From 0379fa9b7d1dcd6a3e5973effae438106b608033 Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Wed, 17 Mar 2021 14:58:50 +0100 Subject: [PATCH 001/492] displaymanager from arcolinux --- src/modules/displaymanager/main.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index c75897efc6..8c75baf292 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -175,7 +175,6 @@ def update_from_desktop_file(self, root_mount_point): '/usr/bin/budgie-session', 'budgie-desktop' # Budgie v8 ), DesktopEnvironment('/usr/bin/gnome-session', 'gnome'), - DesktopEnvironment('/usr/bin/startxfce4', 'xfce'), DesktopEnvironment('/usr/bin/cinnamon-session-cinnamon', 'cinnamon'), DesktopEnvironment('/usr/bin/mate-session', 'mate'), DesktopEnvironment('/usr/bin/enlightenment_start', 'enlightenment'), @@ -184,9 +183,18 @@ def update_from_desktop_file(self, root_mount_point): DesktopEnvironment('/usr/bin/lxqt-session', 'lxqt'), DesktopEnvironment('/usr/bin/pekwm', 'pekwm'), DesktopEnvironment('/usr/bin/pantheon-session', 'pantheon'), - DesktopEnvironment('/usr/bin/i3', 'i3'), DesktopEnvironment('/usr/bin/startdde', 'deepin'), - DesktopEnvironment('/usr/bin/openbox-session', 'openbox') + DesktopEnvironment('/usr/bin/startxfce4', 'xfce'), + DesktopEnvironment('/usr/bin/openbox-session', 'openbox'), + DesktopEnvironment('/usr/bin/i3', 'i3'), + DesktopEnvironment('/usr/bin/awesome', 'awesome'), + DesktopEnvironment('/usr/bin/bspwm', 'bspwm'), + DesktopEnvironment('/usr/bin/herbstluftwm', 'herbstluftwm'), + DesktopEnvironment('/usr/bin/qtile', 'qtile'), + DesktopEnvironment('/usr/bin/xmonad', 'xmonad'), + DesktopEnvironment('/usr/bin/dwm', 'dmw'), + DesktopEnvironment('/usr/bin/jwm', 'jwm'), + DesktopEnvironment('/usr/bin/icewm-session', 'icewm-session'), ] From 6d4a0a1ba3b8eacf005902f6d7d826563f188fcc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Mar 2021 14:38:13 +0100 Subject: [PATCH 002/492] i18n: update the English source files --- lang/calamares_en.ts | 249 ++++++++++++++++++++++++------------------- lang/python.pot | 171 ++++++++++++++--------------- 2 files changed, 217 insertions(+), 203 deletions(-) diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index eb20be4c27..7da27b24c4 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. + - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Widget Tree - + Debug information Debug information @@ -286,13 +306,13 @@ - + &Yes &Yes - + &No &No @@ -302,17 +322,17 @@ &Close - + Install Log Paste URL Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard Link copied to clipboard - + Calamares Initialization Failed Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: <br/>The following modules could not be loaded: - + Continue with setup? Continue with setup? - + Continue with installation? Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now &Set up now - + &Install now &Install now - + Go &back Go &back - + &Set up &Set up - + &Install &Install - + Setup is complete. Close the setup program. Setup is complete. Close the setup program. - + The installation is complete. Close the installer. The installation is complete. Close the installer. - + Cancel setup without changing the system. Cancel setup without changing the system. - + Cancel installation without changing the system. Cancel installation without changing the system. - + &Next &Next - + &Back &Back - + &Done &Done - + &Cancel &Cancel - + Cancel setup? Cancel setup? - + Cancel installation? Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Do you really want to cancel the current install process? @@ -475,12 +495,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 Setup Program - + %1 Installer %1 Installer @@ -488,7 +508,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Gathering system information... @@ -736,22 +756,32 @@ The installer will quit and all changes will be lost. The numbers and dates locale will be set to %1. - + Network Installation. (Disabled: Incorrect configuration) Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Package selection - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -846,42 +876,42 @@ The installer will quit and all changes will be lost. Your passwords do not match! - + Setup Failed Setup Failed - + Installation Failed Installation Failed - + The setup of %1 did not complete successfully. The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. The installation of %1 did not complete successfully. - + Setup Complete Setup Complete - + Installation Complete Installation Complete - + The setup of %1 is complete. The setup of %1 is complete. - + The installation of %1 is complete. The installation of %1 is complete. @@ -1478,72 +1508,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source is plugged in to a power source - + The system is not plugged in to a power source. The system is not plugged in to a power source. - + is connected to the Internet is connected to the Internet - + The system is not connected to the Internet. The system is not connected to the Internet. - + is running the installer as an administrator (root) is running the installer as an administrator (root) - + The setup program is not running with administrator rights. The setup program is not running with administrator rights. - + The installer is not running with administrator rights. The installer is not running with administrator rights. - + has a screen large enough to show the whole installer has a screen large enough to show the whole installer - + The screen is too small to display the setup program. The screen is too small to display the setup program. - + The screen is too small to display the installer. The screen is too small to display the installer. @@ -1611,7 +1641,7 @@ The installer will quit and all changes will be lost. Please install KDE Konsole and try again! - + Executing script: &nbsp;<code>%1</code> Executing script: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Package selection - + Office software Office software - + Office package Office package - + Browser software Browser software - + Browser package Browser package - + Web browser Web browser - + Kernel Kernel - + Services Services - + Login Login - + Desktop Desktop - + Applications Applications - + Communication Communication - + Development Development - + Office Office - + Multimedia Multimedia - + Internet Internet - + Theming Theming - + Gaming Gaming - + Utilities Utilities @@ -3708,12 +3737,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3721,7 +3750,7 @@ Output: UsersQmlViewStep - + Users Users @@ -4141,102 +4170,102 @@ Output: What is your name? - + Your Full Name Your Full Name - + What name do you want to use to log in? What name do you want to use to log in? - + Login Name Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? What is the name of this computer? - + Computer Name Computer Name - + This name will be used if you make the computer visible to others on a network. This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Choose a password to keep your account safe. - + Password Password - + Repeat Password Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password Log in automatically without asking for the password - + Reuse user password as root password Reuse user password as root password - + Use the same password for the administrator account. Use the same password for the administrator account. - + Choose a root password to keep your account safe. Choose a root password to keep your account safe. - + Root Password Root Password - + Repeat Root Password Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/python.pot b/lang/python.pot index 1345aeb3fc..28f17ae174 100644 --- a/lang/python.pot +++ b/lang/python.pot @@ -2,361 +2,346 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." -msgstr "Configure GRUB." +msgstr "" #: src/modules/mount/main.py:30 msgid "Mounting partitions." -msgstr "Mounting partitions." +msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" -msgstr "Configuration Error" +msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." -msgstr "No partitions are defined for 
{!s}
to use." +msgstr "" #: src/modules/services-systemd/main.py:26 msgid "Configure systemd services" -msgstr "Configure systemd services" +msgstr "" #: src/modules/services-systemd/main.py:59 #: src/modules/services-openrc/main.py:93 msgid "Cannot modify service" -msgstr "Cannot modify service" +msgstr "" #: src/modules/services-systemd/main.py:60 msgid "" "systemctl {arg!s} call in chroot returned error code {num!s}." msgstr "" -"systemctl {arg!s} call in chroot returned error code {num!s}." #: src/modules/services-systemd/main.py:63 #: src/modules/services-systemd/main.py:67 msgid "Cannot enable systemd service {name!s}." -msgstr "Cannot enable systemd service {name!s}." +msgstr "" #: src/modules/services-systemd/main.py:65 msgid "Cannot enable systemd target {name!s}." -msgstr "Cannot enable systemd target {name!s}." +msgstr "" #: src/modules/services-systemd/main.py:69 msgid "Cannot disable systemd target {name!s}." -msgstr "Cannot disable systemd target {name!s}." +msgstr "" #: src/modules/services-systemd/main.py:71 msgid "Cannot mask systemd unit {name!s}." -msgstr "Cannot mask systemd unit {name!s}." +msgstr "" #: src/modules/services-systemd/main.py:73 msgid "" -"Unknown systemd commands {command!s} and " -"{suffix!s} for unit {name!s}." +"Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}." msgstr "" -"Unknown systemd commands {command!s} and " -"{suffix!s} for unit {name!s}." #: src/modules/umount/main.py:31 msgid "Unmount file systems." -msgstr "Unmount file systems." +msgstr "" #: src/modules/unpackfs/main.py:35 msgid "Filling up filesystems." -msgstr "Filling up filesystems." +msgstr "" #: src/modules/unpackfs/main.py:255 msgid "rsync failed with error code {}." -msgstr "rsync failed with error code {}." +msgstr "" #: src/modules/unpackfs/main.py:300 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "Unpacking image {}/{}, file {}/{}" +msgstr "" #: src/modules/unpackfs/main.py:315 msgid "Starting to unpack {}" -msgstr "Starting to unpack {}" +msgstr "" #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 msgid "Failed to unpack image \"{}\"" -msgstr "Failed to unpack image \"{}\"" +msgstr "" #: src/modules/unpackfs/main.py:431 msgid "No mount point for root partition" -msgstr "No mount point for root partition" +msgstr "" #: src/modules/unpackfs/main.py:432 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" -msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" #: src/modules/unpackfs/main.py:437 msgid "Bad mount point for root partition" -msgstr "Bad mount point for root partition" +msgstr "" #: src/modules/unpackfs/main.py:438 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" -msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" #: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 #: src/modules/unpackfs/main.py:478 msgid "Bad unsquash configuration" -msgstr "Bad unsquash configuration" +msgstr "" #: src/modules/unpackfs/main.py:455 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" -msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" #: src/modules/unpackfs/main.py:459 msgid "The source filesystem \"{}\" does not exist" -msgstr "The source filesystem \"{}\" does not exist" +msgstr "" #: src/modules/unpackfs/main.py:465 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" -"Failed to find unsquashfs, make sure you have the squashfs-tools package " -"installed" #: src/modules/unpackfs/main.py:479 msgid "The destination \"{}\" in the target system is not a directory" -msgstr "The destination \"{}\" in the target system is not a directory" +msgstr "" #: src/modules/displaymanager/main.py:514 msgid "Cannot write KDM configuration file" -msgstr "Cannot write KDM configuration file" +msgstr "" #: src/modules/displaymanager/main.py:515 msgid "KDM config file {!s} does not exist" -msgstr "KDM config file {!s} does not exist" +msgstr "" #: src/modules/displaymanager/main.py:576 msgid "Cannot write LXDM configuration file" -msgstr "Cannot write LXDM configuration file" +msgstr "" #: src/modules/displaymanager/main.py:577 msgid "LXDM config file {!s} does not exist" -msgstr "LXDM config file {!s} does not exist" +msgstr "" #: src/modules/displaymanager/main.py:660 msgid "Cannot write LightDM configuration file" -msgstr "Cannot write LightDM configuration file" +msgstr "" #: src/modules/displaymanager/main.py:661 msgid "LightDM config file {!s} does not exist" -msgstr "LightDM config file {!s} does not exist" +msgstr "" #: src/modules/displaymanager/main.py:735 msgid "Cannot configure LightDM" -msgstr "Cannot configure LightDM" +msgstr "" #: src/modules/displaymanager/main.py:736 msgid "No LightDM greeter installed." -msgstr "No LightDM greeter installed." +msgstr "" #: src/modules/displaymanager/main.py:767 msgid "Cannot write SLIM configuration file" -msgstr "Cannot write SLIM configuration file" +msgstr "" #: src/modules/displaymanager/main.py:768 msgid "SLIM config file {!s} does not exist" -msgstr "SLIM config file {!s} does not exist" +msgstr "" #: src/modules/displaymanager/main.py:894 msgid "No display managers selected for the displaymanager module." -msgstr "No display managers selected for the displaymanager module." +msgstr "" #: src/modules/displaymanager/main.py:895 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" -"The displaymanagers list is empty or undefined in both globalstorage and " -"displaymanager.conf." #: src/modules/displaymanager/main.py:977 msgid "Display manager configuration was incomplete" -msgstr "Display manager configuration was incomplete" +msgstr "" #: src/modules/initcpiocfg/main.py:28 msgid "Configuring mkinitcpio." -msgstr "Configuring mkinitcpio." +msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." -msgstr "No root mount point is given for 
{!s}
to use." +msgstr "" #: src/modules/luksopenswaphookcfg/main.py:26 msgid "Configuring encrypted swap." -msgstr "Configuring encrypted swap." +msgstr "" #: src/modules/rawfs/main.py:26 msgid "Installing data." -msgstr "Installing data." +msgstr "" #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" -msgstr "Configure OpenRC services" +msgstr "" #: src/modules/services-openrc/main.py:57 msgid "Cannot add service {name!s} to run-level {level!s}." -msgstr "Cannot add service {name!s} to run-level {level!s}." +msgstr "" #: src/modules/services-openrc/main.py:59 msgid "Cannot remove service {name!s} from run-level {level!s}." -msgstr "Cannot remove service {name!s} from run-level {level!s}." +msgstr "" #: src/modules/services-openrc/main.py:61 msgid "" "Unknown service-action {arg!s} for service {name!s} in run-" "level {level!s}." msgstr "" -"Unknown service-action {arg!s} for service {name!s} in run-" -"level {level!s}." #: src/modules/services-openrc/main.py:94 msgid "" "rc-update {arg!s} call in chroot returned error code {num!s}." msgstr "" -"rc-update {arg!s} call in chroot returned error code {num!s}." #: src/modules/services-openrc/main.py:101 msgid "Target runlevel does not exist" -msgstr "Target runlevel does not exist" +msgstr "" #: src/modules/services-openrc/main.py:102 msgid "" "The path for runlevel {level!s} is {path!s}, which does not " "exist." msgstr "" -"The path for runlevel {level!s} is {path!s}, which does not " -"exist." #: src/modules/services-openrc/main.py:110 msgid "Target service does not exist" -msgstr "Target service does not exist" +msgstr "" #: src/modules/services-openrc/main.py:111 msgid "" -"The path for service {name!s} is {path!s}, which does not " -"exist." +"The path for service {name!s} is {path!s}, which does not exist." msgstr "" -"The path for service {name!s} is {path!s}, which does not " -"exist." #: src/modules/plymouthcfg/main.py:27 msgid "Configure Plymouth theme" -msgstr "Configure Plymouth theme" +msgstr "" #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 msgid "Install packages." -msgstr "Install packages." +msgstr "" #: src/modules/packages/main.py:57 #, python-format msgid "Processing packages (%(count)d / %(total)d)" -msgstr "Processing packages (%(count)d / %(total)d)" +msgstr "" #: src/modules/packages/main.py:62 #, python-format msgid "Installing one package." msgid_plural "Installing %(num)d packages." -msgstr[0] "Installing one package." -msgstr[1] "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" #: src/modules/packages/main.py:65 #, python-format msgid "Removing one package." msgid_plural "Removing %(num)d packages." -msgstr[0] "Removing one package." -msgstr[1] "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" #: src/modules/bootloader/main.py:43 msgid "Install bootloader." -msgstr "Install bootloader." +msgstr "" #: src/modules/hwclock/main.py:26 msgid "Setting hardware clock." -msgstr "Setting hardware clock." +msgstr "" #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "Creating initramfs with mkinitfs." +msgstr "" #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "Failed to run mkinitfs on the target" +msgstr "" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" -msgstr "The exit code was {}" +msgstr "" #: src/modules/dracut/main.py:27 msgid "Creating initramfs with dracut." -msgstr "Creating initramfs with dracut." +msgstr "" #: src/modules/dracut/main.py:49 msgid "Failed to run dracut on the target" -msgstr "Failed to run dracut on the target" +msgstr "" #: src/modules/initramfscfg/main.py:32 msgid "Configuring initramfs." -msgstr "Configuring initramfs." +msgstr "" #: src/modules/openrcdmcryptcfg/main.py:26 msgid "Configuring OpenRC dmcrypt service." -msgstr "Configuring OpenRC dmcrypt service." +msgstr "" #: src/modules/fstab/main.py:29 msgid "Writing fstab." -msgstr "Writing fstab." +msgstr "" #: src/modules/dummypython/main.py:35 msgid "Dummy python job." -msgstr "Dummy python job." +msgstr "" #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 #: src/modules/dummypython/main.py:94 msgid "Dummy python step {}" -msgstr "Dummy python step {}" +msgstr "" #: src/modules/localecfg/main.py:30 msgid "Configuring locales." -msgstr "Configuring locales." +msgstr "" #: src/modules/networkcfg/main.py:28 msgid "Saving network configuration." -msgstr "Saving network configuration." +msgstr "" From 3600c6748583159785b7f400b1628206452a9751 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 7 Aug 2019 22:37:41 +0200 Subject: [PATCH 003/492] CMake: remove mention of the os-modules The modules (and the need for a specific USE_os) have moved to calamares-extensions. --- CMakeLists.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ad919c4fc..e71f1c889a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,22 +92,13 @@ option( BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON ) # # To explicitly disable a set of modules, set USE_=none # (e.g. the literal string none), which won't match any of the -# modules but is handled specially. This is the default for -# USE_os, which are modules for specialty non-Linux distributions. +# modules but is handled specially. # # The following USE_* functionalities are available: # - *services* picks one of the two service-configuration modules, # for either systemd or openrc. This defaults to empty so that # **both** modules are available. -# - *os* picks an OS-specific module for things-that-are-not-Linux. -# It is generally discouraged to use this unless your distro is -# completely unable to use standard Linux tools for configuration. -# This defaults to *none* so that nothing gets picked up and nothing -# is packaged -- you must explicitly set it to empty to get all of -# the modules, but that hardly makes sense. Note, too that there -# are currently no os-* modules shipped with Calamares. set( USE_services "" CACHE STRING "Select the services module to use" ) -set( USE_os "none" CACHE STRING "Select the OS-specific module to include" ) ### Calamares application info # From b5788d4b1704d5a595847cb4eeb2e3eaa4d68ff6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 22 Mar 2021 13:18:41 +0100 Subject: [PATCH 004/492] CMake: be more verbose on developer machines This change is relevant only if you build Calamares and some out-of-tree modules (e.g. calamares-extensions) on the same machine where CMake caches files in the developer's ~/.cmake/packages . If the user packages registry kicks in the include files won't be found, and the targets are not defined. --- CalamaresConfig.cmake.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CalamaresConfig.cmake.in b/CalamaresConfig.cmake.in index fdb3c2038e..f10fda11ae 100644 --- a/CalamaresConfig.cmake.in +++ b/CalamaresConfig.cmake.in @@ -23,6 +23,9 @@ # include(${CMAKE_CURRENT_LIST_DIR}/CalamaresConfigVersion.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CalamaresTargets.cmake) +if (NOT TARGET Calamares::calamares OR NOT TARGET Calamares::calamaresui) + message(FATAL_ERROR "Calamares found with missing CMake targets") +endif() ### Dependencies # From dc0164d50848a462814d9323fcd878bf292483dc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 22 Mar 2021 13:36:52 +0100 Subject: [PATCH 005/492] [libcalamares] Also install the version header --- src/libcalamares/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 95dad05300..a084c120db 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -187,6 +187,7 @@ file( GLOB rootHeaders "*.h" ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h + ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h ${rootHeaders} DESTINATION include/libcalamares ) From 0bf1df72cdc023a5d1ca1c3ec945ce6d71ec2626 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 22 Mar 2021 13:49:04 +0100 Subject: [PATCH 006/492] CMake: report Python module name without subdirectory FIXES ##1641 --- CMakeModules/CalamaresAddModuleSubdirectory.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeModules/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake index 87f8547f80..186c03d00f 100644 --- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake +++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake @@ -59,10 +59,10 @@ function( calamares_add_module_subdirectory ) if( _dirname ) # Remove the dirname and any leftover leading /s string( REGEX REPLACE "^${_dirname}/*" "" _modulename "${SUBDIRECTORY}" ) - set( MODULE_DESTINATION ${MODULES_DIR}/${_modulename} ) else() - set( MODULE_DESTINATION ${MODULES_DIR}/${SUBDIRECTORY} ) + set( _modulename ${SUBDIRECTORY} ) endif() + set( MODULE_DESTINATION ${MODULES_DIR}/${_modulename} ) # Read module.desc, check that the interface type is supported. # @@ -114,7 +114,7 @@ function( calamares_add_module_subdirectory ) endif() endforeach() - message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${SUBDIRECTORY}${ColorReset}" ) + message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${_modulename}${ColorReset}" ) message( " ${Green}TYPE:${ColorReset} jobmodule" ) message( " ${Green}MODULE_DESTINATION:${ColorReset} ${MODULE_DESTINATION}" ) if( MODULE_CONFIG_FILES ) From a64a54ff040239fb8e4249ec055005f2ec036c5e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 22 Mar 2021 15:39:43 +0100 Subject: [PATCH 007/492] CMake: split out global skip-modules checking There are two ways to skip building a module: - SKIP_MODULES (individually listed) - USE_* (pick one from a collection) Move the handling for those ways to a separate function, so that it can be re-used in the calamares-extensions module too, or other external module repositories. --- .../CalamaresAddModuleSubdirectory.cmake | 49 ++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/CMakeModules/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake index 186c03d00f..9435021c19 100644 --- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake +++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake @@ -32,9 +32,46 @@ function( calamares_explain_skipped_modules ) endif() endfunction() +# Globally, SKIP_MODULES and USE_* affect what modules are built. +# Check if *modulename* should be skipped, and if so, set *outvar* to +# a human-readable reason for skipping it. +function( calamares_check_skip modulename outvar ) + # Globally-defined SKIP_MODULES may be space- or semicolon- separated + # so convert it to a list-variable. + string( REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}" ) + + list( FIND SKIP_LIST "${modulename}" DO_SKIP ) + if( NOT DO_SKIP EQUAL -1 ) + set( ${outvar} "user request" PARENT_SCOPE ) + return() + endif() + + # Not skipped by the global check, see if it has an applicable USE_* + if( "${modulename}" MATCHES "^[a-zA-Z0-9_]+-" ) + # Split the name into - + string( REGEX REPLACE "-.*" "" _category "${modulename}" ) + string( REGEX REPLACE "^[^-]+-" "" _implementation "${modulename}" ) + else() + # Not a module to which USE_* applies + return() + endif() + + if( NOT "${UsE_${_category}}" ) + # Category not set at all or nonexistent + return() + elseif( "${USE_${_category}}" STREQUAL "none" ) + set( ${outvar} "category ${_category} disabled" PARENT_SCOPE ) + elseif( NOT "${USE_${_category}}" STREQUAL "${modulename}" ) + set( ${outvar} "category ${_category} selects ${USE_${_category}}" PARENT_SCOPE ) + endif() +endfunction() + function( calamares_add_module_subdirectory ) set( SUBDIRECTORY ${ARGV0} ) + # Set SKIPPED_MODULES here, so CMake-based modules have a + # parent scope to set it in; this function, in turn sets it + # in **its** parent scope. set( SKIPPED_MODULES ) set( MODULE_CONFIG_FILES "" ) @@ -64,13 +101,19 @@ function( calamares_add_module_subdirectory ) endif() set( MODULE_DESTINATION ${MODULES_DIR}/${_modulename} ) + calamares_check_skip( ${_modulename} SKIPPED_MODULES ) + # Read module.desc, check that the interface type is supported. # # _mod_enabled boolean if the module should be built (only if the interface is supported) # _mod_reason is a human-readable explanation why it isn't built # _mod_testing boolean if the module should be added to the loadmodule tests file(STRINGS "${_mod_dir}/module.desc" MODULE_INTERFACE REGEX "^interface") - if ( MODULE_INTERFACE MATCHES "pythonqt" ) + if ( SKIPPED_MODULES ) + set( _mod_enabled OFF ) + set( _mod_reason "${SKIPPED_MODULES}" ) + set( _mod_testing OFF ) + elseif ( MODULE_INTERFACE MATCHES "pythonqt" ) set( _mod_enabled ${Calamares_WITH_PYTHONQT} ) set( _mod_reason "No PythonQt support" ) set( _mod_testing OFF ) @@ -159,7 +202,9 @@ function( calamares_add_module_subdirectory ) endforeach() endif() - # Check that the module can be loaded. Since this calls exec(), the module + # Adding general tests + # + # Add a check that the module can be loaded. Since this calls exec(), the module # may try to do things to the running system. Needs work to make that a # safe thing to do. # From 88aa1755cede01cc008b806abdc1df04bab94959 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 22 Mar 2021 15:55:30 +0100 Subject: [PATCH 008/492] CMake: split out skip-module-checking to its own cmake module The skip-checking is now in the functions for adding plugins and subdirectories, so that third-party building should get it as well, for free. Since AddModuleSubdirectory and AddPlugin use the newly split-out module, handling SKIP_MODULES and USE_* consistently across module repositories is now easier. While here, make accumulating-the-skipped-modules explicit. --- CMakeLists.txt | 1 + .../CalamaresAddModuleSubdirectory.cmake | 108 ++++++++-------- CMakeModules/CalamaresAddPlugin.cmake | 14 +++ .../CalamaresCheckModuleSelection.cmake | 116 ++++++++++++++++++ src/modules/CMakeLists.txt | 50 +------- 5 files changed, 185 insertions(+), 104 deletions(-) create mode 100644 CMakeModules/CalamaresCheckModuleSelection.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index e71f1c889a..c0a800750f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -606,6 +606,7 @@ install( "CMakeModules/CalamaresAddTest.cmake" "CMakeModules/CalamaresAddTranslations.cmake" "CMakeModules/CalamaresAutomoc.cmake" + "CMakeModules/CalamaresCheckModuleSelection.cmake" "CMakeModules/CMakeColors.cmake" "CMakeModules/FindYAMLCPP.cmake" DESTINATION diff --git a/CMakeModules/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake index 9435021c19..a08f1162e3 100644 --- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake +++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake @@ -12,67 +12,38 @@ # Function and support code for adding a Calamares module (either a Qt / C++ plugin, # or a Python module, or whatever) to the build. # +# # Usage +# +# The public API is one single function: +# +# - calamares_add_module_subdirectory(subdirectory [skiplistvar]) +# Adds a given *subdirectory* to the modules list, building the +# module that is there. The *subdirectory* must contain a `module.desc` +# (generally non-C++ modules) or a `CMakeLists.txt` (for C++ modules, +# or special cases). The module is assumed to be named after the +# (last component of) the subdirectory. +# +# If the module would be skipped (by the global SKIP_MODULES setting +# or a USE_* setting) or the module itself sets a reason to skip +# via the calamares_skip_module() function, the module is added to +# the list of skipped-modules in *skiplistvar*. If no variable is +# given, the reason is set in the parent scope variable +# SKIPPED_MODULES . Do **not** use SKIPPED_MODULES as the name of +# *skiplistvar*, things will get weird. +# + include( CalamaresAddTranslations ) +include( CalamaresCheckModuleSelection ) set( MODULE_DATA_DESTINATION share/calamares/modules ) -# Convenience function to indicate that a module has been skipped -# (optionally also why). Call this in the module's CMakeLists.txt -macro( calamares_skip_module ) - set( SKIPPED_MODULES ${SKIPPED_MODULES} ${ARGV} PARENT_SCOPE ) -endmacro() - -function( calamares_explain_skipped_modules ) - if ( ARGN ) - message( "${ColorReset}-- Skipped modules:" ) - foreach( SUBDIRECTORY ${ARGN} ) - message( "${ColorReset}-- Skipped ${BoldRed}${SUBDIRECTORY}${ColorReset}." ) - endforeach() - message( "" ) - endif() -endfunction() - -# Globally, SKIP_MODULES and USE_* affect what modules are built. -# Check if *modulename* should be skipped, and if so, set *outvar* to -# a human-readable reason for skipping it. -function( calamares_check_skip modulename outvar ) - # Globally-defined SKIP_MODULES may be space- or semicolon- separated - # so convert it to a list-variable. - string( REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}" ) - - list( FIND SKIP_LIST "${modulename}" DO_SKIP ) - if( NOT DO_SKIP EQUAL -1 ) - set( ${outvar} "user request" PARENT_SCOPE ) - return() - endif() - - # Not skipped by the global check, see if it has an applicable USE_* - if( "${modulename}" MATCHES "^[a-zA-Z0-9_]+-" ) - # Split the name into - - string( REGEX REPLACE "-.*" "" _category "${modulename}" ) - string( REGEX REPLACE "^[^-]+-" "" _implementation "${modulename}" ) - else() - # Not a module to which USE_* applies - return() - endif() - - if( NOT "${UsE_${_category}}" ) - # Category not set at all or nonexistent - return() - elseif( "${USE_${_category}}" STREQUAL "none" ) - set( ${outvar} "category ${_category} disabled" PARENT_SCOPE ) - elseif( NOT "${USE_${_category}}" STREQUAL "${modulename}" ) - set( ${outvar} "category ${_category} selects ${USE_${_category}}" PARENT_SCOPE ) - endif() -endfunction() - -function( calamares_add_module_subdirectory ) +function( _calamares_add_module_subdirectory_impl ) set( SUBDIRECTORY ${ARGV0} ) # Set SKIPPED_MODULES here, so CMake-based modules have a # parent scope to set it in; this function, in turn sets it # in **its** parent scope. - set( SKIPPED_MODULES ) + set( SKIPPED_MODULES "" ) set( MODULE_CONFIG_FILES "" ) set( _mod_dir "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" ) @@ -85,6 +56,16 @@ function( calamares_add_module_subdirectory ) if ( SKIPPED_MODULES ) set( SKIPPED_MODULES ${SKIPPED_MODULES} PARENT_SCOPE ) set( MODULE_CONFIG_FILES "" ) + else() + # The SKIPPED_MODULES may be set in the directory itself + get_directory_property( _skip DIRECTORY ${SUBDIRECTORY} DEFINITION SKIPPED_MODULES ) + if ( _skip ) + set( SKIPPED_MODULES ${_skip} PARENT_SCOPE ) + set( MODULE_CONFIG_FILES "" ) + endif() + endif() + if ( SKIPPED_MODULES ) + return() endif() # ...otherwise, we look for a module.desc. elseif( EXISTS "${_mod_dir}/module.desc" ) @@ -110,9 +91,10 @@ function( calamares_add_module_subdirectory ) # _mod_testing boolean if the module should be added to the loadmodule tests file(STRINGS "${_mod_dir}/module.desc" MODULE_INTERFACE REGEX "^interface") if ( SKIPPED_MODULES ) - set( _mod_enabled OFF ) - set( _mod_reason "${SKIPPED_MODULES}" ) - set( _mod_testing OFF ) + # If it's skipped by infrastucture, the message already includes the module + # name. We don't need to do any further checking. + set( SKIPPED_MODULES "${SKIPPED_MODULES}" PARENT_SCOPE ) + return() elseif ( MODULE_INTERFACE MATCHES "pythonqt" ) set( _mod_enabled ${Calamares_WITH_PYTHONQT} ) set( _mod_reason "No PythonQt support" ) @@ -248,3 +230,19 @@ function( calamares_add_module_subdirectory ) endif() endif() endfunction() + +function( calamares_add_module_subdirectory ) + set( SUBDIRECTORY ${ARGV0} ) + set( _ams_SKIP_LIST ${ARGV1} ) + + set( SKIPPED_MODULES "" ) + _calamares_add_module_subdirectory_impl( ${SUBDIRECTORY} ) + if ( SKIPPED_MODULES ) + if ( _ams_SKIP_LIST ) + list( APPEND ${_ams_SKIP_LIST} "${SKIPPED_MODULES}" ) + set( ${_ams_SKIP_LIST} "${${_ams_SKIP_LIST}}" PARENT_SCOPE ) + else() + set( SKIPPED_MODULES "${SKIPPED_MODULES}" PARENT_SCOPE ) + endif() + endif() +endfunction() diff --git a/CMakeModules/CalamaresAddPlugin.cmake b/CMakeModules/CalamaresAddPlugin.cmake index 55865999c1..5186bc54b1 100644 --- a/CMakeModules/CalamaresAddPlugin.cmake +++ b/CMakeModules/CalamaresAddPlugin.cmake @@ -59,9 +59,17 @@ # If this is set, writes an explicit weight into the module.desc; # module weights are used in progress reporting. # +# +# This function follows the global SKIP_MODULES and USE_* settings, so +# a plugin may be skipped -- then nothing will be built. In that case, +# SKIPPED_MODULES is set in the parent (i.e. caller's) scope with the +# reason why. This should rarely be a concern as AddModuleSubdirectory +# already handles skip-reasons and collects them for reporting. include( CMakeParseArguments ) + include( CalamaresAddLibrary ) +include( CalamaresCheckModuleSelection ) include( CMakeColors ) function( calamares_add_plugin ) @@ -80,6 +88,12 @@ function( calamares_add_plugin ) set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) + calamares_check_skip( ${NAME} _skip) + if ( _skip ) + set( SKIPPED_MODULES "${_skip}" PARENT_SCOPE ) + return() + endif() + message( "-- ${BoldYellow}Found ${CALAMARES_APPLICATION_NAME} module: ${BoldRed}${PLUGIN_NAME}${ColorReset}" ) message( " ${Green}TYPE:${ColorReset} ${PLUGIN_TYPE}" ) message( " ${Green}LINK_LIBRARIES:${ColorReset} ${PLUGIN_LINK_LIBRARIES}" ) diff --git a/CMakeModules/CalamaresCheckModuleSelection.cmake b/CMakeModules/CalamaresCheckModuleSelection.cmake new file mode 100644 index 0000000000..5eeb0e9700 --- /dev/null +++ b/CMakeModules/CalamaresCheckModuleSelection.cmake @@ -0,0 +1,116 @@ +# === This file is part of Calamares - === +# +# SPDX-FileCopyrightText: 2014 Teo Mrnjavac +# SPDX-FileCopyrightText: 2017 Adriaan de Groot +# SPDX-License-Identifier: BSD-2-Clause +# +# Calamares is Free Software: see the License-Identifier above. +# +### +# +# This module implements the "skip modules" part of configuring +# the Calamares repository or an external-modules repository. +# +# It should not be necessary to include() this module explicitly, +# since both AddPlugin and AddModuleSubdirectory do so implicitly. +# +# +# # Usage +# +# The public API is two functions: +# +# - calamares_skip_module(reason) +# A C++ module (or any that uses CMake) can call this macro to +# add *reason* to the list of skipped modules. Typically a module +# will pass in "modulename (why)" so that it is clear **which** +# module is skipped. This macro should be called at the top-level +# of a module's CMakeLists.txt and the module should then **not** +# call calamares_add_plugin(). +# - calamares_explain_skipped_modules(list...) +# This will print out all the module reasons (see above) that have +# been added to the given *listvar*. When AddModuleSubdirectory is +# used as the mechanism to add all the subdirectories in the repository +# that contain modules, with a consistent *listvar* setting, +# this will show all the modules that have been skipped. +# +# The internal API is one function: +# +# - calamares_check_skip(modulename outvar) +# Checks if the *modulename* has been listed in the global SKIP_MODULES +# variable (to skip specifically-named modules) or if there is a USE_* +# setting applicable to the module. If the module is skipped for this +# reason, a suitable entry is added to *outvar* as if +# calamares_skip_module() had been called. +# +# Best practice is to pick a variable to collect all of the skipped +# modules, and to pass the name of that variable to AddModuleSubdirectory +# in each call. After all subdirectories have been added, call +# calamares_explain_skipped_modules() with the value of that variable. + + +# Convenience function to indicate that a module has been skipped +# (optionally also why). Call this in the module's CMakeLists.txt +macro( calamares_skip_module ) + set( SKIPPED_MODULES ${SKIPPED_MODULES} ${ARGV} PARENT_SCOPE ) +endmacro() + +function( calamares_explain_skipped_modules ) + if ( ARGN ) + message( "${ColorReset}-- Skipped modules:" ) + foreach( SUBDIRECTORY ${ARGN} ) + message( "${ColorReset}-- Skipped ${BoldRed}${SUBDIRECTORY}${ColorReset}." ) + endforeach() + message( "" ) + endif() +endfunction() + +# Globally, SKIP_MODULES and USE_* affect what modules are built. +# Check if *modulename* should be skipped, and if so, set *outvar* to +# a human-readable reason for skipping it. +function( _calamares_check_skip_impl modulename outvar ) + # Globally-defined SKIP_MODULES may be space- or semicolon- separated + # so convert it to a list-variable. + string( REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}" ) + + list( FIND SKIP_LIST "${modulename}" DO_SKIP ) + if( NOT DO_SKIP EQUAL -1 ) + set( ${outvar} "user request" PARENT_SCOPE ) + return() + endif() + + # Not skipped by the global check, see if it has an applicable USE_* + if( "${modulename}" MATCHES "^[a-zA-Z0-9_]+-" ) + # Split the name into - + string( REGEX REPLACE "-.*" "" _category "${modulename}" ) + string( REGEX REPLACE "^[^-]+-" "" _implementation "${modulename}" ) + else() + # Not a module to which USE_* applies + return() + endif() + + if( "${USE_${_category}}" STREQUAL "none" ) + set( ${outvar} "category ${_category} disabled" PARENT_SCOPE ) + return() + elseif( "${USE_${_category}}" STREQUAL "" ) + # Category not set at all or nonexistent + return() + endif() + + if ( "${USE_${_category}}" STREQUAL "${_implementation}" ) + # Matches, so accept this module + else() + set( ${outvar} "category ${_category} selects ${USE_${_category}}" PARENT_SCOPE ) + endif() +endfunction() + +# This is the public API;it calls the _impl version so that there +# is an extra intermediate scope for the subdirectory to write results into. +function( calamares_check_skip modulename outvar ) + set( _skip "" ) + _calamares_check_skip_impl( "${modulename}" _skip ) + if ( _skip ) + message( "${ColorReset}-- Skipping module ${BoldRed}${modulename} (${_skip})${ColorReset}." ) + message( "" ) + set( ${outvar} "${modulename} (${_skip})" PARENT_SCOPE ) + endif() +endfunction() diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 8e8c67848e..03384105ec 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -21,56 +21,8 @@ string( REPLACE " " ";" SKIP_LIST "${SKIP_MODULES}" ) file( GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*" ) list( SORT SUBDIRECTORIES ) -set( _use_categories "" ) -set( _found_categories "" ) - foreach( SUBDIRECTORY ${SUBDIRECTORIES} ) - list( FIND SKIP_LIST ${SUBDIRECTORY} DO_SKIP ) - - set( _skip_reason "user request" ) - # Handle the USE_ variables by looking for subdirectories - # with a - kind of name. - if( SUBDIRECTORY MATCHES "^[a-zA-Z0-9_]+-" ) - string( REGEX REPLACE "^[^-]+-" "" _implementation ${SUBDIRECTORY} ) - string( REGEX REPLACE "-.*" "" _category ${SUBDIRECTORY} ) - if( USE_${_category} ) - list( APPEND _use_categories ${_category} ) - if( "${_implementation}" STREQUAL "${USE_${_category}}" ) - list( APPEND _found_categories ${_category} ) - else() - list( APPEND SKIP_LIST ${SUBDIRECTORY} ) - set( _skip_reason "USE_${_category}=${USE_${_category}}" ) - set( DO_SKIP 1 ) - endif() - endif() - endif() - - if( NOT DO_SKIP EQUAL -1 ) - message( "${ColorReset}-- Skipping module ${BoldRed}${SUBDIRECTORY}${ColorReset}." ) - message( "" ) - list( APPEND LIST_SKIPPED_MODULES "${SUBDIRECTORY} (${_skip_reason})" ) - elseif( ( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" ) AND - ( DO_SKIP EQUAL -1 ) ) - set( SKIPPED_MODULES ) - calamares_add_module_subdirectory( ${SUBDIRECTORY} ) - if ( SKIPPED_MODULES ) - list( APPEND LIST_SKIPPED_MODULES "${SKIPPED_MODULES}" ) - endif() - endif() -endforeach() - -# This is *also* done in top-level, so list is displayed -# both before and after the feature summary. -calamares_explain_skipped_modules( ${LIST_SKIPPED_MODULES} ) - -foreach( _category ${_use_categories} ) - list( FIND _found_categories ${_category} _found ) - if ( ${USE_${_category}} STREQUAL "none" ) - set( _found 0 ) - endif() - if ( _found EQUAL -1 ) - message( FATAL_ERROR "USE_${_category} is set to ${USE_${_category}} and no module matches." ) - endif() + calamares_add_module_subdirectory( ${SUBDIRECTORY} LIST_SKIPPED_MODULES ) endforeach() # TODO:3.3: Use FindPython3 From 1e1b7b7ecea1b93980ef2f2582c4972de69135d3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 14:21:58 +0100 Subject: [PATCH 009/492] [libcalamares] Introduce a convenience getter for GlobalStorage --- src/libcalamares/JobQueue.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/libcalamares/JobQueue.h b/src/libcalamares/JobQueue.h index 92468d535e..699f52e428 100644 --- a/src/libcalamares/JobQueue.h +++ b/src/libcalamares/JobQueue.h @@ -27,7 +27,22 @@ class DLLEXPORT JobQueue : public QObject explicit JobQueue( QObject* parent = nullptr ); ~JobQueue() override; + /** @brief Returns the most-recently-created instance. + * + * It is possible for instance() to be @c nullptr, since you must + * call the constructor explicitly first. + */ static JobQueue* instance(); + /* @brief Returns the GlobalStorage object for the instance. + * + * It is possible for instanceGlobalStorage() to be @c nullptr, + * since there might not be an instance to begin with. + */ + static GlobalStorage* instanceGlobalStorage() + { + auto* jq = instance(); + return jq ? jq->globalStorage() : nullptr; + } GlobalStorage* globalStorage() const; From afdf431b774a5a58abf8ef2521e126a91772fb7d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 11:13:49 +0100 Subject: [PATCH 010/492] [libcalamares] Add partition service for managing global storage - the global storage key filesystem_use has a structured meaning, so give it a (trivial-ish) API for reading and writing. --- src/libcalamares/CMakeLists.txt | 1 + src/libcalamares/partition/Global.cpp | 78 +++++++++++++++++++++++++++ src/libcalamares/partition/Global.h | 66 +++++++++++++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 src/libcalamares/partition/Global.cpp create mode 100644 src/libcalamares/partition/Global.h diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index a084c120db..404ac129f4 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -63,6 +63,7 @@ set( libSources packages/Globals.cpp # Partition service + partition/Global.cpp partition/Mount.cpp partition/PartitionSize.cpp partition/Sync.cpp diff --git a/src/libcalamares/partition/Global.cpp b/src/libcalamares/partition/Global.cpp new file mode 100644 index 0000000000..7203f6b555 --- /dev/null +++ b/src/libcalamares/partition/Global.cpp @@ -0,0 +1,78 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + * + */ +#include "Global.h" + +#include "FileSystem.h" +#include "GlobalStorage.h" +#include "JobQueue.h" + +#include + +static const QString fsUse_key = QStringLiteral( "filesystem_use" ); + +STATICTEST +bool +isFilesystemUsedGS( const Calamares::GlobalStorage& gs, const QString& filesystemType ) +{ + + const QVariantMap fsUse = gs.value( fsUse_key ).toMap(); + if ( fsUse.contains( filesystemType ) ) + { + const auto v = fsUse.value( filesystemType ); + return v.toBool(); + } + return false; +} + +STATICTEST void +useFilesystemGS( Calamares::GlobalStorage& gs, const QString& filesystemType, bool used ) +{ + QVariantMap existingMap = gs.contains( fsUse_key ) ? gs.value( fsUse_key ).toMap() : QVariantMap(); + existingMap.insert( filesystemType, used ); + gs.insert( fsUse_key, existingMap ); +} + +bool +CalamaresUtils::Partition::isFilesystemUsedGS( const QString& filesystemType ) +{ + const auto* jq = Calamares::JobQueue::instance(); + const auto* gs = jq ? jq->globalStorage() : nullptr; + + if ( !gs ) + { + return false; + } + return isFilesystemUsedGS( *gs, filesystemType ); +} + +void +CalamaresUtils::Partition::useFilesystemGS( const QString& filesystemType, bool used ) +{ + const auto* jq = Calamares::JobQueue::instance(); + auto* gs = jq ? jq->globalStorage() : nullptr; + + if ( gs ) + { + useFilesystemGS( *gs, filesystemType, used ); + } +} + +#ifdef WITH_KPMCORE4API +bool +CalamaresUtils::Partition::isFilesystemUsedGS( FileSystem::Type filesystem ) +{ + return isFilesystemUsedGS( untranslatedFS( filesystem ) ); +} +void +CalamaresUtils::Partition::useFilesystemGS( FileSystem::Type filesystem, bool used ) +{ + useFilesystemGS( untranslatedFS( filesystem ), used ); +} +#endif diff --git a/src/libcalamares/partition/Global.h b/src/libcalamares/partition/Global.h new file mode 100644 index 0000000000..3164d06fc9 --- /dev/null +++ b/src/libcalamares/partition/Global.h @@ -0,0 +1,66 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + * + */ + +/* + * This is the API for manipulating Global Storage keys related to + * filesystems and partitions. + */ + +#ifndef PARTITION_GLOBAL_H +#define PARTITION_GLOBAL_H + +#include "DllMacro.h" + +#ifdef WITH_KPMCORE4API +#include +#endif + +namespace CalamaresUtils +{ +namespace Partition +{ +/** @brief Mark a particular filesystem type as used (or not) + * + * Filesystems are marked used (or not) in the global storage + * key *filesystem_use*. Sub-keys are the filesystem name, + * and the values are boolean; filesystems that are used in + * the target system are marked with @c true. Unused filesystems + * may be unmarked, or may be marked @c false. + * + * The filesystem name should be the untranslated name. Filesystem + * names are **lower**cased when used as keys. + */ +void DLLEXPORT useFilesystemGS( const QString& filesystemType, bool used ); +/** @brief Reads from global storage whether the filesystem type is used + * + * Reads from the global storage key *filesystem_use* and returns + * the boolean value stored in subkey @p filesystemType. Returns + * @c false if the subkey is not set at all. + */ +bool DLLEXPORT isFilesystemUsedGS( const QString& filesystemType ); + +#ifdef WITH_KPMCORE4API +/** @brief Mark a particular filesystem type as used (or not) + * + * See useFilesystemGS(const QString&, bool); this method uses the filesystem type + * enumeration to pick the name. + */ +void DLLEXPORT useFilesystemGS( FileSystem::Type filesystem, bool used ); +/* @brief Reads from global storage whether the typesystem type is used + * + * See isFilesystemUsedGS(const QString&). + */ +bool DLLEXPORT isFilesystemUsedGS( FileSystem::Type filesystem ); + +#endif +} // namespace Partition +} // namespace CalamaresUtils + +#endif From 75eb2c3cd4482543afec01a995f7249ced694c8a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 11:21:15 +0100 Subject: [PATCH 011/492] [libcalamares] Add tests for filesystem_use service --- src/libcalamares/CMakeLists.txt | 3 + src/libcalamares/partition/Tests.cpp | 93 ++++++++++++++++++++++++---- src/libcalamares/partition/Tests.h | 33 ---------- 3 files changed, 84 insertions(+), 45 deletions(-) delete mode 100644 src/libcalamares/partition/Tests.h diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 404ac129f4..69533cfffb 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -242,7 +242,10 @@ calamares_add_test( calamares_add_test( libcalamarespartitiontest SOURCES + partition/Global.cpp partition/Tests.cpp + LIBRARIES + ${OPTIONAL_PRIVATE_LIBRARIES} ) if( KPMcore_FOUND ) diff --git a/src/libcalamares/partition/Tests.cpp b/src/libcalamares/partition/Tests.cpp index cd2922ee2d..512a23110d 100644 --- a/src/libcalamares/partition/Tests.cpp +++ b/src/libcalamares/partition/Tests.cpp @@ -8,32 +8,54 @@ * */ -#include "Tests.h" - #include "PartitionSize.h" +#include "GlobalStorage.h" +#include "utils/Logger.h" + +#include +#include + +// Implementation details being tested +extern bool isFilesystemUsedGS( const Calamares::GlobalStorage& gs, const QString& filesystemType ); +extern void useFilesystemGS( Calamares::GlobalStorage& gs, const QString& filesystemType, bool used ); + + using SizeUnit = CalamaresUtils::Partition::SizeUnit; using PartitionSize = CalamaresUtils::Partition::PartitionSize; Q_DECLARE_METATYPE( SizeUnit ) -#include "utils/Logger.h" +class PartitionServiceTests : public QObject +{ + Q_OBJECT +public: + PartitionServiceTests(); + ~PartitionServiceTests() override; -#include +private Q_SLOTS: + void initTestCase(); + + void testUnitComparison_data(); + void testUnitComparison(); + + void testUnitNormalisation_data(); + void testUnitNormalisation(); -QTEST_GUILESS_MAIN( PartitionSizeTests ) + void testFilesystemGS(); +}; -PartitionSizeTests::PartitionSizeTests() {} +PartitionServiceTests::PartitionServiceTests() {} -PartitionSizeTests::~PartitionSizeTests() {} +PartitionServiceTests::~PartitionServiceTests() {} void -PartitionSizeTests::initTestCase() +PartitionServiceTests::initTestCase() { } void -PartitionSizeTests::testUnitComparison_data() +PartitionServiceTests::testUnitComparison_data() { QTest::addColumn< SizeUnit >( "u1" ); QTest::addColumn< SizeUnit >( "u2" ); @@ -71,7 +93,7 @@ original_compare( SizeUnit m_unit, SizeUnit other_m_unit ) } void -PartitionSizeTests::testUnitComparison() +PartitionServiceTests::testUnitComparison() { QFETCH( SizeUnit, u1 ); QFETCH( SizeUnit, u2 ); @@ -98,7 +120,7 @@ constexpr qint64 operator""_qi( unsigned long long m ) } void -PartitionSizeTests::testUnitNormalisation_data() +PartitionServiceTests::testUnitNormalisation_data() { QTest::addColumn< SizeUnit >( "u1" ); QTest::addColumn< int >( "v" ); @@ -131,7 +153,7 @@ PartitionSizeTests::testUnitNormalisation_data() } void -PartitionSizeTests::testUnitNormalisation() +PartitionServiceTests::testUnitNormalisation() { QFETCH( SizeUnit, u1 ); QFETCH( int, v ); @@ -139,3 +161,50 @@ PartitionSizeTests::testUnitNormalisation() QCOMPARE( PartitionSize( v, u1 ).toBytes(), bytes ); } + +void +PartitionServiceTests::testFilesystemGS() +{ + // Some filesystems names, they don't have to be real + const QStringList fsNames { "ext4", "zfs", "berries", "carrot" }; + // Predicate to return whether we consider this FS in use + auto pred = []( const QString& s ) { return !s.startsWith( 'z' ); }; + + // Fill the GS + Calamares::GlobalStorage gs; + for ( const auto& s : fsNames ) + { + useFilesystemGS( gs, s, pred( s ) ); + } + + QVERIFY( gs.contains( "filesystem_use" ) ); + { + const auto map = gs.value( "filesystem_use" ).toMap(); + QCOMPARE( map.count(), fsNames.count() ); + } + + for ( const auto& s : fsNames ) + { + QCOMPARE( isFilesystemUsedGS( gs, s ), pred( s ) ); + } + QCOMPARE( isFilesystemUsedGS( gs, QStringLiteral( "derp" ) ), false ); + QCOMPARE( isFilesystemUsedGS( gs, QString() ), false ); + // But I can set a value for QString! + useFilesystemGS( gs, QString(), true ); + QCOMPARE( isFilesystemUsedGS( gs, QString() ), true ); + // .. and replace it again + useFilesystemGS( gs, QString(), false ); + QCOMPARE( isFilesystemUsedGS( gs, QString() ), false ); + // Now there is one more key + { + const auto map = gs.value( "filesystem_use" ).toMap(); + QCOMPARE( map.count(), fsNames.count() + 1 ); + } +} + + +QTEST_GUILESS_MAIN( PartitionServiceTests ) + +#include "utils/moc-warnings.h" + +#include "Tests.moc" diff --git a/src/libcalamares/partition/Tests.h b/src/libcalamares/partition/Tests.h deleted file mode 100644 index 0d6f77a764..0000000000 --- a/src/libcalamares/partition/Tests.h +++ /dev/null @@ -1,33 +0,0 @@ -/* === This file is part of Calamares - === - * - * SPDX-FileCopyrightText: 2019 Adriaan de Groot - * SPDX-License-Identifier: GPL-3.0-or-later - * - * Calamares is Free Software: see the License-Identifier above. - * - * - */ - -#ifndef LIBCALAMARES_PARTITION_TESTS_H -#define LIBCALAMARES_PARTITION_TESTS_H - -#include - -class PartitionSizeTests : public QObject -{ - Q_OBJECT -public: - PartitionSizeTests(); - ~PartitionSizeTests() override; - -private Q_SLOTS: - void initTestCase(); - - void testUnitComparison_data(); - void testUnitComparison(); - - void testUnitNormalisation_data(); - void testUnitNormalisation(); -}; - -#endif From 488631824dd6036ea476fba4fbb716347755945f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 14:01:32 +0100 Subject: [PATCH 012/492] [libcalamares] Make the KPMCore global storage filesystem handlers inline --- src/libcalamares/partition/Global.cpp | 13 ------------- src/libcalamares/partition/Global.h | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/libcalamares/partition/Global.cpp b/src/libcalamares/partition/Global.cpp index 7203f6b555..5be9036c75 100644 --- a/src/libcalamares/partition/Global.cpp +++ b/src/libcalamares/partition/Global.cpp @@ -63,16 +63,3 @@ CalamaresUtils::Partition::useFilesystemGS( const QString& filesystemType, bool useFilesystemGS( *gs, filesystemType, used ); } } - -#ifdef WITH_KPMCORE4API -bool -CalamaresUtils::Partition::isFilesystemUsedGS( FileSystem::Type filesystem ) -{ - return isFilesystemUsedGS( untranslatedFS( filesystem ) ); -} -void -CalamaresUtils::Partition::useFilesystemGS( FileSystem::Type filesystem, bool used ) -{ - useFilesystemGS( untranslatedFS( filesystem ), used ); -} -#endif diff --git a/src/libcalamares/partition/Global.h b/src/libcalamares/partition/Global.h index 3164d06fc9..a013c4e2f2 100644 --- a/src/libcalamares/partition/Global.h +++ b/src/libcalamares/partition/Global.h @@ -19,6 +19,8 @@ #include "DllMacro.h" #ifdef WITH_KPMCORE4API +#include "FileSystem.h" + #include #endif @@ -52,12 +54,21 @@ bool DLLEXPORT isFilesystemUsedGS( const QString& filesystemType ); * See useFilesystemGS(const QString&, bool); this method uses the filesystem type * enumeration to pick the name. */ -void DLLEXPORT useFilesystemGS( FileSystem::Type filesystem, bool used ); +void +useFilesystemGS( FileSystem::Type filesystem, bool used ) +{ + useFilesystemGS( untranslatedFS( filesystem ), used ); +} + /* @brief Reads from global storage whether the typesystem type is used * * See isFilesystemUsedGS(const QString&). */ -bool DLLEXPORT isFilesystemUsedGS( FileSystem::Type filesystem ); +bool +isFilesystemUsedGS( FileSystem::Type filesystem ) +{ + return isFilesystemUsedGS( untranslatedFS( filesystem ) ); +} #endif } // namespace Partition From f3681a533e7d414627abac0c7d763d0894f810de Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 14:41:17 +0100 Subject: [PATCH 013/492] [libcalamares] Rearrange filesystem-use API - make the functies that take a GS* first-class - use the convenience functions from JobQueue for the others - inline so only the explicit-GS* functions are in the library --- src/libcalamares/partition/Global.cpp | 40 +++++++-------------------- src/libcalamares/partition/Global.h | 32 ++++++++++++++++++--- src/libcalamares/partition/Tests.cpp | 25 ++++++++--------- 3 files changed, 50 insertions(+), 47 deletions(-) diff --git a/src/libcalamares/partition/Global.cpp b/src/libcalamares/partition/Global.cpp index 5be9036c75..3071cd0815 100644 --- a/src/libcalamares/partition/Global.cpp +++ b/src/libcalamares/partition/Global.cpp @@ -17,12 +17,14 @@ static const QString fsUse_key = QStringLiteral( "filesystem_use" ); -STATICTEST bool -isFilesystemUsedGS( const Calamares::GlobalStorage& gs, const QString& filesystemType ) +CalamaresUtils::Partition::isFilesystemUsedGS( const Calamares::GlobalStorage* gs, const QString& filesystemType ) { - - const QVariantMap fsUse = gs.value( fsUse_key ).toMap(); + if ( !gs ) + { + return false; + } + const QVariantMap fsUse = gs->value( fsUse_key ).toMap(); if ( fsUse.contains( filesystemType ) ) { const auto v = fsUse.value( filesystemType ); @@ -31,35 +33,13 @@ isFilesystemUsedGS( const Calamares::GlobalStorage& gs, const QString& filesyste return false; } -STATICTEST void -useFilesystemGS( Calamares::GlobalStorage& gs, const QString& filesystemType, bool used ) -{ - QVariantMap existingMap = gs.contains( fsUse_key ) ? gs.value( fsUse_key ).toMap() : QVariantMap(); - existingMap.insert( filesystemType, used ); - gs.insert( fsUse_key, existingMap ); -} - -bool -CalamaresUtils::Partition::isFilesystemUsedGS( const QString& filesystemType ) -{ - const auto* jq = Calamares::JobQueue::instance(); - const auto* gs = jq ? jq->globalStorage() : nullptr; - - if ( !gs ) - { - return false; - } - return isFilesystemUsedGS( *gs, filesystemType ); -} - void -CalamaresUtils::Partition::useFilesystemGS( const QString& filesystemType, bool used ) +CalamaresUtils::Partition::useFilesystemGS( Calamares::GlobalStorage* gs, const QString& filesystemType, bool used ) { - const auto* jq = Calamares::JobQueue::instance(); - auto* gs = jq ? jq->globalStorage() : nullptr; - if ( gs ) { - useFilesystemGS( *gs, filesystemType, used ); + QVariantMap existingMap = gs->contains( fsUse_key ) ? gs->value( fsUse_key ).toMap() : QVariantMap(); + existingMap.insert( filesystemType, used ); + gs->insert( fsUse_key, existingMap ); } } diff --git a/src/libcalamares/partition/Global.h b/src/libcalamares/partition/Global.h index a013c4e2f2..960e302d04 100644 --- a/src/libcalamares/partition/Global.h +++ b/src/libcalamares/partition/Global.h @@ -17,6 +17,7 @@ #define PARTITION_GLOBAL_H #include "DllMacro.h" +#include "JobQueue.h" #ifdef WITH_KPMCORE4API #include "FileSystem.h" @@ -39,14 +40,37 @@ namespace Partition * The filesystem name should be the untranslated name. Filesystem * names are **lower**cased when used as keys. */ -void DLLEXPORT useFilesystemGS( const QString& filesystemType, bool used ); +void DLLEXPORT useFilesystemGS( Calamares::GlobalStorage* gs, const QString& filesystemType, bool used ); /** @brief Reads from global storage whether the filesystem type is used * * Reads from the global storage key *filesystem_use* and returns * the boolean value stored in subkey @p filesystemType. Returns * @c false if the subkey is not set at all. + * + * The filesystem name should be the untranslated name. Filesystem + * names are **lower**cased when used as keys. */ -bool DLLEXPORT isFilesystemUsedGS( const QString& filesystemType ); +bool DLLEXPORT isFilesystemUsedGS( const Calamares::GlobalStorage* gs, const QString& filesystemType ); + +/** @brief Convenience function for using "the" Global Storage + * + * @see useFilesystemGS(const QString&, bool) + */ +inline void +useFilesystemGS( const QString& filesystemType, bool used ) +{ + useFilesystemGS( Calamares::JobQueue::instanceGlobalStorage(), filesystemType, used ); +} + +/** @brief Convenience function for using "the" Global Storage + * + * @see isFilesystemUsedGS(const QString&); + */ +inline bool +isFilesystemUsedGS( const QString& filesystemType ) +{ + return isFilesystemUsedGS( Calamares::JobQueue::instanceGlobalStorage(), filesystemType ); +} #ifdef WITH_KPMCORE4API /** @brief Mark a particular filesystem type as used (or not) @@ -54,7 +78,7 @@ bool DLLEXPORT isFilesystemUsedGS( const QString& filesystemType ); * See useFilesystemGS(const QString&, bool); this method uses the filesystem type * enumeration to pick the name. */ -void +inline void useFilesystemGS( FileSystem::Type filesystem, bool used ) { useFilesystemGS( untranslatedFS( filesystem ), used ); @@ -64,7 +88,7 @@ useFilesystemGS( FileSystem::Type filesystem, bool used ) * * See isFilesystemUsedGS(const QString&). */ -bool +inline bool isFilesystemUsedGS( FileSystem::Type filesystem ) { return isFilesystemUsedGS( untranslatedFS( filesystem ) ); diff --git a/src/libcalamares/partition/Tests.cpp b/src/libcalamares/partition/Tests.cpp index 512a23110d..bf1c433fec 100644 --- a/src/libcalamares/partition/Tests.cpp +++ b/src/libcalamares/partition/Tests.cpp @@ -8,6 +8,7 @@ * */ +#include "Global.h" #include "PartitionSize.h" #include "GlobalStorage.h" @@ -16,11 +17,6 @@ #include #include -// Implementation details being tested -extern bool isFilesystemUsedGS( const Calamares::GlobalStorage& gs, const QString& filesystemType ); -extern void useFilesystemGS( Calamares::GlobalStorage& gs, const QString& filesystemType, bool used ); - - using SizeUnit = CalamaresUtils::Partition::SizeUnit; using PartitionSize = CalamaresUtils::Partition::PartitionSize; @@ -165,6 +161,9 @@ PartitionServiceTests::testUnitNormalisation() void PartitionServiceTests::testFilesystemGS() { + using CalamaresUtils::Partition::isFilesystemUsedGS; + using CalamaresUtils::Partition::useFilesystemGS; + // Some filesystems names, they don't have to be real const QStringList fsNames { "ext4", "zfs", "berries", "carrot" }; // Predicate to return whether we consider this FS in use @@ -174,7 +173,7 @@ PartitionServiceTests::testFilesystemGS() Calamares::GlobalStorage gs; for ( const auto& s : fsNames ) { - useFilesystemGS( gs, s, pred( s ) ); + useFilesystemGS( &gs, s, pred( s ) ); } QVERIFY( gs.contains( "filesystem_use" ) ); @@ -185,16 +184,16 @@ PartitionServiceTests::testFilesystemGS() for ( const auto& s : fsNames ) { - QCOMPARE( isFilesystemUsedGS( gs, s ), pred( s ) ); + QCOMPARE( isFilesystemUsedGS( &gs, s ), pred( s ) ); } - QCOMPARE( isFilesystemUsedGS( gs, QStringLiteral( "derp" ) ), false ); - QCOMPARE( isFilesystemUsedGS( gs, QString() ), false ); + QCOMPARE( isFilesystemUsedGS( &gs, QStringLiteral( "derp" ) ), false ); + QCOMPARE( isFilesystemUsedGS( &gs, QString() ), false ); // But I can set a value for QString! - useFilesystemGS( gs, QString(), true ); - QCOMPARE( isFilesystemUsedGS( gs, QString() ), true ); + useFilesystemGS( &gs, QString(), true ); + QCOMPARE( isFilesystemUsedGS( &gs, QString() ), true ); // .. and replace it again - useFilesystemGS( gs, QString(), false ); - QCOMPARE( isFilesystemUsedGS( gs, QString() ), false ); + useFilesystemGS( &gs, QString(), false ); + QCOMPARE( isFilesystemUsedGS( &gs, QString() ), false ); // Now there is one more key { const auto map = gs.value( "filesystem_use" ).toMap(); From 48541629f91842340f515fe018f59c0fcf5c65a1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 14:46:34 +0100 Subject: [PATCH 014/492] [libcalamares] Extend tests to handle case-insensitive --- src/libcalamares/partition/Tests.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/libcalamares/partition/Tests.cpp b/src/libcalamares/partition/Tests.cpp index bf1c433fec..a456d7e367 100644 --- a/src/libcalamares/partition/Tests.cpp +++ b/src/libcalamares/partition/Tests.cpp @@ -199,6 +199,16 @@ PartitionServiceTests::testFilesystemGS() const auto map = gs.value( "filesystem_use" ).toMap(); QCOMPARE( map.count(), fsNames.count() + 1 ); } + + // The API says that it it case-insensitive + QVERIFY( !isFilesystemUsedGS( &gs, "ZFS" ) ); + QVERIFY( isFilesystemUsedGS( &gs, "EXT4" ) ); + QCOMPARE( isFilesystemUsedGS( &gs, "ZFS" ), isFilesystemUsedGS( &gs, "zfs" ) ); + QCOMPARE( isFilesystemUsedGS( &gs, "EXT4" ), isFilesystemUsedGS( &gs, "ext4" ) ); + + useFilesystemGS( &gs, "EXT4", false ); + QVERIFY( !isFilesystemUsedGS( &gs, "EXT4" ) ); + QCOMPARE( isFilesystemUsedGS( &gs, "EXT4" ), isFilesystemUsedGS( &gs, "ext4" ) ); } From 9665af0e5a19fd863663d0a4ad84c64e296dba81 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 14:47:55 +0100 Subject: [PATCH 015/492] [libcalamares] Make keys case-insensitive (as documented) --- src/libcalamares/partition/Global.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libcalamares/partition/Global.cpp b/src/libcalamares/partition/Global.cpp index 3071cd0815..fbe775f114 100644 --- a/src/libcalamares/partition/Global.cpp +++ b/src/libcalamares/partition/Global.cpp @@ -25,9 +25,10 @@ CalamaresUtils::Partition::isFilesystemUsedGS( const Calamares::GlobalStorage* g return false; } const QVariantMap fsUse = gs->value( fsUse_key ).toMap(); - if ( fsUse.contains( filesystemType ) ) + QString key = filesystemType.toLower(); + if ( fsUse.contains( key ) ) { - const auto v = fsUse.value( filesystemType ); + const auto v = fsUse.value( key ); return v.toBool(); } return false; @@ -39,7 +40,8 @@ CalamaresUtils::Partition::useFilesystemGS( Calamares::GlobalStorage* gs, const if ( gs ) { QVariantMap existingMap = gs->contains( fsUse_key ) ? gs->value( fsUse_key ).toMap() : QVariantMap(); - existingMap.insert( filesystemType, used ); + QString key = filesystemType.toLower(); + existingMap.insert( key, used ); gs->insert( fsUse_key, existingMap ); } } From 10bec1d97079d5ac0ebf80d2ad534fadc2146673 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 15:05:24 +0100 Subject: [PATCH 016/492] [libcalamares] Expand API to allow clearing out the filesystem use --- src/libcalamares/partition/Global.cpp | 9 +++++++++ src/libcalamares/partition/Global.h | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/src/libcalamares/partition/Global.cpp b/src/libcalamares/partition/Global.cpp index fbe775f114..fb7b09aaf6 100644 --- a/src/libcalamares/partition/Global.cpp +++ b/src/libcalamares/partition/Global.cpp @@ -45,3 +45,12 @@ CalamaresUtils::Partition::useFilesystemGS( Calamares::GlobalStorage* gs, const gs->insert( fsUse_key, existingMap ); } } + +void +CalamaresUtils::Partition::clearFilesystemGS( Calamares::GlobalStorage* gs ) +{ + if ( gs ) + { + gs->remove( fsUse_key ); + } +} diff --git a/src/libcalamares/partition/Global.h b/src/libcalamares/partition/Global.h index 960e302d04..733e2f69cf 100644 --- a/src/libcalamares/partition/Global.h +++ b/src/libcalamares/partition/Global.h @@ -52,6 +52,12 @@ void DLLEXPORT useFilesystemGS( Calamares::GlobalStorage* gs, const QString& fil */ bool DLLEXPORT isFilesystemUsedGS( const Calamares::GlobalStorage* gs, const QString& filesystemType ); +/** @brief Clears the usage data for filesystems + * + * This removes the internal key *filesystem_use*. + */ +void DLLEXPORT clearFilesystemGS( Calamares::GlobalStorage* gs ); + /** @brief Convenience function for using "the" Global Storage * * @see useFilesystemGS(const QString&, bool) From 559b79f92054b285c0dc3e5c381a95f298180c1e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 8 Feb 2021 15:08:45 +0100 Subject: [PATCH 017/492] [partition] Use (better documented) filesystem-use API --- src/libcalamares/partition/Tests.cpp | 7 ++++ .../partition/jobs/FillGlobalStorageJob.cpp | 35 ++++++++----------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/libcalamares/partition/Tests.cpp b/src/libcalamares/partition/Tests.cpp index a456d7e367..16f7d78c25 100644 --- a/src/libcalamares/partition/Tests.cpp +++ b/src/libcalamares/partition/Tests.cpp @@ -209,6 +209,13 @@ PartitionServiceTests::testFilesystemGS() useFilesystemGS( &gs, "EXT4", false ); QVERIFY( !isFilesystemUsedGS( &gs, "EXT4" ) ); QCOMPARE( isFilesystemUsedGS( &gs, "EXT4" ), isFilesystemUsedGS( &gs, "ext4" ) ); + useFilesystemGS( &gs, "ext4", true ); + QVERIFY( isFilesystemUsedGS( &gs, "EXT4" ) ); + + CalamaresUtils::Partition::clearFilesystemGS( &gs ); + QVERIFY( !isFilesystemUsedGS( &gs, "ZFS" ) ); + QVERIFY( !isFilesystemUsedGS( &gs, "EXT4" ) ); + QVERIFY( !isFilesystemUsedGS( &gs, "ext4" ) ); } diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index 1660dbb540..f79918e647 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -18,6 +18,7 @@ #include "GlobalStorage.h" #include "JobQueue.h" #include "partition/FileSystem.h" +#include "partition/Global.h" #include "partition/PartitionIterator.h" #include "utils/Logger.h" @@ -291,35 +292,29 @@ FillGlobalStorageJob::prettyStatusMessage() const * .. mark as "1" if it's on the system, somewhere * .. mark as "2" if it's one of the claimed / in-use FSses * - * Stores a GS key called "filesystems_use" with this mapping. + * Stores a GS key called "filesystem_use" with this mapping. + * @see CalamaresUtils::Partition::useFilesystemGS() */ static void storeFSUse( Calamares::GlobalStorage* storage, const QVariantList& partitions ) { - QMap< QString, int > fsUses; - for ( const auto& p : partitions ) + if ( storage ) { - const auto pmap = p.toMap(); - - QString fs = pmap.value( "fs" ).toString(); - int thisUse = pmap.value( "claimed" ).toBool() ? 2 : 1; - - if ( fs.isEmpty() ) + CalamaresUtils::Partition::clearFilesystemGS( storage ); + for ( const auto& p : partitions ) { - continue; - } + const auto pmap = p.toMap(); - int newUse = qMax( fsUses.value( fs ), thisUse ); // value() is 0 if not present - fsUses.insert( fs, newUse ); - } + QString fs = pmap.value( "fs" ).toString(); - QVariantMap fsUsesVariant; - for ( auto it = fsUses.cbegin(); it != fsUses.cend(); ++it ) - { - fsUsesVariant.insert( it.key(), it.value() ); - } + if ( fs.isEmpty() ) + { + continue; + } - storage->insert( "filesystems_use", fsUsesVariant ); + CalamaresUtils::Partition::useFilesystemGS( storage, fs, true ); + } + } } Calamares::JobResult From 405fc3dfc202b392cda1eeb0df29979090444a3b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 23 Mar 2021 12:28:00 +0100 Subject: [PATCH 018/492] Changes: document new merges --- CHANGES | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 0c96bc47c8..8b2f7ccce4 100644 --- a/CHANGES +++ b/CHANGES @@ -10,13 +10,22 @@ website will have to do for older versions. # 3.2.40 (unreleased) # This release contains contributions from (alphabetically by first name): - - No external contributors yet + - Erik Dubois ## Core ## - - No core changes yet + - The CMake modules for consumption by external modules (e.g. the + calamares-extensions repository, but also any other modules built + by distro's for internal use) now support consistent skip-module + behavior and reporting. #1641 (one tiny part of this change) + - In global storage, the *filesystem_use* key now has an API in + libcalamares to systematically mark filesystem (types) as "in use" + or not. This, in turn, means that modules can depend on that information + for other work (e.g. removing drivers for unused filesystems). #1635 ## Modules ## - - No module changes yet + - *displaymanager* example configuration has been shuffled around a bit, + for better results when the live image is running XFCE. Also lists + more potential display managers. #1205 (Thanks Erik) # 3.2.39 (2021-03-19) # From 1cfdc8044cca98846b01fc52a6af99b6f54d30f9 Mon Sep 17 00:00:00 2001 From: shainer Date: Sat, 23 Jul 2016 22:28:22 +0100 Subject: [PATCH 019/492] Display current filesystem label as a column in the main partition view. --- src/modules/partition/core/PartitionModel.cpp | 6 ++++++ src/modules/partition/core/PartitionModel.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp index 9a8f4d96c5..b4ea57adb5 100644 --- a/src/modules/partition/core/PartitionModel.cpp +++ b/src/modules/partition/core/PartitionModel.cpp @@ -167,6 +167,10 @@ PartitionModel::data( const QModelIndex& index, int role ) const { return CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); } + if ( col == FileSystemLabelColumn ) + { + return partition->fileSystem().label(); + } if ( col == MountPointColumn ) { return PartitionInfo::mountPoint( partition ); @@ -296,6 +300,8 @@ PartitionModel::headerData( int section, Qt::Orientation, int role ) const return tr( "Name" ); case FileSystemColumn: return tr( "File System" ); + case FileSystemLabelColumn: + return tr( "File System Label" ); case MountPointColumn: return tr( "Mount Point" ); case SizeColumn: diff --git a/src/modules/partition/core/PartitionModel.h b/src/modules/partition/core/PartitionModel.h index f91479adc8..433fa06203 100644 --- a/src/modules/partition/core/PartitionModel.h +++ b/src/modules/partition/core/PartitionModel.h @@ -79,6 +79,7 @@ class PartitionModel : public QAbstractItemModel { NameColumn, FileSystemColumn, + FileSystemLabelColumn, MountPointColumn, SizeColumn, ColumnCount // Must remain last From 2ebf9124d10dbe8a81820b8f59c252b66db71cba Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 26 Mar 2021 13:37:02 +0100 Subject: [PATCH 020/492] CMake: move check for skipped-modules to all subdirs The check for skipping a subdirectory was applied to Python subdirs, not to C++ subdirs. This meant that a skipped module would notice only in calamares_add_plugin() that it should be skipped. The **rest** of the CMakeLists.txt in the to-be-skipped modules' subdirectory was not skipped, and so a test might be added for a module that was skipped. Depending on how the test consumes the code/module under test, that might fail to link. Example module is *initramfs*. Reported by yonggan. --- .../CalamaresAddModuleSubdirectory.cmake | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/CMakeModules/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake index a08f1162e3..1f1c023005 100644 --- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake +++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake @@ -31,6 +31,11 @@ # SKIPPED_MODULES . Do **not** use SKIPPED_MODULES as the name of # *skiplistvar*, things will get weird. # +# Do note that the name of a module must be the same as the name of +# the directory containing it (as documented in src/modules/README.md). +# This applies to both C++ and Python modules, and allows the use of +# the subdirectory as a proxy for the module name inside. +# include( CalamaresAddTranslations ) include( CalamaresCheckModuleSelection ) @@ -46,7 +51,32 @@ function( _calamares_add_module_subdirectory_impl ) set( SKIPPED_MODULES "" ) set( MODULE_CONFIG_FILES "" ) + # The module subdirectory may be given as a/b/c, but the module + # needs to be installed as "c", so we split off any intermediate + # directories. + # + # Compute _modulename (the last directory name) and _mod_dir + # (the full path to the module sources). + get_filename_component(_dirname "${SUBDIRECTORY}" DIRECTORY) + if( _dirname ) + # Remove the dirname and any leftover leading /s + string( REGEX REPLACE "^${_dirname}/*" "" _modulename "${SUBDIRECTORY}" ) + else() + set( _modulename ${SUBDIRECTORY} ) + endif() + # Strip any remaining / + string( REGEX REPLACE "/" "" _modulename "${_modulename}" ) set( _mod_dir "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" ) + + # Skip list check applies to all kinds of modules + calamares_check_skip( ${_modulename} SKIPPED_MODULES ) + if ( SKIPPED_MODULES ) + # If it's skipped by infrastucture, the message already includes the module + # name. We don't need to do any further checking. + set( SKIPPED_MODULES "${SKIPPED_MODULES}" PARENT_SCOPE ) + return() + endif() + # If this subdirectory has a CMakeLists.txt, we add_subdirectory it... if( EXISTS "${_mod_dir}/CMakeLists.txt" ) add_subdirectory( ${SUBDIRECTORY} ) @@ -70,32 +100,15 @@ function( _calamares_add_module_subdirectory_impl ) # ...otherwise, we look for a module.desc. elseif( EXISTS "${_mod_dir}/module.desc" ) set( MODULES_DIR ${CMAKE_INSTALL_LIBDIR}/calamares/modules ) - # The module subdirectory may be given as a/b/c, but the module - # needs to be installed as "c", so we split off any intermediate - # directories. - get_filename_component(_dirname "${SUBDIRECTORY}" DIRECTORY) - if( _dirname ) - # Remove the dirname and any leftover leading /s - string( REGEX REPLACE "^${_dirname}/*" "" _modulename "${SUBDIRECTORY}" ) - else() - set( _modulename ${SUBDIRECTORY} ) - endif() set( MODULE_DESTINATION ${MODULES_DIR}/${_modulename} ) - calamares_check_skip( ${_modulename} SKIPPED_MODULES ) - # Read module.desc, check that the interface type is supported. # # _mod_enabled boolean if the module should be built (only if the interface is supported) # _mod_reason is a human-readable explanation why it isn't built # _mod_testing boolean if the module should be added to the loadmodule tests file(STRINGS "${_mod_dir}/module.desc" MODULE_INTERFACE REGEX "^interface") - if ( SKIPPED_MODULES ) - # If it's skipped by infrastucture, the message already includes the module - # name. We don't need to do any further checking. - set( SKIPPED_MODULES "${SKIPPED_MODULES}" PARENT_SCOPE ) - return() - elseif ( MODULE_INTERFACE MATCHES "pythonqt" ) + if ( MODULE_INTERFACE MATCHES "pythonqt" ) set( _mod_enabled ${Calamares_WITH_PYTHONQT} ) set( _mod_reason "No PythonQt support" ) set( _mod_testing OFF ) From c2d759f11eed4aa96d7ad48114eed431dec4c3a1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 26 Mar 2021 14:33:44 +0100 Subject: [PATCH 021/492] CMake: make show-version available in all builds --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0a800750f..a95768f2d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -522,13 +522,18 @@ if( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) endif() endif() -# Special target for not-RC (e.g. might-be-release) builds. -# This is used by the release script to get the version. +# Special target for displaying the version. In RC (might-be-release) +# builds, use the short version (3.x.y), otherwise show the long version. if ( CALAMARES_VERSION_RC EQUAL 0 ) add_custom_target(show-version ${CMAKE_COMMAND} -E echo CALAMARES_VERSION=${CALAMARES_VERSION_SHORT} USES_TERMINAL ) +else() + add_custom_target(show-version + ${CMAKE_COMMAND} -E echo CALAMARES_VERSION=${CALAMARES_VERSION} + USES_TERMINAL + ) endif() # enforce using constBegin, constEnd for const-iterators From 61f579b591eb6b9af269ab5fa2964375d9afd84e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 26 Mar 2021 14:44:28 +0100 Subject: [PATCH 022/492] CMake: drop rc from version number In current development, RC is effectively 0 (for a release) or 1 (during development). It doesn't add anything to suffix 'rc1' to the version number. While here, remove the BUILD_RELEASE check (because nothing ever sets it) and instead rely on the RC setting instead to decide for long-calamares-version --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a95768f2d2..d8f8cff8a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -500,16 +500,13 @@ if( CALAMARES_VERSION_TWEAK ) set( CALAMARES_VERSION "${CALAMARES_VERSION}.${CALAMARES_VERSION_TWEAK}" ) endif() set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) -if( CALAMARES_VERSION_RC ) - set( CALAMARES_VERSION ${CALAMARES_VERSION}rc${CALAMARES_VERSION_RC} ) -endif() # Additional info for non-release builds. The "extended" version information # with date and git information (commit, dirty status) is used only # by CalamaresVersionX.h, which is included by consumers that need a full # version number with all that information; normal consumers can include # CalamaresVersion.h with more stable numbers. -if( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) +if( NOT CALAMARES_VERSION_RC EQUAL 0 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) include( CMakeDateStamp ) set( CALAMARES_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) if( CALAMARES_VERSION_DATE GREATER 0 ) From 2be9aece3fa1b30a4a533282bc4ab495b0f0154e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 26 Mar 2021 16:39:09 +0100 Subject: [PATCH 023/492] CMake: tweak version-handling - separate out the version into a variable (again -- this was moved **into** project() long ago, but now there's a desire to have the value before reaching the project() command) - rename CALAMARES_VERSION_RC to something more sensible. --- CMakeLists.txt | 18 ++++++++---------- ci/RELEASE.md | 7 ++++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8f8cff8a4..5a12950fc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,13 +40,15 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) + +set( CALAMARES_VERSION 3.2.40 ) +set( CALAMARES_RELEASE_MODE OFF ) + project( CALAMARES - VERSION 3.2.40 + VERSION ${CALAMARES_VERSION} LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development - ### OPTIONS # option( INSTALL_CONFIG "Install configuration files" OFF ) @@ -494,11 +496,7 @@ add_feature_info( ExampleDistro ${mksquashfs_FOUND} "Create example-distro targe ### CALAMARES PROPER # -set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) -# In rare cases we have hotfix-releases with a tweak -if( CALAMARES_VERSION_TWEAK ) - set( CALAMARES_VERSION "${CALAMARES_VERSION}.${CALAMARES_VERSION_TWEAK}" ) -endif() +# set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) # Additional info for non-release builds. The "extended" version information @@ -506,7 +504,7 @@ set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) # by CalamaresVersionX.h, which is included by consumers that need a full # version number with all that information; normal consumers can include # CalamaresVersion.h with more stable numbers. -if( NOT CALAMARES_VERSION_RC EQUAL 0 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) +if( NOT CALAMARES_RELEASE_MODE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) include( CMakeDateStamp ) set( CALAMARES_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) if( CALAMARES_VERSION_DATE GREATER 0 ) @@ -521,7 +519,7 @@ endif() # Special target for displaying the version. In RC (might-be-release) # builds, use the short version (3.x.y), otherwise show the long version. -if ( CALAMARES_VERSION_RC EQUAL 0 ) +if ( CALAMARES_RELEASE_MODE ) add_custom_target(show-version ${CMAKE_COMMAND} -E echo CALAMARES_VERSION=${CALAMARES_VERSION_SHORT} USES_TERMINAL diff --git a/ci/RELEASE.md b/ci/RELEASE.md index 628f5c7731..5289da5afa 100644 --- a/ci/RELEASE.md +++ b/ci/RELEASE.md @@ -27,7 +27,8 @@ ## (1) Preparation -* Drop the RC variable to 0 in `CMakeLists.txt`, *CALAMARES_VERSION_RC*. +* Double-check the *CALAMARES_VERSION* value at the top of `CMakeLists.txt`. +* Set *CALAMARES_RELEASE_MODE* to `ON` in `CMakeLists.txt`. * Edit `CHANGES` and set the date of the release. * Commit both. This is usually done with commit-message *Changes: pre-release housekeeping*. @@ -78,8 +79,8 @@ Follow the instructions printed by the release script. ## (4) Post-Release -* Bump the version number in `CMakeLists.txt` in the `project()` command. -* Set *CALAMARES_VERSION_RC* back to 1. +* Bump the version number in `CMakeLists.txt` in *CALAMARES_VERSION*. +* Set *CALAMARES_RELEASE_MODE* back to `OFF`. * Add a placeholder entry for the next release in `CHANGES` with date text *not released yet*. * Commit and push that, usually with the message From 38ec357bd590f93ba56afa7beae428830f7fcc62 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 26 Mar 2021 14:54:50 +0100 Subject: [PATCH 024/492] CMake: simplify development-version string - merge the (not-installed) date-stamp and git-version files into ExtendedVersion, turn things into functions - drop support for CVS (wut?) - don't mention the branch, in git-versioning, because the hash is enough to find whatever - don't need external program to find date, use `string(TIMESTAMP...)` --- CMakeLists.txt | 29 ++++------- CMakeModules/CMakeDateStamp.cmake | 31 ----------- CMakeModules/CMakeVersionSource.cmake | 52 ------------------- CMakeModules/ExtendedVersion.cmake | 75 +++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 102 deletions(-) delete mode 100644 CMakeModules/CMakeDateStamp.cmake delete mode 100644 CMakeModules/CMakeVersionSource.cmake create mode 100644 CMakeModules/ExtendedVersion.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a12950fc0..ab30845e52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,14 @@ cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) set( CALAMARES_VERSION 3.2.40 ) set( CALAMARES_RELEASE_MODE OFF ) +if ( CMAKE_SCRIPT_MODE_FILE ) + include( ${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake ) + set( CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR} ) + extend_version( ${CALAMARES_VERSION} OFF _vshort _vlong ) + message( "${_vlong}" ) + return() +endif() + project( CALAMARES VERSION ${CALAMARES_VERSION} LANGUAGES C CXX @@ -182,6 +190,7 @@ include( FeatureSummary ) # Calamares Modules include( CMakeColors ) +include( ExtendedVersion ) ### C++ SETUP # @@ -497,25 +506,7 @@ add_feature_info( ExampleDistro ${mksquashfs_FOUND} "Create example-distro targe ### CALAMARES PROPER # # -set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) - -# Additional info for non-release builds. The "extended" version information -# with date and git information (commit, dirty status) is used only -# by CalamaresVersionX.h, which is included by consumers that need a full -# version number with all that information; normal consumers can include -# CalamaresVersion.h with more stable numbers. -if( NOT CALAMARES_RELEASE_MODE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) - include( CMakeDateStamp ) - set( CALAMARES_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) - if( CALAMARES_VERSION_DATE GREATER 0 ) - set( CALAMARES_VERSION ${CALAMARES_VERSION}.${CALAMARES_VERSION_DATE} ) - endif() - - include( CMakeVersionSource ) - if( CMAKE_VERSION_SOURCE ) - set( CALAMARES_VERSION ${CALAMARES_VERSION}-${CMAKE_VERSION_SOURCE} ) - endif() -endif() +extend_version( "${CALAMARES_VERSION}" ${CALAMARES_RELEASE_MODE} CALAMARES_VERSION_SHORT CALAMARES_VERSION ) # Special target for displaying the version. In RC (might-be-release) # builds, use the short version (3.x.y), otherwise show the long version. diff --git a/CMakeModules/CMakeDateStamp.cmake b/CMakeModules/CMakeDateStamp.cmake deleted file mode 100644 index 15482100f1..0000000000 --- a/CMakeModules/CMakeDateStamp.cmake +++ /dev/null @@ -1,31 +0,0 @@ -# === This file is part of Calamares - === -# -# SPDX-FileCopyrightText: 2014 Teo Mrnjavac -# SPDX-License-Identifier: BSD-2-Clause -# -### -# -# Find today's date, for versioning purposes. -find_program(DATE_EXECUTABLE NAMES date) -mark_as_advanced(DATE_EXECUTABLE) - -if(DATE_EXECUTABLE) - execute_process( - COMMAND ${DATE_EXECUTABLE} +%Y - OUTPUT_VARIABLE CMAKE_DATESTAMP_YEAR - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - execute_process( - COMMAND ${DATE_EXECUTABLE} +%m - OUTPUT_VARIABLE CMAKE_DATESTAMP_MONTH - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - execute_process( - COMMAND ${DATE_EXECUTABLE} +%d - OUTPUT_VARIABLE CMAKE_DATESTAMP_DAY - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) -endif() diff --git a/CMakeModules/CMakeVersionSource.cmake b/CMakeModules/CMakeVersionSource.cmake deleted file mode 100644 index 295fffa5d9..0000000000 --- a/CMakeModules/CMakeVersionSource.cmake +++ /dev/null @@ -1,52 +0,0 @@ -# === This file is part of Calamares - === -# -# SPDX-FileCopyrightText: 2014 Teo Mrnjavac -# SPDX-License-Identifier: BSD-2-Clause -# -### -# -# Try to identify the current development source version. -set(CMAKE_VERSION_SOURCE "") -if(EXISTS ${CMAKE_SOURCE_DIR}/.git/HEAD) - find_program(GIT_EXECUTABLE NAMES git git.cmd) - mark_as_advanced(GIT_EXECUTABLE) - if(GIT_EXECUTABLE) - execute_process( - COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=7 HEAD - OUTPUT_VARIABLE head - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - if(head) - set(branch "") - execute_process( - COMMAND ${GIT_EXECUTABLE} name-rev HEAD - OUTPUT_VARIABLE branch - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - string(REGEX REPLACE "HEAD " "" branch "${branch}") - set(CMAKE_VERSION_SOURCE "git-${branch}-${head}") - execute_process( - COMMAND ${GIT_EXECUTABLE} update-index -q --refresh - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - execute_process( - COMMAND ${GIT_EXECUTABLE} diff-index --name-only HEAD -- - OUTPUT_VARIABLE dirty - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - if(dirty) - set(CMAKE_VERSION_SOURCE "${CMAKE_VERSION_SOURCE}-dirty") - endif() - endif() - endif() -elseif(EXISTS ${CMAKE_SOURCE_DIR}/CVS/Repository) - file(READ ${CMAKE_SOURCE_DIR}/CVS/Repository repo) - set(branch "") - if("${repo}" MATCHES "\\.git/") - string(REGEX REPLACE ".*\\.git/([^\r\n]*).*" "-\\1" branch "${repo}") - endif() - set(CMAKE_VERSION_SOURCE "cvs${branch}") -endif() diff --git a/CMakeModules/ExtendedVersion.cmake b/CMakeModules/ExtendedVersion.cmake new file mode 100644 index 0000000000..b737dd2e20 --- /dev/null +++ b/CMakeModules/ExtendedVersion.cmake @@ -0,0 +1,75 @@ +# === This file is part of Calamares - === +# +# SPDX-FileCopyrightText: 2014 Teo Mrnjavac +# SPDX-FileCopyrightText: 2021 Adriaan de Groot +# SPDX-License-Identifier: BSD-2-Clause +# +### +# +# This file defines one function for extending a VERSION-like value +# with date and git information (if desired). +# +# - extend_version( version-string short_only short_var long_var ) +# Calling this function will copy *version-string* (which would typically +# be a semver-style string, like "3.2.40") into the variable *short_var*. +# If *short_only* is true, then: +# - the short version is also copied into the variable *long_var*, +# If *short_only* is false, then: +# - the *version-string* plus date and git information, is copied +# into the varialbe *long_var*, in the format {version}-{date}-{hash} +# +# + +function( get_git_version_info out_var ) + set(CMAKE_VERSION_SOURCE "") + if(EXISTS ${CMAKE_SOURCE_DIR}/.git/HEAD) + find_program(GIT_EXECUTABLE NAMES git git.cmd) + mark_as_advanced(GIT_EXECUTABLE) + if(GIT_EXECUTABLE) + execute_process( + COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=8 HEAD + OUTPUT_VARIABLE head + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + if(head) + set(CMAKE_VERSION_SOURCE "${head}") + execute_process( + COMMAND ${GIT_EXECUTABLE} update-index -q --refresh + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + execute_process( + COMMAND ${GIT_EXECUTABLE} diff-index --name-only HEAD -- + OUTPUT_VARIABLE dirty + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + if(dirty) + set(CMAKE_VERSION_SOURCE "${CMAKE_VERSION_SOURCE}-dirty") + endif() + endif() + endif() + endif() + set( ${out_var} "${CMAKE_VERSION_SOURCE}" PARENT_SCOPE ) +endfunction() + +function( extend_version version short_only short_var long_var ) + set( ${short_var} "${version}" PARENT_SCOPE ) + set( _v "${version}" ) + if ( NOT short_only ) + # Additional info for non-release builds which want "long" version info + # with date and git information (commit, dirty status). That is used only + # by CalamaresVersionX.h, which is included by consumers that need a full + # version number with all that information; normal consumers can include + # CalamaresVersion.h with more stable numbers. + string( TIMESTAMP CALAMARES_VERSION_DATE "%Y%m%d" ) + if( CALAMARES_VERSION_DATE GREATER 0 ) + set( _v ${_v}.${CALAMARES_VERSION_DATE} ) + endif() + get_git_version_info( _gitv ) + if( _gitv ) + set( _v "${_v}-${_gitv}" ) + endif() + endif() + set( ${long_var} "${_v}" PARENT_SCOPE ) +endfunction() From ac8f99a20643e15ac8206808ea391227a2e3cb46 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 27 Mar 2021 02:38:45 +0100 Subject: [PATCH 025/492] [libcalamares] Don't double-include FileSystem The partitioning header 'FileSystem.h' is for KPMCore support; it is already included by Global.h and guarded by ifdefs for KPMCore. Do not unconditionally include it from the implementation. --- src/libcalamares/partition/Global.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libcalamares/partition/Global.cpp b/src/libcalamares/partition/Global.cpp index fb7b09aaf6..a4d2ee9794 100644 --- a/src/libcalamares/partition/Global.cpp +++ b/src/libcalamares/partition/Global.cpp @@ -9,7 +9,6 @@ */ #include "Global.h" -#include "FileSystem.h" #include "GlobalStorage.h" #include "JobQueue.h" From b602d423c73c30d56bae2760d41c59587874ef3d Mon Sep 17 00:00:00 2001 From: shainer Date: Thu, 21 Jul 2016 13:33:35 +0100 Subject: [PATCH 026/492] Allow users to set/edit filesystem labels. When creating or editing a new formatted partition, allow to set a filesystem label (16 chars maximum). Modify the KPMHelpers to accept it as a new parameter. Partitions created by default may get a meaningful label too. --- src/modules/partition/core/KPMHelpers.cpp | 4 ++ src/modules/partition/core/KPMHelpers.h | 2 + .../partition/core/PartitionActions.cpp | 3 ++ .../partition/core/PartitionCoreModule.cpp | 8 ++++ .../partition/gui/CreatePartitionDialog.cpp | 5 ++- .../partition/gui/CreatePartitionDialog.ui | 43 ++++++++++++++----- .../gui/EditExistingPartitionDialog.cpp | 6 +++ .../gui/EditExistingPartitionDialog.ui | 31 +++++++++++-- 8 files changed, 86 insertions(+), 16 deletions(-) diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp index e9e69456d1..ed105e28b4 100644 --- a/src/modules/partition/core/KPMHelpers.cpp +++ b/src/modules/partition/core/KPMHelpers.cpp @@ -46,11 +46,13 @@ createNewPartition( PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem::Type fsType, + const QString& fsLabel, qint64 firstSector, qint64 lastSector, PartitionTable::Flags flags ) { FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector, device.logicalSize() ); + fs->setLabel( fsLabel ); return new Partition( parent, device, role, @@ -71,6 +73,7 @@ createNewEncryptedPartition( PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem::Type fsType, + const QString& fsLabel, qint64 firstSector, qint64 lastSector, const QString& passphrase, @@ -92,6 +95,7 @@ createNewEncryptedPartition( PartitionNode* parent, fs->createInnerFileSystem( fsType ); fs->setPassphrase( passphrase ); + fs->setLabel( fsLabel ); Partition* p = new Partition( parent, device, PartitionRole( newRoles ), diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h index ad25689f38..89a019f6cf 100644 --- a/src/modules/partition/core/KPMHelpers.h +++ b/src/modules/partition/core/KPMHelpers.h @@ -55,6 +55,7 @@ Partition* createNewPartition( PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem::Type fsType, + const QString& fsLabel, qint64 firstSector, qint64 lastSector, PartitionTable::Flags flags ); @@ -63,6 +64,7 @@ Partition* createNewEncryptedPartition( PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem::Type fsType, + const QString& fsLabel, qint64 firstSector, qint64 lastSector, const QString& passphrase, diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index d4301578ba..1a3f6246be 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -132,6 +132,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO *dev, PartitionRole( PartitionRole::Primary ), FileSystem::Fat32, + QString(), firstFreeSector, lastSector, KPM_PARTITION_FLAG( None ) ); @@ -180,6 +181,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO *dev, PartitionRole( PartitionRole::Primary ), FileSystem::LinuxSwap, + QStringLiteral( "swap" ), lastSectorForRoot + 1, dev->totalLogical() - 1, KPM_PARTITION_FLAG( None ) ); @@ -190,6 +192,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO *dev, PartitionRole( PartitionRole::Primary ), FileSystem::LinuxSwap, + QStringLiteral( "swap" ), lastSectorForRoot + 1, dev->totalLogical() - 1, o.luksPassphrase, diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index f99c78745e..3b5c09362f 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -911,6 +911,14 @@ PartitionCoreModule::layoutApply( Device* dev, = std::find_if( partList.constBegin(), partList.constEnd(), is_boot ) != partList.constEnd(); for ( Partition* part : partList ) { + if ( is_boot( part ) ) + { + part->setLabel( "boot" ); + } + if ( is_root( part ) ) + { + part->setLabel( "root" ); + } if ( ( separate_boot_partition && is_boot( part ) ) || ( !separate_boot_partition && is_root( part ) ) ) { createPartition( diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index 3b51010b88..11f7f3e865 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -202,17 +202,18 @@ CreatePartitionDialog::createPartition() FileSystem::Type fsType = m_role.has( PartitionRole::Extended ) ? FileSystem::Extended : FileSystem::typeForName( m_ui->fsComboBox->currentText() ); + const QString fsLabel = m_ui->filesystemLabelEdit->text(); Partition* partition = nullptr; QString luksPassphrase = m_ui->encryptWidget->passphrase(); if ( m_ui->encryptWidget->state() == EncryptWidget::Encryption::Confirmed && !luksPassphrase.isEmpty() ) { partition = KPMHelpers::createNewEncryptedPartition( - m_parent, *m_device, m_role, fsType, first, last, luksPassphrase, newFlags() ); + m_parent, *m_device, m_role, fsType, fsLabel, first, last, luksPassphrase, newFlags() ); } else { - partition = KPMHelpers::createNewPartition( m_parent, *m_device, m_role, fsType, first, last, newFlags() ); + partition = KPMHelpers::createNewPartition( m_parent, *m_device, m_role, fsType, fsLabel, first, last, newFlags() ); } if ( m_device->type() == Device::Type::LVM_Device ) diff --git a/src/modules/partition/gui/CreatePartitionDialog.ui b/src/modules/partition/gui/CreatePartitionDialog.ui index 24e05e2e18..dad932101d 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.ui +++ b/src/modules/partition/gui/CreatePartitionDialog.ui @@ -130,10 +130,10 @@ SPDX-License-Identifier: GPL-3.0-or-later - + - + Qt::Vertical @@ -149,17 +149,17 @@ SPDX-License-Identifier: GPL-3.0-or-later - + LVM LV name - + - + &Mount Point: @@ -169,7 +169,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - + true @@ -179,21 +179,21 @@ SPDX-License-Identifier: GPL-3.0-or-later - + - + Flags: - + true @@ -206,7 +206,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - + Qt::Vertical @@ -219,6 +219,29 @@ SPDX-License-Identifier: GPL-3.0-or-later + + + + + 150 + 16777215 + + + + Label for the filesystem + + + 16 + + + + + + + FS Label: + + + diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp index 3de6e0c4cb..6c724bea26 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp @@ -70,6 +70,9 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, m_ui->fileSystemLabel->setEnabled( doFormat ); m_ui->fileSystemComboBox->setEnabled( doFormat ); + m_ui->fileSystemLabelEdit->setEnabled( doFormat ); + m_ui->fileSystemLabelEdit->setText( m_partition->fileSystem().label() ); + if ( !doFormat ) { m_ui->fileSystemComboBox->setCurrentText( userVisibleFS( m_partition->fileSystem() ) ); @@ -146,6 +149,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core ) ? FileSystem::Extended : FileSystem::typeForName( m_ui->fileSystemComboBox->currentText() ); } + const QString fsLabel = m_ui->fileSystemLabelEdit->text(); const auto resultFlags = newFlags(); const auto currentFlags = PartitionInfo::flags( m_partition ); @@ -158,6 +162,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core ) *m_device, m_partition->roles(), fsType, + fsLabel, newFirstSector, newLastSector, resultFlags ); @@ -197,6 +202,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core ) *m_device, m_partition->roles(), fsType, + fsLabel, m_partition->firstSector(), m_partition->lastSector(), resultFlags ); diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.ui b/src/modules/partition/gui/EditExistingPartitionDialog.ui index 9c0c996f6f..7599bc7720 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.ui +++ b/src/modules/partition/gui/EditExistingPartitionDialog.ui @@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-3.0-or-later 0 0 450 - 579 + 615 @@ -147,14 +147,14 @@ SPDX-License-Identifier: GPL-3.0-or-later - + Flags: - + true @@ -167,13 +167,36 @@ SPDX-License-Identifier: GPL-3.0-or-later - + + + + + + 150 + 16777215 + + + + Label for the filesystem + + + 16 + + + + + + + FS Label: + + + From 3d49379bec68774df447c1e33c74a87b377560b6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 27 Mar 2021 14:45:34 +0100 Subject: [PATCH 027/492] [partition] Chase API change in createNewPartition() The partition- and filesystem-label setting code was already there, but not in the call to createNewPartition(); now we set the FS label twice (once in the call, once afterwards) --- src/modules/partition/core/PartitionLayout.cpp | 2 ++ src/modules/partition/tests/PartitionJobTests.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index d6f817af76..23eaeda620 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -230,6 +230,7 @@ PartitionLayout::createPartitions( Device* dev, *dev, role, entry.partFileSystem, + entry.partLabel, currentSector, currentSector + sectors - 1, KPM_PARTITION_FLAG( None ) ); @@ -240,6 +241,7 @@ PartitionLayout::createPartitions( Device* dev, *dev, role, entry.partFileSystem, + entry.partLabel, currentSector, currentSector + sectors - 1, luksPassphrase, diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp index 57dc2579c7..4dddf43776 100644 --- a/src/modules/partition/tests/PartitionJobTests.cpp +++ b/src/modules/partition/tests/PartitionJobTests.cpp @@ -377,6 +377,7 @@ PartitionJobTests::testResizePartition() *m_device, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, + QStringLiteral( "testp" ), oldFirst, oldLast, KPM_PARTITION_FLAG( None ) ); From c035029f38b1244401ab6fcd7f995f7877a5281e Mon Sep 17 00:00:00 2001 From: shainer Date: Sat, 23 Jul 2016 19:04:23 +0100 Subject: [PATCH 028/492] Make sure we always set the filesystem label. In particular, we need a separate Job class to set the label; this is invoked after we formatted a partition, and when no other changes to the partition have been requested in the Edit dialog. --- src/modules/partition/CMakeLists.txt | 2 + .../partition/core/PartitionCoreModule.cpp | 10 ++ .../partition/core/PartitionCoreModule.h | 2 + .../gui/EditExistingPartitionDialog.cpp | 15 ++- .../jobs/ChangeFilesystemLabelJob.cpp | 106 ++++++++++++++++++ .../partition/jobs/ChangeFilesystemLabelJob.h | 40 +++++++ 6 files changed, 172 insertions(+), 3 deletions(-) create mode 100644 src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp create mode 100644 src/modules/partition/jobs/ChangeFilesystemLabelJob.h diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index ac47714cea..07f1eaf5d1 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -80,6 +80,7 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND gui/ReplaceWidget.cpp gui/VolumeGroupBaseDialog.cpp jobs/AutoMountManagementJob.cpp + jobs/ChangeFilesystemLabelJob.cpp jobs/ClearMountsJob.cpp jobs/ClearTempMountsJob.cpp jobs/CreatePartitionJob.cpp @@ -117,3 +118,4 @@ else() calamares_skip_module( "partition (missing dependencies for KPMcore)" ) endif() endif() + diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 3b5c09362f..0ef4dca561 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -22,6 +22,7 @@ #include "core/PartitionInfo.h" #include "core/PartitionModel.h" #include "jobs/AutoMountManagementJob.h" +#include "jobs/ChangeFilesystemLabelJob.h" #include "jobs/ClearMountsJob.h" #include "jobs/ClearTempMountsJob.h" #include "jobs/CreatePartitionJob.h" @@ -541,6 +542,15 @@ PartitionCoreModule::formatPartition( Device* device, Partition* partition ) deviceInfo->makeJob< FormatPartitionJob >( partition ); } +void +PartitionCoreModule::setFilesystemLabel(Device *device, Partition *partition, const QString& newLabel) { + auto deviceInfo = infoForDevice( device ); + Q_ASSERT( deviceInfo ); + + OperationHelper helper( partitionModelForDevice( device ), this ); + deviceInfo->makeJob< ChangeFilesystemLabelJob >( partition, newLabel ); +} + void PartitionCoreModule::resizePartition( Device* device, Partition* partition, qint64 first, qint64 last ) { diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h index 46604b97cd..47353530bb 100644 --- a/src/modules/partition/core/PartitionCoreModule.h +++ b/src/modules/partition/core/PartitionCoreModule.h @@ -147,6 +147,8 @@ class PartitionCoreModule : public QObject void formatPartition( Device* device, Partition* partition ); + void setFilesystemLabel( Device* device, Partition* partition, const QString& newLabel); + void resizePartition( Device* device, Partition* partition, qint64 first, qint64 last ); void setPartitionFlags( Device* device, Partition* partition, PartitionTable::Flags flags ); diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp index 6c724bea26..7a4ea138fa 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp @@ -62,6 +62,10 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, this, &EditExistingPartitionDialog::checkMountPointSelection ); + // The filesystem label dialog is always enabled, because we may want to change + // the label on the current filesystem without formatting. + m_ui->fileSystemLabelEdit->setText( m_partition->fileSystem().label() ); + replacePartResizerWidget(); connect( m_ui->formatRadioButton, &QAbstractButton::toggled, [this]( bool doFormat ) { @@ -70,9 +74,6 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, m_ui->fileSystemLabel->setEnabled( doFormat ); m_ui->fileSystemComboBox->setEnabled( doFormat ); - m_ui->fileSystemLabelEdit->setEnabled( doFormat ); - m_ui->fileSystemLabelEdit->setText( m_partition->fileSystem().label() ); - if ( !doFormat ) { m_ui->fileSystemComboBox->setCurrentText( userVisibleFS( m_partition->fileSystem() ) ); @@ -195,6 +196,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core ) { core->setPartitionFlags( m_device, m_partition, resultFlags ); } + core->setFilesystemLabel( m_device, m_partition, fsLabel ); } else // otherwise, we delete and recreate the partition with new fs type { @@ -220,6 +222,13 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core ) { core->setPartitionFlags( m_device, m_partition, resultFlags ); } + // In this case, we are not formatting the partition, but we are setting the + // label on the current filesystem, if any. We only create the job if the + // label actually changed. + if (m_partition->fileSystem().type() != FileSystem::Type::Unformatted && + fsLabel != m_partition->fileSystem().label()) { + core->setFilesystemLabel( m_device, m_partition, fsLabel ); + } core->refreshPartition( m_device, m_partition ); } } diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp new file mode 100644 index 0000000000..54420e96ca --- /dev/null +++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp @@ -0,0 +1,106 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2016, Lisa Vitolo + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "ChangeFilesystemLabelJob.h" + +#include "utils/Logger.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +ChangeFilesystemLabelJob::ChangeFilesystemLabelJob( Device* device, + Partition* partition, + const QString& newLabel ) + : PartitionJob( partition ) + , m_device( device ) + , m_label( newLabel ) +{} + + +QString +ChangeFilesystemLabelJob::prettyName() const +{ + return tr( "Set filesystem label on %1." ).arg( partition()->partitionPath() ); +} + + +QString +ChangeFilesystemLabelJob::prettyDescription() const +{ + return tr( "Set filesystem label %1 to partition " + "%2." ) + .arg( m_label ) + .arg( partition()->partitionPath() ); +} + + +QString +ChangeFilesystemLabelJob::prettyStatusMessage() const +{ + return prettyDescription(); +} + + +Calamares::JobResult +ChangeFilesystemLabelJob::exec() +{ + if (m_label == partition()->fileSystem().label()) { + return Calamares::JobResult::ok(); + } + + CoreBackend* backend = CoreBackendManager::self()->backend(); + + QString errorMessage = tr( "The installer failed to set flags on partition %1." ) + .arg( m_partition->partitionPath() ); + + QScopedPointer< CoreBackendDevice > backendDevice( backend->openDevice( m_device->deviceNode() ) ); + if ( !backendDevice.data() ) + { + return Calamares::JobResult::error( + errorMessage, + tr( "Could not open device '%1'." ).arg( m_device->deviceNode() ) + ); + } + + QScopedPointer< CoreBackendPartitionTable > backendPartitionTable( backendDevice->openPartitionTable() ); + if ( !backendPartitionTable.data() ) + { + return Calamares::JobResult::error( + errorMessage, + tr( "Could not open partition table on device '%1'." ).arg( m_device->deviceNode() ) + ); + } + + QScopedPointer< CoreBackendPartition > backendPartition( + ( partition()->roles().has( PartitionRole::Extended ) ) + ? backendPartitionTable->getExtendedPartition() + : backendPartitionTable->getPartitionBySector( partition()->firstSector() ) + ); + if ( !backendPartition.data() ) { + return Calamares::JobResult::error( + errorMessage, + tr( "Could not find partition '%1'." ).arg( partition()->partitionPath() ) + ); + } + + FileSystem& fs = m_partition->fileSystem(); + fs.setLabel( m_label ); + + backendPartitionTable->commit(); + return Calamares::JobResult::ok(); +} + + +#include "ChangeFilesystemLabelJob.moc" diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.h b/src/modules/partition/jobs/ChangeFilesystemLabelJob.h new file mode 100644 index 0000000000..3d8982c158 --- /dev/null +++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.h @@ -0,0 +1,40 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2016, Lisa Vitolo + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef CHANGEFILESYSTEMLABELJOB_H +#define CHANGEFILESYSTEMLABELJOB_H + +#include "PartitionJob.h" + +#include + +class Device; +class Partition; + +/** + * This job changes the flags on an existing partition. + */ +class ChangeFilesystemLabelJob : public PartitionJob +{ + Q_OBJECT +public: + ChangeFilesystemLabelJob( Device* device, Partition* partition, const QString& newLabel ); + QString prettyName() const override; + QString prettyDescription() const override; + QString prettyStatusMessage() const override; + Calamares::JobResult exec() override; + + Device* device() const; + +private: + Device* m_device; + QString m_label; +}; + +#endif // CHANGEFILESYSTEMLABELJOB_H From 10076809316308070393c123482a5c9469d7f978 Mon Sep 17 00:00:00 2001 From: shainer Date: Sat, 13 Aug 2016 12:14:48 +0100 Subject: [PATCH 029/492] Fix error handling in ChangeFilesystemLabelJob --- .../jobs/ChangeFilesystemLabelJob.cpp | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp index 54420e96ca..658acc71c1 100644 --- a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp +++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp @@ -60,17 +60,15 @@ ChangeFilesystemLabelJob::exec() return Calamares::JobResult::ok(); } + Report report( nullptr ); CoreBackend* backend = CoreBackendManager::self()->backend(); - QString errorMessage = tr( "The installer failed to set flags on partition %1." ) - .arg( m_partition->partitionPath() ); - QScopedPointer< CoreBackendDevice > backendDevice( backend->openDevice( m_device->deviceNode() ) ); if ( !backendDevice.data() ) { return Calamares::JobResult::error( - errorMessage, - tr( "Could not open device '%1'." ).arg( m_device->deviceNode() ) + tr( "Could not open device '%1'." ).arg( m_device->deviceNode() ), + report.toText() ); } @@ -78,8 +76,8 @@ ChangeFilesystemLabelJob::exec() if ( !backendPartitionTable.data() ) { return Calamares::JobResult::error( - errorMessage, - tr( "Could not open partition table on device '%1'." ).arg( m_device->deviceNode() ) + tr( "Could not open partition table on device '%1'." ).arg( m_device->deviceNode() ), + report.toText() ); } @@ -90,14 +88,22 @@ ChangeFilesystemLabelJob::exec() ); if ( !backendPartition.data() ) { return Calamares::JobResult::error( - errorMessage, - tr( "Could not find partition '%1'." ).arg( partition()->partitionPath() ) + tr( "Could not find partition '%1'." ).arg( partition()->partitionPath() ), + report.toText() ); } FileSystem& fs = m_partition->fileSystem(); fs.setLabel( m_label ); + if ( !backendPartitionTable->setPartitionSystemType( report, *m_partition ) ) + { + return Calamares::JobResult::error( + tr( "The installer failed to update partition table on disk '%1'." ).arg( m_device->name() ), + report.toText() + ); + } + backendPartitionTable->commit(); return Calamares::JobResult::ok(); } From 9c2a26bed544fdee2c09a184e3ef11d7fca36100 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 27 Mar 2021 15:41:58 +0100 Subject: [PATCH 030/492] [libcalamares] Apply coding style --- src/libcalamares/Settings.h | 2 +- src/libcalamares/utils/Units.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h index 4d3d2db3a1..b2f669ffe6 100644 --- a/src/libcalamares/Settings.h +++ b/src/libcalamares/Settings.h @@ -179,7 +179,7 @@ class DLLEXPORT Settings : public QObject bool m_promptInstall = false; bool m_disableCancel = false; bool m_disableCancelDuringExec = false; - bool m_hideBackAndNextDuringExec=false; + bool m_hideBackAndNextDuringExec = false; bool m_quitAtEnd = false; }; diff --git a/src/libcalamares/utils/Units.h b/src/libcalamares/utils/Units.h index 7a13dac102..bb5bf45091 100644 --- a/src/libcalamares/utils/Units.h +++ b/src/libcalamares/utils/Units.h @@ -57,7 +57,7 @@ constexpr qint64 operator""_GiB( unsigned long long m ) return operator""_MiB(m)*1024; } -} +} // namespace Units constexpr qint64 KBtoBytes( unsigned long long m ) From 1eba562d07283f2778ebb8d6507e777a9103e439 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 27 Mar 2021 15:43:32 +0100 Subject: [PATCH 031/492] [partition] Apply coding style --- .../partition/core/PartitionCoreModule.cpp | 3 +- .../partition/core/PartitionCoreModule.h | 2 +- .../partition/gui/CreatePartitionDialog.cpp | 3 +- .../gui/EditExistingPartitionDialog.cpp | 5 ++- .../jobs/ChangeFilesystemLabelJob.cpp | 45 ++++++++----------- .../partition/jobs/ChangeFilesystemLabelJob.h | 2 +- .../partition/jobs/CreatePartitionJob.cpp | 37 ++++++++------- .../partition/tests/AutoMountTests.cpp | 9 ++-- 8 files changed, 51 insertions(+), 55 deletions(-) diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 0ef4dca561..058c10d181 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -543,7 +543,8 @@ PartitionCoreModule::formatPartition( Device* device, Partition* partition ) } void -PartitionCoreModule::setFilesystemLabel(Device *device, Partition *partition, const QString& newLabel) { +PartitionCoreModule::setFilesystemLabel( Device* device, Partition* partition, const QString& newLabel ) +{ auto deviceInfo = infoForDevice( device ); Q_ASSERT( deviceInfo ); diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h index 47353530bb..4923481872 100644 --- a/src/modules/partition/core/PartitionCoreModule.h +++ b/src/modules/partition/core/PartitionCoreModule.h @@ -147,7 +147,7 @@ class PartitionCoreModule : public QObject void formatPartition( Device* device, Partition* partition ); - void setFilesystemLabel( Device* device, Partition* partition, const QString& newLabel); + void setFilesystemLabel( Device* device, Partition* partition, const QString& newLabel ); void resizePartition( Device* device, Partition* partition, qint64 first, qint64 last ); diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index 11f7f3e865..c765bf1f77 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -213,7 +213,8 @@ CreatePartitionDialog::createPartition() } else { - partition = KPMHelpers::createNewPartition( m_parent, *m_device, m_role, fsType, fsLabel, first, last, newFlags() ); + partition + = KPMHelpers::createNewPartition( m_parent, *m_device, m_role, fsType, fsLabel, first, last, newFlags() ); } if ( m_device->type() == Device::Type::LVM_Device ) diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp index 7a4ea138fa..e2d7ac5ba5 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp @@ -225,8 +225,9 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core ) // In this case, we are not formatting the partition, but we are setting the // label on the current filesystem, if any. We only create the job if the // label actually changed. - if (m_partition->fileSystem().type() != FileSystem::Type::Unformatted && - fsLabel != m_partition->fileSystem().label()) { + if ( m_partition->fileSystem().type() != FileSystem::Type::Unformatted + && fsLabel != m_partition->fileSystem().label() ) + { core->setFilesystemLabel( m_device, m_partition, fsLabel ); } core->refreshPartition( m_device, m_partition ); diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp index 658acc71c1..2df2db5e42 100644 --- a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp +++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp @@ -11,22 +11,21 @@ #include "utils/Logger.h" -#include #include #include #include #include #include #include +#include #include -ChangeFilesystemLabelJob::ChangeFilesystemLabelJob( Device* device, - Partition* partition, - const QString& newLabel ) +ChangeFilesystemLabelJob::ChangeFilesystemLabelJob( Device* device, Partition* partition, const QString& newLabel ) : PartitionJob( partition ) , m_device( device ) , m_label( newLabel ) -{} +{ +} QString @@ -41,8 +40,8 @@ ChangeFilesystemLabelJob::prettyDescription() const { return tr( "Set filesystem label %1 to partition " "%2." ) - .arg( m_label ) - .arg( partition()->partitionPath() ); + .arg( m_label ) + .arg( partition()->partitionPath() ); } @@ -56,7 +55,8 @@ ChangeFilesystemLabelJob::prettyStatusMessage() const Calamares::JobResult ChangeFilesystemLabelJob::exec() { - if (m_label == partition()->fileSystem().label()) { + if ( m_label == partition()->fileSystem().label() ) + { return Calamares::JobResult::ok(); } @@ -66,31 +66,25 @@ ChangeFilesystemLabelJob::exec() QScopedPointer< CoreBackendDevice > backendDevice( backend->openDevice( m_device->deviceNode() ) ); if ( !backendDevice.data() ) { - return Calamares::JobResult::error( - tr( "Could not open device '%1'." ).arg( m_device->deviceNode() ), - report.toText() - ); + return Calamares::JobResult::error( tr( "Could not open device '%1'." ).arg( m_device->deviceNode() ), + report.toText() ); } QScopedPointer< CoreBackendPartitionTable > backendPartitionTable( backendDevice->openPartitionTable() ); if ( !backendPartitionTable.data() ) { return Calamares::JobResult::error( - tr( "Could not open partition table on device '%1'." ).arg( m_device->deviceNode() ), - report.toText() - ); + tr( "Could not open partition table on device '%1'." ).arg( m_device->deviceNode() ), report.toText() ); } QScopedPointer< CoreBackendPartition > backendPartition( - ( partition()->roles().has( PartitionRole::Extended ) ) + ( partition()->roles().has( PartitionRole::Extended ) ) ? backendPartitionTable->getExtendedPartition() - : backendPartitionTable->getPartitionBySector( partition()->firstSector() ) - ); - if ( !backendPartition.data() ) { - return Calamares::JobResult::error( - tr( "Could not find partition '%1'." ).arg( partition()->partitionPath() ), - report.toText() - ); + : backendPartitionTable->getPartitionBySector( partition()->firstSector() ) ); + if ( !backendPartition.data() ) + { + return Calamares::JobResult::error( tr( "Could not find partition '%1'." ).arg( partition()->partitionPath() ), + report.toText() ); } FileSystem& fs = m_partition->fileSystem(); @@ -99,9 +93,8 @@ ChangeFilesystemLabelJob::exec() if ( !backendPartitionTable->setPartitionSystemType( report, *m_partition ) ) { return Calamares::JobResult::error( - tr( "The installer failed to update partition table on disk '%1'." ).arg( m_device->name() ), - report.toText() - ); + tr( "The installer failed to update partition table on disk '%1'." ).arg( m_device->name() ), + report.toText() ); } backendPartitionTable->commit(); diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.h b/src/modules/partition/jobs/ChangeFilesystemLabelJob.h index 3d8982c158..ac39605380 100644 --- a/src/modules/partition/jobs/ChangeFilesystemLabelJob.h +++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.h @@ -37,4 +37,4 @@ class ChangeFilesystemLabelJob : public PartitionJob QString m_label; }; -#endif // CHANGEFILESYSTEMLABELJOB_H +#endif // CHANGEFILESYSTEMLABELJOB_H diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 2b6451c3e0..b4d89c5eb5 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -33,7 +33,7 @@ CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition ) { } -static const QMap < QString, QString > gptTypePrettyStrings = { +static const QMap< QString, QString > gptTypePrettyStrings = { { "44479540-f297-41b2-9af7-d131d5f0458a", "Linux Root Partition (x86)" }, { "4f68bce3-e8cd-4db1-96e7-fbcaf984b709", "Linux Root Partition (x86-64)" }, { "69dad710-2ce4-4e3c-b16c-21a1d49abed3", "Linux Root Partition (32-bit ARM)" }, @@ -115,17 +115,17 @@ CreatePartitionJob::prettyName() const if ( !entries.isEmpty() ) { return tr( "Create new %1MiB partition on %3 (%2) with entries %4." ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) - .arg( m_device->name() ) - .arg( m_device->deviceNode() ) - .arg( entries ); + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( m_device->name() ) + .arg( m_device->deviceNode() ) + .arg( entries ); } else { return tr( "Create new %1MiB partition on %3 (%2)." ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) - .arg( m_device->name() ) - .arg( m_device->deviceNode() ); + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( m_device->name() ) + .arg( m_device->deviceNode() ); } } @@ -146,18 +146,19 @@ CreatePartitionJob::prettyDescription() const QString entries = prettyGptEntries( m_partition ); if ( !entries.isEmpty() ) { - return tr( "Create new %1MiB partition on %3 (%2) with entries %4." ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) - .arg( m_device->name() ) - .arg( m_device->deviceNode() ) - .arg( entries ); + return tr( "Create new %1MiB partition on %3 (%2) with entries " + "%4." ) + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( m_device->name() ) + .arg( m_device->deviceNode() ) + .arg( entries ); } else { return tr( "Create new %1MiB partition on %3 (%2)." ) - .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) - .arg( m_device->name() ) - .arg( m_device->deviceNode() ); + .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) ) + .arg( m_device->name() ) + .arg( m_device->deviceNode() ); } } @@ -186,9 +187,7 @@ CreatePartitionJob::prettyStatusMessage() const type = userVisibleFS( m_partition->fileSystem() ); } - return tr( "Creating new %1 partition on %2." ) - .arg( type ) - .arg( m_device->deviceNode() ); + return tr( "Creating new %1 partition on %2." ).arg( type ).arg( m_device->deviceNode() ); } return tr( "Creating new %1 partition on %2." ) diff --git a/src/modules/partition/tests/AutoMountTests.cpp b/src/modules/partition/tests/AutoMountTests.cpp index fcebe02bd2..45a7b4f127 100644 --- a/src/modules/partition/tests/AutoMountTests.cpp +++ b/src/modules/partition/tests/AutoMountTests.cpp @@ -9,8 +9,8 @@ #include "jobs/AutoMountManagementJob.h" -#include "utils/Logger.h" #include "JobQueue.h" +#include "utils/Logger.h" #include #include @@ -52,7 +52,8 @@ AutoMountJobTests::testRunThrice() CalamaresUtils::Partition::automountRestore( original ); } -void AutoMountJobTests::testRunQueue() +void +AutoMountJobTests::testRunQueue() { Calamares::JobQueue q; Calamares::job_ptr jp( new AutoMountManagementJob( false ) ); @@ -68,8 +69,8 @@ void AutoMountJobTests::testRunQueue() QVERIFY( !q.isRunning() ); QEventLoop loop; - QTimer::singleShot( std::chrono::milliseconds( 100 ), [&q](){ q.start(); } ); - QTimer::singleShot( std::chrono::milliseconds( 5000 ), [&loop](){ loop.quit(); } ); + QTimer::singleShot( std::chrono::milliseconds( 100 ), [&q]() { q.start(); } ); + QTimer::singleShot( std::chrono::milliseconds( 5000 ), [&loop]() { loop.quit(); } ); connect( &q, &Calamares::JobQueue::finished, &loop, &QEventLoop::quit ); loop.exec(); From 3c7d97403e91008dded5d6a6b0d37839b89b3996 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 27 Mar 2021 15:44:26 +0100 Subject: [PATCH 032/492] [plasmalnf] Apply coding style --- src/modules/plasmalnf/ThemeInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/plasmalnf/ThemeInfo.cpp b/src/modules/plasmalnf/ThemeInfo.cpp index 73f7174b3b..8e7aa13b91 100644 --- a/src/modules/plasmalnf/ThemeInfo.cpp +++ b/src/modules/plasmalnf/ThemeInfo.cpp @@ -185,7 +185,7 @@ ThemesModel::setThemeImage( const QMap< QString, QString >& images ) QSignalBlocker b( this ); for ( auto k = images.constKeyValueBegin(); k != images.constKeyValueEnd(); ++k ) { - setThemeImage( (*k).first, (*k).second ); + setThemeImage( ( *k ).first, ( *k ).second ); } } emit dataChanged( index( 0, 0 ), index( m_themes->count() - 1 ), { ImageRole } ); From 51d414d6ef29faed2d81346d4fd3f0dab948221f Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Sun, 28 Mar 2021 17:07:09 +0200 Subject: [PATCH 033/492] Update main.py Typo --- src/modules/displaymanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 8c75baf292..2b125cb68d 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -192,7 +192,7 @@ def update_from_desktop_file(self, root_mount_point): DesktopEnvironment('/usr/bin/herbstluftwm', 'herbstluftwm'), DesktopEnvironment('/usr/bin/qtile', 'qtile'), DesktopEnvironment('/usr/bin/xmonad', 'xmonad'), - DesktopEnvironment('/usr/bin/dwm', 'dmw'), + DesktopEnvironment('/usr/bin/dwm', 'dwm'), DesktopEnvironment('/usr/bin/jwm', 'jwm'), DesktopEnvironment('/usr/bin/icewm-session', 'icewm-session'), ] From e2113eda38eaa904407b226204095ac28e22a1f5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 28 Mar 2021 17:52:44 +0200 Subject: [PATCH 034/492] [partition] trust in AutoMoc --- src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp index 2df2db5e42..855e5fa8b0 100644 --- a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp +++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp @@ -100,6 +100,3 @@ ChangeFilesystemLabelJob::exec() backendPartitionTable->commit(); return Calamares::JobResult::ok(); } - - -#include "ChangeFilesystemLabelJob.moc" From 47c167c04305653be86f94dc893dd8974b2d6a99 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 28 Mar 2021 17:56:54 +0200 Subject: [PATCH 035/492] [partition] KPMCore removed some headers --- src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp index 855e5fa8b0..5fdc106c21 100644 --- a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp +++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp @@ -12,14 +12,17 @@ #include "utils/Logger.h" #include -#include #include -#include -#include #include #include #include +#ifndef WITH_KPMCORE42API +#include +#include +#include +#endif + ChangeFilesystemLabelJob::ChangeFilesystemLabelJob( Device* device, Partition* partition, const QString& newLabel ) : PartitionJob( partition ) , m_device( device ) From 22dbe60bb9dcb92619a7e83729711f4e96a2fb2c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 28 Mar 2021 18:07:32 +0200 Subject: [PATCH 036/492] [partition] Use operations-API (available in all supported KPMCore versions) --- .../jobs/ChangeFilesystemLabelJob.cpp | 48 +++---------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp index 5fdc106c21..9541c000a6 100644 --- a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp +++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp @@ -15,14 +15,9 @@ #include #include #include +#include #include -#ifndef WITH_KPMCORE42API -#include -#include -#include -#endif - ChangeFilesystemLabelJob::ChangeFilesystemLabelJob( Device* device, Partition* partition, const QString& newLabel ) : PartitionJob( partition ) , m_device( device ) @@ -64,42 +59,13 @@ ChangeFilesystemLabelJob::exec() } Report report( nullptr ); - CoreBackend* backend = CoreBackendManager::self()->backend(); - - QScopedPointer< CoreBackendDevice > backendDevice( backend->openDevice( m_device->deviceNode() ) ); - if ( !backendDevice.data() ) - { - return Calamares::JobResult::error( tr( "Could not open device '%1'." ).arg( m_device->deviceNode() ), - report.toText() ); - } - - QScopedPointer< CoreBackendPartitionTable > backendPartitionTable( backendDevice->openPartitionTable() ); - if ( !backendPartitionTable.data() ) - { - return Calamares::JobResult::error( - tr( "Could not open partition table on device '%1'." ).arg( m_device->deviceNode() ), report.toText() ); - } + SetFileSystemLabelOperation op( *partition(), m_label ); + op.setStatus( Operation::StatusRunning ); - QScopedPointer< CoreBackendPartition > backendPartition( - ( partition()->roles().has( PartitionRole::Extended ) ) - ? backendPartitionTable->getExtendedPartition() - : backendPartitionTable->getPartitionBySector( partition()->firstSector() ) ); - if ( !backendPartition.data() ) + if ( op.execute( report ) ) { - return Calamares::JobResult::error( tr( "Could not find partition '%1'." ).arg( partition()->partitionPath() ), - report.toText() ); - } - - FileSystem& fs = m_partition->fileSystem(); - fs.setLabel( m_label ); - - if ( !backendPartitionTable->setPartitionSystemType( report, *m_partition ) ) - { - return Calamares::JobResult::error( - tr( "The installer failed to update partition table on disk '%1'." ).arg( m_device->name() ), - report.toText() ); + return Calamares::JobResult::ok(); } - - backendPartitionTable->commit(); - return Calamares::JobResult::ok(); + return Calamares::JobResult::error( + tr( "The installer failed to update partition table on disk '%1'." ).arg( m_device->name() ), report.toText() ); } From 53beea6061f8fb8f1eb19606d22972055b8e198d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 10:08:20 +0200 Subject: [PATCH 037/492] CMake: partial revert of updated versioning - Keep the project() version as literal, drop the script-mode changes, to keep existing (weird?) build-and-packaging hacks working. - Do switch to unified versioning-git-annotations CMake module, do drop the "rc" from version numbers. --- CMakeLists.txt | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab30845e52..246c828cca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,23 +40,13 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) - -set( CALAMARES_VERSION 3.2.40 ) -set( CALAMARES_RELEASE_MODE OFF ) - -if ( CMAKE_SCRIPT_MODE_FILE ) - include( ${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake ) - set( CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR} ) - extend_version( ${CALAMARES_VERSION} OFF _vshort _vlong ) - message( "${_vlong}" ) - return() -endif() - project( CALAMARES - VERSION ${CALAMARES_VERSION} + VERSION 3.2.40 LANGUAGES C CXX ) +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development + ### OPTIONS # option( INSTALL_CONFIG "Install configuration files" OFF ) @@ -190,7 +180,6 @@ include( FeatureSummary ) # Calamares Modules include( CMakeColors ) -include( ExtendedVersion ) ### C++ SETUP # @@ -505,21 +494,30 @@ add_feature_info( ExampleDistro ${mksquashfs_FOUND} "Create example-distro targe ### CALAMARES PROPER # -# -extend_version( "${CALAMARES_VERSION}" ${CALAMARES_RELEASE_MODE} CALAMARES_VERSION_SHORT CALAMARES_VERSION ) +set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} ) +# In rare cases we have hotfix-releases with a tweak +if( CALAMARES_VERSION_TWEAK ) + set( CALAMARES_VERSION "${CALAMARES_VERSION}.${CALAMARES_VERSION_TWEAK}" ) +endif() +set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" ) + +# Additional info for non-release builds. The "extended" version information +# with date and git information (commit, dirty status) is used only +# by CalamaresVersionX.h, which is included by consumers that need a full +# version number with all that information; normal consumers can include +# CalamaresVersion.h with more stable numbers. +if( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) + include( ExtendedVersion ) + extend_version( "${CALAMARES_VERSION}" OFF CALAMARES_VERSION_SHORT CALAMARES_VERSION ) +endif() -# Special target for displaying the version. In RC (might-be-release) -# builds, use the short version (3.x.y), otherwise show the long version. -if ( CALAMARES_RELEASE_MODE ) +# Special target for not-RC (e.g. might-be-release) builds. +# This is used by the release script to get the version. +if ( CALAMARES_VERSION_RC EQUAL 0 ) add_custom_target(show-version ${CMAKE_COMMAND} -E echo CALAMARES_VERSION=${CALAMARES_VERSION_SHORT} USES_TERMINAL ) -else() - add_custom_target(show-version - ${CMAKE_COMMAND} -E echo CALAMARES_VERSION=${CALAMARES_VERSION} - USES_TERMINAL - ) endif() # enforce using constBegin, constEnd for const-iterators From af282e092d3b8494ac6da184c599a7cb37123187 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 10:24:39 +0200 Subject: [PATCH 038/492] Changes: document partition fslabel --- CHANGES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 8b2f7ccce4..92c80c81aa 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,7 @@ website will have to do for older versions. This release contains contributions from (alphabetically by first name): - Erik Dubois + - Lisa Vitolo ## Core ## - The CMake modules for consumption by external modules (e.g. the @@ -26,6 +27,9 @@ This release contains contributions from (alphabetically by first name): - *displaymanager* example configuration has been shuffled around a bit, for better results when the live image is running XFCE. Also lists more potential display managers. #1205 (Thanks Erik) + - A long-neglected pull request from Lisa Vitolo for the *partition* + module -- allowing to set filesystem labels during manual partitioning -- + has been revived and merged. # 3.2.39 (2021-03-19) # From 42d00ffe38f854f90fb966e3f3ee32e26811ed96 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 10:30:56 +0200 Subject: [PATCH 039/492] [displaymanager] Fix mismatch in spelling of "autologinUser" In 4ffa79d4cff4f0a6e65fbb53b110b0d3ac007b0a, the spelling was changed to consistently be "autoLoginUser" in the *users* module, but that changed the Global Storage key as well, and the *displaymanager* module wasn't changed to follow. --- src/modules/displaymanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 2b125cb68d..fad03eede9 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -954,7 +954,7 @@ def run(): else: enable_basic_setup = False - username = libcalamares.globalstorage.value("autologinUser") + username = libcalamares.globalstorage.value("autoLoginUser") if username is not None: do_autologin = True libcalamares.utils.debug("Setting up autologin for user {!s}.".format(username)) From b04d59ba2eeb81754eeef3670ed55cdcd5eca7cc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 10:46:28 +0200 Subject: [PATCH 040/492] [libcalamares] More variant->python translations - There's still 49 enumeration values not handled, leading to an annoying Clang warning, but there's just no **point** in listing them all: that's what 'default' is for. --- src/libcalamares/PythonHelper.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp index f13f5979fe..5a3e2d6488 100644 --- a/src/libcalamares/PythonHelper.cpp +++ b/src/libcalamares/PythonHelper.cpp @@ -40,19 +40,25 @@ variantToPyObject( const QVariant& variant ) case QVariant::Int: return bp::object( variant.toInt() ); + case QVariant::UInt: + return bp::object( variant.toUInt() ); case QVariant::LongLong: return bp::object( variant.toLongLong() ); + case QVariant::ULongLong: + return bp::object( variant.toULongLong() ); case QVariant::Double: return bp::object( variant.toDouble() ); + case QVariant::Char: case QVariant::String: return bp::object( variant.toString().toStdString() ); case QVariant::Bool: return bp::object( variant.toBool() ); + case QVariant::Invalid: default: return bp::object(); } From 0ccd55e33f8bcdbba136699b52241a7dcc6bf305 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 10:50:32 +0200 Subject: [PATCH 041/492] [libcalamares] Warn (python only) about unknown GS keys This makes it easier to spot problems where key-names are mis-spelled in Python (or other modules change a name and it's not applied to consumers) --- src/libcalamares/PythonHelper.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp index 5a3e2d6488..d6e61b3aa8 100644 --- a/src/libcalamares/PythonHelper.cpp +++ b/src/libcalamares/PythonHelper.cpp @@ -437,14 +437,24 @@ GlobalStoragePythonWrapper::keys() const int GlobalStoragePythonWrapper::remove( const std::string& key ) { - return m_gs->remove( QString::fromStdString( key ) ); + const QString gsKey( QString::fromStdString( key ) ); + if ( !m_gs->contains( gsKey ) ) + { + cWarning() << "Unknown GS key" << key.c_str(); + } + return m_gs->remove( gsKey ); } bp::object GlobalStoragePythonWrapper::value( const std::string& key ) const { - return CalamaresPython::variantToPyObject( m_gs->value( QString::fromStdString( key ) ) ); + const QString gsKey( QString::fromStdString( key ) ); + if ( !m_gs->contains( gsKey ) ) + { + cWarning() << "Unknown GS key" << key.c_str(); + } + return CalamaresPython::variantToPyObject( m_gs->value( gsKey ) ); } } // namespace CalamaresPython From df1d7dea611d992a88cbbd9fe7a20ff2341bebb8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 11:03:32 +0200 Subject: [PATCH 042/492] [partition] Warnings-- Avoid the extra indirection through the otherwise-unused prettyGptType(const QString&), construct table of names only on first call to avoid static-initialization order (though that's not important here). --- .../partition/jobs/CreatePartitionJob.cpp | 72 +++++++++---------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index b4d89c5eb5..241e0a4514 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -33,49 +33,45 @@ CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition ) { } -static const QMap< QString, QString > gptTypePrettyStrings = { - { "44479540-f297-41b2-9af7-d131d5f0458a", "Linux Root Partition (x86)" }, - { "4f68bce3-e8cd-4db1-96e7-fbcaf984b709", "Linux Root Partition (x86-64)" }, - { "69dad710-2ce4-4e3c-b16c-21a1d49abed3", "Linux Root Partition (32-bit ARM)" }, - { "b921b045-1df0-41c3-af44-4c6f280d3fae", "Linux Root Partition (64-bit ARM)" }, - { "993d8d3d-f80e-4225-855a-9daf8ed7ea97", "Linux Root Partition (Itanium/IA-64)" }, - { "d13c5d3b-b5d1-422a-b29f-9454fdc89d76", "Linux Root Verity Partition (x86)" }, - { "2c7357ed-ebd2-46d9-aec1-23d437ec2bf5", "Linux Root Verity Partition (x86-64)" }, - { "7386cdf2-203c-47a9-a498-f2ecce45a2d6", "Linux Root Verity Partition (32-bit ARM)" }, - { "df3300ce-d69f-4c92-978c-9bfb0f38d820", "Linux Root Verity Partition (64-bit ARM/AArch64)" }, - { "86ed10d5-b607-45bb-8957-d350f23d0571", "Linux Root Verity Partition (Itanium/IA-64)" }, - { "75250d76-8cc6-458e-bd66-bd47cc81a812", "Linux /usr Partition (x86)" }, - { "8484680c-9521-48c6-9c11-b0720656f69e", "Linux /usr Partition (x86-64)" }, - { "7d0359a3-02b3-4f0a-865c-654403e70625", "Linux /usr Partition (32-bit ARM)" }, - { "b0e01050-ee5f-4390-949a-9101b17104e9", "Linux /usr Partition (64-bit ARM/AArch64)" }, - { "4301d2a6-4e3b-4b2a-bb94-9e0b2c4225ea", "Linux /usr Partition (Itanium/IA-64)" }, - { "8f461b0d-14ee-4e81-9aa9-049b6fb97abd", "Linux /usr Verity Partition (x86)" }, - { "77ff5f63-e7b6-4633-acf4-1565b864c0e6", "Linux /usr Verity Partition (x86-64)" }, - { "c215d751-7bcd-4649-be90-6627490a4c05", "Linux /usr Verity Partition (32-bit ARM)" }, - { "6e11a4e7-fbca-4ded-b9e9-e1a512bb664e", "Linux /usr Verity Partition (64-bit ARM/AArch64)" }, - { "6a491e03-3be7-4545-8e38-83320e0ea880", "Linux /usr Verity Partition (Itanium/IA-64)" }, - { "933ac7e1-2eb4-4f13-b844-0e14e2aef915", "Linux Home Partition" }, - { "3b8f8425-20e0-4f3b-907f-1a25a76f98e8", "Linux Server Data Partition" }, - { "4d21b016-b534-45c2-a9fb-5c16e091fd2d", "Linux Variable Data Partition" }, - { "7ec6f557-3bc5-4aca-b293-16ef5df639d1", "Linux Temporary Data Partition" }, - { "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f", "Linux Swap" }, - { "c12a7328-f81f-11d2-ba4b-00a0c93ec93b", "EFI System Partition" }, - { "bc13c2ff-59e6-4262-a352-b275fd6f7172", "Extended Boot Loader Partition" }, - { "0fc63daf-8483-4772-8e79-3d69d8477de4", "Other Data Partitions" }, - { "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7", "Microsoft basic data" }, -}; - -static QString -prettyGptType( const QString& type ) -{ - return gptTypePrettyStrings.value( type.toLower(), type ); -} static QString prettyGptType( const Partition* partition ) { #ifdef WITH_KPMCORE42API - return prettyGptType( partition->type() ); + static const QMap< QString, QString > gptTypePrettyStrings = { + { "44479540-f297-41b2-9af7-d131d5f0458a", "Linux Root Partition (x86)" }, + { "4f68bce3-e8cd-4db1-96e7-fbcaf984b709", "Linux Root Partition (x86-64)" }, + { "69dad710-2ce4-4e3c-b16c-21a1d49abed3", "Linux Root Partition (32-bit ARM)" }, + { "b921b045-1df0-41c3-af44-4c6f280d3fae", "Linux Root Partition (64-bit ARM)" }, + { "993d8d3d-f80e-4225-855a-9daf8ed7ea97", "Linux Root Partition (Itanium/IA-64)" }, + { "d13c5d3b-b5d1-422a-b29f-9454fdc89d76", "Linux Root Verity Partition (x86)" }, + { "2c7357ed-ebd2-46d9-aec1-23d437ec2bf5", "Linux Root Verity Partition (x86-64)" }, + { "7386cdf2-203c-47a9-a498-f2ecce45a2d6", "Linux Root Verity Partition (32-bit ARM)" }, + { "df3300ce-d69f-4c92-978c-9bfb0f38d820", "Linux Root Verity Partition (64-bit ARM/AArch64)" }, + { "86ed10d5-b607-45bb-8957-d350f23d0571", "Linux Root Verity Partition (Itanium/IA-64)" }, + { "75250d76-8cc6-458e-bd66-bd47cc81a812", "Linux /usr Partition (x86)" }, + { "8484680c-9521-48c6-9c11-b0720656f69e", "Linux /usr Partition (x86-64)" }, + { "7d0359a3-02b3-4f0a-865c-654403e70625", "Linux /usr Partition (32-bit ARM)" }, + { "b0e01050-ee5f-4390-949a-9101b17104e9", "Linux /usr Partition (64-bit ARM/AArch64)" }, + { "4301d2a6-4e3b-4b2a-bb94-9e0b2c4225ea", "Linux /usr Partition (Itanium/IA-64)" }, + { "8f461b0d-14ee-4e81-9aa9-049b6fb97abd", "Linux /usr Verity Partition (x86)" }, + { "77ff5f63-e7b6-4633-acf4-1565b864c0e6", "Linux /usr Verity Partition (x86-64)" }, + { "c215d751-7bcd-4649-be90-6627490a4c05", "Linux /usr Verity Partition (32-bit ARM)" }, + { "6e11a4e7-fbca-4ded-b9e9-e1a512bb664e", "Linux /usr Verity Partition (64-bit ARM/AArch64)" }, + { "6a491e03-3be7-4545-8e38-83320e0ea880", "Linux /usr Verity Partition (Itanium/IA-64)" }, + { "933ac7e1-2eb4-4f13-b844-0e14e2aef915", "Linux Home Partition" }, + { "3b8f8425-20e0-4f3b-907f-1a25a76f98e8", "Linux Server Data Partition" }, + { "4d21b016-b534-45c2-a9fb-5c16e091fd2d", "Linux Variable Data Partition" }, + { "7ec6f557-3bc5-4aca-b293-16ef5df639d1", "Linux Temporary Data Partition" }, + { "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f", "Linux Swap" }, + { "c12a7328-f81f-11d2-ba4b-00a0c93ec93b", "EFI System Partition" }, + { "bc13c2ff-59e6-4262-a352-b275fd6f7172", "Extended Boot Loader Partition" }, + { "0fc63daf-8483-4772-8e79-3d69d8477de4", "Other Data Partitions" }, + { "ebd0a0a2-b9e5-4433-87c0-68b6b72699c7", "Microsoft basic data" }, + }; + + auto type = partition->type(); + return gptTypePrettyStrings.value( type.toLower(), type ); #else return QString(); #endif From 0ec77f5d857b647745d15655351104d0ada801f0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 11:06:16 +0200 Subject: [PATCH 043/492] [partition] Warnings-- (uninitialized value) --- src/modules/partition/gui/ChoicePage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index ba7552c764..f6b49cb2f5 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -1111,7 +1111,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) } // Also handle selection behavior on beforeFrame. - QAbstractItemView::SelectionMode previewSelectionMode; + QAbstractItemView::SelectionMode previewSelectionMode = QAbstractItemView::NoSelection; switch ( m_config->installChoice() ) { case InstallChoice::Replace: From 777b582e5b46158d8093d243ac3d3ce64e00dbda Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 29 Mar 2021 14:06:42 +0200 Subject: [PATCH 044/492] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ar.ts | 247 +++++++++++---------- lang/calamares_as.ts | 249 ++++++++++++---------- lang/calamares_ast.ts | 247 +++++++++++---------- lang/calamares_az.ts | 297 ++++++++++++++------------ lang/calamares_az_AZ.ts | 301 ++++++++++++++------------ lang/calamares_be.ts | 249 ++++++++++++---------- lang/calamares_bg.ts | 247 +++++++++++---------- lang/calamares_bn.ts | 245 +++++++++++---------- lang/calamares_ca.ts | 249 ++++++++++++---------- lang/calamares_ca@valencia.ts | 249 ++++++++++++---------- lang/calamares_cs_CZ.ts | 249 ++++++++++++---------- lang/calamares_da.ts | 249 ++++++++++++---------- lang/calamares_de.ts | 303 ++++++++++++++------------ lang/calamares_el.ts | 247 +++++++++++---------- lang/calamares_en.ts | 16 +- lang/calamares_en_GB.ts | 247 +++++++++++---------- lang/calamares_eo.ts | 247 +++++++++++---------- lang/calamares_es.ts | 247 +++++++++++---------- lang/calamares_es_MX.ts | 247 +++++++++++---------- lang/calamares_es_PR.ts | 245 +++++++++++---------- lang/calamares_et.ts | 247 +++++++++++---------- lang/calamares_eu.ts | 247 +++++++++++---------- lang/calamares_fa.ts | 249 ++++++++++++---------- lang/calamares_fi_FI.ts | 307 ++++++++++++++------------ lang/calamares_fr.ts | 249 ++++++++++++---------- lang/calamares_fr_CH.ts | 245 +++++++++++---------- lang/calamares_fur.ts | 249 ++++++++++++---------- lang/calamares_gl.ts | 247 +++++++++++---------- lang/calamares_gu.ts | 245 +++++++++++---------- lang/calamares_he.ts | 281 +++++++++++++----------- lang/calamares_hi.ts | 305 ++++++++++++++------------ lang/calamares_hr.ts | 293 ++++++++++++++----------- lang/calamares_hu.ts | 247 +++++++++++---------- lang/calamares_id.ts | 249 ++++++++++++---------- lang/calamares_id_ID.ts | 245 +++++++++++---------- lang/calamares_ie.ts | 247 +++++++++++---------- lang/calamares_is.ts | 247 +++++++++++---------- lang/calamares_it_IT.ts | 249 ++++++++++++---------- lang/calamares_ja.ts | 391 ++++++++++++++++++---------------- lang/calamares_kk.ts | 247 +++++++++++---------- lang/calamares_kn.ts | 247 +++++++++++---------- lang/calamares_ko.ts | 247 +++++++++++---------- lang/calamares_lo.ts | 245 +++++++++++---------- lang/calamares_lt.ts | 249 ++++++++++++---------- lang/calamares_lv.ts | 245 +++++++++++---------- lang/calamares_mk.ts | 247 +++++++++++---------- lang/calamares_ml.ts | 247 +++++++++++---------- lang/calamares_mr.ts | 247 +++++++++++---------- lang/calamares_nb.ts | 247 +++++++++++---------- lang/calamares_ne.ts | 245 +++++++++++---------- lang/calamares_ne_NP.ts | 247 +++++++++++---------- lang/calamares_nl.ts | 249 ++++++++++++---------- lang/calamares_pl.ts | 247 +++++++++++---------- lang/calamares_pt_BR.ts | 293 ++++++++++++++----------- lang/calamares_pt_PT.ts | 249 ++++++++++++---------- lang/calamares_ro.ts | 247 +++++++++++---------- lang/calamares_ru.ts | 289 ++++++++++++++----------- lang/calamares_si.ts | 245 +++++++++++---------- lang/calamares_sk.ts | 249 ++++++++++++---------- lang/calamares_sl.ts | 245 +++++++++++---------- lang/calamares_sq.ts | 249 ++++++++++++---------- lang/calamares_sr.ts | 247 +++++++++++---------- lang/calamares_sr@latin.ts | 245 +++++++++++---------- lang/calamares_sv.ts | 247 +++++++++++---------- lang/calamares_te.ts | 247 +++++++++++---------- lang/calamares_tg.ts | 249 ++++++++++++---------- lang/calamares_th.ts | 245 +++++++++++---------- lang/calamares_tr_TR.ts | 293 ++++++++++++++----------- lang/calamares_uk.ts | 247 +++++++++++---------- lang/calamares_ur.ts | 245 +++++++++++---------- lang/calamares_uz.ts | 245 +++++++++++---------- lang/calamares_vi.ts | 249 ++++++++++++---------- lang/calamares_zh.ts | 245 +++++++++++---------- lang/calamares_zh_CN.ts | 249 ++++++++++++---------- lang/calamares_zh_TW.ts | 249 ++++++++++++---------- 75 files changed, 10567 insertions(+), 8373 deletions(-) diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts index e9946899d7..8b8a094191 100644 --- a/lang/calamares_ar.ts +++ b/lang/calamares_ar.ts @@ -102,22 +102,42 @@ الواجهة: - - Tools - الأدوات + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet إعادة تحميل ورقة الأنماط - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information معلومات التّنقيح @@ -294,13 +314,13 @@ - + &Yes &نعم - + &No &لا @@ -310,17 +330,17 @@ &اغلاق - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -329,124 +349,124 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? الإستمرار في التثبيت؟ - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> مثبّت %1 على وشك بإجراء تعديلات على قرصك لتثبيت %2.<br/><strong>لن تستطيع التّراجع عن هذا.</strong> - + &Set up now - + &Install now &ثبت الأن - + Go &back &إرجع - + &Set up - + &Install &ثبت - + Setup is complete. Close the setup program. اكتمل الإعداد. أغلق برنامج الإعداد. - + The installation is complete. Close the installer. اكتمل التثبيت , اغلق المثبِت - + Cancel setup without changing the system. - + Cancel installation without changing the system. الغاء الـ تثبيت من دون احداث تغيير في النظام - + &Next &التالي - + &Back &رجوع - + &Done - + &Cancel &إلغاء - + Cancel setup? إلغاء الإعداد؟ - + Cancel installation? إلغاء التثبيت؟ - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. هل تريد حقًا إلغاء عملية الإعداد الحالية؟ سيتم إنهاء برنامج الإعداد وسيتم فقد جميع التغييرات. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. أتريد إلغاء عمليّة التّثبيت الحاليّة؟ @@ -479,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 المثبت @@ -492,7 +512,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... يجمع معلومات النّظام... @@ -740,22 +760,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -850,42 +880,42 @@ The installer will quit and all changes will be lost. لا يوجد تطابق في كلمات السر! - + Setup Failed - + Installation Failed فشل التثبيت - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1482,72 +1512,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source موصول بمصدر للطّاقة - + The system is not plugged in to a power source. النّظام ليس متّصلًا بمصدر للطّاقة. - + is connected to the Internet موصول بالإنترنت - + The system is not connected to the Internet. النّظام ليس موصولًا بالإنترنت - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. المثبّت لا يعمل بصلاحيّات المدير. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1615,7 +1645,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> ينفّذ السّكربت: &nbsp;<code>%1</code> @@ -1885,98 +1915,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3740,12 +3769,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3753,7 +3782,7 @@ Output: UsersQmlViewStep - + Users المستخدمين @@ -4137,102 +4166,102 @@ Output: ما اسمك؟ - + Your Full Name - + What name do you want to use to log in? ما الاسم الذي تريده لتلج به؟ - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? ما اسم هذا الحاسوب؟ - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. اختر كلمة مرور لإبقاء حسابك آمنًا. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. استخدم نفس كلمة المرور لحساب المدير. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts index af7ee1a037..721d21d2ed 100644 --- a/lang/calamares_as.ts +++ b/lang/calamares_as.ts @@ -102,22 +102,42 @@ ইন্টাৰফেচ: - - Tools - সঁজুলি + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet স্টাইলছীট পুনৰ লোড্ কৰক - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree ৱিজেত্ ত্ৰি - + Debug information ডিবাগ তথ্য @@ -286,13 +306,13 @@ - + &Yes হয় (&Y) - + &No নহয় (&N) @@ -302,17 +322,17 @@ বন্ধ (&C) - + Install Log Paste URL ইনস্তল​ ল'গ পেস্ট URL - + The upload was unsuccessful. No web-paste was done. আপলোড বিফল হৈছিল। কোনো ৱেব-পেস্ট কৰা হোৱা নাছিল। - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed কেলামাৰেচৰ আৰম্ভণি বিফল হ'ল - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ইনস্তল কৰিব পৰা নগ'ল। কেলামাৰেচে সকলোবোৰ সংৰূপ দিয়া মডিউল লোড্ কৰাত সফল নহ'ল। এইটো এটা আপোনাৰ ডিষ্ট্ৰিবিউচনে কি ধৰণে কেলামাৰেচ ব্যৱহাৰ কৰিছে, সেই সম্বন্ধীয় সমস্যা। - + <br/>The following modules could not be loaded: <br/>নিম্নোক্ত মডিউলবোৰ লোড্ কৰিৱ পৰা নগ'ল: - + Continue with setup? চেত্ আপ অব্যাহত ৰাখিব? - + Continue with installation? ইন্স্তলেচন অব্যাহত ৰাখিব? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 চেত্ আপ প্ৰগ্ৰেমটোৱে %2 চেত্ আপ কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 ইনস্তলাৰটোৱে %2 ইনস্তল কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</strong> - + &Set up now এতিয়া চেত্ আপ কৰক (&S) - + &Install now এতিয়া ইনস্তল কৰক (&I) - + Go &back উভতি যাওক (&b) - + &Set up চেত্ আপ কৰক (&S) - + &Install ইনস্তল (&I) - + Setup is complete. Close the setup program. চেত্ আপ সম্পূৰ্ণ হ'ল। প্ৰোগ্ৰেম বন্ধ কৰক। - + The installation is complete. Close the installer. ইনস্তলেচন সম্পূৰ্ণ হ'ল। ইন্স্তলাৰ বন্ধ কৰক। - + Cancel setup without changing the system. চিছ্তেম সলনি নকৰাকৈ চেত্ আপ বাতিল কৰক। - + Cancel installation without changing the system. চিছ্তেম সলনি নকৰাকৈ ইনস্তলেচন বাতিল কৰক। - + &Next পৰবর্তী (&N) - + &Back পাছলৈ (&B) - + &Done হৈ গ'ল (&D) - + &Cancel বাতিল কৰক (&C) - + Cancel setup? চেত্ আপ বাতিল কৰিব? - + Cancel installation? ইনস্তলেছন বাতিল কৰিব? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. সচাকৈয়ে চলিত চেত্ আপ প্ৰক্ৰিয়া বাতিল কৰিব বিচাৰে নেকি? চেত্ আপ প্ৰোগ্ৰেম বন্ধ হ'ব আৰু গোটেই সলনিবোৰ নোহোৱা হৈ যাব। - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. সচাকৈয়ে চলিত ইনস্তল প্ৰক্ৰিয়া বাতিল কৰিব বিচাৰে নেকি? @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 চেত্ আপ প্ৰোগ্ৰেম - + %1 Installer %1 ইনস্তলাৰ @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... চিছ্তেম তথ্য সংগ্ৰহ কৰা হৈ আছে... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. সংখ্যা আৰু তাৰিখ স্থানীয় %1লৈ সলনি কৰা হ'ব। - + Network Installation. (Disabled: Incorrect configuration) নেটৱৰ্ক ইনস্তলেচন। (নিস্ক্ৰিয়: ভুল কনফিগাৰেচন) - + Network Installation. (Disabled: Received invalid groups data) নেটৱৰ্ক্ ইনস্তলেচন। (নিস্ক্ৰিয়: অকার্যকৰ গোটৰ তথ্য পোৱা গ'ল) - - Network Installation. (Disabled: internal error) - নেটৱৰ্ক ইনস্তলেচন। (নিস্ক্ৰিয়: ভিতৰুৱা দোষ) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + পেকেজ বাচনি - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) নেটৱৰ্ক্ ইনস্তলেচন। (নিস্ক্ৰিয়: পেকেজ সুচী বিচাৰি পোৱা নগ'ল, আপোনাৰ নেটৱৰ্ক্ সংযোগ পৰীক্ষা কৰক) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. আপোনাৰ পাছৱৰ্ডকেইটাৰ মিল নাই! - + Setup Failed চেত্ আপ বিফল হ'ল - + Installation Failed ইনস্তলেচন বিফল হ'ল - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete চেত্ আপ সম্পুৰ্ণ হৈছে - + Installation Complete ইনস্তলচেন সম্পুৰ্ণ হ'ল - + The setup of %1 is complete. %1ৰ চেত্ আপ সম্পুৰ্ণ হৈছে। - + The installation of %1 is complete. %1ৰ ইনস্তলচেন সম্পুৰ্ণ হ'ল। @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space অতি কমেও %1 GiB খালী ঠাই ড্ৰাইভত উপলব্ধ আছে - + There is not enough drive space. At least %1 GiB is required. ড্ৰাইভত পৰ্য্যাপ্ত খালী ঠাই নাই। অতি কমেও %1 GiB আৱশ্যক। - + has at least %1 GiB working memory অতি কমেও %1 GiB কাৰ্য্যকৰি মেম'ৰি আছে - + The system does not have enough working memory. At least %1 GiB is required. চিছটেমত পৰ্য্যাপ্ত কাৰ্য্যকৰি মেম'ৰী নাই। অতি কমেও %1 GiB আৱশ্যক। - + is plugged in to a power source পাৱাৰৰ উৎসৰ লগত সংযোগ হৈ আছে। - + The system is not plugged in to a power source. চিছটেম পাৱাৰৰ উৎসৰ লগত সংযোগ হৈ থকা নাই। - + is connected to the Internet ইন্টাৰনেটৰ সৈতে সংযোগ হৈছে - + The system is not connected to the Internet. চিছটেমটো ইন্টাৰনেটৰ সৈতে সংযোগ হৈ থকা নাই। - + is running the installer as an administrator (root) ইনস্তলাৰটো প্ৰসাশনক (ৰুট) হিছাবে চলি আছে নেকি - + The setup program is not running with administrator rights. চেত্ আপ প্ৰগ্ৰেমটো প্ৰসাশনীয় অধিকাৰৰ সৈতে চলি থকা নাই। - + The installer is not running with administrator rights. ইনস্তলাৰটো প্ৰসাশনীয় অধিকাৰৰ সৈতে চলি থকা নাই। - + has a screen large enough to show the whole installer সম্পূৰ্ণ ইনস্তলাৰটো দেখাবলৈ প্ৰয়োজনীয় ডাঙৰ স্ক্ৰীণ আছে নেকি? - + The screen is too small to display the setup program. চেত্ আপ প্ৰগ্ৰেমটো প্ৰদৰ্শন কৰিবলৈ স্ক্ৰিনখনৰ আয়তন যথেস্ট সৰু। - + The screen is too small to display the installer. ইনস্তলাৰটো প্ৰদৰ্শন কৰিবলৈ স্ক্ৰিনখনৰ আয়তন যথেস্ট সৰু। @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. অনুগ্ৰহ কৰি কেডিই কনচোল্ ইন্সটল কৰক আৰু পুনৰ চেষ্টা কৰক! - + Executing script: &nbsp;<code>%1</code> নিস্পাদিত লিপি: &nbsp; <code>%1</code> @@ -1879,98 +1909,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection পেকেজ বাচনি - + Office software কাৰ্যালয়ৰ ছফটৱেৰ - + Office package কাৰ্যালয়ৰ পেকেজ - + Browser software ব্ৰাউজাৰৰ ছফটৱেৰ - + Browser package ব্ৰাউজাৰৰ পেকেজ - + Web browser ৱেব ব্ৰাউজাৰ - + Kernel কাৰ্ণেল - + Services সেৰ্ৱিচেস - + Login পৰীক্ষণ কৰক - + Desktop দেস্কেতোপ - + Applications এপ্লীকেছ্নচ - + Communication যোগাযোগ - + Development প্রবৃদ্ধি - + Office কাৰ্যালয় - + Multimedia মাল্টিমিডিয়া - + Internet ইণ্টাৰনেট - + Theming থিমীং - + Gaming খেলা - + Utilities সঁজুলি @@ -3702,12 +3731,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>যদি এটাতকৈ বেছি ব্যক্তিয়ে এইটো কম্পিউটাৰ ব্যৱহাৰ কৰে, আপুনি চেত্ আপৰ পিছত বহুতো একাউন্ট বনাব পাৰে।</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>যদি এটাতকৈ বেছি ব্যক্তিয়ে এইটো কম্পিউটাৰ ব্যৱহাৰ কৰে, আপুনি ইনস্তলচেন​ৰ পিছত বহুতো একাউন্ট বনাব পাৰে।</small> @@ -3715,7 +3744,7 @@ Output: UsersQmlViewStep - + Users ব্যৱহাৰকাৰীসকল @@ -4102,102 +4131,102 @@ Output: আপোনাৰ নাম কি? - + Your Full Name আপোনাৰ সম্পূৰ্ণ নাম - + What name do you want to use to log in? লগইনত আপোনি কি নাম ব্যৱহাৰ কৰিব বিচাৰে? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? এইটো কম্পিউটাৰৰ নাম কি? - + Computer Name কম্পিউটাৰৰ নাম - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. আপোনাৰ একাউণ্ট সুৰক্ষিত ৰাখিবলৈ পাছৱৰ্ড এটা বাছনি কৰক। - + Password পাছৱৰ্ড - + Repeat Password পাছৱৰ্ড পুনৰ লিখক। - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. এই বাকচটো চিহ্নিত কৰিলে পাছ্ৱৰ্ডৰ প্ৰৱলতা কৰা হ'ব আৰু আপুনি দুৰ্বল পাছৱৰ্ড ব্যৱহাৰ কৰিব নোৱাৰিব। - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. প্ৰশাসনীয় একাউন্টৰ বাবে একে পাছৱৰ্ড্ ব্যৱহাৰ কৰক। - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts index 7f593e9f51..a005105ab2 100644 --- a/lang/calamares_ast.ts +++ b/lang/calamares_ast.ts @@ -102,22 +102,42 @@ Interfaz: - - Tools - Ferramientes + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Información de la depuración @@ -286,13 +306,13 @@ - + &Yes &Sí - + &No &Non @@ -302,17 +322,17 @@ &Zarrar - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Falló l'aniciu de Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 nun pue instalase. Calamares nun foi a cargar tolos módulos configuraos. Esto ye un problema col mou nel que la distribución usa Calamares. - + <br/>The following modules could not be loaded: <br/>Nun pudieron cargase los módulos de darréu: - + Continue with setup? ¿Siguir cola instalación? - + Continue with installation? ¿Siguir cola instalación? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> El programa d'instalación de %1 ta a piques de facer cambeos nel discu pa configurar %2.<br/><strong>Nun vas ser a desfacer estos cambeos.<strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> L'instalador de %1 ta a piques de facer cambeos nel discu pa instalar %2.<br/><strong>Nun vas ser a desfacer esos cambeos.</strong> - + &Set up now &Configurar agora - + &Install now &Instalar agora - + Go &back Dir p'&atrás - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. Completóse la configuración. Zarra'l programa de configuración. - + The installation is complete. Close the installer. Completóse la instalación. Zarra l'instalador. - + Cancel setup without changing the system. Encaboxa la configuración ensin camudar el sistema. - + Cancel installation without changing the system. Encaboxa la instalación ensin camudar el sistema. - + &Next &Siguiente - + &Back &Atrás - + &Done &Fecho - + &Cancel &Encaboxar - + Cancel setup? ¿Encaboxar la configuración? - + Cancel installation? ¿Encaboxar la instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. ¿De xuru que quies encaboxar el procesu actual de configuración? El programa de configuración va colar y van perdese tolos cambeos. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿De xuru que quies encaboxar el procesu actual d'instalación? @@ -471,12 +491,12 @@ L'instalador va colar y van perdese tolos cambeos. CalamaresWindow - + %1 Setup Program Programa de configuración de %1 - + %1 Installer Instalador de %1 @@ -484,7 +504,7 @@ L'instalador va colar y van perdese tolos cambeos. CheckerContainer - + Gathering system information... Recoyendo la información del sistema... @@ -732,22 +752,32 @@ L'instalador va colar y van perdese tolos cambeos. La númberación y data van afitase en %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalación per rede. (Desactivada: Recibiéronse datos non válidos de grupos) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Esbilla de paquetes + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalación per rede. (Desactivada: Nun pue dise en cata de les llistes de paquetes, comprueba la conexón a internet) @@ -842,42 +872,42 @@ L'instalador va colar y van perdese tolos cambeos. ¡Les contraseñes nun concasen! - + Setup Failed Falló la configuración - + Installation Failed Falló la instalación - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Configuración completada - + Installation Complete Instalación completada - + The setup of %1 is complete. La configuración de %1 ta completada. - + The installation of %1 is complete. Completóse la instalación de %1. @@ -1474,72 +1504,72 @@ L'instalador va colar y van perdese tolos cambeos. GeneralRequirements - + has at least %1 GiB available drive space tien polo menos %1 GiB d'espaciu disponible nel discu - + There is not enough drive space. At least %1 GiB is required. Nun hai espaciu abondu nel discu. Ríquense polo menos %1 GiB. - + has at least %1 GiB working memory tien polo menos %1 GiB memoria de trabayu - + The system does not have enough working memory. At least %1 GiB is required. El sistema nun tien abonda memoria de trabayu. Ríquense polo menos %1 GiB. - + is plugged in to a power source ta enchufáu a una fonte d'enerxía - + The system is not plugged in to a power source. El sistema nun ta enchufáu a una fonte d'enerxía. - + is connected to the Internet ta coneutáu a internet - + The system is not connected to the Internet. El sistema nun ta coneutáu a internet. - + is running the installer as an administrator (root) ta executando l'instalador como alministrador (root) - + The setup program is not running with administrator rights. El programa de configuración nun ta executándose con drechos alministrativos. - + The installer is not running with administrator rights. L'instalador nun ta executándose con drechos alministrativos. - + has a screen large enough to show the whole installer tien una pantalla abondo grande como p'amosar tol instalador - + The screen is too small to display the setup program. La pantalla ye mui pequeña como p'amosar el programa de configuración. - + The screen is too small to display the installer. La pantalla ye mui pequeña como p'amosar l'instalador. @@ -1607,7 +1637,7 @@ L'instalador va colar y van perdese tolos cambeos. ¡Instala Konsole y volvi tentalo! - + Executing script: &nbsp;<code>%1</code> Executando'l script: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ L'instalador va colar y van perdese tolos cambeos. NetInstallViewStep - - + Package selection Esbilla de paquetes - + Office software Software ofimáticu - + Office package Paquete ofimáticu - + Browser software - + Browser package - + Web browser Restolador web - + Kernel Kernel - + Services Servicios - + Login - + Desktop Escritoriu - + Applications Aplicaciones - + Communication Comunicación - + Development Desendolcu - + Office Oficina - + Multimedia Multimedia - + Internet Internet - + Theming Estilu - + Gaming - + Utilities Utilidaes @@ -3702,12 +3731,12 @@ Salida: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si va usar l'ordenador más d'una persona, pues crear más cuentes tres la configuración.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si va usar l'ordenador más d'una persona, pues crear más cuentes tres la instalación.</small> @@ -3715,7 +3744,7 @@ Salida: UsersQmlViewStep - + Users Usuarios @@ -4099,102 +4128,102 @@ Salida: ¿Cómo te llames? - + Your Full Name - + What name do you want to use to log in? ¿Qué nome quies usar p'aniciar sesión? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? ¿Cómo va llamase esti ordenador? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Escueyi una contraseña pa caltener segura la cuenta. - + Password Contraseña - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Usar la mesma contraseña pa la cuenta d'alministrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index 1262f0b3fc..068d6a9e41 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Avtomatik qoşulma ayarlarını idarə edin @@ -102,22 +102,42 @@ İnterfeys: - - Tools - Alətlər + + Crashes Calamares, so that Dr. Konqui can look at it. + Calamares çökür, belə ki, Dr. Konqui onu görə bilir. - + + Reloads the stylesheet from the branding directory. + Üslub cədvəlini marka kataloqundan yenidən yükləyir. + + + + Uploads the session log to the configured pastebin. + Sessiya jurnalını konfiqurasiya edilmiş pastebin'ə yükləyir. + + + + Send Session Log + Sessiya jurnalını göndərin + + + Reload Stylesheet Üslub cədvəlini yenidən yükləmək - + + Displays the tree of widget names in the log (for stylesheet debugging). + (Üslub cədvəli sazlamaları üçün) Jurnalda vidjet adları ağacını göstərir. + + + Widget Tree Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -286,13 +306,13 @@ - + &Yes &Bəli - + &No &Xeyr @@ -302,143 +322,147 @@ &Bağlamaq - + Install Log Paste URL Jurnal yerləşdirmə URL-nu daxil etmək - + The upload was unsuccessful. No web-paste was done. Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi. - + Install log posted to %1 Link copied to clipboard - + Quraşdırma jurnalını burada yazın + +%1 + +Keçid mübadilə yaddaşına kopyalandı - + Calamares Initialization Failed Calamares işə salına bilmədi - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir. - + <br/>The following modules could not be loaded: <br/>Yüklənə bilməyən modullar aşağıdakılardır: - + Continue with setup? Quraşdırılma davam etdirilsin? - + Continue with installation? Quraşdırılma davam etdirilsin? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong> - + &Set up now &İndi ayarlamaq - + &Install now Q&uraşdırmağa başlamaq - + Go &back &Geriyə - + &Set up A&yarlamaq - + &Install Qu&raşdırmaq - + Setup is complete. Close the setup program. Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın. - + The installation is complete. Close the installer. Quraşdırma başa çatdı. Quraşdırıcını bağlayın. - + Cancel setup without changing the system. Sistemi dəyişdirmədən quraşdırmanı ləğv etmək. - + Cancel installation without changing the system. Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək. - + &Next İ&rəli - + &Back &Geriyə - + &Done &Hazır - + &Cancel İm&tina etmək - + Cancel setup? Quraşdırılmadan imtina edilsin? - + Cancel installation? Yüklənmədən imtina edilsin? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz? Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz? @@ -471,12 +495,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -484,7 +508,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CheckerContainer - + Gathering system information... Sistem məlumatları toplanır ... @@ -732,22 +756,32 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Yerli say və tarix formatı %1 təyin olunacaq. - + Network Installation. (Disabled: Incorrect configuration) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: Səhv tənzimlənmə) - + Network Installation. (Disabled: Received invalid groups data) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: qruplar haqqında səhv məlumatlar alındı) - - Network Installation. (Disabled: internal error) - Şəbəkə üzərindən quraşdırmaq (Söndürüldü: Daxili xəta) + + Network Installation. (Disabled: Internal error) + Şəbəkənin quraşdırılması. (Söndürüldü: daxili xəta) - + + Network Installation. (Disabled: No package list) + Şəbəkənin quraşdırılması. (Söndürüldü: Paket siyahısı yoxdur) + + + + Package selection + Paket seçimi + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: paket siyahıları qəbul edilmir, şəbəkə bağlantınızı yoxlayın) @@ -842,42 +876,42 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şifrənizin təkrarı eyni deyil! - + Setup Failed Quraşdırılma xətası - + Installation Failed Quraşdırılma alınmadı - + The setup of %1 did not complete successfully. - + %1 qurulması uğurla çaşa çatmadı. - + The installation of %1 did not complete successfully. - + %1 quraşdırılması uğurla tamamlanmadı. - + Setup Complete Quraşdırma tamamlandı - + Installation Complete Quraşdırma tamamlandı - + The setup of %1 is complete. %1 quraşdırmaq başa çatdı. - + The installation of %1 is complete. %1-n quraşdırılması başa çatdı. @@ -973,12 +1007,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Create new %1MiB partition on %3 (%2) with entries %4. - + Yeni %1MiB bölməsini %3 (%2) üzərində %4 girişləri ilə yaradın. Create new %1MiB partition on %3 (%2). - + Yeni %1MiB bölməsini %3 (%2) üzərində yaradın. @@ -988,12 +1022,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində <em>%4</em> girişlərində yaradın. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində yaradın. @@ -1341,7 +1375,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <strong>Yeni</strong> %2 sistem bölməsində <em>%3</em> xüsusiyyətləri ilə %1 quraşdırın @@ -1351,37 +1385,37 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + <strong>Yeni</strong> %2 bölməsini <strong>%1</strong> qoşulma nöqtəsi və <em>%3</em> xüsusiyyətləri ilə qurun. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + <strong>yeni</strong> %2 bölməsini <strong>%1</strong>%3 qoşulma nöqtəsi ilə qurun. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + %3 <strong>%1</strong> sistem bölməsində <em>%4</em> xüsusiyyətləri ilə %2 quraşdırın. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + <strong>%1</strong> %3 bölməsini <strong>%2</strong> qoşulma nöqtəsi və <em>%4</em> xüsusiyyətləri ilə qurun. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + %3 bölməsinə <strong>%1</strong> ilə <strong>%2</strong>%4 qoşulma nöqtəsi ayarlamaq. Install %2 on %3 system partition <strong>%1</strong>. - %3dəki <strong>%1</strong> sistem bölməsinə %2 quraşdırmaq. + %3 <strong>%1</strong> sistem bölməsində %2 quraşdırın. Install boot loader on <strong>%1</strong>. - Ön yükləyicini <strong>%1</strong>də quraşdırmaq. + Ön yükləyicini <strong>%1</strong> üzərində quraşdırın. @@ -1474,72 +1508,72 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. GeneralRequirements - + has at least %1 GiB available drive space ən az %1 QB disk boş sahəsi var - + There is not enough drive space. At least %1 GiB is required. Kifayət qədər disk sahəsi yoxdur. Ən azı %1 QB tələb olunur. - + has at least %1 GiB working memory ən azı %1 QB iş yaddaşı var - + The system does not have enough working memory. At least %1 GiB is required. Sistemdə kifayət qədər iş yaddaşı yoxdur. Ən azı %1 GiB tələb olunur. - + is plugged in to a power source enerji mənbəyi qoşuludur - + The system is not plugged in to a power source. enerji mənbəyi qoşulmayıb. - + is connected to the Internet internetə qoşuludur - + The system is not connected to the Internet. Sistem internetə qoşulmayıb. - + is running the installer as an administrator (root) quraşdırıcını adminstrator (root) imtiyazları ilə başladılması - + The setup program is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + The installer is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + has a screen large enough to show the whole installer quraşdırıcını tam göstərmək üçün ekran kifayət qədər genişdir - + The screen is too small to display the setup program. Quraşdırıcı proqramı göstərmək üçün ekran çox kiçikdir. - + The screen is too small to display the installer. Bu quarşdırıcını göstərmək üçün ekran çox kiçikdir. @@ -1607,7 +1641,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Lütfən KDE Konsole tətbiqini quraşdırın və yenidən cəhd edin! - + Executing script: &nbsp;<code>%1</code> Ssenari icra olunur. &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. NetInstallViewStep - - + Package selection Paket seçimi - + Office software Ofis proqramı - + Office package Ofis paketi - + Browser software Veb bələdçi proqramı - + Browser package Veb bələdçi paketi - + Web browser Veb bələdçi - + Kernel Nüvə - + Services Xidmətlər - + Login Giriş - + Desktop İş Masası - + Applications Tətbiqlər - + Communication Rabitə - + Development Tərtibat - + Office Ofis - + Multimedia Multimediya - + Internet Internet - + Theming Mövzular, Temalar - + Gaming Oyun - + Utilities Vasitələr, Alətlər @@ -3705,12 +3738,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman ayarlandıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman quraşdırıldıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> @@ -3718,7 +3751,7 @@ Output: UsersQmlViewStep - + Users İstifadəçilər @@ -3960,29 +3993,31 @@ Output: Installation Completed - + Quraşdırma başa çatdı %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 komputerinizə quraşdırıldı.<br/> + Siz indi yeni quraşdırılmış sistemə daxil ola bilərsiniz, və ya Canlı mühitdən istifadə etməyə davam edə bilərsiniz. Close Installer - + Quraşdırıcını bağlayın Restart System - + Sistemi yenidən başladın <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Quraşdırmanın tam jurnalı, Canlı mühit istifadəçisinin ev qovluğunda installation.log kimi mövcuddur.<br/> + Bu jurnal, hədəf sistemin /var/log/installation.log qovluğuna kopyalandı.</p> @@ -4134,102 +4169,102 @@ Output: Adınız nədir? - + Your Full Name Tam adınız - + What name do you want to use to log in? Giriş üçün hansı adı istifadə etmək istəyirsiniz? - + Login Name Giriş Adı - + If more than one person will use this computer, you can create multiple accounts after installation. Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz. - + What is the name of this computer? Bu kompyuterin adı nədir? - + Computer Name Kompyuterin adı - + This name will be used if you make the computer visible to others on a network. Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək. - + Choose a password to keep your account safe. Hesabınızın təhlükəsizliyi üçün şifrə seçin. - + Password Şifrə - + Repeat Password Şifrənin təkararı - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir. - + Validate passwords quality Şifrənin keyfiyyətini yoxlamaq - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz. - + Log in automatically without asking for the password Şifrə soruşmadan sistemə daxil olmaq - + Reuse user password as root password İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək - + Use the same password for the administrator account. İdarəçi hesabı üçün eyni şifrədən istifadə etmək. - + Choose a root password to keep your account safe. Hesabınızı qorumaq üçün kök şifrəsini seçin. - + Root Password Kök Şifrəsi - + Repeat Root Password Kök Şifrəsini təkrar yazın - + Enter the same password twice, so that it can be checked for typing errors. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index d432fb1bd5..46f94c08cf 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Avtomatik qoşulma ayarlarını idarə edin @@ -102,22 +102,42 @@ İnterfeys: - - Tools - Alətlər + + Crashes Calamares, so that Dr. Konqui can look at it. + Calamares çökür, belə ki, Dr. Konqui onu görə bilir. - + + Reloads the stylesheet from the branding directory. + Üslub cədvəlini marka kataloqundan yenidən yükləyir. + + + + Uploads the session log to the configured pastebin. + Sessiya jurnalını konfiqurasiya edilmiş pastebin'ə yükləyir. + + + + Send Session Log + Sessiya jurnalını göndərin + + + Reload Stylesheet Üslub cədvəlini yenidən yükləmək - + + Displays the tree of widget names in the log (for stylesheet debugging). + (Üslub cədvəli sazlamaları üçün) Jurnalda vidjet adları ağacını göstərir. + + + Widget Tree Vidjetlər ağacı - + Debug information Sazlama məlumatları @@ -286,13 +306,13 @@ - + &Yes &Bəli - + &No &Xeyr @@ -302,143 +322,147 @@ &Bağlamaq - + Install Log Paste URL Jurnal yerləşdirmə URL-nu daxil etmək - + The upload was unsuccessful. No web-paste was done. Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi. - + Install log posted to %1 Link copied to clipboard - + Quraşdırma jurnalını burada yazın + +%1 + +Keçid mübadilə yaddaşına kopyalandı - + Calamares Initialization Failed Calamares işə salına bilmədi - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir. - + <br/>The following modules could not be loaded: <br/>Yüklənə bilməyən modullar aşağıdakılardır: - + Continue with setup? Quraşdırılma davam etdirilsin? - + Continue with installation? Quraşdırılma davam etdirilsin? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong> - + &Set up now &İndi ayarlamaq - + &Install now Q&uraşdırmağa başlamaq - + Go &back &Geriyə - + &Set up A&yarlamaq - + &Install Qu&raşdırmaq - + Setup is complete. Close the setup program. Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın. - + The installation is complete. Close the installer. Quraşdırma başa çatdı. Quraşdırıcını bağlayın. - + Cancel setup without changing the system. Sistemi dəyişdirmədən quraşdırmanı ləğv etmək. - + Cancel installation without changing the system. Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək. - + &Next İ&rəli - + &Back &Geriyə - + &Done &Hazır - + &Cancel İm&tina etmək - + Cancel setup? Quraşdırılmadan imtina edilsin? - + Cancel installation? Yüklənmədən imtina edilsin? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz? Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz? @@ -471,12 +495,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CalamaresWindow - + %1 Setup Program %1 Quraşdırıcı proqram - + %1 Installer %1 Quraşdırıcı @@ -484,7 +508,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. CheckerContainer - + Gathering system information... Sistem məlumatları toplanır ... @@ -732,22 +756,32 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Yerli say və tarix formatı %1 təyin olunacaq. - + Network Installation. (Disabled: Incorrect configuration) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: Səhv tənzimlənmə) - + Network Installation. (Disabled: Received invalid groups data) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: qruplar haqqında səhv məlumatlar alındı) - - Network Installation. (Disabled: internal error) - Şəbəkə üzərindən quraşdırmaq (Söndürüldü: Daxili xəta) + + Network Installation. (Disabled: Internal error) + Şəbəkənin quraşdırılması. (Söndürüldü: daxili xəta) + + + + Network Installation. (Disabled: No package list) + Şəbəkənin quraşdırılması. (Söndürüldü: Paket siyahısı yoxdur) - + + Package selection + Paket seçimi + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Şəbəkə üzərindən quraşdırmaq (Söndürüldü: paket siyahıları qəbul edilmir, şəbəkə bağlantınızı yoxlayın) @@ -842,42 +876,42 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şifrənizin təkrarı eyni deyil! - + Setup Failed Quraşdırılma xətası - + Installation Failed Quraşdırılma alınmadı - + The setup of %1 did not complete successfully. - + %1 qurulması uğurla çaşa çatmadı. - + The installation of %1 did not complete successfully. - + %1 quraşdırılması uğurla tamamlanmadı. - + Setup Complete Quraşdırma tamamlandı - + Installation Complete Quraşdırma tamamlandı - + The setup of %1 is complete. %1 quraşdırmaq başa çatdı. - + The installation of %1 is complete. %1-n quraşdırılması başa çatdı. @@ -973,12 +1007,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Create new %1MiB partition on %3 (%2) with entries %4. - + Yeni %1MiB bölməsini %3 (%2) üzərində %4 girişləri ilə yaradın. Create new %1MiB partition on %3 (%2). - + Yeni %1MiB bölməsini %3 (%2) üzərində yaradın. @@ -988,12 +1022,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində <em>%4</em> girişlərində yaradın. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində yaradın. @@ -1084,7 +1118,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Creating user %1 - İstifadəçi %1 yaradılır + İsitfadəçi %1 yaradılır @@ -1341,7 +1375,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <strong>Yeni</strong> %2 sistem bölməsində <em>%3</em> xüsusiyyətləri ilə %1 quraşdırın @@ -1351,37 +1385,37 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + <strong>Yeni</strong> %2 bölməsini <strong>%1</strong> qoşulma nöqtəsi və <em>%3</em> xüsusiyyətləri ilə qurun. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + <strong>yeni</strong> %2 bölməsini <strong>%1</strong>%3 qoşulma nöqtəsi ilə qurun. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + %3 <strong>%1</strong> sistem bölməsində <em>%4</em> xüsusiyyətləri ilə %2 quraşdırın. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + <strong>%1</strong> %3 bölməsini <strong>%2</strong> qoşulma nöqtəsi və <em>%4</em> xüsusiyyətləri ilə qurun. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + %3 bölməsinə <strong>%1</strong> ilə <strong>%2</strong>%4 qoşulma nöqtəsi ayarlamaq. Install %2 on %3 system partition <strong>%1</strong>. - %3dəki <strong>%1</strong> sistem bölməsinə %2 quraşdırmaq. + %3 <strong>%1</strong> sistem bölməsində %2 quraşdırın. Install boot loader on <strong>%1</strong>. - Ön yükləyicini <strong>%1</strong>də quraşdırmaq. + Ön yükləyicini <strong>%1</strong> üzərində quraşdırın. @@ -1474,72 +1508,72 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. GeneralRequirements - + has at least %1 GiB available drive space ən az %1 QB disk boş sahəsi var - + There is not enough drive space. At least %1 GiB is required. Kifayət qədər disk sahəsi yoxdur. Ən azı %1 QB tələb olunur. - + has at least %1 GiB working memory ən azı %1 QB iş yaddaşı var - + The system does not have enough working memory. At least %1 GiB is required. Sistemdə kifayət qədər iş yaddaşı yoxdur. Ən azı %1 GiB tələb olunur. - + is plugged in to a power source enerji mənbəyi qoşuludur - + The system is not plugged in to a power source. enerji mənbəyi qoşulmayıb. - + is connected to the Internet internetə qoşuludur - + The system is not connected to the Internet. Sistem internetə qoşulmayıb. - + is running the installer as an administrator (root) quraşdırıcını adminstrator (root) imtiyazları ilə başladılması - + The setup program is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + The installer is not running with administrator rights. Quraşdırıcı adminstrator imtiyazları ilə başladılmayıb. - + has a screen large enough to show the whole installer quraşdırıcını tam göstərmək üçün ekran kifayət qədər genişdir - + The screen is too small to display the setup program. Quraşdırıcı proqramı göstərmək üçün ekran çox kiçikdir. - + The screen is too small to display the installer. Bu quarşdırıcını göstərmək üçün ekran çox kiçikdir. @@ -1607,7 +1641,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Lütfən KDE Konsole tətbiqini quraşdırın və yenidən cəhd edin! - + Executing script: &nbsp;<code>%1</code> Ssenari icra olunur. &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. NetInstallViewStep - - + Package selection Paket seçimi - + Office software Ofis proqramı - + Office package Ofis paketi - + Browser software Veb bələdçi proqramı - + Browser package Veb bələdçi paketi - + Web browser Veb bələdçi - + Kernel Nüvə - + Services Xidmətlər - + Login Giriş - + Desktop İş Masası - + Applications Tətbiqlər - + Communication Rabitə - + Development Tərtibat - + Office Ofis - + Multimedia Multimediya - + Internet Internet - + Theming Mövzular, Temalar - + Gaming Oyun - + Utilities Vasitələr, Alətlər @@ -2120,7 +2153,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. The password contains fewer than %n lowercase letters - Şifrə %n hərfdən az kiçik hərflərdən ibarətdir + Şifrə %n-dən(dan) az kiçik hərflərdən ibarətdir Şifrə %n hərfdən az kiçik hərflərdən ibarətdir @@ -3705,12 +3738,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman ayarlandıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Əgər bu kompyuteri sizdən başqa şəxs istifadə edəcəkdirsə o zaman quraşdırıldıqdan sonra bir neçə istifadəçi hesabı yarada bilərsiniz.</small> @@ -3718,7 +3751,7 @@ Output: UsersQmlViewStep - + Users İstifadəçilər @@ -3960,29 +3993,31 @@ Output: Installation Completed - + Quraşdırma başa çatdı %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 komputerinizə quraşdırıldı.<br/> + Siz indi yeni quraşdırılmış sistemə daxil ola bilərsiniz, və ya Canlı mühitdən istifadə etməyə davam edə bilərsiniz. Close Installer - + Quraşdırıcını bağlayın Restart System - + Sistemi yenidən başladın <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Quraşdırmanın tam jurnalı, Canlı mühit istifadəçisinin ev qovluğunda installation.log kimi mövcuddur.<br/> + Bu jurnal, hədəf sistemin /var/log/installation.log qovluğuna kopyalandı.</p> @@ -4134,102 +4169,102 @@ Output: Adınız nədir? - + Your Full Name Tam adınız - + What name do you want to use to log in? Giriş üçün hansı adı istifadə etmək istəyirsiniz? - + Login Name Giriş Adı - + If more than one person will use this computer, you can create multiple accounts after installation. Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz. - + What is the name of this computer? Bu kompyuterin adı nədir? - + Computer Name Kompyuterin adı - + This name will be used if you make the computer visible to others on a network. Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək. - + Choose a password to keep your account safe. Hesabınızın təhlükəsizliyi üçün şifrə seçin. - + Password Şifrə - + Repeat Password Şifrənin təkararı - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir. - + Validate passwords quality Şifrənin keyfiyyətini yoxlamaq - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz. - + Log in automatically without asking for the password Şifrə soruşmadan sistemə daxil olmaq - + Reuse user password as root password İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək - + Use the same password for the administrator account. İdarəçi hesabı üçün eyni şifrədən istifadə etmək. - + Choose a root password to keep your account safe. Hesabınızı qorumaq üçün kök şifrəsini seçin. - + Root Password Kök Şifrəsi - + Repeat Root Password Kök Şifrəsini təkrar yazın - + Enter the same password twice, so that it can be checked for typing errors. Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts index b0acdec042..51c4298bbe 100644 --- a/lang/calamares_be.ts +++ b/lang/calamares_be.ts @@ -102,22 +102,42 @@ Інтэрфейс: - - Tools - Інструменты + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Перазагрузіць табліцу стыляў - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Дрэва віджэтаў - + Debug information Адладачная інфармацыя @@ -290,13 +310,13 @@ - + &Yes &Так - + &No &Не @@ -306,17 +326,17 @@ &Закрыць - + Install Log Paste URL Уставіць журнал усталёўкі па URL - + The upload was unsuccessful. No web-paste was done. Запампаваць не атрымалася. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard - + Calamares Initialization Failed Не атрымалася ініцыялізаваць Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. Не атрымалася ўсталяваць %1. У Calamares не атрымалася загрузіць усе падрыхтаваныя модулі. Гэтая праблема ўзнікла праз асаблівасці выкарыстання Calamares вашым дыстрыбутывам. - + <br/>The following modules could not be loaded: <br/>Не атрымалася загрузіць наступныя модулі: - + Continue with setup? Працягнуць усталёўку? - + Continue with installation? Працягнуць усталёўку? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Праграма ўсталёўкі %1 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Скасаваць змены будзе немагчыма.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Праграма ўсталёўкі %1 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Адрабіць змены будзе немагчыма.</strong> - + &Set up now &Усталяваць - + &Install now &Усталяваць - + Go &back &Назад - + &Set up &Усталяваць - + &Install &Усталяваць - + Setup is complete. Close the setup program. Усталёўка завершаная. Закрыйце праграму ўсталёўкі. - + The installation is complete. Close the installer. Усталёўка завершаная. Закрыйце праграму. - + Cancel setup without changing the system. Скасаваць усталёўку без змены сістэмы. - + Cancel installation without changing the system. Скасаваць усталёўку без змены сістэмы. - + &Next &Далей - + &Back &Назад - + &Done &Завершана - + &Cancel &Скасаваць - + Cancel setup? Скасаваць усталёўку? - + Cancel installation? Скасаваць усталёўку? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Сапраўды хочаце скасаваць працэс усталёўкі? Праграма спыніць працу, а ўсе змены страцяцца. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Сапраўды хочаце скасаваць працэс усталёўкі? Праграма спыніць працу, а ўсе змены страцяцца. @@ -473,12 +493,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Праграма ўсталёўкі %1 - + %1 Installer Праграма ўсталёўкі %1 @@ -486,7 +506,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Збор інфармацыі пра сістэму... @@ -734,22 +754,32 @@ The installer will quit and all changes will be lost. Рэгіянальным фарматам лічбаў і датаў будзе %1. - + Network Installation. (Disabled: Incorrect configuration) Сеткавая ўсталёўка. (Адключана: хібная канфігурацыя) - + Network Installation. (Disabled: Received invalid groups data) Сеткавая ўсталёўка. (Адключана: атрыманы хібныя звесткі пра групы) - - Network Installation. (Disabled: internal error) - Сеціўная ўсталёўка. (Адключана: унутраная памылка) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Выбар пакункаў - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Сеткавая ўсталёўка. (Адключана: немагчыма атрымаць спіс пакункаў, праверце ваша сеткавае злучэнне) @@ -844,42 +874,42 @@ The installer will quit and all changes will be lost. Вашыя паролі не супадаюць! - + Setup Failed Усталёўка схібіла - + Installation Failed Не атрымалася ўсталяваць - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Усталёўка завершаная - + Installation Complete Усталёўка завершаная - + The setup of %1 is complete. Усталёўка %1 завершаная. - + The installation of %1 is complete. Усталёўка %1 завершаная. @@ -1476,72 +1506,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space даступна прынамсі %1 Гб вольнага месца - + There is not enough drive space. At least %1 GiB is required. Недастаткова месца. Неабходна прынамсі %1 Гб. - + has at least %1 GiB working memory даступна прынамсі %1 Гб аператыўнай памяці - + The system does not have enough working memory. At least %1 GiB is required. Недастаткова аператыўнай памяці. Патрэбна прынамсі %1 Гб. - + is plugged in to a power source падключана да крыніцы сілкавання - + The system is not plugged in to a power source. Не падключана да крыніцы сілкавання. - + is connected to the Internet ёсць злучэнне з інтэрнэтам - + The system is not connected to the Internet. Злучэнне з інтэрнэтам адсутнічае. - + is running the installer as an administrator (root) праграма ўсталёўкі запушчаная ад імя адміністратара (root) - + The setup program is not running with administrator rights. Праграма ўсталёўкі запушчаная без правоў адміністратара. - + The installer is not running with administrator rights. Праграма ўсталёўкі запушчаная без правоў адміністратара. - + has a screen large enough to show the whole installer ёсць экран, памераў якога дастаткова, каб адлюстраваць акно праграмы ўсталёўкі - + The screen is too small to display the setup program. Экран занадта малы для таго, каб адлюстраваць акно праграмы ўсталёўкі. - + The screen is too small to display the installer. Экран занадта малы для таго, каб адлюстраваць акно праграмы ўсталёўкі. @@ -1609,7 +1639,7 @@ The installer will quit and all changes will be lost. Калі ласка, ўсталюйце KDE Konsole і паўтарыце зноў! - + Executing script: &nbsp;<code>%1</code> Выкананне скрыпта: &nbsp;<code>%1</code> @@ -1881,98 +1911,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Выбар пакункаў - + Office software Офіс - + Office package Офісны пакунак - + Browser software Браўзер - + Browser package Пакунак браўзера - + Web browser Вэб-браўзер - + Kernel Ядро - + Services Службы - + Login Лагін - + Desktop Працоўнае асяроддзе - + Applications Праграмы - + Communication Стасункі - + Development Распрацоўка - + Office Офіс - + Multimedia Медыя - + Internet Інтэрнэт - + Theming Афармленне - + Gaming Гульні - + Utilities Утыліты @@ -3724,12 +3753,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі.</small> @@ -3737,7 +3766,7 @@ Output: UsersQmlViewStep - + Users Карыстальнікі @@ -4155,102 +4184,102 @@ Output: Як ваша імя? - + Your Full Name Ваша поўнае імя - + What name do you want to use to log in? Якое імя вы хочаце выкарыстоўваць для ўваходу? - + Login Name Лагін - + If more than one person will use this computer, you can create multiple accounts after installation. Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі. - + What is the name of this computer? Якая назва гэтага камп’ютара? - + Computer Name Назва камп’ютара - + This name will be used if you make the computer visible to others on a network. Назва будзе выкарыстоўвацца для пазначэння камп’ютара ў сетцы. - + Choose a password to keep your account safe. Абярыце пароль для абароны вашага акаўнта. - + Password Пароль - + Repeat Password Паўтарыце пароль - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Увядзіце двойчы аднолькавы пароль. Гэта неабходна для таго, каб пазбегнуць памылак. Надзейны пароль павінен складацца з літар, лічбаў, знакаў пунктуацыі. Ён павінен змяшчаць прынамсі 8 знакаў, яго перыядычна трэба змяняць. - + Validate passwords quality Праверка якасці пароляў - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Калі адзначана, будзе выконвацца праверка надзейнасці пароля, таму вы не зможаце выкарыстаць слабы пароль. - + Log in automatically without asking for the password Аўтаматычна ўваходзіць без уводу пароля - + Reuse user password as root password Выкарыстоўваць пароль карыстальніка як пароль адміністратара - + Use the same password for the administrator account. Выкарыстоўваць той жа пароль для акаўнта адміністратара. - + Choose a root password to keep your account safe. Абярыце пароль адміністратара для абароны вашага акаўнта. - + Root Password Пароль адміністратара - + Repeat Root Password Паўтарыце пароль адміністратара - + Enter the same password twice, so that it can be checked for typing errors. Увядзіце пароль двойчы, каб пазбегнуць памылак уводу. diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts index dace8bafa1..0fd0ba338c 100644 --- a/lang/calamares_bg.ts +++ b/lang/calamares_bg.ts @@ -102,22 +102,42 @@ Интерфейс: - - Tools - Инструменти + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Информация за отстраняване на грешки @@ -286,13 +306,13 @@ - + &Yes &Да - + &No &Не @@ -302,17 +322,17 @@ &Затвори - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Инициализацията на Calamares се провали - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 не може да се инсталира. Calamares не можа да зареди всичките конфигурирани модули. Това е проблем с начина, по който Calamares е използван от дистрибуцията. - + <br/>The following modules could not be loaded: <br/>Следните модули не могат да се заредят: - + Continue with setup? Продължаване? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Инсталатора на %1 ще направи промени по вашия диск за да инсталира %2. <br><strong>Промените ще бъдат окончателни.</strong> - + &Set up now - + &Install now &Инсталирай сега - + Go &back В&ръщане - + &Set up - + &Install &Инсталирай - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Инсталацията е завършена. Затворете инсталаторa. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Отказ от инсталацията без промяна на системата. - + &Next &Напред - + &Back &Назад - + &Done &Готово - + &Cancel &Отказ - + Cancel setup? - + Cancel installation? Отмяна на инсталацията? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Наистина ли искате да отмените текущият процес на инсталиране? @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Инсталатор @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Събиране на системна информация... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. Форматът на цифрите и датата ще бъде %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Мрежова инсталация. (Изключена: Получени са данни за невалидни групи) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Избор на пакети + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Мрежова инсталация. (Изключена: Списъкът с пакети не може да бъде извлечен, проверете Вашата Интернет връзка) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. Паролите Ви не съвпадат! - + Setup Failed - + Installation Failed Неуспешна инсталация - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Инсталацията е завършена - + The setup of %1 is complete. - + The installation of %1 is complete. Инсталацията на %1 е завършена. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source е включен към източник на захранване - + The system is not plugged in to a power source. Системата не е включена към източник на захранване. - + is connected to the Internet е свързан към интернет - + The system is not connected to the Internet. Системата не е свързана с интернет. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Инсталаторът не е стартиран с права на администратор. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Екранът е твърде малък за инсталатора. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. Моля, инсталирайте KDE Konsole и опитайте отново! - + Executing script: &nbsp;<code>%1</code> Изпълняване на скрипт: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Избор на пакети - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3699,12 +3728,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3712,7 +3741,7 @@ Output: UsersQmlViewStep - + Users Потребители @@ -4096,102 +4125,102 @@ Output: Какво е вашето име? - + Your Full Name - + What name do you want to use to log in? Какво име искате да използвате за влизане? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Какво е името на този компютър? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Изберете парола за да държите вашият акаунт в безопасност. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Използвайте същата парола за администраторския акаунт. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts index 670a6c2ef9..709bbadcda 100644 --- a/lang/calamares_bn.ts +++ b/lang/calamares_bn.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information তথ্য ডিবাগ করুন @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? সেটআপ চালিয়ে যেতে চান? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 ইনস্টলার %2 সংস্থাপন করতে আপনার ডিস্কে পরিবর্তন করতে যাচ্ছে। - + &Set up now - + &Install now এবংএখনই ইনস্টল করুন - + Go &back এবংফিরে যান - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next এবং পরবর্তী - + &Back এবং পেছনে - + &Done - + &Cancel এবংবাতিল করুন - + Cancel setup? - + Cancel installation? ইনস্টলেশন বাতিল করবেন? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. আপনি কি সত্যিই বর্তমান সংস্থাপন প্রক্রিয়া বাতিল করতে চান? @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer 1% ইনস্টল @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... সিস্টেম তথ্য সংগ্রহ করা হচ্ছে... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ The installer will quit and all changes will be lost. আপনার পাসওয়ার্ড মেলে না! - + Setup Failed - + Installation Failed ইনস্টলেশন ব্যর্থ হলো - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1473,72 +1503,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1606,7 +1636,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> স্ক্রিপ্ট কার্যকর করা হচ্ছে: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3695,12 +3724,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3708,7 +3737,7 @@ Output: UsersQmlViewStep - + Users ব্যবহারকারীরা @@ -4092,102 +4121,102 @@ Output: আপনার নাম কি? - + Your Full Name - + What name do you want to use to log in? লগ-ইন করতে আপনি কোন নাম ব্যবহার করতে চান? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? এই কম্পিউটারের নাম কি? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. আপনার অ্যাকাউন্ট সুরক্ষিত রাখতে একটি পাসওয়ার্ড নির্বাচন করুন। - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. প্রশাসক হিসাবের জন্য একই গুপ্ত-সংকেত ব্যবহার করুন। - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index b2594aff10..4f048689f2 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -102,22 +102,42 @@ Interfície: - - Tools - Eines + + Crashes Calamares, so that Dr. Konqui can look at it. + Falla el Calamares, perquè el Dr. Konqui pugui mirar-s'ho. - + + Reloads the stylesheet from the branding directory. + Torna a carregar el full d'estil del directori de marques. + + + + Uploads the session log to the configured pastebin. + Puja el registre de la sessió a la carpeta d'enganxar configurada. + + + + Send Session Log + Envia el registre de la sessió + + + Reload Stylesheet Torna a carregar el full d’estil - + + Displays the tree of widget names in the log (for stylesheet debugging). + Mostra l'arbre dels noms dels ginys al registre (per a la depuració del full d'estil). + + + Widget Tree Arbre de ginys - + Debug information Informació de depuració @@ -286,13 +306,13 @@ - + &Yes &Sí - + &No &No @@ -302,17 +322,17 @@ Tan&ca - + Install Log Paste URL URL de publicació del registre d'instal·lació - + The upload was unsuccessful. No web-paste was done. La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard L'enllaç s'ha copiat al porta-retalls. - + Calamares Initialization Failed Ha fallat la inicialització de Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. Aquest és un problema amb la manera com el Calamares és utilitzat per la distribució. - + <br/>The following modules could not be loaded: <br/>No s'han pogut carregar els mòduls següents: - + Continue with setup? Voleu continuar la configuració? - + Continue with installation? Voleu continuar la instal·lació? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> El programa de configuració %1 està a punt de fer canvis al disc per tal de configurar %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> L'instal·lador per a %1 està a punt de fer canvis al disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + &Set up now Con&figura-ho ara - + &Install now &Instal·la'l ara - + Go &back Ves &enrere - + &Set up Con&figura-ho - + &Install &Instal·la - + Setup is complete. Close the setup program. La configuració s'ha acabat. Tanqueu el programa de configuració. - + The installation is complete. Close the installer. La instal·lació s'ha acabat. Tanqueu l'instal·lador. - + Cancel setup without changing the system. Cancel·la la configuració sense canviar el sistema. - + Cancel installation without changing the system. Cancel·leu la instal·lació sense canviar el sistema. - + &Next &Següent - + &Back &Enrere - + &Done &Fet - + &Cancel &Cancel·la - + Cancel setup? Voleu cancel·lar la configuració? - + Cancel installation? Voleu cancel·lar la instal·lació? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Realment voleu cancel·lar el procés de configuració actual? El programa de configuració es tancarà i es perdran tots els canvis. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voleu cancel·lar el procés d'instal·lació actual? @@ -475,12 +495,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -488,7 +508,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. CheckerContainer - + Gathering system information... Es recopila informació del sistema... @@ -736,22 +756,32 @@ L'instal·lador es tancarà i tots els canvis es perdran. Els números i les dates de la configuració local s'establiran a %1. - + Network Installation. (Disabled: Incorrect configuration) Instal·lació per xarxa. (Inhabilitada: configuració incorrecta) - + Network Installation. (Disabled: Received invalid groups data) Instal·lació per xarxa. (Inhabilitada: dades de grups rebudes no vàlides) - - Network Installation. (Disabled: internal error) - Instal·lació per xarxa. (Inhabilitada: error intern) + + Network Installation. (Disabled: Internal error) + Instal·lació de xarxa. (Inhabilitat: error intern) + + + + Network Installation. (Disabled: No package list) + Instal·lació de xarxa. (Inhabilitat: no hi ha llista de paquets) + + + + Package selection + Selecció de paquets - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instal·lació per xarxa. (Inhabilitada: no es poden obtenir les llistes de paquets, comproveu la connexió.) @@ -846,42 +876,42 @@ L'instal·lador es tancarà i tots els canvis es perdran. Les contrasenyes no coincideixen! - + Setup Failed Ha fallat la configuració. - + Installation Failed La instal·lació ha fallat. - + The setup of %1 did not complete successfully. La configuració de %1 no s'ha completat correctament. - + The installation of %1 did not complete successfully. La instal·lació de %1 no s'ha completat correctament. - + Setup Complete Configuració completa - + Installation Complete Instal·lació acabada - + The setup of %1 is complete. La configuració de %1 ha acabat. - + The installation of %1 is complete. La instal·lació de %1 ha acabat. @@ -1478,72 +1508,72 @@ L'instal·lador es tancarà i tots els canvis es perdran. GeneralRequirements - + has at least %1 GiB available drive space tingui com a mínim %1 GiB d'espai de disc disponible. - + There is not enough drive space. At least %1 GiB is required. No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GiB. - + has at least %1 GiB working memory tingui com a mínim %1 GiB de memòria de treball. - + The system does not have enough working memory. At least %1 GiB is required. El sistema no té prou memòria de treball. Com a mínim hi ha d'haver %1 GiB. - + is plugged in to a power source estigui connectat a una presa de corrent. - + The system is not plugged in to a power source. El sistema no està connectat a una presa de corrent. - + is connected to the Internet estigui connectat a Internet. - + The system is not connected to the Internet. El sistema no està connectat a Internet. - + is running the installer as an administrator (root) executi l'instal·lador com a administrador (arrel). - + The setup program is not running with administrator rights. El programa de configuració no s'executa amb privilegis d'administrador. - + The installer is not running with administrator rights. L'instal·lador no s'executa amb privilegis d'administrador. - + has a screen large enough to show the whole installer tingui una pantalla prou grossa per mostrar completament l'instal·lador. - + The screen is too small to display the setup program. La pantalla és massa petita per mostrar el programa de configuració. - + The screen is too small to display the installer. La pantalla és massa petita per mostrar l'instal·lador. @@ -1611,7 +1641,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Si us plau, instal·leu el Konsole de KDE i torneu-ho a intentar! - + Executing script: &nbsp;<code>%1</code> S'executa l'script &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé NetInstallViewStep - - + Package selection Selecció de paquets - + Office software Programari d'oficina - + Office package Paquet d'oficina - + Browser software Programari de navegador - + Browser package Paquet de navegador - + Web browser Navegador web - + Kernel Nucli - + Services Serveis - + Login Entrada - + Desktop Escriptori - + Applications Aplicacions - + Communication Comunicació - + Development Desenvolupament - + Office Oficina - + Multimedia Multimèdia - + Internet Internet - + Theming Tema - + Gaming Jocs - + Utilities Utilitats @@ -3708,12 +3737,12 @@ La configuració pot continuar, però algunes característiques podrien estar in UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si més d'una persona usarà aquest ordinador, podeu crear diversos comptes després de la configuració.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si més d'una persona usarà aquest ordinador, podeu crear diversos comptes després de la instal·lació.</small> @@ -3721,7 +3750,7 @@ La configuració pot continuar, però algunes característiques podrien estar in UsersQmlViewStep - + Users Usuaris @@ -4141,102 +4170,102 @@ La configuració pot continuar, però algunes característiques podrien estar in Com us dieu? - + Your Full Name El nom complet - + What name do you want to use to log in? Quin nom voleu usar per iniciar la sessió? - + Login Name Nom d'entrada - + If more than one person will use this computer, you can create multiple accounts after installation. Si aquest ordinador l'usarà més d'una persona, podreu crear diversos comptes després de la instal·lació. - + What is the name of this computer? Com es diu aquest ordinador? - + Computer Name Nom de l'ordinador - + This name will be used if you make the computer visible to others on a network. Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa. - + Choose a password to keep your account safe. Trieu una contrasenya per tal de mantenir el compte segur. - + Password Contrasenya - + Repeat Password Repetiu la contrasenya. - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. Una bona contrasenya ha de contenir una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars. - + Validate passwords quality Valida la qualitat de les contrasenyes. - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no en podreu fer una de dèbil. - + Log in automatically without asking for the password Entra automàticament sense demanar la contrasenya. - + Reuse user password as root password Reutilitza la contrasenya d'usuari com a contrasenya d'arrel. - + Use the same password for the administrator account. Usa la mateixa contrasenya per al compte d'administració. - + Choose a root password to keep your account safe. Trieu una contrasenya d'arrel per mantenir el compte segur. - + Root Password Contrasenya d'arrel - + Repeat Root Password Repetiu la contrasenya d'arrel. - + Enter the same password twice, so that it can be checked for typing errors. Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts index 9b910f2361..cac8c4981a 100644 --- a/lang/calamares_ca@valencia.ts +++ b/lang/calamares_ca@valencia.ts @@ -102,22 +102,42 @@ Interfície: - - Tools - Eines + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Torna a carregar el full d'estil - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Arbre d'elements - + Debug information Informació de depuració @@ -286,13 +306,13 @@ - + &Yes &Sí - + &No &No @@ -302,17 +322,17 @@ Tan&ca - + Install Log Paste URL URL de publicació del registre d'instal·lació - + The upload was unsuccessful. No web-paste was done. La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed La inicialització del Calamares ha fallat. - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. El problema es troba en com utilitza el Calamares la distribució. - + <br/>The following modules could not be loaded: <br/>No s'han pogut carregar els mòduls següents: - + Continue with setup? Voleu continuar la configuració? - + Continue with installation? Voleu continuar la instal·lació? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> El programa de configuració %1 està a punt de fer canvis en el disc per a configurar %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> L'instal·lador per a %1 està a punt de fer canvis en el disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong> - + &Set up now Con&figura-ho ara - + &Install now &Instal·la'l ara - + Go &back &Arrere - + &Set up Con&figuració - + &Install &Instal·la - + Setup is complete. Close the setup program. La configuració s'ha completat. Tanqueu el programa de configuració. - + The installation is complete. Close the installer. La instal·lació s'ha completat. Tanqueu l'instal·lador. - + Cancel setup without changing the system. Cancel·la la configuració sense canviar el sistema. - + Cancel installation without changing the system. Cancel·la la instal·lació sense canviar el sistema. - + &Next &Següent - + &Back A&rrere - + &Done &Fet - + &Cancel &Cancel·la - + Cancel setup? Voleu cancel·lar la configuració? - + Cancel installation? Voleu cancel·lar la instal·lació? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Voleu cancel·lar el procés de configuració actual? El programa de configuració es tancarà i es perdran tots els canvis. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voleu cancel·lar el procés d'instal·lació actual? @@ -471,12 +491,12 @@ L'instal·lador es tancarà i tots els canvis es perdran. CalamaresWindow - + %1 Setup Program Programa de configuració %1 - + %1 Installer Instal·lador de %1 @@ -484,7 +504,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. CheckerContainer - + Gathering system information... S'està obtenint la informació del sistema... @@ -732,22 +752,32 @@ L'instal·lador es tancarà i tots els canvis es perdran. Els números i les dates de la configuració local s'establiran en %1. - + Network Installation. (Disabled: Incorrect configuration) Instal·lació per xarxa. (Inhabilitada: configuració incorrecta) - + Network Installation. (Disabled: Received invalid groups data) Instal·lació per xarxa. (Inhabilitada: dades de grups rebudes no vàlides) - - Network Installation. (Disabled: internal error) - Instal·lació per xarxa. (Inhabilitada: error intern) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Selecció de paquets - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instal·lació per xarxa. (Inhabilitada: no es poden obtindre les llistes de paquets, comproveu la connexió.) @@ -842,42 +872,42 @@ L'instal·lador es tancarà i tots els canvis es perdran. Les contrasenyes no coincideixen. - + Setup Failed S'ha produït un error en la configuració. - + Installation Failed La instal·lació ha fallat. - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete S'ha completat la configuració. - + Installation Complete Ha acabat la instal·lació. - + The setup of %1 is complete. La configuració de %1 ha acabat. - + The installation of %1 is complete. La instal·lació de %1 ha acabat. @@ -1474,72 +1504,72 @@ L'instal·lador es tancarà i tots els canvis es perdran. GeneralRequirements - + has at least %1 GiB available drive space té com a mínim %1 GiB d'espai de disc disponible. - + There is not enough drive space. At least %1 GiB is required. No hi ha prou espai de disc disponible. Com a mínim hi ha d'haver %1 GiB. - + has at least %1 GiB working memory té com a mínim %1 GiB de memòria de treball. - + The system does not have enough working memory. At least %1 GiB is required. El sistema no té prou memòria de treball. Com a mínim cal que hi haja %1 GiB. - + is plugged in to a power source està connectat a la xarxa elèctrica - + The system is not plugged in to a power source. El sistema no està connectat a una xarxa elèctrica. - + is connected to the Internet està connectat a Internet - + The system is not connected to the Internet. El sistema no està connectat a Internet. - + is running the installer as an administrator (root) està executant l'instal·lador com a administrador (arrel). - + The setup program is not running with administrator rights. El programa de configuració no s'està executant amb privilegis d'administració. - + The installer is not running with administrator rights. L'instal·lador no s'està executant amb privilegis d'administració. - + has a screen large enough to show the whole installer té una pantalla suficientment gran per a mostrar completament l'instal·lador. - + The screen is too small to display the setup program. La pantalla és massa menuda per a mostrar el programa de configuració. - + The screen is too small to display the installer. La pantalla és massa menuda per a mostrar l'instal·lador. @@ -1607,7 +1637,7 @@ L'instal·lador es tancarà i tots els canvis es perdran. Instal·leu el Konsole de KDE i torneu a intentar-ho. - + Executing script: &nbsp;<code>%1</code> S'està executant l'script &nbsp;<code>%1</code> @@ -1879,98 +1909,97 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé NetInstallViewStep - - + Package selection Selecció de paquets - + Office software Programari d'oficina - + Office package Paquet d'oficina - + Browser software Programari de navegador - + Browser package Paquet de navegador - + Web browser Navegador web - + Kernel Nucli - + Services Serveis - + Login Entrada - + Desktop Escriptori - + Applications Aplicacions - + Communication Comunicació - + Development Desenvolupament - + Office Oficina - + Multimedia Multimèdia - + Internet Internet - + Theming Tema - + Gaming Jugant - + Utilities Utilitats @@ -3704,12 +3733,12 @@ La configuració pot continuar, però és possible que algunes característiques UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la configuració.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació.</small> @@ -3717,7 +3746,7 @@ La configuració pot continuar, però és possible que algunes característiques UsersQmlViewStep - + Users Usuaris @@ -4135,102 +4164,102 @@ La configuració pot continuar, però és possible que algunes característiques Quin és el vostre nom? - + Your Full Name Nom complet - + What name do you want to use to log in? Quin nom voleu utilitzar per a entrar al sistema? - + Login Name Nom d'entrada - + If more than one person will use this computer, you can create multiple accounts after installation. Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació. - + What is the name of this computer? Quin és el nom d'aquest ordinador? - + Computer Name Nom de l'ordinador - + This name will be used if you make the computer visible to others on a network. Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa. - + Choose a password to keep your account safe. Seleccioneu una contrasenya per a mantindre el vostre compte segur. - + Password Contrasenya - + Repeat Password Repetiu la contrasenya - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació. Hauria de tindre un mínim de huit caràcters i s'hauria de canviar sovint. - + Validate passwords quality Valida la qualitat de les contrasenyes. - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no podreu indicar-ne una de dèbil. - + Log in automatically without asking for the password Entra automàticament sense demanar la contrasenya. - + Reuse user password as root password Reutilitza la contrasenya d'usuari com a contrasenya d'arrel. - + Use the same password for the administrator account. Usa la mateixa contrasenya per al compte d'administració. - + Choose a root password to keep your account safe. Trieu una contrasenya d'arrel per mantindre el compte segur. - + Root Password Contrasenya d'arrel - + Repeat Root Password Repetiu la contrasenya d'arrel. - + Enter the same password twice, so that it can be checked for typing errors. Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts index d108a7b7ac..e1eb5256d1 100644 --- a/lang/calamares_cs_CZ.ts +++ b/lang/calamares_cs_CZ.ts @@ -102,22 +102,42 @@ Rozhraní: - - Tools - Nástroje + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet Znovunačíst sešit se styly - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Strom widgetu - + Debug information Ladící informace @@ -290,13 +310,13 @@ - + &Yes &Ano - + &No &Ne @@ -306,17 +326,17 @@ &Zavřít - + Install Log Paste URL URL pro vložení záznamu událostí při instalaci - + The upload was unsuccessful. No web-paste was done. Nahrání se nezdařilo. Na web nebylo nic vloženo. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard - + Calamares Initialization Failed Inicializace Calamares se nezdařila - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 nemůže být nainstalováno. Calamares se nepodařilo načíst všechny nastavené moduly. Toto je problém způsobu použití Calamares ve vámi používané distribuci. - + <br/>The following modules could not be loaded: <br/> Následující moduly se nepodařilo načíst: - + Continue with setup? Pokračovat s instalací? - + Continue with installation? Pokračovat v instalaci? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong> - + &Set up now Na&stavit nyní - + &Install now &Spustit instalaci - + Go &back Jít &zpět - + &Set up Na&stavit - + &Install Na&instalovat - + Setup is complete. Close the setup program. Nastavení je dokončeno. Ukončete nastavovací program. - + The installation is complete. Close the installer. Instalace je dokončena. Ukončete instalátor. - + Cancel setup without changing the system. Zrušit nastavení bez změny v systému. - + Cancel installation without changing the system. Zrušení instalace bez provedení změn systému. - + &Next &Další - + &Back &Zpět - + &Done &Hotovo - + &Cancel &Storno - + Cancel setup? Zrušit nastavování? - + Cancel installation? Přerušit instalaci? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Opravdu chcete přerušit instalaci? Instalační program bude ukončen a všechny změny ztraceny. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Opravdu chcete instalaci přerušit? @@ -475,12 +495,12 @@ Instalační program bude ukončen a všechny změny ztraceny. CalamaresWindow - + %1 Setup Program Instalátor %1 - + %1 Installer %1 instalátor @@ -488,7 +508,7 @@ Instalační program bude ukončen a všechny změny ztraceny. CheckerContainer - + Gathering system information... Shromažďování informací o systému… @@ -736,22 +756,32 @@ Instalační program bude ukončen a všechny změny ztraceny. Formát zobrazení čísel, data a času bude nastaven dle národního prostředí %1. - + Network Installation. (Disabled: Incorrect configuration) Síťová instalace. (vypnuto: nesprávné nastavení) - + Network Installation. (Disabled: Received invalid groups data) Síťová instalace. (Vypnuto: Obdrženy neplatné údaje skupin) - - Network Installation. (Disabled: internal error) - Instalace ze sítě. (Vypnuto: vnitřní chyba) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Výběr balíčků - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Síťová instalace. (Vypnuto: Nedaří se stáhnout seznamy balíčků – zkontrolujte připojení k síti) @@ -846,42 +876,42 @@ Instalační program bude ukončen a všechny změny ztraceny. Zadání hesla se neshodují! - + Setup Failed Nastavení se nezdařilo - + Installation Failed Instalace se nezdařila - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Nastavení dokončeno - + Installation Complete Instalace dokončena - + The setup of %1 is complete. Nastavení %1 je dokončeno. - + The installation of %1 is complete. Instalace %1 je dokončena. @@ -1478,72 +1508,72 @@ Instalační program bude ukončen a všechny změny ztraceny. GeneralRequirements - + has at least %1 GiB available drive space má alespoň %1 GiB dostupného prostoru - + There is not enough drive space. At least %1 GiB is required. Nedostatek místa na úložišti. Je potřeba nejméně %1 GiB. - + has at least %1 GiB working memory má alespoň %1 GiB operační paměti - + The system does not have enough working memory. At least %1 GiB is required. Systém nemá dostatek operační paměti. Je potřeba nejméně %1 GiB. - + is plugged in to a power source je připojený ke zdroji napájení - + The system is not plugged in to a power source. Systém není připojen ke zdroji napájení. - + is connected to the Internet je připojený k Internetu - + The system is not connected to the Internet. Systém není připojený k Internetu. - + is running the installer as an administrator (root) instalátor je spuštěný s právy správce systému (root) - + The setup program is not running with administrator rights. Nastavovací program není spuštěn s právy správce systému. - + The installer is not running with administrator rights. Instalační program není spuštěn s právy správce systému. - + has a screen large enough to show the whole installer má obrazovku dostatečně velkou pro zobrazení celého instalátoru - + The screen is too small to display the setup program. Rozlišení obrazovky je příliš malé pro zobrazení nastavovacího programu. - + The screen is too small to display the installer. Rozlišení obrazovky je příliš malé pro zobrazení instalátoru. @@ -1611,7 +1641,7 @@ Instalační program bude ukončen a všechny změny ztraceny. Nainstalujte KDE Konsole a zkuste to znovu! - + Executing script: &nbsp;<code>%1</code> Spouštění skriptu: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ Instalační program bude ukončen a všechny změny ztraceny. NetInstallViewStep - - + Package selection Výběr balíčků - + Office software Aplikace pro kancelář - + Office package Balíček s kancelářským software - + Browser software Aplikace pro procházení webu - + Browser package Balíček s webovým prohlížečem - + Web browser Webový prohlížeč - + Kernel Jádro systému - + Services Služby - + Login Uživatelské jméno - + Desktop Desktop - + Applications Aplikace - + Communication Komunikace - + Development Vývoj - + Office Kancelář - + Multimedia Multimédia - + Internet Internet - + Theming Motivy vzhledu - + Gaming Hry - + Utilities Nástroje @@ -3726,12 +3755,12 @@ Výstup: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Pokud bude tento počítač používat více lidí, můžete přidat uživatelské účty po dokončení instalace.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Pokud bude tento počítač používat více lidí, můžete přidat uživatelské účty po dokončení instalace.</small> @@ -3739,7 +3768,7 @@ Výstup: UsersQmlViewStep - + Users Uživatelé @@ -4157,102 +4186,102 @@ Výstup: Jak se jmenujete? - + Your Full Name Vaše celé jméno - + What name do you want to use to log in? Jaké jméno chcete používat pro přihlašování do systému? - + Login Name Přihlašovací jméno - + If more than one person will use this computer, you can create multiple accounts after installation. Pokud bude tento počítač používat více než jedna osoba, můžete po instalaci vytvořit více účtů. - + What is the name of this computer? Jaký je název tohoto počítače? - + Computer Name Název počítače - + This name will be used if you make the computer visible to others on a network. Tento název se použije, pokud počítač zviditelníte ostatním v síti. - + Choose a password to keep your account safe. Zvolte si heslo pro ochranu svého účtu. - + Password Heslo - + Repeat Password Zopakování zadání hesla - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní. Dobré heslo by mělo obsahovat směs písmen, čísel a interpunkce a mělo by mít alespoň osm znaků. Zvažte také jeho pravidelnou změnu. - + Validate passwords quality Ověřte kvalitu hesel - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Když je toto zaškrtnuto, je prověřována odolnost hesla a nebude umožněno použít snadno prolomitelné heslo. - + Log in automatically without asking for the password Přihlaste se automaticky bez zadávání hesla - + Reuse user password as root password Použijte uživatelské heslo zároveň jako heslo root - + Use the same password for the administrator account. Použít stejné heslo i pro účet správce systému. - + Choose a root password to keep your account safe. Zvolte heslo uživatele root, aby byl váš účet v bezpečí. - + Root Password Heslo uživatele root - + Repeat Root Password Opakujte root heslo - + Enter the same password twice, so that it can be checked for typing errors. Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní. diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index ebd5a655d9..2f5ff91911 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -102,22 +102,42 @@ Grænseflade: - - Tools - Værktøjer + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Genindlæs stilark - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Widgettræ - + Debug information Fejlretningsinformation @@ -286,13 +306,13 @@ - + &Yes &Ja - + &No &Nej @@ -302,17 +322,17 @@ &Luk - + Install Log Paste URL Indsættelses-URL for installationslog - + The upload was unsuccessful. No web-paste was done. Uploaden lykkedes ikke. Der blev ikke foretaget nogen webindsættelse. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Initiering af Calamares mislykkedes - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 kan ikke installeres. Calamares kunne ikke indlæse alle de konfigurerede moduler. Det er et problem med den måde Calamares bruges på af distributionen. - + <br/>The following modules could not be loaded: <br/>Følgende moduler kunne ikke indlæses: - + Continue with setup? Fortsæt med opsætningen? - + Continue with installation? Fortsæt installationen? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1-opsætningsprogrammet er ved at foretage ændringer til din disk for at opsætte %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1-installationsprogrammet er ved at foretage ændringer til din disk for at installere %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong> - + &Set up now &Opsæt nu - + &Install now &Installér nu - + Go &back Gå &tilbage - + &Set up &Opsæt - + &Install &Installér - + Setup is complete. Close the setup program. Opsætningen er fuldført. Luk opsætningsprogrammet. - + The installation is complete. Close the installer. Installationen er fuldført. Luk installationsprogrammet. - + Cancel setup without changing the system. Annullér opsætningen uden at ændre systemet. - + Cancel installation without changing the system. Annullér installation uden at ændre systemet. - + &Next &Næste - + &Back &Tilbage - + &Done &Færdig - + &Cancel &Annullér - + Cancel setup? Annullér opsætningen? - + Cancel installation? Annullér installationen? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Vil du virkelig annullere den igangværende opsætningsproces? Opsætningsprogrammet vil stoppe og alle ændringer vil gå tabt. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Vil du virkelig annullere den igangværende installationsproces? @@ -471,12 +491,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CalamaresWindow - + %1 Setup Program %1-opsætningsprogram - + %1 Installer %1-installationsprogram @@ -484,7 +504,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. CheckerContainer - + Gathering system information... Indsamler systeminformation ... @@ -732,22 +752,32 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Lokalitet for tal og datoer indstilles til %1. - + Network Installation. (Disabled: Incorrect configuration) Netværksinstallation. (deaktiveret: forkert konfiguration) - + Network Installation. (Disabled: Received invalid groups data) Netværksinstallation. (deaktiveret: modtog ugyldige gruppers data) - - Network Installation. (Disabled: internal error) - Netværksinstallation. (deaktiveret: intern fejl) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Valg af pakke - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Netværksinstallation. (deaktiveret: kunne ikke hente pakkelister, tjek din netværksforbindelse) @@ -842,42 +872,42 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Dine adgangskoder er ikke ens! - + Setup Failed Opsætningen mislykkedes - + Installation Failed Installation mislykkedes - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Opsætningen er fuldført - + Installation Complete Installation fuldført - + The setup of %1 is complete. Opsætningen af %1 er fuldført. - + The installation of %1 is complete. Installationen af %1 er fuldført. @@ -1474,72 +1504,72 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. GeneralRequirements - + has at least %1 GiB available drive space har mindst %1 GiB ledig plads på drevet - + There is not enough drive space. At least %1 GiB is required. Der er ikke nok ledig plads på drevet. Mindst %1 GiB er påkrævet. - + has at least %1 GiB working memory har mindst %1 GiB hukkommelse - + The system does not have enough working memory. At least %1 GiB is required. Systemet har ikke nok arbejdshukommelse. Mindst %1 GiB er påkrævet. - + is plugged in to a power source er tilsluttet en strømkilde - + The system is not plugged in to a power source. Systemet er ikke tilsluttet en strømkilde. - + is connected to the Internet er forbundet til internettet - + The system is not connected to the Internet. Systemet er ikke forbundet til internettet. - + is running the installer as an administrator (root) kører installationsprogrammet som en administrator (root) - + The setup program is not running with administrator rights. Opsætningsprogrammet kører ikke med administratorrettigheder. - + The installer is not running with administrator rights. Installationsprogrammet kører ikke med administratorrettigheder. - + has a screen large enough to show the whole installer har en skærm, som er stor nok til at vise hele installationsprogrammet - + The screen is too small to display the setup program. Skærmen er for lille til at vise opsætningsprogrammet. - + The screen is too small to display the installer. Skærmen er for lille til at vise installationsprogrammet. @@ -1607,7 +1637,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Installér venligst KDE Konsole og prøv igen! - + Executing script: &nbsp;<code>%1</code> Eksekverer skript: &nbsp;<code>%1</code> @@ -1879,98 +1909,97 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. NetInstallViewStep - - + Package selection Valg af pakke - + Office software Kontorsoftware - + Office package Kontorpakke - + Browser software Browsersoftware - + Browser package Browserpakke - + Web browser Webbrowser - + Kernel Kerne - + Services Tjenester - + Login Log ind - + Desktop Skrivebord - + Applications Programmer - + Communication Kommunikation - + Development Udvikling - + Office Kontor - + Multimedia Multimedie - + Internet Internet - + Theming Tema - + Gaming Spil - + Utilities Redskaber @@ -3705,12 +3734,12 @@ setting UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter opsætningen.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen.</small> @@ -3718,7 +3747,7 @@ setting UsersQmlViewStep - + Users Brugere @@ -4135,102 +4164,102 @@ setting Hvad er dit navn? - + Your Full Name Dit fulde navn - + What name do you want to use to log in? Hvilket navn skal bruges til at logge ind? - + Login Name Loginnavn - + If more than one person will use this computer, you can create multiple accounts after installation. Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen. - + What is the name of this computer? Hvad er navnet på computeren? - + Computer Name Computernavn - + This name will be used if you make the computer visible to others on a network. Navnet bruges, hvis du gør computeren synlig for andre på et netværk. - + Choose a password to keep your account safe. Vælg en adgangskode for at beskytte din konto. - + Password Adgangskode - + Repeat Password Gentag adgangskode - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl. En god adgangskode indeholder en blanding af bogstaver, tal og specialtegn, bør være mindst 8 tegn langt og bør skiftes jævnligt. - + Validate passwords quality Validér kvaliteten af adgangskoderne - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Når boksen er tilvalgt, så foretages der tjek af adgangskodens styrke og du vil ikke være i stand til at bruge en svag adgangskode. - + Log in automatically without asking for the password Log ind automatisk uden at spørge efter adgangskoden - + Reuse user password as root password Genbrug brugeradgangskode som root-adgangskode - + Use the same password for the administrator account. Brug den samme adgangskode til administratorkontoen. - + Choose a root password to keep your account safe. Vælg en root-adgangskode til at holde din konto sikker - + Root Password Root-adgangskode - + Repeat Root Password Gentag root-adgangskode - + Enter the same password twice, so that it can be checked for typing errors. Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl. diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts index cbc9fa0d99..cecd14c459 100644 --- a/lang/calamares_de.ts +++ b/lang/calamares_de.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Einstellungen für das automatische Einhängen bearbeiten @@ -102,22 +102,42 @@ Schnittstelle: - - Tools - Werkzeuge + + Crashes Calamares, so that Dr. Konqui can look at it. + Bringt Calamares zum Absturz, damit eine Untersuchung durch Dr. Konqui erfolgen kann. - + + Reloads the stylesheet from the branding directory. + Aktualisiert die Formatvorlage aus dem Herstellerverzeichnis. + + + + Uploads the session log to the configured pastebin. + Hochladen des Sitzungsprotokolls zum eingestellten Ziel. + + + + Send Session Log + Sitzungsprotokoll senden + + + Reload Stylesheet Stylesheet neu laden - + + Displays the tree of widget names in the log (for stylesheet debugging). + Vermerkt den Verzeichnisbaum der Widget-Namen im Protokoll (für die Fehlersuche bei Formatvorlagen) + + + Widget Tree Widget-Baum - + Debug information Debug-Information @@ -286,13 +306,13 @@ - + &Yes &Ja - + &No &Nein @@ -302,143 +322,147 @@ &Schließen - + Install Log Paste URL Internetadresse für das Senden des Installationsprotokolls - + The upload was unsuccessful. No web-paste was done. Das Hochladen ist fehlgeschlagen. Es wurde nichts an eine Internetadresse gesendet. - + Install log posted to %1 Link copied to clipboard - + Installationsprotokoll gesendet an + +%1 + +Link wurde in die Zwischenablage kopiert - + Calamares Initialization Failed Initialisierung von Calamares fehlgeschlagen - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 kann nicht installiert werden. Calamares war nicht in der Lage, alle konfigurierten Module zu laden. Dieses Problem hängt mit der Art und Weise zusammen, wie Calamares von der jeweiligen Distribution eingesetzt wird. - + <br/>The following modules could not be loaded: <br/>Die folgenden Module konnten nicht geladen werden: - + Continue with setup? Setup fortsetzen? - + Continue with installation? Installation fortsetzen? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Das %1 Installationsprogramm ist dabei, Änderungen an Ihrer Festplatte vorzunehmen, um %2 einzurichten.<br/><strong> Sie werden diese Änderungen nicht rückgängig machen können.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Das %1 Installationsprogramm wird Änderungen an Ihrer Festplatte vornehmen, um %2 zu installieren.<br/><strong>Diese Änderungen können nicht rückgängig gemacht werden.</strong> - + &Set up now &Jetzt einrichten - + &Install now Jetzt &installieren - + Go &back Gehe &zurück - + &Set up &Einrichten - + &Install &Installieren - + Setup is complete. Close the setup program. Setup ist abgeschlossen. Schließe das Installationsprogramm. - + The installation is complete. Close the installer. Die Installation ist abgeschlossen. Schließe das Installationsprogramm. - + Cancel setup without changing the system. Installation abbrechen ohne das System zu verändern. - + Cancel installation without changing the system. Installation abbrechen, ohne das System zu verändern. - + &Next &Weiter - + &Back &Zurück - + &Done &Erledigt - + &Cancel &Abbrechen - + Cancel setup? Installation abbrechen? - + Cancel installation? Installation abbrechen? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Wollen Sie die Installation wirklich abbrechen? Dadurch wird das Installationsprogramm beendet und alle Änderungen gehen verloren. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Wollen Sie wirklich die aktuelle Installation abbrechen? @@ -471,12 +495,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CalamaresWindow - + %1 Setup Program %1 Installationsprogramm - + %1 Installer %1 Installationsprogramm @@ -484,7 +508,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. CheckerContainer - + Gathering system information... Sammle Systeminformationen... @@ -732,22 +756,32 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Das Format für Zahlen und Datum wird auf %1 gesetzt. - + Network Installation. (Disabled: Incorrect configuration) Netzwerk-Installation. (Deaktiviert: Ungültige Konfiguration) - + Network Installation. (Disabled: Received invalid groups data) Netzwerk-Installation. (Deaktiviert: Ungültige Gruppen-Daten eingegeben) - - Network Installation. (Disabled: internal error) - Netzwerk-Installation. (Deaktiviert: Interner Fehler) + + Network Installation. (Disabled: Internal error) + Netzwerkinstallation. (Deaktiviert: Interner Fehler) + + + + Network Installation. (Disabled: No package list) + Netzwerkinstallation. (Deaktiviert: Keine Paketliste) + + + + Package selection + Paketauswahl - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Netzwerk-Installation. (Deaktiviert: Paketlisten nicht erreichbar, prüfen Sie Ihre Netzwerk-Verbindung) @@ -842,42 +876,42 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Ihre Passwörter stimmen nicht überein! - + Setup Failed - Setup fehlgeschlagen + Einrichtung fehlgeschlagen - + Installation Failed Installation gescheitert - + The setup of %1 did not complete successfully. - + Die Einrichtung von %1 wurde nicht erfolgreich abgeschlossen. - + The installation of %1 did not complete successfully. - + Die Installation von %1 wurde nicht erfolgreich abgeschlossen. - + Setup Complete - Installation abgeschlossen + Einrichtung abgeschlossen - + Installation Complete Installation abgeschlossen - + The setup of %1 is complete. - Die Installation von %1 ist abgeschlossen. + Die Einrichtung von %1 ist abgeschlossen. - + The installation of %1 is complete. Die Installation von %1 ist abgeschlossen. @@ -973,12 +1007,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Create new %1MiB partition on %3 (%2) with entries %4. - + Erstelle neue %1MiB Partition auf %3 (%2) mit den Einträgen %4. Create new %1MiB partition on %3 (%2). - + Erstelle neue %1MiB Partition auf %3 (%2). @@ -988,12 +1022,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Erstelle neue <strong>%1MiB</strong>Partition auf <strong>%3</strong> (%2) mit den Einträgen <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Erstelle neue <strong>%1MiB</strong> Partition auf <strong>%3</strong> (%2). @@ -1341,7 +1375,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Installiere %1 auf <strong>neue</strong> %2 Systempartition mit den Funktionen <em>%3</em> @@ -1351,27 +1385,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Erstelle <strong>neue</strong> %2 Partition mit Einhängepunkt <strong>%1</strong> und den Funktionen <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Erstelle<strong>neue</strong> %2 Partition mit Einhängepunkt <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Installiere %2 auf %3 Systempartition <strong>%1</strong> mit den Funktionen <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Erstelle %3 Partition <strong>%1</strong> mit Einhängepunkt <strong>%2</strong> und den Funktionen <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Erstelle %3 Partition <strong>%1</strong> mit Einhängepunkt <strong>%2</strong>%4. @@ -1437,7 +1471,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Finish - Beenden + Abschließen @@ -1474,72 +1508,72 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. GeneralRequirements - + has at least %1 GiB available drive space mindestens %1 GiB freien Festplattenplatz hat - + There is not enough drive space. At least %1 GiB is required. Zu wenig Speicherplatz auf der Festplatte. Es wird mindestens %1 GiB benötigt. - + has at least %1 GiB working memory mindestens %1 GiB Arbeitsspeicher hat - + The system does not have enough working memory. At least %1 GiB is required. Das System hat nicht genug Arbeitsspeicher. Es wird mindestens %1 GiB benötigt. - + is plugged in to a power source ist an eine Stromquelle angeschlossen - + The system is not plugged in to a power source. Der Computer ist an keine Stromquelle angeschlossen. - + is connected to the Internet ist mit dem Internet verbunden - + The system is not connected to the Internet. Der Computer ist nicht mit dem Internet verbunden. - + is running the installer as an administrator (root) führt das Installationsprogramm als Administrator (root) aus - + The setup program is not running with administrator rights. Das Installationsprogramm wird nicht mit Administratorrechten ausgeführt. - + The installer is not running with administrator rights. Das Installationsprogramm wird nicht mit Administratorrechten ausgeführt. - + has a screen large enough to show the whole installer hat einen ausreichend großen Bildschirm für die Anzeige des gesamten Installationsprogramm - + The screen is too small to display the setup program. Der Bildschirm ist zu klein, um das Installationsprogramm anzuzeigen. - + The screen is too small to display the installer. Der Bildschirm ist zu klein, um das Installationsprogramm anzuzeigen. @@ -1607,7 +1641,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. Bitte installieren Sie das KDE-Programm namens Konsole und probieren Sie es erneut! - + Executing script: &nbsp;<code>%1</code> Führe Skript aus: &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren. NetInstallViewStep - - + Package selection Paketauswahl - + Office software Office-Software - + Office package Office-Paket - + Browser software Browser-Software - + Browser package Browser-Paket - + Web browser Webbrowser - + Kernel Kernel - + Services Dienste - + Login Anmeldung - + Desktop Desktop - + Applications Anwendungen - + Communication Kommunikation - + Development Entwicklung - + Office Büro - + Multimedia Multimedia - + Internet Internet - + Theming Anpassung - + Gaming Spielen - + Utilities Dienstprogramme @@ -3704,12 +3737,12 @@ Ausgabe: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Falls dieser Computer von mehr als einer Person benutzt werden soll, können weitere Benutzerkonten nach der Installation eingerichtet werden.</small> @@ -3717,7 +3750,7 @@ Ausgabe: UsersQmlViewStep - + Users Benutzer @@ -3953,7 +3986,7 @@ Ausgabe: Show debug information - Debug-Information anzeigen + Informationen zur Fehlersuche anzeigen @@ -3961,29 +3994,31 @@ Ausgabe: Installation Completed - + Installation abgeschlossen %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 wurde auf Ihrem Computer installiert.<br/> + Sie können nun per Neustart das installierte System starten oder weiterhin die Live-Umgebung benutzen. Close Installer - + Installationsprogramm schließen Restart System - + System neustarten <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Ein komplettes Protokoll der Installation ist als installation.log im Home-Verzeichnis des Live-Benutzers verfügbar.<br/> + Dieses Protokoll liegt als /var/log/installation.log im installierten System vor.</p> @@ -4135,102 +4170,102 @@ Ausgabe: Wie ist Ihr Vor- und Nachname? - + Your Full Name Ihr vollständiger Name - + What name do you want to use to log in? Welchen Namen möchten Sie zum Anmelden benutzen? - + Login Name Anmeldename - + If more than one person will use this computer, you can create multiple accounts after installation. Falls mehrere Personen diesen Computer benutzen, können Sie nach der Installation weitere Konten hinzufügen. - + What is the name of this computer? Wie ist der Name dieses Computers? - + Computer Name Computername - + This name will be used if you make the computer visible to others on a network. Dieser Name wird benutzt, wenn Sie den Computer im Netzwerk für andere sichtbar machen. - + Choose a password to keep your account safe. Wählen Sie ein Passwort, um Ihr Konto zu sichern. - + Password Passwort - + Repeat Password Passwort wiederholen - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann. Ein gutes Passwort sollte eine Mischung aus Buchstaben, Zahlen sowie Sonderzeichen enthalten, mindestens acht Zeichen lang sein und regelmäßig geändert werden. - + Validate passwords quality Passwort-Qualität überprüfen - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Wenn dieses Kontrollkästchen aktiviert ist, wird die Passwortstärke überprüft und verhindert, dass Sie ein schwaches Passwort verwenden. - + Log in automatically without asking for the password Automatisch anmelden ohne Passwortabfrage - + Reuse user password as root password Benutzerpasswort als Root-Passwort benutzen - + Use the same password for the administrator account. Nutze das gleiche Passwort auch für das Administratorkonto. - + Choose a root password to keep your account safe. Wählen Sie ein Root-Passwort, um Ihr Konto zu schützen. - + Root Password Root-Passwort - + Repeat Root Password Root-Passwort wiederholen - + Enter the same password twice, so that it can be checked for typing errors. Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann. diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts index 16333af389..b9ef0eedc4 100644 --- a/lang/calamares_el.ts +++ b/lang/calamares_el.ts @@ -102,22 +102,42 @@ Διεπαφή: - - Tools - Εργαλεία + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Πληροφορίες αποσφαλμάτωσης @@ -286,13 +306,13 @@ - + &Yes &Ναι - + &No &Όχι @@ -302,17 +322,17 @@ &Κλείσιμο - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Η αρχικοποίηση του Calamares απέτυχε - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? Συνέχεια με την εγκατάσταση; - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Το πρόγραμμα εγκατάστασης %1 θα κάνει αλλαγές στον δίσκο για να εγκαταστήσετε το %2.<br/><strong>Δεν θα είστε σε θέση να αναιρέσετε τις αλλαγές.</strong> - + &Set up now - + &Install now &Εγκατάσταση τώρα - + Go &back Μετάβαση &πίσω - + &Set up - + &Install &Εγκατάσταση - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Η εγκτάσταση ολοκληρώθηκε. Κλείστε το πρόγραμμα εγκατάστασης. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Ακύρωση της εγκατάστασης χωρίς αλλαγές στο σύστημα. - + &Next &Επόμενο - + &Back &Προηγούμενο - + &Done &Ολοκληρώθηκε - + &Cancel &Ακύρωση - + Cancel setup? - + Cancel installation? Ακύρωση της εγκατάστασης; - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Θέλετε πραγματικά να ακυρώσετε τη διαδικασία εγκατάστασης; @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer Εφαρμογή εγκατάστασης του %1 @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Συλλογή πληροφοριών συστήματος... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Επιλογή πακέτου + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ The installer will quit and all changes will be lost. Οι κωδικοί πρόσβασης δεν ταιριάζουν! - + Setup Failed - + Installation Failed Η εγκατάσταση απέτυχε - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1473,72 +1503,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source είναι συνδεδεμένος σε πηγή ρεύματος - + The system is not plugged in to a power source. Το σύστημα δεν είναι συνδεδεμένο σε πηγή ρεύματος. - + is connected to the Internet είναι συνδεδεμένος στο διαδίκτυο - + The system is not connected to the Internet. Το σύστημα δεν είναι συνδεδεμένο στο διαδίκτυο. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Το πρόγραμμα εγκατάστασης δεν εκτελείται με δικαιώματα διαχειριστή. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Η οθόνη είναι πολύ μικρή για να απεικονίσει το πρόγραμμα εγκατάστασης @@ -1606,7 +1636,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> Εκτελείται το σενάριο: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Επιλογή πακέτου - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3695,12 +3724,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3708,7 +3737,7 @@ Output: UsersQmlViewStep - + Users Χρήστες @@ -4092,102 +4121,102 @@ Output: Ποιο είναι το όνομά σας; - + Your Full Name - + What name do you want to use to log in? Ποιο όνομα θα θέλατε να χρησιμοποιείτε για σύνδεση; - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Ποιο είναι το όνομά του υπολογιστή; - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Επιλέξτε ένα κωδικό για να διατηρήσετε το λογαριασμό σας ασφαλή. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Χρησιμοποιήστε τον ίδιο κωδικό πρόσβασης για τον λογαριασμό διαχειριστή. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index 7da27b24c4..dfb3ddb95a 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -104,22 +104,22 @@ Crashes Calamares, so that Dr. Konqui can look at it. - + Crashes Calamares, so that Dr. Konqui can look at it. Reloads the stylesheet from the branding directory. - + Reloads the stylesheet from the branding directory. Uploads the session log to the configured pastebin. - + Uploads the session log to the configured pastebin. Send Session Log - + Send Session Log @@ -129,7 +129,7 @@ Displays the tree of widget names in the log (for stylesheet debugging). - + Displays the tree of widget names in the log (for stylesheet debugging). @@ -768,17 +768,17 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: Internal error) - + Network Installation. (Disabled: Internal error) Network Installation. (Disabled: No package list) - + Network Installation. (Disabled: No package list) Package selection - Package selection + Package selection diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 194caa7592..286894d8ad 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Debug information @@ -286,13 +306,13 @@ - + &Yes &Yes - + &No &No @@ -302,17 +322,17 @@ &Close - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares Initialisation Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: <br/>The following modules could not be loaded: - + Continue with setup? Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now &Install now - + Go &back Go &back - + &Set up - + &Install &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Cancel installation without changing the system. - + &Next &Next - + &Back &Back - + &Done &Done - + &Cancel &Cancel - + Cancel setup? - + Cancel installation? Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Do you really want to cancel the current install process? @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installer @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Gathering system information... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. The numbers and dates locale will be set to %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Package selection + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ The installer will quit and all changes will be lost. Your passwords do not match! - + Setup Failed - + Installation Failed Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. The installation of %1 is complete. @@ -1473,72 +1503,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source is plugged in to a power source - + The system is not plugged in to a power source. The system is not plugged in to a power source. - + is connected to the Internet is connected to the Internet - + The system is not connected to the Internet. The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. The screen is too small to display the installer. @@ -1606,7 +1636,7 @@ The installer will quit and all changes will be lost. Please install KDE Konsole and try again! - + Executing script: &nbsp;<code>%1</code> Executing script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3698,12 +3727,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3711,7 +3740,7 @@ Output: UsersQmlViewStep - + Users Users @@ -4095,102 +4124,102 @@ Output: What is your name? - + Your Full Name - + What name do you want to use to log in? What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index ab4efbc437..4db4d9025b 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -102,22 +102,42 @@ Interfaco: - - Tools - Iloj + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Reŝargu Stilfolio - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree KromprogrametArbo - + Debug information Sencimiga Informaĵo @@ -286,13 +306,13 @@ - + &Yes &Jes - + &No &Ne @@ -302,17 +322,17 @@ &Fermi - + Install Log Paste URL Retadreso de la alglua servilo - + The upload was unsuccessful. No web-paste was done. Alŝuto malsukcesinta. Neniu transpoŝigis al la reto. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard La retadreso estis copiita al vian tondujon. - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now &Aranĝu nun - + &Install now &Instali nun - + Go &back Iru &Reen - + &Set up &Aranĝu - + &Install &Instali - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Nuligi instalado sen ŝanĝante la sistemo. - + &Next &Sekva - + &Back &Reen - + &Done &Finita - + &Cancel &Nuligi - + Cancel setup? - + Cancel installation? Nuligi instalado? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Ĉu vi vere volas nuligi la instalan procedon? @@ -474,12 +494,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalilo @@ -487,7 +507,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. CheckerContainer - + Gathering system information... @@ -735,22 +755,32 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -845,42 +875,42 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Agordaĵo Plenumita - + Installation Complete Instalaĵo Plenumita - + The setup of %1 is complete. La agordaĵo de %1 estas plenumita. - + The installation of %1 is complete. La instalaĵo de %1 estas plenumita. @@ -1477,72 +1507,72 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1610,7 +1640,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. - + Executing script: &nbsp;<code>%1</code> @@ -1880,98 +1910,97 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3699,12 +3728,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3712,7 +3741,7 @@ Output: UsersQmlViewStep - + Users @@ -4096,102 +4125,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 79da48d525..8a5d5455c7 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -103,22 +103,42 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar Interfaz: - - Tools - Herramientas + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Recargar Hoja de estilo - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Información de depuración. @@ -287,13 +307,13 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar - + &Yes &Sí - + &No &No @@ -303,17 +323,17 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar &Cerrar - + Install Log Paste URL Pegar URL Registro de Instalación - + The upload was unsuccessful. No web-paste was done. La carga no tuvo éxito. No se realizó pegado web. - + Install log posted to %1 @@ -322,123 +342,123 @@ Link copied to clipboard - + Calamares Initialization Failed La inicialización de Calamares falló - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 no se pudo instalar. Calamares no fue capaz de cargar todos los módulos configurados. Esto es un problema con la forma en que Calamares es usado por la distribución - + <br/>The following modules could not be loaded: Los siguientes módulos no se pudieron cargar: - + Continue with setup? ¿Continuar con la configuración? - + Continue with installation? Continuar con la instalación? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> El programa de instalación %1 está a punto de hacer cambios en el disco con el fin de configurar %2.<br/><strong>No podrá deshacer estos cambios.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong> - + &Set up now &Configurar ahora - + &Install now &Instalar ahora - + Go &back Regresar - + &Set up &Instalar - + &Install &Instalar - + Setup is complete. Close the setup program. La instalación se ha completado. Cierre el instalador. - + The installation is complete. Close the installer. La instalación se ha completado. Cierre el instalador. - + Cancel setup without changing the system. Cancelar instalación sin cambiar el sistema. - + Cancel installation without changing the system. Cancelar instalación sin cambiar el sistema. - + &Next &Siguiente - + &Back &Atrás - + &Done &Hecho - + &Cancel &Cancelar - + Cancel setup? ¿Cancelar la instalación? - + Cancel installation? ¿Cancelar la instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿Realmente quiere cancelar el proceso de instalación? @@ -471,12 +491,12 @@ Saldrá del instalador y se perderán todos los cambios. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalador @@ -484,7 +504,7 @@ Saldrá del instalador y se perderán todos los cambios. CheckerContainer - + Gathering system information... Obteniendo información del sistema... @@ -732,22 +752,32 @@ Saldrá del instalador y se perderán todos los cambios. La localización de números y fechas se establecerá a %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalación de red. (Deshabilitada: Se recibieron grupos de datos no válidos) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selección de paquetes + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalación a través de la Red. (Desactivada: no se ha podido obtener una lista de paquetes, comprueba tu conexión a la red) @@ -842,42 +872,42 @@ Saldrá del instalador y se perderán todos los cambios. ¡Sus contraseñas no coinciden! - + Setup Failed Configuración Fallida - + Installation Failed Error en la Instalación - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalación completada - + The setup of %1 is complete. - + The installation of %1 is complete. Se ha completado la instalación de %1. @@ -1474,72 +1504,72 @@ Saldrá del instalador y se perderán todos los cambios. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. No hay suficiente espació en el disco duro. Se requiere al menos %1 GB libre. - + has at least %1 GiB working memory tiene al menos %1 GB de memoria. - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source esta conectado a una fuente de alimentación - + The system is not plugged in to a power source. El sistema no esta conectado a una fuente de alimentación. - + is connected to the Internet esta conectado a Internet - + The system is not connected to the Internet. El sistema no esta conectado a Internet - + is running the installer as an administrator (root) esta ejecutándose con permisos de administrador (root). - + The setup program is not running with administrator rights. El instalador no esta ejecutándose con permisos de administrador. - + The installer is not running with administrator rights. El instalador no esta ejecutándose con permisos de administrador. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. La pantalla es demasiado pequeña para mostrar el instalador. - + The screen is too small to display the installer. La pantalla es demasiado pequeña para mostrar el instalador. @@ -1607,7 +1637,7 @@ Saldrá del instalador y se perderán todos los cambios. ¡Por favor, instale KDE Konsole e inténtelo de nuevo! - + Executing script: &nbsp;<code>%1</code> Ejecutando script: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ Saldrá del instalador y se perderán todos los cambios. NetInstallViewStep - - + Package selection Selección de paquetes - + Office software Programas de oficina - + Office package Paquete de oficina - + Browser software - + Browser package - + Web browser - + Kernel Kernel - + Services Servicios - + Login - + Desktop - + Applications Aplicaciónes - + Communication - + Development - + Office Oficina - + Multimedia Multimedia - + Internet Internet - + Theming Temas - + Gaming Juegos - + Utilities Utilidades @@ -3699,12 +3728,12 @@ Salida: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3712,7 +3741,7 @@ Salida: UsersQmlViewStep - + Users Usuarios @@ -4096,102 +4125,102 @@ Salida: Nombre - + Your Full Name Su nombre completo - + What name do you want to use to log in? ¿Qué nombre desea usar para ingresar? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Nombre del equipo - + Computer Name Nombre de computadora - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Elija una contraseña para mantener su cuenta segura. - + Password Contraseña - + Repeat Password Repita la contraseña - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Usar la misma contraseña para la cuenta de administrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index c5f6adfc4a..9690665808 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -102,22 +102,42 @@ Interfaz: - - Tools - Herramientas + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Información de depuración @@ -286,13 +306,13 @@ - + &Yes &Si - + &No &No @@ -302,17 +322,17 @@ &Cerrar - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed La inicialización de Calamares ha fallado - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 no pudo ser instalado. Calamares no pudo cargar todos los módulos configurados. Este es un problema con la forma en que Calamares esta siendo usada por la distribución. - + <br/>The following modules could not be loaded: <br/>Los siguientes módulos no pudieron ser cargados: - + Continue with setup? ¿Continuar con la instalación? - + Continue with installation? ¿Continuar con la instalación? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> El %1 programa de instalación esta a punto de realizar cambios a su disco con el fin de establecer %2.<br/><strong>Usted no podrá deshacer estos cambios.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong> - + &Set up now &Configurar ahora - + &Install now &Instalar ahora - + Go &back &Regresar - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. Configuración completa. Cierre el programa de instalación. - + The installation is complete. Close the installer. Instalación completa. Cierre el instalador. - + Cancel setup without changing the system. Cancelar la configuración sin cambiar el sistema. - + Cancel installation without changing the system. Cancelar instalación sin cambiar el sistema. - + &Next &Siguiente - + &Back &Atrás - + &Done &Hecho - + &Cancel &Cancelar - + Cancel setup? ¿Cancelar la configuración? - + Cancel installation? ¿Cancelar la instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. ¿Realmente desea cancelar el actual proceso de configuración? El programa de instalación se cerrará y todos los cambios se perderán. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. ¿Realmente desea cancelar el proceso de instalación actual? @@ -471,12 +491,12 @@ El instalador terminará y se perderán todos los cambios. CalamaresWindow - + %1 Setup Program %1 Programa de instalación - + %1 Installer %1 Instalador @@ -484,7 +504,7 @@ El instalador terminará y se perderán todos los cambios. CheckerContainer - + Gathering system information... Obteniendo información del sistema... @@ -733,22 +753,32 @@ El instalador terminará y se perderán todos los cambios. Los números y datos locales serán establecidos a %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalación de Red. (Deshabilitada: Grupos de datos invalidos recibidos) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selección de paquete + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalación de Red. (Deshabilitada: No se puede acceder a la lista de paquetes, verifique su conección de red) @@ -843,42 +873,42 @@ El instalador terminará y se perderán todos los cambios. Las contraseñas no coinciden! - + Setup Failed Fallo en la configuración. - + Installation Failed Instalación Fallida - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalación Completa - + The setup of %1 is complete. - + The installation of %1 is complete. La instalación de %1 está completa. @@ -1475,72 +1505,72 @@ El instalador terminará y se perderán todos los cambios. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source está conectado a una fuente de energía - + The system is not plugged in to a power source. El sistema no está conectado a una fuente de energía. - + is connected to the Internet está conectado a Internet - + The system is not connected to the Internet. El sistema no está conectado a Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. El instalador no se está ejecutando con privilegios de administrador. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. La pantalla es muy pequeña para mostrar el instalador @@ -1608,7 +1638,7 @@ El instalador terminará y se perderán todos los cambios. Favor instale la Konsola KDE e intentelo de nuevo! - + Executing script: &nbsp;<code>%1</code> Ejecutando script: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ El instalador terminará y se perderán todos los cambios. NetInstallViewStep - - + Package selection Selección de paquete - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3701,12 +3730,12 @@ Salida UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Si más de una persona usará esta computadora, puede crear múltiples cuentas después de la configuración</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Si más de una persona usará esta computadora, puede crear varias cuentas después de la instalación.</small> @@ -3714,7 +3743,7 @@ Salida UsersQmlViewStep - + Users Usuarios @@ -4098,102 +4127,102 @@ Salida ¿Cuál es su nombre? - + Your Full Name - + What name do you want to use to log in? ¿Qué nombre desea usar para acceder al sistema? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? ¿Cuál es el nombre de esta computadora? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Seleccione una contraseña para mantener segura su cuenta. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Usar la misma contraseña para la cuenta de administrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts index 3dd9caed8e..ba29564ec6 100644 --- a/lang/calamares_es_PR.ts +++ b/lang/calamares_es_PR.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Información de depuración @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Próximo - + &Back &Atrás - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed Falló la instalación - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts index bad69099dc..c6dad0a2af 100644 --- a/lang/calamares_et.ts +++ b/lang/calamares_et.ts @@ -102,22 +102,42 @@ Liides: - - Tools - Tööriistad + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Silumisteave @@ -286,13 +306,13 @@ - + &Yes &Jah - + &No &Ei @@ -302,17 +322,17 @@ &Sulge - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Calamarese alglaadimine ebaõnnestus - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ei saa paigaldada. Calamares ei saanud laadida kõiki konfigureeritud mooduleid. See on distributsiooni põhjustatud Calamarese kasutamise viga. - + <br/>The following modules could not be loaded: <br/>Järgnevaid mooduleid ei saanud laadida: - + Continue with setup? Jätka seadistusega? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 paigaldaja on tegemas muudatusi sinu kettale, et paigaldada %2.<br/><strong>Sa ei saa neid muudatusi tagasi võtta.</strong> - + &Set up now &Seadista kohe - + &Install now &Paigalda kohe - + Go &back Mine &tagasi - + &Set up &Seadista - + &Install &Paigalda - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Paigaldamine on lõpetatud. Sulge paigaldaja. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Tühista paigaldamine ilma süsteemi muutmata. - + &Next &Edasi - + &Back &Tagasi - + &Done &Valmis - + &Cancel &Tühista - + Cancel setup? - + Cancel installation? Tühista paigaldamine? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Kas sa tõesti soovid tühistada praeguse paigaldusprotsessi? @@ -470,12 +490,12 @@ Paigaldaja sulgub ning kõik muutused kaovad. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 paigaldaja @@ -483,7 +503,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. CheckerContainer - + Gathering system information... Hangin süsteemiteavet... @@ -731,22 +751,32 @@ Paigaldaja sulgub ning kõik muutused kaovad. Arvude ja kuupäevade lokaaliks seatakse %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Võrgupaigaldus. (Keelatud: vastu võetud sobimatud grupiandmed) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Paketivalik + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Võrgupaigaldus. (Keelatud: paketinimistute saamine ebaõnnestus, kontrolli oma võrguühendust) @@ -841,42 +871,42 @@ Paigaldaja sulgub ning kõik muutused kaovad. Sinu paroolid ei ühti! - + Setup Failed - + Installation Failed Paigaldamine ebaõnnestus - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Seadistus valmis - + Installation Complete Paigaldus valmis - + The setup of %1 is complete. - + The installation of %1 is complete. %1 paigaldus on valmis. @@ -1473,72 +1503,72 @@ Paigaldaja sulgub ning kõik muutused kaovad. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source on ühendatud vooluallikasse - + The system is not plugged in to a power source. Süsteem pole ühendatud vooluallikasse. - + is connected to the Internet on ühendatud Internetti - + The system is not connected to the Internet. Süsteem pole ühendatud Internetti. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Paigaldaja pole käivitatud administraatoriõigustega. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Ekraan on paigaldaja kuvamiseks liiga väike. @@ -1606,7 +1636,7 @@ Paigaldaja sulgub ning kõik muutused kaovad. Palun paigalda KDE Konsole ja proovi uuesti! - + Executing script: &nbsp;<code>%1</code> Käivitan skripti: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Paigaldaja sulgub ning kõik muutused kaovad. NetInstallViewStep - - + Package selection Paketivalik - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3698,12 +3727,12 @@ Väljund: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3711,7 +3740,7 @@ Väljund: UsersQmlViewStep - + Users Kasutajad @@ -4095,102 +4124,102 @@ Väljund: Mis on su nimi? - + Your Full Name - + What name do you want to use to log in? Mis nime soovid sisselogimiseks kasutada? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Mis on selle arvuti nimi? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Vali parool, et hoida oma konto turvalisena. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Kasuta sama parooli administraatorikontole. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts index 275dff6b06..f9b6b44e1e 100644 --- a/lang/calamares_eu.ts +++ b/lang/calamares_eu.ts @@ -102,22 +102,42 @@ Interfasea: - - Tools - Tresnak + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Arazte informazioa @@ -286,13 +306,13 @@ - + &Yes &Bai - + &No &Ez @@ -302,17 +322,17 @@ &Itxi - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares instalazioak huts egin du - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ezin da instalatu. Calamares ez da gai konfiguratutako modulu guztiak kargatzeko. Arazao hau banaketak Calamares erabiltzen duen eragatik da. - + <br/>The following modules could not be loaded: <br/> Ondorengo moduluak ezin izan dira kargatu: - + Continue with setup? Ezarpenarekin jarraitu? - + Continue with installation? Instalazioarekin jarraitu? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 instalatzailea zure diskoan aldaketak egitera doa %2 instalatzeko.<br/><strong>Ezingo dituzu desegin aldaketa hauek.</strong> - + &Set up now - + &Install now &Instalatu orain - + Go &back &Atzera - + &Set up - + &Install &Instalatu - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalazioa burutu da. Itxi instalatzailea. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Instalazioa bertan behera utsi da sisteman aldaketarik gabe. - + &Next &Hurrengoa - + &Back &Atzera - + &Done E&ginda - + &Cancel &Utzi - + Cancel setup? - + Cancel installation? Bertan behera utzi instalazioa? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Ziur uneko instalazio prozesua bertan behera utzi nahi duzula? @@ -470,12 +490,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instalatzailea @@ -483,7 +503,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. CheckerContainer - + Gathering system information... Sistemaren informazioa eskuratzen... @@ -731,22 +751,32 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Zenbaki eta daten eskualdea %1-(e)ra ezarri da. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Pakete aukeraketa + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Pasahitzak ez datoz bat! - + Setup Failed - + Installation Failed Instalazioak huts egin du - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalazioa amaitua - + The setup of %1 is complete. - + The installation of %1 is complete. %1 instalazioa amaitu da. @@ -1473,72 +1503,72 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. Sistema ez dago indar iturri batetara konektatuta. - + is connected to the Internet Internetera konektatuta dago - + The system is not connected to the Internet. Sistema ez dago Internetera konektatuta. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Instalatzailea ez dabil exekutatzen administrari eskubideekin. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Pantaila txikiegia da instalatzailea erakusteko. @@ -1606,7 +1636,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. Mesedez instalatu KDE kontsola eta saiatu berriz! - + Executing script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira. NetInstallViewStep - - + Package selection Pakete aukeraketa - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3697,12 +3726,12 @@ Irteera: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3710,7 +3739,7 @@ Irteera: UsersQmlViewStep - + Users Erabiltzaileak @@ -4094,102 +4123,102 @@ Irteera: Zein da zure izena? - + Your Full Name - + What name do you want to use to log in? Zein izen erabili nahi duzu saioa hastean? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Zein da ordenagailu honen izena? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Aukeratu pasahitza zure kontua babesteko. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Erabili pasahitz bera administratzaile kontuan. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts index d7a27ef6ac..ec0753b7f2 100644 --- a/lang/calamares_fa.ts +++ b/lang/calamares_fa.ts @@ -102,22 +102,42 @@ رابط: - - Tools - ابزارها + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet بارگزاری مجدد برگه‌شیوه - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree درخت ابزارک‌ها - + Debug information اطّلاعات اشکال‌زدایی @@ -286,13 +306,13 @@ - + &Yes &بله - + &No &خیر @@ -302,17 +322,17 @@ &بسته - + Install Log Paste URL Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed راه اندازی کالاماریس شکست خورد. - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 نمی‌تواند نصب شود. کالاماریس نمی‌تواند همه ماژول‌های پیکربندی را بالا بیاورد. این یک مشکل در نحوه استفاده کالاماریس توسط توزیع است. - + <br/>The following modules could not be loaded: <br/>این ماژول نمی‌تواند بالا بیاید: - + Continue with setup? ادامهٔ برپایی؟ - + Continue with installation? نصب ادامه یابد؟ - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> برنامه نصب %1 در شرف ایجاد تغییرات در دیسک شما به منظور راه‌اندازی %2 است. <br/><strong>شما قادر نخواهید بود تا این تغییرات را برگردانید.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> نصب‌کنندهٔ %1 می‌خواهد برای نصب %2 تغییراتی در دیسکتان بدهد. <br/><strong>نخواهید توانست این تغییرات را برگردانید.</strong> - + &Set up now &همین حالا راه‌انداری کنید - + &Install now &اکنون نصب شود - + Go &back &بازگشت - + &Set up &راه‌اندازی - + &Install &نصب - + Setup is complete. Close the setup program. نصب انجام شد. برنامه نصب را ببندید. - + The installation is complete. Close the installer. نصب انجام شد. نصاب را ببندید. - + Cancel setup without changing the system. لغو راه‌اندازی بدون تغییر سیستم. - + Cancel installation without changing the system. لغو نصب بدون تغییر کردن سیستم. - + &Next &بعدی - + &Back &پیشین - + &Done &انجام شد - + &Cancel &لغو - + Cancel setup? لغو راه‌اندازی؟ - + Cancel installation? لغو نصب؟ - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. آیا واقعا می‌خواهید روند راه‌اندازی فعلی رو لغو کنید؟ برنامه راه اندازی ترک می شود و همه تغییرات از بین می روند. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. واقعاً می خواهید فرایند نصب فعلی را لغو کنید؟ @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 برنامه راه‌اندازی - + %1 Installer نصب‌کنندهٔ %1 @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... جمع‌آوری اطلاعات سیستم... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. محلی و اعداد و تاریخ ها روی٪ 1 تنظیم می شوند. - + Network Installation. (Disabled: Incorrect configuration) نصب شبکه‌ای. (از کار افتاده: پیکربندی نادرست) - + Network Installation. (Disabled: Received invalid groups data) نصب شبکه‌ای. (از کار افتاده: دریافت داده‌های گروه‌های نامعتبر) - - Network Installation. (Disabled: internal error) - نصب شبکه‌ای. (از کار افتاده: خطای داخلی) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + گزینش بسته‌ها - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) نصب شبکه‌ای. (از کار افتاده: ناتوان در گرفتن فهرست بسته‌ها. اتّصال شبکه‌تان را بررسی کنید) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. گذرواژه‌هایتان مطابق نیستند! - + Setup Failed راه‌اندازی شکست خورد. - + Installation Failed نصب شکست خورد - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete برپایی کامل شد - + Installation Complete نصب کامل شد - + The setup of %1 is complete. برپایی %1 کامل شد. - + The installation of %1 is complete. نصب %1 کامل شد. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source به برق وصل است. - + The system is not plugged in to a power source. سامانه به برق وصل نیست. - + is connected to the Internet به اینترنت وصل است - + The system is not connected to the Internet. سامانه به اینترنت وصل نیست. - + is running the installer as an administrator (root) دارد نصب‌کننده را به عنوان یک مدیر (ریشه) اجرا می‌کند - + The setup program is not running with administrator rights. برنامهٔ برپایی با دسترسی‌های مدیر اجرا نشده‌است. - + The installer is not running with administrator rights. برنامهٔ نصب کننده با دسترسی‌های مدیر اجرا نشده‌است. - + has a screen large enough to show the whole installer صفحه‌ای با بزرگی کافی برای نمایش تمام نصب‌کننده دارد - + The screen is too small to display the setup program. صفحه برای نمایش برنامهٔ برپایی خیلی کوچک است. - + The screen is too small to display the installer. صفحه برای نمایش نصب‌کننده خیلی کوچک است. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. لطفاً Konsole کی‌دی‌ای را نصب کرده و دوباره تلاش کنید! - + Executing script: &nbsp;<code>%1</code> در حال اجرای کدنوشته: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection گزینش بسته‌ها - + Office software نرم‌افزار اداری - + Office package بستهٔ اداری - + Browser software نرم‌افزار مرورگر - + Browser package بستهٔ مرورگر - + Web browser مرورگر وب - + Kernel کرنل - + Services خدمت‌ها - + Login ورود - + Desktop میزکار - + Applications برنامه‌های کاربردی - + Communication ارتباطات - + Development توسعه - + Office اداری - + Multimedia چندرسانه‌ای - + Internet اینترنت - + Theming شخصی‌سازی - + Gaming بازی - + Utilities ابزارها @@ -3696,12 +3725,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3709,7 +3738,7 @@ Output: UsersQmlViewStep - + Users کاربران @@ -4094,102 +4123,102 @@ Output: نامتان چیست؟ - + Your Full Name نام کاملتان - + What name do you want to use to log in? برای ورود می خواهید از چه نامی استفاده کنید؟ - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? نام این رایانه چیست؟ - + Computer Name نام رایانه - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. برای امن نگه داشتن حسابتان، گذرواژه‌ای برگزینید. - + Password گذرواژه - + Repeat Password تکرار TextLabel - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. رمز ورود یکسان را دو بار وارد کنید ، تا بتوان آن را از نظر اشتباه تایپ بررسی کرد. یک رمز ورود خوب شامل ترکیبی از حروف ، اعداد و علائم نگارشی است ، باید حداقل هشت حرف داشته باشد و باید در فواصل منظم تغییر یابد. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. وقتی این کادر علامت گذاری شد ، بررسی قدرت رمز عبور انجام می شود و دیگر نمی توانید از رمز عبور ضعیف استفاده کنید. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. استفاده از گذرواژهٔ یکسان برای حساب مدیر. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts index 16ec5d3ece..4045f5247e 100644 --- a/lang/calamares_fi_FI.ts +++ b/lang/calamares_fi_FI.ts @@ -102,22 +102,42 @@ Käyttöliittymä: - - Tools - Työkalut + + Crashes Calamares, so that Dr. Konqui can look at it. + Kaada Calamares, jotta tohtori Konqui voi katsoa sitä. - + + Reloads the stylesheet from the branding directory. + Lataa tyylisivu tuotemerkin kansiosta uudelleen. + + + + Uploads the session log to the configured pastebin. + Lataa istunnon loki määritettyn pastebin-tiedostoon. + + + + Send Session Log + Lähetä istunnon loki + + + Reload Stylesheet Virkistä tyylisivu - + + Displays the tree of widget names in the log (for stylesheet debugging). + Näyttää sovelman nimen hakemistopuun lokissa (tyylisivun virheenkorjausta varten). + + + Widget Tree Widget puurakenne - + Debug information Vianetsinnän tiedot @@ -225,7 +245,7 @@ QML Step <i>%1</i>. - QML-vaihe <i>%1</i>. + QML vaihe <i>%1</i>. @@ -286,13 +306,13 @@ - + &Yes &Kyllä - + &No &Ei @@ -302,17 +322,17 @@ &Sulje - + Install Log Paste URL - Asenna lokitiedon URL-osoite + Asenna lokiliitoksen URL-osoite - + The upload was unsuccessful. No web-paste was done. - Lähettäminen epäonnistui. Web-liittämistä ei tehty. + Lähettäminen epäonnistui. Verkko-liittämistä ei tehty. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard Linkki kopioitu leikepöydälle - + Calamares Initialization Failed Calamaresin alustaminen epäonnistui - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ei voi asentaa. Calamares ei voinut ladata kaikkia määritettyjä moduuleja. Ongelma on siinä, miten jakelu käyttää Calamaresia. - + <br/>The following modules could not be loaded: <br/>Seuraavia moduuleja ei voitu ladata: - + Continue with setup? Jatketaanko asennusta? - + Continue with installation? Jatka asennusta? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 asennusohjelma on aikeissa tehdä muutoksia levylle, jotta voit määrittää kohteen %2.<br/><strong>Et voi kumota näitä muutoksia.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Asennus ohjelman %1 on tehtävä muutoksia levylle, jotta %2 voidaan asentaa.<br/><strong>Et voi kumota näitä muutoksia.</strong> - + &Set up now &Määritä nyt - + &Install now &Asenna nyt - + Go &back Mene &takaisin - + &Set up &Määritä - + &Install &Asenna - + Setup is complete. Close the setup program. Asennus on valmis. Sulje asennusohjelma. - + The installation is complete. Close the installer. Asennus on valmis. Sulje asennusohjelma. - + Cancel setup without changing the system. Peruuta asennus muuttamatta järjestelmää. - + Cancel installation without changing the system. Peruuta asennus tekemättä muutoksia järjestelmään. - + &Next &Seuraava - + &Back &Takaisin - + &Done &Valmis - + &Cancel &Peruuta - + Cancel setup? Peruuta asennus? - + Cancel installation? Peruuta asennus? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Haluatko todella peruuttaa nykyisen asennuksen? Asennusohjelma lopetetaan ja kaikki muutokset menetetään. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Oletko varma että haluat peruuttaa käynnissä olevan asennusprosessin? @@ -475,20 +495,20 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. CalamaresWindow - + %1 Setup Program - %1 Asennusohjelma + %1 asennusohjelma - + %1 Installer - %1 Asennusohjelma + %1 asentaja CheckerContainer - + Gathering system information... Kerätään järjestelmän tietoja... @@ -551,17 +571,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - EFI-osiota ei löydy mistään tässä järjestelmässä. Siirry takaisin ja käytä manuaalista osiointia, kun haluat määrittää %1 + Järjestelmäosiota EFI ei löydy tästä järjestelmästä. Siirry takaisin ja käytä manuaalista osiointia, kun haluat määrittää %1 The EFI system partition at %1 will be used for starting %2. - EFI-järjestelmän osiota %1 käytetään käynnistettäessä %2. + Järjestelmäosiota EFI %1 käytetään %2 käynnistämiseen. EFI system partition: - EFI järjestelmäosio: + EFI järjestelmän osio: @@ -582,7 +602,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - <strong>Asenna nykyisen rinnalle</strong><br/>Asennus ohjelma supistaa osion tehdäkseen tilaa kohteelle %1. + <strong>Asenna nykyisen rinnalle</strong><br/>Asennusohjelma supistaa osiota tehdäkseen tilaa kohteelle %1. @@ -610,42 +630,42 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - Tässä kiintolevyssä on jo käyttöjärjestelmä, mutta osiotaulukko <strong>%1</strong> on erilainen kuin tarvittava <strong>%2</strong>.<br/> + Tällä kiintolevyllä on jo käyttöjärjestelmä, mutta osiotaulukko <strong>%1</strong> on erilainen kuin tarvittava <strong>%2</strong>.<br/> This storage device has one of its partitions <strong>mounted</strong>. - Tähän kiintolevyyn on <strong>asennettu</strong> yksi osioista. + Tähän kiintolevyyn on <strong>kiinnitetty</strong> yksi osioista. This storage device is a part of an <strong>inactive RAID</strong> device. - Tämä kiintolevy on osa <strong>passiivista RAID</strong> -laitetta. + Tämä kiintolevy on osa <strong>passiivista RAID</strong> kokoonpanoa. No Swap - Ei välimuistia + Swap ei Reuse Swap - Kierrätä välimuistia + Swap käytä uudellen Swap (no Hibernate) - Välimuisti (ei lepotilaa) + Swap (ei lepotilaa) Swap (with Hibernate) - Välimuisti (lepotilan kanssa) + Swap (lepotilan kanssa) Swap to file - Välimuisti tiedostona + Swap tiedostona @@ -653,12 +673,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Clear mounts for partitioning operations on %1 - Poista osiointitoimenpiteitä varten tehdyt liitokset kohteesta %1 + Tyhjennä osiointia varten tehdyt liitokset kohteesta %1 Clearing mounts for partitioning operations on %1. - Tyhjennät kiinnitys osiointitoiminnoille %1. + Tyhjennetään liitokset %1 osiointia varten. @@ -681,7 +701,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Cannot get list of temporary mounts. - Väliaikaisten kiinnitysten luetteloa ei voi hakea. + Väliaikaisten liitosten luetteloa ei voi hakea. @@ -736,22 +756,32 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat. Numerot ja päivämäärät, paikallinen asetus on %1. - + Network Installation. (Disabled: Incorrect configuration) Verkko asennus. (Ei käytössä: virheellinen määritys) - + Network Installation. (Disabled: Received invalid groups data) Verkkoasennus. (Ei käytössä: Vastaanotettiin virheellisiä ryhmän tietoja) - - Network Installation. (Disabled: internal error) - Verkon asennus. (Ei käytössä: sisäinen virhe) + + Network Installation. (Disabled: Internal error) + Verkon asennus (Poistettu käytöstä: sisäinen virhe) + + + + Network Installation. (Disabled: No package list) + Verkon asennus (Poistettu käytöstä: ei pakettien listaa) + + + + Package selection + Paketin valinta - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Verkkoasennus. (Ei käytössä: Pakettiluetteloita ei voi hakea, tarkista verkkoyhteys) @@ -794,12 +824,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. <h1>Welcome to the Calamares installer for %1</h1> - <h1>Tervetuloa Calamares -asennusohjelmaan %1</h1> + <h1>Tervetuloa Calamares asentajaan %1</h1> <h1>Welcome to the %1 installer</h1> - <h1>Tervetuloa %1 -asennusohjelmaan</h1> + <h1>Tervetuloa %1 asentajaan</h1> @@ -809,12 +839,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. '%1' is not allowed as username. - '%1' ei ole sallittu käyttäjänimenä. + Käyttäjänimessä '%1' ei ole sallittu. Your username must start with a lowercase letter or underscore. - Käyttäjätunnuksesi täytyy alkaa pienillä kirjaimilla tai alaviivoilla. + Sinun käyttäjänimi täytyy alkaa pienellä kirjaimella tai alaviivalla. @@ -824,17 +854,17 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Your hostname is too short. - Isäntänimesi on liian lyhyt. + Koneen nimi on liian lyhyt. Your hostname is too long. - Isäntänimesi on liian pitkä. + Koneen nimi on liian pitkä. '%1' is not allowed as hostname. - '%1' ei ole sallittu koneen nimenä. + Koneen nimessä '%1' ei ole sallittu. @@ -847,42 +877,42 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Salasanasi eivät täsmää! - + Setup Failed Asennus epäonnistui - + Installation Failed Asentaminen epäonnistui - + The setup of %1 did not complete successfully. Määrityksen %1 asennus ei onnistunut. - + The installation of %1 did not complete successfully. Asennus %1 ei onnistunut. - + Setup Complete Asennus valmis - + Installation Complete Asennus valmis - + The setup of %1 is complete. Asennus %1 on valmis. - + The installation of %1 is complete. Asennus %1 on valmis. @@ -915,7 +945,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Partition &Type: - Osion &Tyyppi: + Osion &tyyppi: @@ -930,7 +960,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. Fi&le System: - Tie&dosto järjestelmä: + Tiedostojärjeste&lmä: @@ -1479,72 +1509,72 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. GeneralRequirements - + has at least %1 GiB available drive space vähintään %1 GiB vapaata levytilaa - + There is not enough drive space. At least %1 GiB is required. Levytilaa ei ole riittävästi. Vähintään %1 GiB tarvitaan. - + has at least %1 GiB working memory vähintään %1 GiB työmuistia - + The system does not have enough working memory. At least %1 GiB is required. Järjestelmässä ei ole tarpeeksi työmuistia. Vähintään %1 GiB vaaditaan. - + is plugged in to a power source on yhdistetty virtalähteeseen - + The system is not plugged in to a power source. Järjestelmä ei ole kytketty virtalähteeseen. - + is connected to the Internet on yhdistetty internetiin - + The system is not connected to the Internet. Järjestelmä ei ole yhteydessä internetiin. - + is running the installer as an administrator (root) ajaa asennusohjelmaa järjestelmänvalvojana (root) - + The setup program is not running with administrator rights. Asennus -ohjelma ei ole käynnissä järjestelmänvalvojan oikeuksin. - + The installer is not running with administrator rights. Asennus -ohjelma ei ole käynnissä järjestelmänvalvojan oikeuksin. - + has a screen large enough to show the whole installer näytöllä on riittävän suuri tarkkuus asentajalle - + The screen is too small to display the setup program. Näyttö on liian pieni, jotta asennus -ohjelma voidaan näyttää. - + The screen is too small to display the installer. Näyttö on liian pieni asentajan näyttämiseksi. @@ -1612,7 +1642,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Asenna KDE konsole ja yritä uudelleen! - + Executing script: &nbsp;<code>%1</code> Suoritetaan skripti: &nbsp;<code>%1</code> @@ -1884,98 +1914,97 @@ hiiren vieritystä skaalaamiseen. NetInstallViewStep - - + Package selection Paketin valinta - + Office software Office-ohjelmisto - + Office package Office-paketti - + Browser software Selainohjelmisto - + Browser package Selainpaketti - + Web browser Nettiselain - + Kernel Kernel - + Services Palvelut - + Login Kirjaudu - + Desktop Työpöytä - + Applications Sovellukset - + Communication Viestintä - + Development Ohjelmistokehitys - + Office Toimisto - + Multimedia Multimedia - + Internet Internetti - + Theming Teema - + Gaming Pelit - + Utilities Apuohjelmat @@ -3710,12 +3739,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Jos useampi kuin yksi henkilö käyttää tätä tietokonetta, voit luoda useita tilejä asennuksen jälkeen.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Jos useampi kuin yksi henkilö käyttää tätä tietokonetta, voit luoda useita tilejä asennuksen jälkeen.</small> @@ -3723,7 +3752,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä. UsersQmlViewStep - + Users Käyttäjät @@ -4143,102 +4172,102 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Mikä on nimesi? - + Your Full Name Koko nimesi - + What name do you want to use to log in? Mitä nimeä haluat käyttää sisäänkirjautumisessa? - + Login Name Kirjautumisnimi - + If more than one person will use this computer, you can create multiple accounts after installation. Jos tätä tietokonetta käyttää useampi kuin yksi henkilö, voit luoda useita tilejä asennuksen jälkeen. - + What is the name of this computer? Mikä on tämän tietokoneen nimi? - + Computer Name Tietokoneen nimi - + This name will be used if you make the computer visible to others on a network. Tätä nimeä käytetään, jos teet tietokoneen näkyväksi verkon muille käyttäjille. - + Choose a password to keep your account safe. Valitse salasana pitääksesi tilisi turvallisena. - + Password Salasana - + Repeat Password Toista salasana - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoittamisvirheiden varalta. Hyvä salasana sisältää sekoituksen kirjaimia, numeroita ja välimerkkejä. Vähintään kahdeksan merkkiä pitkä ja se on vaihdettava säännöllisin väliajoin. - + Validate passwords quality Tarkista salasanojen laatu - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Kun tämä valintaruutu on valittu, salasanan vahvuus tarkistetaan, etkä voi käyttää heikkoa salasanaa. - + Log in automatically without asking for the password Kirjaudu automaattisesti ilman salasanaa - + Reuse user password as root password Käytä käyttäjän salasanaa myös root-salasanana - + Use the same password for the administrator account. Käytä pääkäyttäjän tilillä samaa salasanaa. - + Choose a root password to keep your account safe. Valitse root-salasana, jotta tilisi pysyy turvassa. - + Root Password Root salasana - + Repeat Root Password Toista Root salasana - + Enter the same password twice, so that it can be checked for typing errors. Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoitusvirheiden varalta. diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index c65d36f7bd..5b44eb61fd 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Outils + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Recharger la feuille de style - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Arbre de Widget - + Debug information Informations de dépannage @@ -286,13 +306,13 @@ - + &Yes &Oui - + &No &Non @@ -302,17 +322,17 @@ &Fermer - + Install Log Paste URL URL de copie du journal d'installation - + The upload was unsuccessful. No web-paste was done. L'envoi a échoué. La copie sur le web n'a pas été effectuée. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed L'initialisation de Calamares a échoué - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 n'a pas pu être installé. Calamares n'a pas pu charger tous les modules configurés. C'est un problème avec la façon dont Calamares est utilisé par la distribution. - + <br/>The following modules could not be loaded: Les modules suivants n'ont pas pu être chargés : - + Continue with setup? Poursuivre la configuration ? - + Continue with installation? Continuer avec l'installation ? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Le programme de configuration de %1 est sur le point de procéder aux changements sur le disque afin de configurer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> L'installateur %1 est sur le point de procéder aux changements sur le disque afin d'installer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.<strong> - + &Set up now &Configurer maintenant - + &Install now &Installer maintenant - + Go &back &Retour - + &Set up &Configurer - + &Install &Installer - + Setup is complete. Close the setup program. La configuration est terminée. Fermer le programme de configuration. - + The installation is complete. Close the installer. L'installation est terminée. Fermer l'installateur. - + Cancel setup without changing the system. Annuler la configuration sans toucher au système. - + Cancel installation without changing the system. Annuler l'installation sans modifier votre système. - + &Next &Suivant - + &Back &Précédent - + &Done &Terminé - + &Cancel &Annuler - + Cancel setup? Annuler la configuration ? - + Cancel installation? Abandonner l'installation ? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Voulez-vous vraiment abandonner le processus de configuration ? Le programme de configuration se fermera et les changements seront perdus. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Voulez-vous vraiment abandonner le processus d'installation ? @@ -471,12 +491,12 @@ L'installateur se fermera et les changements seront perdus. CalamaresWindow - + %1 Setup Program Programme de configuration de %1 - + %1 Installer Installateur %1 @@ -484,7 +504,7 @@ L'installateur se fermera et les changements seront perdus. CheckerContainer - + Gathering system information... Récupération des informations système... @@ -732,22 +752,32 @@ L'installateur se fermera et les changements seront perdus. Les nombres et les dates seront réglés sur %1. - + Network Installation. (Disabled: Incorrect configuration) Installation réseau. (Désactivée : configuration incorrecte) - + Network Installation. (Disabled: Received invalid groups data) Installation par le réseau. (Désactivée : données de groupes reçues invalides) - - Network Installation. (Disabled: internal error) - Installation réseau. (Désactivée : erreur interne) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Sélection des paquets - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Installation par le réseau (Désactivée : impossible de récupérer leslistes de paquets, vérifiez la connexion réseau) @@ -842,42 +872,42 @@ L'installateur se fermera et les changements seront perdus. Vos mots de passe ne correspondent pas ! - + Setup Failed Échec de la configuration - + Installation Failed L'installation a échoué - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Configuration terminée - + Installation Complete Installation terminée - + The setup of %1 is complete. La configuration de %1 est terminée. - + The installation of %1 is complete. L'installation de %1 est terminée. @@ -1474,72 +1504,72 @@ L'installateur se fermera et les changements seront perdus. GeneralRequirements - + has at least %1 GiB available drive space a au moins %1 Gio d'espace disque disponible - + There is not enough drive space. At least %1 GiB is required. Il n'y a pas assez d'espace disque. Au moins %1 Gio sont requis. - + has at least %1 GiB working memory a au moins %1 Gio de mémoire vive - + The system does not have enough working memory. At least %1 GiB is required. Le système n'a pas assez de mémoire vive. Au moins %1 Gio sont requis. - + is plugged in to a power source est relié à une source de courant - + The system is not plugged in to a power source. Le système n'est pas relié à une source de courant. - + is connected to the Internet est connecté à Internet - + The system is not connected to the Internet. Le système n'est pas connecté à Internet. - + is running the installer as an administrator (root) a démarré l'installateur en tant qu'administrateur (root) - + The setup program is not running with administrator rights. Le programme de configuration ne dispose pas des droits administrateur. - + The installer is not running with administrator rights. L'installateur ne dispose pas des droits administrateur. - + has a screen large enough to show the whole installer a un écran assez large pour afficher l'intégralité de l'installateur - + The screen is too small to display the setup program. L'écran est trop petit pour afficher le programme de configuration. - + The screen is too small to display the installer. L'écran est trop petit pour afficher l'installateur. @@ -1607,7 +1637,7 @@ L'installateur se fermera et les changements seront perdus. Veuillez installer KDE Konsole et réessayer! - + Executing script: &nbsp;<code>%1</code> Exécution en cours du script : &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de NetInstallViewStep - - + Package selection Sélection des paquets - + Office software Logiciel de bureau - + Office package Suite bureautique - + Browser software Logiciel de navigation - + Browser package Navigateur Web - + Web browser Navigateur web - + Kernel Noyau - + Services Services - + Login Connexion - + Desktop Bureau - + Applications Applications - + Communication Communication - + Development Développement - + Office Bureautique - + Multimedia Multimédia - + Internet Internet - + Theming Thèmes - + Gaming Jeux - + Utilities Utilitaires @@ -3701,12 +3730,12 @@ Sortie UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après la configuration.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>si plusieurs personnes utilisent cet ordinateur, vous pourrez créer plusieurs comptes après l'installation.</small> @@ -3714,7 +3743,7 @@ Sortie UsersQmlViewStep - + Users Utilisateurs @@ -4098,102 +4127,102 @@ Sortie Quel est votre nom ? - + Your Full Name Nom complet - + What name do you want to use to log in? Quel nom souhaitez-vous utiliser pour la connexion ? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Quel est le nom de votre ordinateur ? - + Computer Name Nom de l'ordinateur - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Veuillez saisir le mot de passe pour sécuriser votre compte. - + Password Mot de passe - + Repeat Password Répéter le mot de passe - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quand cette case est cochée, la vérification de la puissance du mot de passe est activée et vous ne pourrez pas utiliser de mot de passe faible. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Utiliser le même mot de passe pour le compte administrateur. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts index a42fd77131..71f8136f8a 100644 --- a/lang/calamares_fr_CH.ts +++ b/lang/calamares_fr_CH.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts index 7f333adfce..9dbc70b49e 100644 --- a/lang/calamares_fur.ts +++ b/lang/calamares_fur.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Struments + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Torne cjarie sfuei di stîl - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Arbul dai widget - + Debug information Informazions di debug @@ -286,13 +306,13 @@ - + &Yes &Sì - + &No &No @@ -302,17 +322,17 @@ S&iere - + Install Log Paste URL URL de copie dal regjistri di instalazion - + The upload was unsuccessful. No web-paste was done. Il cjariament sù pe rêt al è lât strucj. No je stade fate nissune copie sul web. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Inizializazion di Calamares falide - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. No si pues instalâ %1. Calamares nol è rivât a cjariâ ducj i modui configurâts. Chest probleme achì al è causât de distribuzion e di cemût che al ven doprât Calamares. - + <br/>The following modules could not be loaded: <br/>I modui chi sot no puedin jessi cjariâts: - + Continue with setup? Continuâ cu la configurazion? - + Continue with installation? Continuâ cu la instalazion? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Il program di configurazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No si podarà tornâ indaûr e anulâ chestis modifichis.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Il program di instalazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No tu podarâs tornâ indaûr e anulâ chestis modifichis.</strong> - + &Set up now &Configure cumò - + &Install now &Instale cumò - + Go &back &Torne indaûr - + &Set up &Configure - + &Install &Instale - + Setup is complete. Close the setup program. Configurazion completade. Siere il program di configurazion. - + The installation is complete. Close the installer. La instalazion e je stade completade. Siere il program di instalazion. - + Cancel setup without changing the system. Anule la configurazion cence modificâ il sisteme. - + Cancel installation without changing the system. Anulâ la instalazion cence modificâ il sisteme. - + &Next &Sucessîf - + &Back &Indaûr - + &Done &Fat - + &Cancel &Anule - + Cancel setup? Anulâ la configurazion? - + Cancel installation? Anulâ la instalazion? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Anulâ pardabon il procès di configurazion? Il program di configurazion al jessarà e dutis lis modifichis a laran pierdudis. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Anulâ pardabon il procès di instalazion? @@ -471,12 +491,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< CalamaresWindow - + %1 Setup Program Program di configurazion di %1 - + %1 Installer Program di instalazion di %1 @@ -484,7 +504,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< CheckerContainer - + Gathering system information... Daûr a dâ dongje lis informazions dal sisteme... @@ -732,22 +752,32 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< La localizazion dai numars e des datis e vignarà configurade a %1. - + Network Installation. (Disabled: Incorrect configuration) Instalazion di rêt (Disabilitade: configurazion no valide) - + Network Installation. (Disabled: Received invalid groups data) Instalazion di rêt. (Disabilitade: ricevûts dâts di grups no valits) - - Network Installation. (Disabled: internal error) - Instalazion di rêt. (Disabilitade: erôr interni) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Selezion pachets - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalazion di rêt. (Disabilitade: impussibil recuperâ la liste dai pachets, controlâ la conession di rêt) @@ -842,42 +872,42 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Lis passwords no corispuindin! - + Setup Failed Configurazion falide - + Installation Failed Instalazion falide - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Configurazion completade - + Installation Complete Instalazion completade - + The setup of %1 is complete. La configurazion di %1 e je completade. - + The installation of %1 is complete. La instalazion di %1 e je completade. @@ -1474,72 +1504,72 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< GeneralRequirements - + has at least %1 GiB available drive space al à almancul %1 GiB di spazi disponibil - + There is not enough drive space. At least %1 GiB is required. No si à vonde spazi libar te unitât. Al covente spazi par almancul %1 GiB. - + has at least %1 GiB working memory al à almancul %1 GiB di memorie di lavôr - + The system does not have enough working memory. At least %1 GiB is required. Il sisteme nol à vonde memorie di lavôr. Al covente spazi par almancul %1 GiB. - + is plugged in to a power source al è tacât a une prese di alimentazion - + The system is not plugged in to a power source. Il sisteme nol è tacât a une prese di alimentazion. - + is connected to the Internet al è tacât a internet - + The system is not connected to the Internet. Il sisteme nol è tacât a internet. - + is running the installer as an administrator (root) al sta eseguint il program di instalazion come aministradôr (root) - + The setup program is not running with administrator rights. Il program di configurazion nol è in esecuzion cui permès di aministradôr. - + The installer is not running with administrator rights. Il program di instalazion nol è in esecuzion cui permès di aministradôr. - + has a screen large enough to show the whole installer al à un schermi avonde grant par mostrâ dut il program di instalazion - + The screen is too small to display the setup program. Il schermi al è masse piçul par visualizâ il program di configurazion. - + The screen is too small to display the installer. Il schermi al è masse piçul par visualizâ il program di instalazion. @@ -1607,7 +1637,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< Par plasê instale KDE Konsole e torne prove! - + Executing script: &nbsp;<code>%1</code> Esecuzion script: &nbsp;<code>%1</code> @@ -1879,98 +1909,97 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.< NetInstallViewStep - - + Package selection Selezion pachets - + Office software Software pal ufici - + Office package Pachet pal ufici - + Browser software Software par navigâ - + Browser package Pachet par navigadôr - + Web browser Navigadôr web - + Kernel Kernel - + Services Servizis - + Login Acès - + Desktop Scritori - + Applications Aplicazions - + Communication Comunicazion - + Development Disvilup - + Office Ufici - + Multimedia Multimedia - + Internet Internet - + Theming Personalizazion teme - + Gaming Zûcs - + Utilities Utilitâts @@ -3704,12 +3733,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se chest computer al vignarà doprât di plui di une persone, si pues creâ plui accounts dopo vê completade la configurazion.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se chest computer al vignarà doprât di plui di une persone, si pues creâ plui accounts dopo vê completade la instalazion.</small> @@ -3717,7 +3746,7 @@ Output: UsersQmlViewStep - + Users Utents @@ -4135,102 +4164,102 @@ Output: Ce non âstu? - + Your Full Name Il to non complet - + What name do you want to use to log in? Ce non vûstu doprâ pe autenticazion? - + Login Name Non di acès - + If more than one person will use this computer, you can create multiple accounts after installation. Se chest computer al vignarà doprât di plui personis, tu puedis creâ plui account dopo vê completade la instalazion. - + What is the name of this computer? Ce non aial chest computer? - + Computer Name Non dal computer - + This name will be used if you make the computer visible to others on a network. Si doprarà chest non se tu rindis visibil a altris chest computer suntune rêt. - + Choose a password to keep your account safe. Sielç une password par tignî il to account al sigûr. - + Password Password - + Repeat Password Ripeti password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. Une buine password e contignarà un miscliç di letaris, numars e puntuazions, e sarà lungje almancul vot caratars e si scugnarà cambiâle a intervai regolârs. - + Validate passwords quality Convalidâ la cualitât des passwords - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Cuant che cheste casele e je selezionade, il control su la fuarce de password al ven fat e no si podarà doprâ une password debile. - + Log in automatically without asking for the password Jentre in automatic cence domandâ la password - + Reuse user password as root password Torne dopre la password dal utent pe password di root - + Use the same password for the administrator account. Dopre la stesse password pal account di aministradôr. - + Choose a root password to keep your account safe. Sielç une password di root par tignî il to account al sigûr. - + Root Password Password di root - + Repeat Root Password Ripeti password di root - + Enter the same password twice, so that it can be checked for typing errors. Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts index 3235f7d083..13921e7183 100644 --- a/lang/calamares_gl.ts +++ b/lang/calamares_gl.ts @@ -103,22 +103,42 @@ Interface - - Tools - Ferramentas + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Informe de depuración de erros. @@ -287,13 +307,13 @@ - + &Yes &Si - + &No &Non @@ -303,17 +323,17 @@ &Pechar - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -322,123 +342,123 @@ Link copied to clipboard - + Calamares Initialization Failed Fallou a inicialización do Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. Non é posíbel instalar %1. O calamares non foi quen de cargar todos os módulos configurados. Este é un problema relacionado con como esta distribución utiliza o Calamares. - + <br/>The following modules could not be loaded: <br/> Non foi posíbel cargar os módulos seguintes: - + Continue with setup? Continuar coa posta en marcha? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> O %1 instalador está a piques de realizar cambios no seu disco para instalar %2.<br/><strong>Estes cambios non poderán desfacerse.</strong> - + &Set up now - + &Install now &Instalar agora - + Go &back Ir &atrás - + &Set up - + &Install &Instalar - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Completouse a instalacion. Peche o instalador - + Cancel setup without changing the system. - + Cancel installation without changing the system. Cancelar a instalación sen cambiar o sistema - + &Next &Seguinte - + &Back &Atrás - + &Done &Feito - + &Cancel &Cancelar - + Cancel setup? - + Cancel installation? Cancelar a instalación? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Desexa realmente cancelar o proceso actual de instalación? @@ -471,12 +491,12 @@ O instalador pecharase e perderanse todos os cambios. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalador de %1 @@ -484,7 +504,7 @@ O instalador pecharase e perderanse todos os cambios. CheckerContainer - + Gathering system information... A reunir a información do sistema... @@ -732,22 +752,32 @@ O instalador pecharase e perderanse todos os cambios. A localización de números e datas será establecida a %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalación de rede. (Desactivado: Recibírense datos de grupos incorrectos) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selección de pacotes. + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Installación por rede. (Desactivadas. Non se pudo recupera-la lista de pacotes, comprobe a sua conexión a rede) @@ -842,42 +872,42 @@ O instalador pecharase e perderanse todos os cambios. Os contrasinais non coinciden! - + Setup Failed - + Installation Failed Erro na instalación - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalacion completa - + The setup of %1 is complete. - + The installation of %1 is complete. Completouse a instalación de %1 @@ -1474,72 +1504,72 @@ O instalador pecharase e perderanse todos os cambios. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source está conectado a unha fonte de enerxía - + The system is not plugged in to a power source. O sistema non está conectado a unha fonte de enerxía. - + is connected to the Internet está conectado á Internet - + The system is not connected to the Internet. O sistema non está conectado á Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. O instalador non se está a executar con dereitos de administrador. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. A pantalla é demasiado pequena para mostrar o instalador. @@ -1607,7 +1637,7 @@ O instalador pecharase e perderanse todos os cambios. Instale KDE Konsole e ténteo de novo! - + Executing script: &nbsp;<code>%1</code> Executando o script: &nbsp; <code>%1</code> @@ -1877,98 +1907,97 @@ O instalador pecharase e perderanse todos os cambios. NetInstallViewStep - - + Package selection Selección de pacotes. - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3699,12 +3728,12 @@ Saída: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3712,7 +3741,7 @@ Saída: UsersQmlViewStep - + Users Usuarios @@ -4096,102 +4125,102 @@ Saída: Cal é o seu nome? - + Your Full Name - + What name do you want to use to log in? Cal é o nome que quere usar para entrar? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Cal é o nome deste computador? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Escolla un contrasinal para mante-la sua conta segura. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Empregar o mesmo contrasinal para a conta de administrador. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts index 20b7b62fb2..86e9f956f6 100644 --- a/lang/calamares_gu.ts +++ b/lang/calamares_gu.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 7171eb1d8e..2a2d68f76b 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -19,12 +19,12 @@ This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - מערכת זו הופעלה בתצורת אתחול <strong>EFI</strong>.<br><br> כדי להגדיר הפעלה מתצורת אתחול EFI, על תכנית ההתקנה להתקין מנהל אתחול מערכת, לדוגמה <strong>GRUB</strong> או <strong>systemd-boot</strong> על <strong>מחיצת מערכת EFI</strong>. פעולה זו היא אוטומטית, אלא אם כן העדפתך היא להגדיר מחיצות באופן ידני, במקרה זה יש לבחור זאת או להגדיר בעצמך. + מערכת זו הופעלה בסביבת אתחול <strong>EFI</strong>.<br><br> להגדרת הפעלה מסביבת אתחול EFI, על אשף ההתקנה להתקין מנהל אתחול מערכת, למשל <strong>GRUB</strong> או <strong>systemd-boot</strong> על <strong>מחיצת מערכת EFI</strong>. פעולה זו היא אוטומטית, אלא אם העדפתך היא להגדיר מחיצות באופן ידני, במקרה זה יש לבחור זאת או להגדיר בעצמך. This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. - מערכת זו הופעלה בתצורת אתחול <strong>BIOS</strong>.<br><br> כדי להגדיר הפעלה מתצורת אתחול BIOS, על תכנית ההתקנה להתקין מנהל אתחול מערכת, לדוגמה <strong>GRUB</strong>, בתחילת המחיצה או על ה־<strong>Master Boot Record</strong> בצמוד להתחלה של טבלת המחיצות (מועדף). פעולה זו היא אוטומטית, אלא אם כן תבחר להגדיר מחיצות באופן ידני, במקרה זה יש להגדיר זאת בעצמך. + מערכת זו הופעלה בסביבת אתחול <strong>BIOS</strong>.<br><br> להגדרת הפעלה מסביבת אתחול BIOS, על אשף ההתקנה להתקין מנהל אתחול מערכת, למשל <strong>GRUB</strong>, בתחילת המחיצה או על ה־<strong>Master Boot Record</strong> בצמוד להתחלה של טבלת המחיצות (מועדף). פעולה זו היא אוטומטית, אלא אם העדפתך היא להגדיר מחיצות באופן ידני, במקרה זה יש להגדיר זאת בעצמך. @@ -102,22 +102,42 @@ מנשק: - - Tools - כלים + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet טעינת גיליון הסגנון מחדש - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree עץ וידג׳טים - + Debug information מידע על ניפוי שגיאות @@ -290,13 +310,13 @@ - + &Yes &כן - + &No &לא @@ -306,17 +326,17 @@ &סגירה - + Install Log Paste URL כתובת הדבקת יומן התקנה - + The upload was unsuccessful. No web-paste was done. ההעלאה לא הצליחה. לא בוצעה הדבקה לאינטרנט. - + Install log posted to %1 @@ -325,128 +345,128 @@ Link copied to clipboard - + Calamares Initialization Failed הפעלת Calamares נכשלה - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. אין אפשרות להתקין את %1. ל־Calamares אין אפשרות לטעון את המודולים המוגדרים. מדובר בתקלה באופן בו ההפצה משתמשת ב־Calamares. - + <br/>The following modules could not be loaded: <br/>לא ניתן לטעון את המודולים הבאים: - + Continue with setup? להמשיך בהתקנה? - + Continue with installation? להמשיך בהתקנה? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> תכנית ההתקנה של %1 עומדת לבצע שינויים בכונן הקשיח שלך לטובת התקנת %2.<br/><strong>לא תהיה לך אפשרות לבטל את השינויים האלה.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - תכנית ההתקנה של %1 עומדת לבצע שינויים בכונן שלך לטובת התקנת %2.<br/><strong>לא תהיה אפשרות לבטל את השינויים הללו.</strong> + אשף התקנת %1 עומד לבצע שינויים בכונן שלך לטובת התקנת %2.<br/><strong>לא תהיה אפשרות לבטל את השינויים הללו.</strong> - + &Set up now להת&קין כעת - + &Install now להת&קין כעת - + Go &back ח&זרה - + &Set up להת&קין - + &Install הת&קנה - + Setup is complete. Close the setup program. ההתקנה הושלמה. נא לסגור את תכנית ההתקנה. - + The installation is complete. Close the installer. תהליך ההתקנה הושלם. נא לסגור את תכנית ההתקנה. - + Cancel setup without changing the system. ביטול ההתקנה ללא שינוי המערכת. - + Cancel installation without changing the system. ביטול התקנה ללא ביצוע שינוי במערכת. - + &Next &קדימה - + &Back &אחורה - + &Done &סיום - + &Cancel &ביטול - + Cancel setup? לבטל את ההתקנה? - + Cancel installation? לבטל את ההתקנה? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. לבטל את תהליך ההתקנה הנוכחי? תכנית ההתקנה תצא וכל השינויים יאבדו. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. האם אכן ברצונך לבטל את תהליך ההתקנה? -תכנית ההתקנה תיסגר וכל השינויים יאבדו. +אשף ההתקנה ייסגר וכל השינויים יאבדו. @@ -475,12 +495,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program תכנית התקנת %1 - + %1 Installer אשף התקנת %1 @@ -488,7 +508,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... נאסף מידע על המערכת… @@ -736,22 +756,32 @@ The installer will quit and all changes will be lost. תבנית של המספרים והתאריכים של המיקום יוגדרו להיות %1. - + Network Installation. (Disabled: Incorrect configuration) התקנת רשת. (מושבתת: תצורה שגויה) - + Network Installation. (Disabled: Received invalid groups data) התקנה מהרשת. (מושבתת: המידע שהתקבל על קבוצות שגוי) - - Network Installation. (Disabled: internal error) - התקנת רשת. (מושבתת: שגיאה פנימית) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + - + + Package selection + בחירת חבילות + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) התקנה מהרשת. (מושבתת: לא ניתן לקבל רשימות של חבילות תכנה, נא לבדוק את החיבור לרשת) @@ -798,7 +828,7 @@ The installer will quit and all changes will be lost. <h1>Welcome to the %1 installer</h1> - <h1>ברוך בואך לתכנית התקנת %1</h1> + <h1>ברוך בואך להתקנת %1</h1> @@ -846,42 +876,42 @@ The installer will quit and all changes will be lost. הסיסמאות לא תואמות! - + Setup Failed ההתקנה נכשלה - + Installation Failed ההתקנה נכשלה - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete ההתקנה הושלמה - + Installation Complete ההתקנה הושלמה - + The setup of %1 is complete. ההתקנה של %1 הושלמה. - + The installation of %1 is complete. ההתקנה של %1 הושלמה. @@ -919,12 +949,12 @@ The installer will quit and all changes will be lost. &Primary - &ראשי + &ראשית E&xtended - מ&ורחב + מ&ורחבת @@ -954,12 +984,12 @@ The installer will quit and all changes will be lost. Logical - לוגי + לוגית Primary - ראשי + ראשית @@ -1171,7 +1201,7 @@ The installer will quit and all changes will be lost. The installer failed to delete partition %1. - כשל של תכנית ההתקנה במחיקת המחיצה %1. + אשף ההתקנה נכשל במחיקת המחיצה %1. @@ -1478,72 +1508,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space יש לפחות %1 GiB פנויים בכונן - + There is not enough drive space. At least %1 GiB is required. נפח האחסון לא מספיק. נדרשים %1 GiB לפחות. - + has at least %1 GiB working memory יש לפחות %1 GiB זיכרון לעבודה - + The system does not have enough working memory. At least %1 GiB is required. כמות הזיכרון הנדרשת לפעולה אינה מספיקה. נדרשים %1 GiB לפחות. - + is plugged in to a power source מחובר לספק חשמל חיצוני - + The system is not plugged in to a power source. המערכת לא מחוברת לספק חשמל חיצוני. - + is connected to the Internet מחובר לאינטרנט - + The system is not connected to the Internet. המערכת לא מחוברת לאינטרנט. - + is running the installer as an administrator (root) ההתקנה מופעלת תחת חשבון מורשה ניהול (root) - + The setup program is not running with administrator rights. תכנית ההתקנה אינה פועלת עם הרשאות ניהול. - + The installer is not running with administrator rights. אשף ההתקנה לא רץ עם הרשאות מנהל. - + has a screen large enough to show the whole installer - יש מסך מספיק גדול כדי להציג את כל תכנית ההתקנה + המסך גדול מספיק להצגת כל אשף ההתקנה - + The screen is too small to display the setup program. המסך קטן מכדי להציג את תכנית ההתקנה. - + The screen is too small to display the installer. גודל המסך קטן מכדי להציג את תכנית ההתקנה. @@ -1611,7 +1641,7 @@ The installer will quit and all changes will be lost. נא להתקין את KDE Konsole ולנסות שוב! - + Executing script: &nbsp;<code>%1</code> הסקריפט מופעל: &nbsp; <code>%1</code> @@ -1875,106 +1905,105 @@ The installer will quit and all changes will be lost. Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. - נא לבחור את המיקום המועדף עליכם על המפה כדי שתכנית ההתקנה תוכל להציע הגדרות מקומיות - ואזור זמן עבורכם. ניתן לכוונן את ההגדרות המוצעות להלן. לחפש במפה על ידי משיכה להזזתה ובכפתורים +/- כדי להתקרב/להתרחק + נא לבחור את המיקום המועדף עליך במפה כדי שאשף ההתקנה יוכל להציע הגדרות מקומיות + ואזור זמן עבורך. ניתן להתאים את ההגדרות המוצעות למטה. ניתן לחפש במפה על ידי משיכה להזזתה ובכפתורים +/- כדי להתקרב/להתרחק או להשתמש בגלילת העכבר לטובת שליטה בתקריב. NetInstallViewStep - - + Package selection בחירת חבילות - + Office software תכנה של כלים משרדיים - + Office package חבילת כלים משרדיים - + Browser software תכנה של דפדפן - + Browser package חבילת דפדפן - + Web browser דפדפן - + Kernel ליבה - + Services שירותים - + Login כניסה - + Desktop שולחן עבודה - + Applications יישומים - + Communication תקשורת - + Development פיתוח - + Office כלי משרד - + Multimedia מולטימדיה - + Internet אינטרנט - + Theming עיצוב - + Gaming משחקים - + Utilities כלים @@ -3208,7 +3237,7 @@ Output: The installer failed to resize partition %1 on disk '%2'. - תהליך ההתקנה נכשל בשינוי גודל המחיצה %1 על כונן '%2'. + אשף ההתקנה נכשל בשינוי גודל המחיצה %1 על כונן '%2'. @@ -3432,7 +3461,7 @@ Output: The installer failed to set flags on partition %1. - תהליך ההתקנה נכשל בעת הצבת סימונים במחיצה %1. + אשף ההתקנה נכשל בהצבת סימונים במחיצה %1. @@ -3726,12 +3755,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>אם מחשב זה מיועד לשימוש לטובת למעלה ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>אם מחשב זה מיועד לשימוש לטובת למעלה ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.</small> @@ -3739,7 +3768,7 @@ Output: UsersQmlViewStep - + Users משתמשים @@ -3906,7 +3935,7 @@ Output: About %1 setup - אודות התקנת %1 + על אודות התקנת %1 @@ -4157,102 +4186,102 @@ Output: מה שמך? - + Your Full Name שמך המלא - + What name do you want to use to log in? איזה שם ברצונך שישמש אותך לכניסה? - + Login Name שם הכניסה - + If more than one person will use this computer, you can create multiple accounts after installation. אם במחשב זה יש יותר ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה. - + What is the name of this computer? מהו השם של המחשב הזה? - + Computer Name שם המחשב - + This name will be used if you make the computer visible to others on a network. השם הזה יהיה בשימוש אם המחשב הזה יהיה גלוי לשאר הרשת. - + Choose a password to keep your account safe. נא לבחור סיסמה להגנה על חשבונך. - + Password סיסמה - + Repeat Password חזרה על הסיסמה - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. יש להקליד את אותה הסיסמה פעמיים כדי שניתן יהיה לבדוק שגיאות הקלדה. סיסמה טובה אמורה להכיל שילוב של אותיות, מספרים וסימני פיסוק, להיות באורך של שמונה תווים לפחות ויש להחליף אותה במרווחי זמן קבועים. - + Validate passwords quality אימות איכות הסיסמאות - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. כשתיבה זו מסומנת, בדיקת אורך סיסמה מתבצעת ולא תהיה לך אפשרות להשתמש בסיסמה חלשה. - + Log in automatically without asking for the password להיכנס אוטומטית מבלי לבקש סיסמה - + Reuse user password as root password להשתמש בסיסמת המשתמש גם בשביל משתמש העל (root) - + Use the same password for the administrator account. להשתמש באותה הסיסמה בשביל חשבון המנהל. - + Choose a root password to keep your account safe. נא לבחור סיסמה למשתמש העל (root) כדי להגן על חשבונך. - + Root Password סיסמה למשתמש העל (root) - + Repeat Root Password נא לחזור על סיסמת משתמש העל - + Enter the same password twice, so that it can be checked for typing errors. נא להקליד את הסיסמה פעמיים כדי לאפשר זיהוי של שגיאות הקלדה. diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index a91072f871..e914157f9d 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + स्वतः माउंट सेटिंग्स हेतु प्रबंधन @@ -102,22 +102,42 @@ अंतरफलक : - - Tools - साधन + + Crashes Calamares, so that Dr. Konqui can look at it. + Dr. Konqui द्वारा जाँच के लिए Calamares की कार्यप्रणाली निरस्त करने हेतु। + + + + Reloads the stylesheet from the branding directory. + ब्रांड डायरेक्टरी से शैली पत्र पुनः लोड करने हेतु। + + + + Uploads the session log to the configured pastebin. + सत्र लॉग फाइल को विन्यस्त पेस्टबिन साइट पर अपलोड करने हेतु। + + + + Send Session Log + सत्र लॉग फाइल भेजें - + Reload Stylesheet शैली पत्रक पुनः लोड करें - + + Displays the tree of widget names in the log (for stylesheet debugging). + (शैली दोषमार्जन हेतु) लॉग फाइल में विजेट नाम प्रदर्शन। + + + Widget Tree विजेट ट्री - + Debug information डीबग संबंधी जानकारी @@ -286,13 +306,13 @@ - + &Yes हाँ (&Y) - + &No नहीं (&N) @@ -302,143 +322,147 @@ बंद करें (&C) - + Install Log Paste URL इंस्टॉल प्रक्रिया की लॉग फ़ाइल पेस्ट करें - + The upload was unsuccessful. No web-paste was done. अपलोड विफल रहा। इंटरनेट पर पेस्ट नहीं हो सका। - + Install log posted to %1 Link copied to clipboard - + यहाँ इंस्टॉल की लॉग फ़ाइल पेस्ट की गई + +%1 + +लिंक को क्लिपबोर्ड पर कॉपी किया गया - + Calamares Initialization Failed Calamares का आरंभीकरण विफल रहा - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 इंस्टॉल नहीं किया जा सका। Calamares सभी विन्यस्त मॉड्यूल लोड करने में विफल रहा। यह आपके लिनक्स वितरण द्वारा Calamares के उपयोग से संबंधित एक समस्या है। - + <br/>The following modules could not be loaded: <br/>निम्नलिखित मॉड्यूल लोड नहीं हो सकें : - + Continue with setup? सेटअप करना जारी रखें? - + Continue with installation? इंस्टॉल प्रक्रिया जारी रखें? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %2 सेटअप करने हेतु %1 सेटअप प्रोग्राम आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %2 इंस्टॉल करने के लिए %1 इंस्टॉलर आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong> - + &Set up now अभी सेटअप करें (&S) - + &Install now अभी इंस्टॉल करें (&I) - + Go &back वापस जाएँ (&b) - + &Set up सेटअप करें (&S) - + &Install इंस्टॉल करें (&I) - + Setup is complete. Close the setup program. सेटअप पूर्ण हुआ। सेटअप प्रोग्राम बंद कर दें। - + The installation is complete. Close the installer. इंस्टॉल पूर्ण हुआ।अब इंस्टॉलर को बंद करें। - + Cancel setup without changing the system. सिस्टम में बदलाव किये बिना सेटअप रद्द करें। - + Cancel installation without changing the system. सिस्टम में बदलाव किये बिना इंस्टॉल रद्द करें। - + &Next आगे (&N) - + &Back वापस (&B) - + &Done हो गया (&D) - + &Cancel रद्द करें (&C) - + Cancel setup? सेटअप रद्द करें? - + Cancel installation? इंस्टॉल रद्द करें? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. क्या आप वाकई वर्तमान सेटअप प्रक्रिया रद्द करना चाहते हैं? सेटअप प्रोग्राम बंद हो जाएगा व सभी बदलाव नष्ट। - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. क्या आप वाकई वर्तमान इंस्टॉल प्रक्रिया रद्द करना चाहते हैं? @@ -471,12 +495,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 सेटअप प्रोग्राम - + %1 Installer %1 इंस्टॉलर @@ -484,7 +508,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... सिस्टम की जानकारी प्राप्त की जा रही है... @@ -732,22 +756,32 @@ The installer will quit and all changes will be lost. संख्या व दिनांक स्थानिकी %1 सेट की जाएगी। - + Network Installation. (Disabled: Incorrect configuration) नेटवर्क इंस्टॉल। (निष्क्रिय : गलत विन्यास) - + Network Installation. (Disabled: Received invalid groups data) नेटवर्क इंस्टॉल (निष्क्रिय है : प्राप्त किया गया समूह डाटा अमान्य है) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) नेटवर्क इंस्टॉल। (निष्क्रिय : आंतरिक त्रुटि) - + + Network Installation. (Disabled: No package list) + नेटवर्क इंस्टॉल। (निष्क्रिय : पैकेज सूची अनुपलब्ध) + + + + Package selection + पैकेज चयन + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) नेटवर्क इंस्टॉल। (निष्क्रिय है : पैकेज सूची प्राप्त करने में असमर्थ, अपना नेटवर्क कनेक्शन जाँचें) @@ -842,42 +876,42 @@ The installer will quit and all changes will be lost. आपके कूटशब्द मेल नहीं खाते! - + Setup Failed - सेटअप विफल रहा + सेटअप विफल - + Installation Failed - इंस्टॉल विफल रहा। + इंस्टॉल विफल - + The setup of %1 did not complete successfully. - + %1 का सेटअप सफलतापूर्वक पूर्ण नहीं हुआ। - + The installation of %1 did not complete successfully. - + %1 का इंस्टॉल सफलतापूर्वक पूर्ण नहीं हुआ। - + Setup Complete - सेटअप पूर्ण हुआ + सेटअप पूर्ण - + Installation Complete - इंस्टॉल पूर्ण हुआ + इंस्टॉल पूर्ण - + The setup of %1 is complete. %1 का सेटअप पूर्ण हुआ। - + The installation of %1 is complete. %1 का इंस्टॉल पूर्ण हुआ। @@ -973,12 +1007,12 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + %3 (%2) पर %4 प्रविष्टि युक्त %1 एमबी का नया विभाजन बनाएँ। Create new %1MiB partition on %3 (%2). - + %3 (%2) पर %1 एमबी का नया विभाजन बनाएँ। @@ -988,12 +1022,12 @@ The installer will quit and all changes will be lost. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + <strong>%3</strong> (%2) पर <em>%4</em> प्रविष्टि युक्त <strong>%1 एमबी</strong> का नया विभाजन बनाएँ। Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + <strong>%3</strong> (%2) पर <strong>%1 एमबी</strong> का नया विभाजन बनाएँ। @@ -1341,7 +1375,7 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <strong>नवीन</strong> सिस्टम विभाजन %2 पर %1 को <em>%3</em> विशेषताओं सहित इंस्टॉल करें। @@ -1351,27 +1385,27 @@ The installer will quit and all changes will be lost. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + <strong>नवीन</strong> %2 विभाजन को माउंट पॉइंट <strong>%1</strong> व <em>%3</em>विशेषताओं सहित सेट करें। Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + <strong>नवीन</strong> %2 विभाजन को माउंट पॉइंट <strong>%1</strong>%3 सहित सेट करें। Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + %3 सिस्टम विभाजन <strong>%1</strong> %2 को <em>%4</em> विशेषताओं सहित इंस्टॉल करें। Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + %3 विभाजन <strong>%1</strong> को माउंट पॉइंट <strong>%2</strong> व <em>%4</em>विशेषताओं सहित सेट करें। Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + %3 विभाजन <strong>%1</strong> माउंट पॉइंट <strong>%2</strong>%4 सहित सेट करें। @@ -1437,7 +1471,7 @@ The installer will quit and all changes will be lost. Finish - समाप्त करें + समाप्त @@ -1445,7 +1479,7 @@ The installer will quit and all changes will be lost. Finish - समाप्त करें + समाप्त @@ -1474,72 +1508,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space कम-से-कम %1 GiB स्पेस ड्राइव पर उपलब्ध हो - + There is not enough drive space. At least %1 GiB is required. ड्राइव में पर्याप्त स्पेस नहीं है। कम-से-कम %1 GiB होना आवश्यक है। - + has at least %1 GiB working memory कम-से-कम %1 GiB मेमोरी उपलब्ध हो - + The system does not have enough working memory. At least %1 GiB is required. सिस्टम में पर्याप्त मेमोरी नहीं है। कम-से-कम %1 GiB होनी आवश्यक है। - + is plugged in to a power source पॉवर के स्रोत से कनेक्ट है - + The system is not plugged in to a power source. सिस्टम पॉवर के स्रोत से कनेक्ट नहीं है। - + is connected to the Internet इंटरनेट से कनेक्ट है - + The system is not connected to the Internet. सिस्टम इंटरनेट से कनेक्ट नहीं है। - + is running the installer as an administrator (root) इंस्टॉलर को प्रबंधक(रुट) के अंतर्गत चला रहा है - + The setup program is not running with administrator rights. सेटअप प्रोग्राम के पास प्रबंधक अधिकार नहीं है। - + The installer is not running with administrator rights. इंस्टॉलर के पास प्रबंधक अधिकार नहीं है। - + has a screen large enough to show the whole installer स्क्रीन का माप इंस्टॉलर को पूर्णतया प्रदर्शित करने में सक्षम हो - + The screen is too small to display the setup program. सेटअप प्रोग्राम प्रदर्शित करने हेतु स्क्रीन काफ़ी छोटी है। - + The screen is too small to display the installer. इंस्टॉलर प्रदर्शित करने हेतु स्क्रीन काफ़ी छोटी है। @@ -1607,7 +1641,7 @@ The installer will quit and all changes will be lost. कृपया केडीई Konsole इंस्टॉल कर, पुनः प्रयास करें। - + Executing script: &nbsp;<code>%1</code> निष्पादित स्क्रिप्ट : &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection पैकेज चयन - + Office software ऑफिस सॉफ्टवेयर - + Office package ऑफिस पैकेज - + Browser software ब्राउज़र सॉफ्टवेयर - + Browser package ब्राउज़र पैकेज - + Web browser वेब ब्राउज़र - + Kernel कर्नेल - + Services सेवाएँ - + Login लॉगिन - + Desktop डेस्कटॉप - + Applications अनुप्रयोग - + Communication संचार - + Development सॉफ्टवेयर विकास - + Office ऑफिस - + Multimedia मल्टीमीडिया - + Internet इंटरनेट - + Theming थीम - + Gaming खेल - + Utilities साधन @@ -2158,7 +2191,7 @@ The installer will quit and all changes will be lost. The password contains fewer than %n digits - कूटशब्द में %n से कम अंक है + कूटशब्द में %n से कम अंक हैं कूटशब्द में %n से कम अंक हैं @@ -3704,12 +3737,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप सेटअप के उपरांत एकाधिक अकाउंट बना सकते हैं।</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं।</small> @@ -3717,7 +3750,7 @@ Output: UsersQmlViewStep - + Users उपयोक्ता @@ -3961,29 +3994,31 @@ Output: Installation Completed - + इंस्टॉल पूर्ण %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + आपके कंप्यूटर पर %1 इंस्टॉल हो चुका है।<br/> + अब आप नए सिस्टम को पुनः आरंभ, या फिर लाइव वातावरण उपयोग करना जारी रख सकते हैं। Close Installer - + इंस्टॉलर बंद करें Restart System - + सिस्टम पुनः आरंभ करें <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>इंस्टॉल प्रक्रिया की पूर्ण लॉग installation.log फाइल के रूप में लाइव उपयोक्ता की होम डायरेक्टरी में उपलब्ध है।<br/> + यह लॉग फाइल लक्षित सिस्टम में %1 पर भी कॉपी की गई है।</p> @@ -4135,102 +4170,102 @@ Output: आपका नाम क्या है? - + Your Full Name आपका पूरा नाम - + What name do you want to use to log in? लॉग इन के लिए आप किस नाम का उपयोग करना चाहते हैं? - + Login Name लॉगिन नाम - + If more than one person will use this computer, you can create multiple accounts after installation. यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं। - + What is the name of this computer? इस कंप्यूटर का नाम ? - + Computer Name कंप्यूटर का नाम - + This name will be used if you make the computer visible to others on a network. यदि आपका कंप्यूटर किसी नेटवर्क पर दृश्यमान होता है, तो यह नाम उपयोग किया जाएगा। - + Choose a password to keep your account safe. अपना अकाउंट सुरक्षित रखने के लिए पासवर्ड चुनें । - + Password कूटशब्द - + Repeat Password कूटशब्द पुनः दर्ज करें - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. एक ही कूटशब्द दो बार दर्ज़ करें, ताकि उसे टाइप त्रुटि हेतु जाँचा जा सके। एक अच्छे कूटशब्द में अक्षर, अंक व विराम चिन्हों का मेल होता है, उसमें कम-से-कम आठ अक्षर होने चाहिए, और उसे नियमित अंतराल पर बदलते रहना चाहिए। - + Validate passwords quality कूटशब्द गुणवत्ता प्रमाणीकरण - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. यह बॉक्स टिक करने के परिणाम स्वरुप कूटशब्द-क्षमता की जाँच होगी व आप कमज़ोर कूटशब्द उपयोग नहीं कर पाएंगे। - + Log in automatically without asking for the password कूटशब्द बिना पूछे ही स्वतः लॉग इन करें - + Reuse user password as root password रुट कूटशब्द हेतु भी उपयोक्ता कूटशब्द उपयोग करें - + Use the same password for the administrator account. प्रबंधक अकाउंट के लिए भी यही कूटशब्द उपयोग करें। - + Choose a root password to keep your account safe. अकाउंट सुरक्षा हेतु रुट कूटशब्द चुनें। - + Root Password रुट कूटशब्द - + Repeat Root Password रुट कूटशब्द पुनः दर्ज करें - + Enter the same password twice, so that it can be checked for typing errors. समान कूटशब्द दो बार दर्ज करें, ताकि टाइपिंग त्रुटि हेतु जाँच की जा सकें। diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts index 845d382ed8..955a5d3d9b 100644 --- a/lang/calamares_hr.ts +++ b/lang/calamares_hr.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Upravljajte postavkama automatskog montiranja @@ -102,22 +102,42 @@ Sučelje: - - Tools - Alati + + Crashes Calamares, so that Dr. Konqui can look at it. + Ruši Calamares, tako da ga dr. Konqui može pogledati. + + + + Reloads the stylesheet from the branding directory. + Ponovno učitava tablicu stilova iz branding direktorija + + + + Uploads the session log to the configured pastebin. + Učitaj zapisnik sesije u konfigurirani pastebin. + + + + Send Session Log + Učitaj zapisnik sesije - + Reload Stylesheet Ponovno učitaj stilsku tablicu - + + Displays the tree of widget names in the log (for stylesheet debugging). + Prikazuje stablo imena dodataka u zapisniku (za otklanjanje pogrešaka u tablici stilova). + + + Widget Tree Stablo widgeta - + Debug information Debug informacija @@ -288,13 +308,13 @@ - + &Yes &Da - + &No &Ne @@ -304,143 +324,147 @@ &Zatvori - + Install Log Paste URL URL za objavu dnevnika instaliranja - + The upload was unsuccessful. No web-paste was done. Objava dnevnika instaliranja na web nije uspjela. - + Install log posted to %1 Link copied to clipboard - + Instaliraj zapisnik objavljen na + +%1 + +Veza je kopirana u međuspremnik - + Calamares Initialization Failed Inicijalizacija Calamares-a nije uspjela - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 se ne može se instalirati. Calamares nije mogao učitati sve konfigurirane module. Ovo je problem s načinom na koji se Calamares koristi u distribuciji. - + <br/>The following modules could not be loaded: <br/>Sljedeći moduli se nisu mogli učitati: - + Continue with setup? Nastaviti s postavljanjem? - + Continue with installation? Nastaviti sa instalacijom? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Instalacijski program %1 će izvršiti promjene na vašem disku kako bi postavio %2. <br/><strong>Ne možete poništiti te promjene.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 instalacijski program će napraviti promjene na disku kako bi instalirao %2.<br/><strong>Nećete moći vratiti te promjene.</strong> - + &Set up now &Postaviti odmah - + &Install now &Instaliraj sada - + Go &back Idi &natrag - + &Set up &Postaviti - + &Install &Instaliraj - + Setup is complete. Close the setup program. Instalacija je završena. Zatvorite instalacijski program. - + The installation is complete. Close the installer. Instalacija je završena. Zatvorite instalacijski program. - + Cancel setup without changing the system. Odustanite od instalacije bez promjena na sustavu. - + Cancel installation without changing the system. Odustanite od instalacije bez promjena na sustavu. - + &Next &Sljedeće - + &Back &Natrag - + &Done &Gotovo - + &Cancel &Odustani - + Cancel setup? Prekinuti instalaciju? - + Cancel installation? Prekinuti instalaciju? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Stvarno želite prekinuti instalacijski proces? Instalacijski program će izaći i sve promjene će biti izgubljene. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Stvarno želite prekinuti instalacijski proces? @@ -473,12 +497,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program %1 instalacijski program - + %1 Installer %1 Instalacijski program @@ -486,7 +510,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. CheckerContainer - + Gathering system information... Skupljanje informacija o sustavu... @@ -734,22 +758,32 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Regionalne postavke brojeva i datuma će se postaviti na %1. - + Network Installation. (Disabled: Incorrect configuration) Mrežna instalacija. (Onemogućeno: Neispravna konfiguracija) - + Network Installation. (Disabled: Received invalid groups data) Mrežna instalacija. (Onemogućeno: Primanje nevažećih podataka o grupama) - - Network Installation. (Disabled: internal error) - Mrežna instalacija. (Onemogućeno: unutarnja pogreška) + + Network Installation. (Disabled: Internal error) + Mrežna instalacija. (Onemogućeno: Interna pogreška) - + + Network Installation. (Disabled: No package list) + Mrežna instalacija. (Onemogućeno: nedostaje lista paketa) + + + + Package selection + Odabir paketa + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Mrežna instalacija. (Onemogućeno: Ne mogu dohvatiti listu paketa, provjerite da li ste spojeni na mrežu) @@ -844,42 +878,42 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Lozinke se ne podudaraju! - + Setup Failed Instalacija nije uspjela - + Installation Failed Instalacija nije uspjela - + The setup of %1 did not complete successfully. - + Postavljanje %1 nije uspješno završilo. - + The installation of %1 did not complete successfully. - + Instalacija %1 nije uspješno završila. - + Setup Complete Instalacija je završena - + Installation Complete Instalacija je završena - + The setup of %1 is complete. Instalacija %1 je završena. - + The installation of %1 is complete. Instalacija %1 je završena. @@ -975,12 +1009,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Create new %1MiB partition on %3 (%2) with entries %4. - + Stvori novu %1MiB particiju na %3 (%2) s unosima %4. Create new %1MiB partition on %3 (%2). - + Stvori novu %1MiB particiju na %3 (%2). @@ -990,12 +1024,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Stvori novu <strong>%1MiB</strong> particiju na <strong>%3</strong> (%2) sa unosima <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Stvori novu <strong>%1MiB</strong> particiju na <strong>%3</strong> (%2). @@ -1343,7 +1377,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Instaliraj %1 na <strong>novu</strong> %2 sistemsku particiju sa značajkama <em>%3</em> @@ -1353,27 +1387,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Postavi <strong>novu</strong> %2 particiju s točkom montiranja <strong>%1</strong> i značajkama <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Postavi <strong>novu</strong> %2 particiju s točkom montiranja <strong>%1</strong> %3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Instaliraj %2 na %3 sistemsku particiju <strong>%1</strong> sa značajkama <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Postavi %3 particiju <strong>%1</strong> s točkom montiranja <strong>%2</strong> i značajkama <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Postavi %3 particiju <strong>%1</strong> s točkom montiranja <strong>%2</strong> %4. @@ -1476,72 +1510,72 @@ Instalacijski program će izaći i sve promjene će biti izgubljene. GeneralRequirements - + has at least %1 GiB available drive space ima barem %1 GB dostupne slobodne memorije na disku - + There is not enough drive space. At least %1 GiB is required. Nema dovoljno prostora na disku. Potrebno je najmanje %1 GB. - + has at least %1 GiB working memory ima barem %1 GB radne memorije - + The system does not have enough working memory. At least %1 GiB is required. Ovaj sustav nema dovoljno radne memorije. Potrebno je najmanje %1 GB. - + is plugged in to a power source je spojeno na izvor struje - + The system is not plugged in to a power source. Ovaj sustav nije spojen na izvor struje. - + is connected to the Internet je spojeno na Internet - + The system is not connected to the Internet. Ovaj sustav nije spojen na internet. - + is running the installer as an administrator (root) pokreće instalacijski program kao administrator (root) - + The setup program is not running with administrator rights. Instalacijski program nije pokrenut sa administratorskim dozvolama. - + The installer is not running with administrator rights. Instalacijski program nije pokrenut sa administratorskim dozvolama. - + has a screen large enough to show the whole installer ima zaslon dovoljno velik da može prikazati cijeli instalacijski program - + The screen is too small to display the setup program. Zaslon je premalen za prikaz instalacijskog programa. - + The screen is too small to display the installer. Zaslon je premalen za prikaz instalacijskog programa. @@ -1609,7 +1643,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Molimo vas da instalirate KDE terminal i pokušajte ponovno! - + Executing script: &nbsp;<code>%1</code> Izvršavam skriptu: &nbsp;<code>%1</code> @@ -1881,98 +1915,97 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje. NetInstallViewStep - - + Package selection Odabir paketa - + Office software Uredski softver - + Office package Uredski paket - + Browser software Preglednici - + Browser package Paket preglednika - + Web browser Web preglednik - + Kernel Kernel - + Services Servisi - + Login Prijava - + Desktop Radna površina - + Applications Aplikacije - + Communication Komunikacija - + Development Razvoj - + Office Ured - + Multimedia Multimedija - + Internet Internet - + Theming Izgled - + Gaming Igranje - + Utilities Alati @@ -3715,12 +3748,12 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Ako će više osoba koristiti ovo računalo, možete postaviti više korisničkih računa poslije instalacije.</small> @@ -3728,7 +3761,7 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene UsersQmlViewStep - + Users Korisnici @@ -3972,29 +4005,31 @@ Liberating Software. Installation Completed - + Instalacija je završila %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 je instaliran na vaše računalo.<br/> + Možete ponovno pokrenuti vaš novi sustav ili nastaviti koristiti trenutno okruženje. Close Installer - + Zatvori instalacijski program Restart System - + Ponovno pokretanje sustava <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Potpuni zapisnik instalacije dostupan je kao installation.log u home direktoriju Live korisnika.<br/> + Ovaj se zapisnik kopira u /var/log/installation.log ciljnog sustava.</p> @@ -4145,102 +4180,102 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str Koje je tvoje ime? - + Your Full Name Vaše puno ime - + What name do you want to use to log in? Koje ime želite koristiti za prijavu? - + Login Name Korisničko ime - + If more than one person will use this computer, you can create multiple accounts after installation. Ako će više korisnika koristiti ovo računalo, nakon instalacije možete otvoriti više računa. - + What is the name of this computer? Koje je ime ovog računala? - + Computer Name Ime računala - + This name will be used if you make the computer visible to others on a network. Ovo će se ime upotrebljavati ako računalo učinite vidljivim drugima na mreži. - + Choose a password to keep your account safe. Odaberite lozinku da bi račun bio siguran. - + Password Lozinka - + Repeat Password Ponovite lozinku - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Dvaput unesite istu lozinku kako biste je mogli provjeriti ima li pogrešaka u tipkanju. Dobra lozinka sadržavat će mješavinu slova, brojeva i interpunkcije, treba imati najmanje osam znakova i treba je mijenjati u redovitim intervalima. - + Validate passwords quality Provjerite kvalitetu lozinki - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Kad je ovaj okvir potvrđen, bit će napravljena provjera jakosti lozinke te nećete moći koristiti slabu lozinku. - + Log in automatically without asking for the password Automatska prijava bez traženja lozinke - + Reuse user password as root password Upotrijebite lozinku korisnika kao root lozinku - + Use the same password for the administrator account. Koristi istu lozinku za administratorski račun. - + Choose a root password to keep your account safe. Odaberite root lozinku da biste zaštitili svoj račun. - + Root Password Root lozinka - + Repeat Root Password Ponovite root lozinku - + Enter the same password twice, so that it can be checked for typing errors. Dvaput unesite istu lozinku kako biste mogli provjeriti ima li pogrešaka u tipkanju. diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts index 0b2e9dab22..e758560e0c 100644 --- a/lang/calamares_hu.ts +++ b/lang/calamares_hu.ts @@ -102,22 +102,42 @@ Interfész: - - Tools - Eszközök + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Stílusok újratöltése - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Modul- fa - + Debug information Hibakeresési információk @@ -286,13 +306,13 @@ - + &Yes &Igen - + &No &Nem @@ -302,17 +322,17 @@ &Bezár - + Install Log Paste URL Telepítési napló beillesztési URL-je. - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed A Calamares előkészítése meghiúsult - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. A(z) %1 nem telepíthető. A Calamares nem tudta betölteni a konfigurált modulokat. Ez a probléma abból fakad, ahogy a disztribúció a Calamarest használja. - + <br/>The following modules could not be loaded: <br/>A következő modulok nem tölthetőek be: - + Continue with setup? Folytatod a telepítéssel? - + Continue with installation? Folytatja a telepítést? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> A %1 telepítő változtatásokat fog végrehajtani a lemezen a %2 telepítéséhez. <br/><strong>Ezután már nem tudja visszavonni a változtatásokat.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> A %1 telepítő változtatásokat fog elvégezni, hogy telepítse a következőt: %2.<br/><strong>A változtatások visszavonhatatlanok lesznek.</strong> - + &Set up now &Telepítés most - + &Install now &Telepítés most - + Go &back Menj &vissza - + &Set up &Telepítés - + &Install &Telepítés - + Setup is complete. Close the setup program. Telepítés sikerült. Zárja be a telepítőt. - + The installation is complete. Close the installer. A telepítés befejeződött, Bezárhatod a telepítőt. - + Cancel setup without changing the system. Telepítés megszakítása a rendszer módosítása nélkül. - + Cancel installation without changing the system. Kilépés a telepítőből a rendszer megváltoztatása nélkül. - + &Next &Következő - + &Back &Vissza - + &Done &Befejez - + &Cancel &Mégse - + Cancel setup? Megszakítja a telepítést? - + Cancel installation? Abbahagyod a telepítést? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Valóban megszakítod a telepítési eljárást? A telepítő ki fog lépni és minden változtatás elveszik. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Biztos abba szeretnéd hagyni a telepítést? @@ -471,12 +491,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CalamaresWindow - + %1 Setup Program %1 Program telepítése - + %1 Installer %1 Telepítő @@ -484,7 +504,7 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. CheckerContainer - + Gathering system information... Rendszerinformációk gyűjtése... @@ -732,22 +752,32 @@ Minden változtatás elveszik, ha kilépsz a telepítőből. A számok és dátumok területi beállítása %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Hálózati Telepítés. (Letiltva: Hibás adat csoportok fogadva) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Csomag választása + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Hálózati telepítés. (Kikapcsolva: A csomagokat nem lehet letölteni, ellenőrizd a hálózati kapcsolatot) @@ -843,42 +873,42 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>A két jelszó nem egyezik! - + Setup Failed Telepítési hiba - + Installation Failed Telepítés nem sikerült - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Telepítés Sikerült - + Installation Complete A telepítés befejeződött. - + The setup of %1 is complete. A telepítésből %1 van kész. - + The installation of %1 is complete. A %1 telepítése elkészült. @@ -1475,72 +1505,72 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> GeneralRequirements - + has at least %1 GiB available drive space legalább %1 GiB lemezterület elérhető - + There is not enough drive space. At least %1 GiB is required. Nincs elég lemezterület. Legalább %1 GiB szükséges. - + has at least %1 GiB working memory legalább %1 GiB memória elérhető - + The system does not have enough working memory. At least %1 GiB is required. A rendszer nem tartalmaz elég memóriát. Legalább %1 GiB szükséges. - + is plugged in to a power source csatlakoztatva van külső áramforráshoz - + The system is not plugged in to a power source. A rendszer nincs csatlakoztatva külső áramforráshoz - + is connected to the Internet csatlakozik az internethez - + The system is not connected to the Internet. A rendszer nem csatlakozik az internethez. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. A telepítő program nem adminisztrátori joggal fut. - + The installer is not running with administrator rights. A telepítő nem adminisztrátori jogokkal fut. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. A képernyő mérete túl kicsi a telepítő program megjelenítéséhez. - + The screen is too small to display the installer. A képernyőméret túl kicsi a telepítő megjelenítéséhez. @@ -1608,7 +1638,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Kérlek telepítsd a KDE Konsole-t és próbáld újra! - + Executing script: &nbsp;<code>%1</code> Script végrehajása: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a> NetInstallViewStep - - + Package selection Csomag választása - + Office software - + Office package - + Browser software - + Browser package - + Web browser Böngésző - + Kernel Kernel - + Services Szolgáltatások - + Login Bejelentkezés - + Desktop Asztal - + Applications Alkalmazások - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3702,12 +3731,12 @@ Calamares hiba %1. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Ha egynél több személy használja a számítógépet akkor létrehozhat több felhasználói fiókot telepítés után.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Ha egynél több személy használja a számítógépet akkor létrehozhat több felhasználói fiókot telepítés után.</small> @@ -3715,7 +3744,7 @@ Calamares hiba %1. UsersQmlViewStep - + Users Felhasználók @@ -4099,102 +4128,102 @@ Calamares hiba %1. Mi a neved? - + Your Full Name - + What name do you want to use to log in? Milyen felhasználónévvel szeretnél bejelentkezni? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Mi legyen a számítógép neve? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Adj meg jelszót a felhasználói fiókod védelmére. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Ugyanaz a jelszó használata az adminisztrátor felhasználóhoz. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index 160ba1b68b..04e1036942 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -102,22 +102,42 @@ Antarmuka: - - Tools - Alat + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Muat ulang Lembar gaya - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Informasi debug @@ -284,13 +304,13 @@ - + &Yes &Ya - + &No &Tidak @@ -300,17 +320,17 @@ &Tutup - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + Calamares Initialization Failed Inisialisasi Calamares Gagal - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 tidak dapat terinstal. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi. - + <br/>The following modules could not be loaded: <br/>Modul berikut tidak dapat dimuat. - + Continue with setup? Lanjutkan dengan setelan ini? - + Continue with installation? Lanjutkan instalasi? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Installer %1 akan membuat perubahan ke disk Anda untuk memasang %2.<br/><strong>Anda tidak dapat membatalkan perubahan tersebut.</strong> - + &Set up now - + &Install now &Instal sekarang - + Go &back &Kembali - + &Set up - + &Install &Instal - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalasi sudah lengkap. Tutup installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Batalkan instalasi tanpa mengubah sistem yang ada. - + &Next &Berikutnya - + &Back &Kembali - + &Done &Kelar - + &Cancel &Batal - + Cancel setup? - + Cancel installation? Batalkan instalasi? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Apakah Anda benar-benar ingin membatalkan proses instalasi ini? @@ -468,12 +488,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang. CalamaresWindow - + %1 Setup Program - + %1 Installer Installer %1 @@ -481,7 +501,7 @@ Instalasi akan ditutup dan semua perubahan akan hilang. CheckerContainer - + Gathering system information... Mengumpulkan informasi sistem... @@ -729,22 +749,32 @@ Instalasi akan ditutup dan semua perubahan akan hilang. Nomor dan tanggal lokal akan disetel ke %1. - + Network Installation. (Disabled: Incorrect configuration) Pemasangan jaringan. (Dimatikan: Konfigurasi yang tidak sesuai) - + Network Installation. (Disabled: Received invalid groups data) Instalasi jaringan. (Menonaktifkan: Penerimaan kelompok data yang tidak sah) - - Network Installation. (Disabled: internal error) - Pemasangan jaringan. (Dimatikan: kesalahan internal) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Pemilihan paket - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalasi Jaringan. (Dinonfungsikan: Tak mampu menarik daftar paket, periksa sambungan jaringanmu) @@ -840,42 +870,42 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Sandi Anda tidak sama! - + Setup Failed Pengaturan Gagal - + Installation Failed Instalasi Gagal - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalasi Lengkap - + The setup of %1 is complete. - + The installation of %1 is complete. Instalasi %1 telah lengkap. @@ -1472,72 +1502,72 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source terhubung dengan sumber listrik - + The system is not plugged in to a power source. Sistem tidak terhubung dengan sumber listrik. - + is connected to the Internet terkoneksi dengan internet - + The system is not connected to the Internet. Sistem tidak terkoneksi dengan internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Installer tidak dijalankan dengan kewenangan administrator. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Layar terlalu kecil untuk menampilkan installer. @@ -1605,7 +1635,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Silahkan instal KDE Konsole dan ulangi lagi! - + Executing script: &nbsp;<code>%1</code> Mengeksekusi skrip: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. NetInstallViewStep - - + Package selection Pemilihan paket - + Office software Perangkat lunak perkantoran - + Office package Paket perkantoran - + Browser software Peramban perangkat lunak - + Browser package Peramban paket - + Web browser Peramban web - + Kernel Inti - + Services Jasa - + Login Masuk - + Desktop Desktop - + Applications Aplikasi - + Communication Komunikasi - + Development Pengembangan - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3690,12 +3719,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3703,7 +3732,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. UsersQmlViewStep - + Users Pengguna @@ -4098,102 +4127,102 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Siapa nama Anda? - + Your Full Name - + What name do you want to use to log in? Nama apa yang ingin Anda gunakan untuk log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Apakah nama dari komputer ini? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Pilih sebuah kata sandi untuk menjaga keamanan akun Anda. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Gunakan sandi yang sama untuk akun administrator. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_id_ID.ts b/lang/calamares_id_ID.ts index 7f10fa7d05..2eae5886f3 100644 --- a/lang/calamares_id_ID.ts +++ b/lang/calamares_id_ID.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -467,12 +487,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -480,7 +500,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -728,22 +748,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -838,42 +868,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1470,72 +1500,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1603,7 +1633,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1873,98 +1903,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3683,12 +3712,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3696,7 +3725,7 @@ Output: UsersQmlViewStep - + Users @@ -4080,102 +4109,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts index 873af5d969..3b5e219475 100644 --- a/lang/calamares_ie.ts +++ b/lang/calamares_ie.ts @@ -102,22 +102,42 @@ - - Tools - Utensiles + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + - + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes &Yes - + &No &No @@ -302,17 +322,17 @@ C&luder - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? Continuar li configuration? - + Continue with installation? Continuar li installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now &Configurar nu - + &Install now &Installar nu - + Go &back Ear &retro - + &Set up &Configurar - + &Install &Installar - + Setup is complete. Close the setup program. Configuration es completat. Ples cluder li configurator. - + The installation is complete. Close the installer. Installation es completat. Ples cluder li installator. - + Cancel setup without changing the system. Anullar li configuration sin modificationes del sistema. - + Cancel installation without changing the system. Anullar li installation sin modificationes del sistema. - + &Next &Sequent - + &Back &Retro - + &Done &Finir - + &Cancel A&nullar - + Cancel setup? Anullar li configuration? - + Cancel installation? Anullar li installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Configiration de %1 - + %1 Installer Installator de %1 @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selection de paccages + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed Configuration ne successat - + Installation Failed Installation ne successat - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Configuration es completat - + Installation Complete Installation es completat - + The setup of %1 is complete. Li configuration de %1 es completat. - + The installation of %1 is complete. Li installation de %1 es completat. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Selection de paccages - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel Nucleo - + Services Servicios - + Login - + Desktop - + Applications Applicationes - + Communication Communication - + Development - + Office Officie - + Multimedia - + Internet - + Theming Temas - + Gaming Ludes - + Utilities Utensiles @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users Usatores @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts index a7c0f8d929..ccee0ec0cf 100644 --- a/lang/calamares_is.ts +++ b/lang/calamares_is.ts @@ -102,22 +102,42 @@ Viðmót: - - Tools - Verkfæri + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Endurhlaða stílblað - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Greinar viðmótshluta - + Debug information Villuleitarupplýsingar @@ -286,13 +306,13 @@ - + &Yes &Já - + &No &Nei @@ -302,17 +322,17 @@ &Loka - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares uppsetning mistókst - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? Halda áfram með uppsetningu? - + Continue with installation? Halda áfram með uppsetningu? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 uppsetningarforritið er um það bil að gera breytingar á diskinum til að setja upp %2.<br/><strong>Þú munt ekki geta afturkallað þessar breytingar.</strong> - + &Set up now &Setja upp núna - + &Install now Setja &inn núna - + Go &back Fara til &baka - + &Set up &Setja upp - + &Install &Setja upp - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Uppsetning er lokið. Lokaðu uppsetningarforritinu. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Hætta við uppsetningu ánþess að breyta kerfinu. - + &Next &Næst - + &Back &Til baka - + &Done &Búið - + &Cancel &Hætta við - + Cancel setup? Hætta við uppsetningu? - + Cancel installation? Hætta við uppsetningu? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Viltu virkilega að hætta við núverandi uppsetningarferli? @@ -470,12 +490,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 uppsetningarforrit @@ -483,7 +503,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. CheckerContainer - + Gathering system information... Söfnun kerfis upplýsingar... @@ -731,22 +751,32 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Valdir pakkar + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. Lykilorð passa ekki! - + Setup Failed Uppsetning mistókst - + Installation Failed Uppsetning mistókst - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Uppsetningu lokið - + Installation Complete Uppsetningu lokið - + The setup of %1 is complete. Uppsetningu á %1 er lokið. - + The installation of %1 is complete. Uppsetningu á %1 er lokið. @@ -1473,72 +1503,72 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source er í sambandi við aflgjafa - + The system is not plugged in to a power source. Kerfið er ekki í sambandi við aflgjafa. - + is connected to the Internet er tengd við Internetið - + The system is not connected to the Internet. Kerfið er ekki tengd við internetið. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Uppsetningarforritið er ekki keyrandi með kerfisstjóraheimildum. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Skjárinn er of lítill til að birta uppsetningarforritið. @@ -1606,7 +1636,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. - + Executing script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Uppsetningarforritið mun hætta og allar breytingar tapast. NetInstallViewStep - - + Package selection Valdir pakkar - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3695,12 +3724,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3708,7 +3737,7 @@ Output: UsersQmlViewStep - + Users Notendur @@ -4092,102 +4121,102 @@ Output: Hvað heitir þú? - + Your Full Name - + What name do you want to use to log in? Hvaða nafn vilt þú vilt nota til að skrá þig inn? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Hvað er nafnið á þessari tölvu? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Veldu lykilorð til að halda reikningnum þínum öruggum. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Nota sama lykilorð fyrir kerfisstjóra reikning. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts index 0a8fe85d03..8df85420ab 100644 --- a/lang/calamares_it_IT.ts +++ b/lang/calamares_it_IT.ts @@ -102,22 +102,42 @@ Interfaccia: - - Tools - Strumenti + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Ricarica il foglio di stile - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Albero dei Widget - + Debug information Informazioni di debug @@ -286,13 +306,13 @@ - + &Yes &Si - + &No &No @@ -302,17 +322,17 @@ &Chiudi - + Install Log Paste URL URL di copia del log d'installazione - + The upload was unsuccessful. No web-paste was done. Il caricamento è fallito. Non è stata fatta la copia sul web. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed Inizializzazione di Calamares fallita - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 non può essere installato. Calamares non ha potuto caricare tutti i moduli configurati. Questo è un problema del modo in cui Calamares viene utilizzato dalla distribuzione. - + <br/>The following modules could not be loaded: <br/>I seguenti moduli non possono essere caricati: - + Continue with setup? Procedere con la configurazione? - + Continue with installation? Continuare l'installazione? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Il programma d'installazione %1 sta per modificare il disco di per installare %2. Non sarà possibile annullare queste modifiche. - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Il programma d'installazione %1 sta per eseguire delle modifiche al tuo disco per poter installare %2.<br/><strong> Non sarà possibile annullare tali modifiche.</strong> - + &Set up now &Installa adesso - + &Install now &Installa adesso - + Go &back &Indietro - + &Set up &Installazione - + &Install &Installa - + Setup is complete. Close the setup program. Installazione completata. Chiudere il programma d'installazione. - + The installation is complete. Close the installer. L'installazione è terminata. Chiudere il programma d'installazione. - + Cancel setup without changing the system. Annulla l'installazione senza modificare il sistema. - + Cancel installation without changing the system. Annullare l'installazione senza modificare il sistema. - + &Next &Avanti - + &Back &Indietro - + &Done &Fatto - + &Cancel &Annulla - + Cancel setup? Annullare l'installazione? - + Cancel installation? Annullare l'installazione? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Si vuole annullare veramente il processo di installazione? Il programma d'installazione verrà terminato e tutti i cambiamenti saranno persi. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Si vuole davvero annullare l'installazione in corso? @@ -470,12 +490,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CalamaresWindow - + %1 Setup Program %1 Programma d'installazione - + %1 Installer %1 Programma di installazione @@ -483,7 +503,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse CheckerContainer - + Gathering system information... Raccolta delle informazioni di sistema... @@ -731,22 +751,32 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse I numeri e le date locali saranno impostati a %1. - + Network Installation. (Disabled: Incorrect configuration) Installazione di rete. (Disabilitato: Configurazione non valida) - + Network Installation. (Disabled: Received invalid groups data) Installazione di rete. (Disabilitata: Ricevuti dati dei gruppi non validi) - - Network Installation. (Disabled: internal error) - Installazione di rete (disabilitata: errore interno) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Selezione del pacchetto - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Installazione di rete. (Disabilitata: impossibile recuperare le liste dei pacchetti, controllare la connessione di rete) @@ -841,42 +871,42 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Le password non corrispondono! - + Setup Failed Installazione fallita - + Installation Failed Installazione non riuscita - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Installazione completata - + Installation Complete Installazione completata - + The setup of %1 is complete. L'installazione di %1 è completa - + The installation of %1 is complete. L'installazione di %1 è completata. @@ -1473,72 +1503,72 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse GeneralRequirements - + has at least %1 GiB available drive space ha almeno %1 GiB di spazio disponibile - + There is not enough drive space. At least %1 GiB is required. Non c'è abbastanza spazio sul disco. E' richiesto almeno %1 GiB - + has at least %1 GiB working memory ha almeno %1 GiB di memoria - + The system does not have enough working memory. At least %1 GiB is required. Il sistema non ha abbastanza memoria. E' richiesto almeno %1 GiB - + is plugged in to a power source è collegato a una presa di alimentazione - + The system is not plugged in to a power source. Il sistema non è collegato a una presa di alimentazione. - + is connected to the Internet è connesso a Internet - + The system is not connected to the Internet. Il sistema non è connesso a internet. - + is running the installer as an administrator (root) sta eseguendo il programma di installazione come amministratore (root) - + The setup program is not running with administrator rights. Il programma di installazione non è stato lanciato con i permessi di amministratore. - + The installer is not running with administrator rights. Il programma di installazione non è stato avviato con i diritti di amministrazione. - + has a screen large enough to show the whole installer ha uno schermo abbastanza grande da mostrare l'intero programma di installazione - + The screen is too small to display the setup program. Lo schermo è troppo piccolo per mostrare il programma di installazione - + The screen is too small to display the installer. Schermo troppo piccolo per mostrare il programma d'installazione. @@ -1606,7 +1636,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse Si prega di installare KDE Konsole e riprovare! - + Executing script: &nbsp;<code>%1</code> Esecuzione script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse NetInstallViewStep - - + Package selection Selezione del pacchetto - + Office software Software per ufficio - + Office package Pacchetto per ufficio - + Browser software Software navigazione web - + Browser package Pacchetto navigazione web - + Web browser Browser web - + Kernel Kernel - + Services Servizi - + Login Accesso - + Desktop Ambiente desktop - + Applications Applicazioni - + Communication Comunicazione - + Development Sviluppo - + Office Ufficio - + Multimedia Multimedia - + Internet Internet - + Theming Personalizzazione tema - + Gaming Giochi - + Utilities Utilità @@ -3698,12 +3727,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se più di una persona utilizzerà questo computer, puoi creare ulteriori account dopo la configurazione.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se più di una persona utilizzerà questo computer, puoi creare ulteriori account dopo l'installazione.</small> @@ -3711,7 +3740,7 @@ Output: UsersQmlViewStep - + Users Utenti @@ -4116,102 +4145,102 @@ Output: Qual è il tuo nome? - + Your Full Name Nome Completo - + What name do you want to use to log in? Quale nome usare per l'autenticazione? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Qual è il nome di questo computer? - + Computer Name Nome Computer - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Scegliere una password per rendere sicuro il tuo account. - + Password Password - + Repeat Password Ripetere Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quando questa casella è selezionata, la robustezza della password viene verificata e non sarà possibile utilizzare password deboli. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Usare la stessa password per l'account amministratore. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 2666b1df5a..a0fb111d9d 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + 自動マウント設定を管理する @@ -19,12 +19,12 @@ This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - このシステムは<strong>EFI</strong> ブート環境で起動しました。<br><br>EFI環境からの起動について設定するためには、<strong>EFI システムパーティション</strong>に <strong>GRUB</strong> あるいは <strong>systemd-boot</strong> といったブートローダーアプリケーションを配置しなければなりません。手動によるパーティショニングを選択する場合、EFI システムパーティションを選択あるいは作成しなければなりません。そうでない場合は、この操作は自動的に行われます。 + このシステムは<strong>EFI</strong> ブート環境で起動しました。<br><br>EFI環境からの起動を設定するには、<strong>EFI システムパーティション</strong>に <strong>GRUB</strong> や <strong>systemd-boot</strong> などのブートローダーアプリケーションを配置する必要があります。手動パーティショニングを選択しなければ、これは自動的に行われます。手動パーティショニングを選択する場合は、選択するか、自分で作成する必要があります。 This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. - このシステムは <strong>BIOS</strong> ブート環境で起動しました。<br><br> BIOS環境からの起動について設定するためには、パーティションの開始位置あるいはパーティションテーブルの開始位置の近く (推奨) にある<strong>マスターブートレコード</strong>に <strong>GRUB</strong> のようなブートローダーをインストールしなければなりません。手動によるパーティショニングを選択する場合はユーザー自身で設定しなければなりません。そうでない場合は、この操作は自動的に行われます。 + このシステムは <strong>BIOS</strong> ブート環境で起動されました。<br><br>BIOS 環境からの起動を設定するため、このインストーラーはパーティションの先頭またはパーティションテーブルの先頭近くの<strong>マスターブートレコード</strong>に、<strong>GRUB</strong> などのブートローダーをインストールする必要があります（推奨）。手動パーティションニングを選択しない限り、これは自動的に行われます。手動パーティションニングを選択した場合は、自分で設定する必要があります。 @@ -102,22 +102,42 @@ インターフェース: - - Tools - ツール + + Crashes Calamares, so that Dr. Konqui can look at it. + Calamares をクラッシュさせ、Dr. Konqui で見られるようにする。 - + + Reloads the stylesheet from the branding directory. + ブランディングディレクトリからスタイルシートをリロードする。 + + + + Uploads the session log to the configured pastebin. + 設定されたペーストビンにセッションログをアップロードする。 + + + + Send Session Log + セッションログを送信 + + + Reload Stylesheet スタイルシートを再読み込む - + + Displays the tree of widget names in the log (for stylesheet debugging). + ログにウィジェット名のツリーを表示する（スタイルシートのデバッグ用）。 + + + Widget Tree ウィジェットツリー - + Debug information デバッグ情報 @@ -197,7 +217,7 @@ Working directory %1 for python job %2 is not readable. - python ジョブ %2 において作業ディレクトリ %1 が読み込めません。 + python ジョブ %2 の作業ディレクトリ %1 が読み取れません。 @@ -284,13 +304,13 @@ - + &Yes はい (&Y) - + &No いいえ (&N) @@ -300,143 +320,147 @@ 閉じる (&C) - + Install Log Paste URL インストールログを貼り付けるURL - + The upload was unsuccessful. No web-paste was done. アップロードは失敗しました。 ウェブへの貼り付けは行われませんでした。 - + Install log posted to %1 Link copied to clipboard - + インストールログをこちらに送信しました + +%1 + +クリップボードにリンクをコピーしました - + Calamares Initialization Failed Calamares によるインストールに失敗しました。 - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 をインストールできません。Calamares はすべてのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。 - + <br/>The following modules could not be loaded: <br/>以下のモジュールがロードできませんでした。: - + Continue with setup? セットアップを続行しますか？ - + Continue with installation? インストールを続行しますか？ - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 のセットアッププログラムは %2 のセットアップのためディスクの内容を変更します。<br/><strong>これらの変更は取り消しできません。</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 インストーラーは %2 をインストールするためディスクの内容を変更しようとしています。<br/><strong>これらの変更は取り消せません。</strong> - + &Set up now セットアップしています (&S) - + &Install now 今すぐインストール (&I) - + Go &back 戻る (&B) - + &Set up セットアップ （&S） - + &Install インストール (&I) - + Setup is complete. Close the setup program. セットアップが完了しました。プログラムを閉じます。 - + The installation is complete. Close the installer. インストールが完了しました。インストーラーを閉じます。 - + Cancel setup without changing the system. システムを変更することなくセットアップを中断します。 - + Cancel installation without changing the system. システムを変更しないでインストールを中止します。 - + &Next 次へ (&N) - + &Back 戻る (&B) - + &Done 実行 (&D) - + &Cancel 中止 (&C) - + Cancel setup? セットアップを中止しますか？ - + Cancel installation? インストールを中止しますか？ - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. 本当に現在のセットアップのプロセスを中止しますか？ すべての変更が取り消されます。 - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. 本当に現在の作業を中止しますか？ @@ -469,12 +493,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 セットアッププログラム - + %1 Installer %1 インストーラー @@ -482,7 +506,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... システム情報を取得しています... @@ -515,7 +539,7 @@ The installer will quit and all changes will be lost. <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - <strong>手動パーティション</strong><br/>パーティションの作成、あるいはサイズ変更を行うことができます。 + <strong>手動パーティション</strong><br/>パーティションを自分で作成またはサイズ変更することができます。 @@ -530,7 +554,7 @@ The installer will quit and all changes will be lost. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - %1 は %2MiB に縮小され新たに %4 に %3MiB のパーティションが作成されます。 + %1 は %2MiB に縮小され、%4 に新しい %3MiB のパーティションが作成されます。 @@ -647,7 +671,7 @@ The installer will quit and all changes will be lost. Clear mounts for partitioning operations on %1 - %1 のパーティション操作のため、マウントを解除 + %1 のパーティション操作のため、マウントを解除する @@ -657,7 +681,7 @@ The installer will quit and all changes will be lost. Cleared all mounts for %1 - %1 のすべてのマウントを解除 + %1 のすべてのマウントを解除しました @@ -665,7 +689,7 @@ The installer will quit and all changes will be lost. Clear all temporary mounts. - すべての一時的なマウントをクリア + すべての一時的なマウントをクリアする @@ -730,22 +754,32 @@ The installer will quit and all changes will be lost. 数値と日付のロケールを %1 に設定します。 - + Network Installation. (Disabled: Incorrect configuration) ネットワークインストール。(無効: 不正な設定) - + Network Installation. (Disabled: Received invalid groups data) ネットワークインストール (不可: 無効なグループデータを受け取りました) - - Network Installation. (Disabled: internal error) - ネットワークインストール。（無効: 内部エラー） + + Network Installation. (Disabled: Internal error) + ネットワークインストール（無効: 内部エラー） + + + + Network Installation. (Disabled: No package list) + ネットワークインストール（無効: パッケージリストなし） - + + Package selection + パッケージの選択 + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) ネットワークインストール。(無効: パッケージリストを取得できません。ネットワーク接続を確認してください。) @@ -840,43 +874,43 @@ The installer will quit and all changes will be lost. パスワードが一致していません！ - + Setup Failed セットアップに失敗しました。 - + Installation Failed インストールに失敗 - + The setup of %1 did not complete successfully. - + %1 のセットアップは正常に完了しませんでした。 - + The installation of %1 did not complete successfully. - + %1 のインストールは正常に完了しませんでした。 - + Setup Complete セットアップが完了しました - + Installation Complete インストールが完了 - + The setup of %1 is complete. %1 のセットアップが完了しました。 - + The installation of %1 is complete. %1 のインストールは完了です。 @@ -972,43 +1006,43 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2) with entries %4. - + %3 (%2) にエントリ %4 の新しい %1MiB パーティションを作成する。 Create new %1MiB partition on %3 (%2). - + %3 (%2) に新しい %1MiB パーティションを作成する。 Create new %2MiB partition on %4 (%3) with file system %1. - %4 (%3) に新たにファイルシステム %1 の %2MiB のパーティションが作成されます。 + %4 (%3) にファイルシステム %1 の新しい %2MiB パーティションを作成する。 Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + <strong>%3</strong> (%2) にエントリ <em>%4</em> の新しい <strong>%1MiB</strong> パーティションを作成する。 Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + <strong>%3</strong> (%2) に新しい <strong>%1MiB</strong> パーティションを作成する。 Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - Create new <strong>%4</strong> (%3) に新たにファイルシステム<strong>%1</strong>の <strong>%2MiB</strong> のパーティションが作成されます。 + <strong>%4</strong> (%3) にファイルシステム <strong>%1</strong> の新しい <strong>%2MiB</strong> パーティションを作成する。 Creating new %1 partition on %2. - %2 に新しく %1 パーティションを作成しています。 + %2 に新しい %1 パーティションを作成しています。 The installer failed to create partition on disk '%1'. - インストーラーはディスク '%1' にパーティションを作成することに失敗しました。 + インストーラーはディスク '%1' にパーティションを作成できませんでした。 @@ -1021,7 +1055,7 @@ The installer will quit and all changes will be lost. Creating a new partition table will delete all existing data on the disk. - パーティションテーブルを作成することによって、ディスク上のデータがすべて削除されます。 + 新しいパーティションテーブルを作成すると、ディスク上の既存のデータがすべて削除されます。 @@ -1044,22 +1078,22 @@ The installer will quit and all changes will be lost. Create new %1 partition table on %2. - %2 に新しく %1 パーティションテーブルを作成 + %2 に新しい %1 パーティションテーブルを作成する。 Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). - <strong>%2</strong> (%3) に新しく <strong>%1</strong> パーティションテーブルを作成 + <strong>%2</strong> (%3) に新しい <strong>%1</strong> パーティションテーブルを作成する。 Creating new %1 partition table on %2. - %2 に新しく %1 パーティションテーブルを作成しています。 + %2 に新しい %1 パーティションテーブルを作成しています。 The installer failed to create a partition table on %1. - インストーラーは%1 へのパーティションテーブルの作成に失敗しました。 + インストーラーは %1 のパーティションテーブル作成に失敗しました。 @@ -1072,7 +1106,7 @@ The installer will quit and all changes will be lost. Create user <strong>%1</strong>. - ユーザー <strong>%1</strong> を作成。 + ユーザー <strong>%1</strong> を作成する。 @@ -1109,22 +1143,22 @@ The installer will quit and all changes will be lost. Create new volume group named %1. - 新しいボリュームグループ %1 を作成。 + 新しいボリュームグループ %1 を作成する。 Create new volume group named <strong>%1</strong>. - 新しいボリュームグループ <strong>%1</strong> を作成。 + 新しいボリュームグループ <strong>%1</strong> を作成する。 Creating new volume group named %1. - 新しいボリュームグループ %1 を作成。 + 新しいボリュームグループ %1 を作成しています。 The installer failed to create a volume group named '%1'. - インストーラーは新しいボリュームグループ '%1' の作成に失敗しました。 + インストーラーはボリュームグループ名 '%1' の作成に失敗しました。 @@ -1179,12 +1213,12 @@ The installer will quit and all changes will be lost. This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem. - このデバイスは<strong>ループ</strong> デバイスです。<br><br> ブロックデバイスとしてふるまうファイルを作成する、パーティションテーブルを持たない仮想デバイスです。このセットアップの種類は通常単一のファイルシステムで構成されます。 + このデバイスは<strong>ループ</strong> デバイスです。<br><br> ブロックデバイスとしてアクセスできるファイルを作成する、パーティションテーブルを持たない仮想デバイスです。この種のセットアップは通常、単一のファイルシステムで構成されます。 This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page. - インストーラが、選択したストレージデバイス上の<strong>パーティションテーブルを検出することができません。</strong><br><br>デバイスにはパーティションテーブルが存在しないか、パーティションテーブルが未知のタイプまたは破損しています。<br>このインストーラーでは、自動であるいは、パーティションページによって手動で、新しいパーティションテーブルを作成することができます。 + インストーラーが、選択したストレージデバイス上の<strong>パーティションテーブルを検出できません。</strong><br><br>デバイスのパーティションテーブルが存在しないか、破損しているか、タイプが不明です。<br>このインストーラーは、自動的に、または手動パーティショニングページを介して、新しいパーティションテーブルを作成できます。 @@ -1340,37 +1374,37 @@ The installer will quit and all changes will be lost. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <em>%3</em> 機能の<strong>新しい</strong> %2 システムパーティションに、%1 をインストールする Install %1 on <strong>new</strong> %2 system partition. - <strong>新しい</strong> %2 システムパーティションに %1 をインストール。 + <strong>新しい</strong> %2 システムパーティションに %1 をインストールする。 Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + マウントポイント <strong>%1</strong> に、<em>%3</em> 機能の<strong>新しい</strong> %2 パーティションをセットアップする。 Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + マウントポイント <strong>%1</strong> %3 に<strong>新しい</strong> %2 パーティションをセットアップする。 Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + <em>%4</em> 機能の %3 システムパーティション <strong>%1</strong> に %2 をインストールする。 Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + マウントポイント <strong>%2</strong> に、<em>%4</em> 機能の %3 パーティション <strong>%1</strong> をセットアップする。 Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + マウントポイント <strong>%2</strong> %4 に、%3 パーティション <strong>%1</strong> をセットアップする。 @@ -1473,74 +1507,74 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space 利用可能な容量が少なくとも %1 GiB - + There is not enough drive space. At least %1 GiB is required. 空き容量が十分ではありません。少なくとも %1 GiB 必要です。 - + has at least %1 GiB working memory %1 GiB以降のメモリーがあります - + The system does not have enough working memory. At least %1 GiB is required. 十分なメモリがありません。少なくとも %1 GiB 必要です。 - + is plugged in to a power source 電源が接続されていること - + The system is not plugged in to a power source. システムに電源が接続されていません。 - + is connected to the Internet インターネットに接続されていること - + The system is not connected to the Internet. システムはインターネットに接続されていません。 - + is running the installer as an administrator (root) は管理者（root）としてインストーラーを実行しています - + The setup program is not running with administrator rights. セットアッププログラムは管理者権限で実行されていません。 - + The installer is not running with administrator rights. インストーラーは管理者権限で実行されていません。 - + has a screen large enough to show the whole installer にはインストーラー全体を表示できる大きさの画面があります - + The screen is too small to display the setup program. - セットアップを表示のは画面が小さすぎます。 + 画面が小さすぎてセットアッププログラムを表示できません。 - + The screen is too small to display the installer. - インストーラーを表示するためには、画面が小さすぎます。 + 画面が小さすぎてインストーラーを表示できません。 @@ -1548,7 +1582,7 @@ The installer will quit and all changes will be lost. Collecting information about your machine. - マシンの情報を収集しています。 + お使いのマシンの情報を収集しています。 @@ -1564,17 +1598,17 @@ The installer will quit and all changes will be lost. Could not create directories <code>%1</code>. - <code>%1</code>のフォルダを作成されませんでした。 + ディレクトリ <code>%1</code> を作成できませんでした。 Could not open file <code>%1</code>. - <code>%1</code>のファイルを開くられませんでした。 + ファイル <code>%1</code> を開けませんでした。 Could not write to file <code>%1</code>. - ファイル <code>%1</code>に書き込めません。 + ファイル <code>%1</code> に書き込めませんでした。 @@ -1582,7 +1616,7 @@ The installer will quit and all changes will be lost. Creating initramfs with mkinitcpio. - mkinitcpioとinitramfsを作成しています。 + mkinitcpio と initramfs を作成しています。 @@ -1606,7 +1640,7 @@ The installer will quit and all changes will be lost. KDE Konsole をインストールして再度試してください！ - + Executing script: &nbsp;<code>%1</code> スクリプトの実行: &nbsp;<code>%1</code> @@ -1822,7 +1856,7 @@ The installer will quit and all changes will be lost. Encrypted rootfs setup error - 暗号化したrootfsセットアップエラー + 暗号化された rootfs のセットアップエラー @@ -1879,98 +1913,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection パッケージの選択 - + Office software オフィスソフトウェア - + Office package オフィスパッケージ - + Browser software ブラウザソフトウェア - + Browser package ブラウザパッケージ - + Web browser ウェブブラウザ - + Kernel カーネル - + Services サービス - + Login ログイン - + Desktop デスクトップ - + Applications アプリケーション - + Communication コミュニケーション - + Development 開発 - + Office オフィス - + Multimedia マルチメディア - + Internet インターネット - + Theming テーマ - + Gaming ゲーム - + Utilities ユーティリティー @@ -2232,7 +2265,7 @@ The installer will quit and all changes will be lost. Password generation failed - required entropy too low for settings - パスワード生成に失敗 - 設定のためのエントロピーが低すぎます + パスワードの生成に失敗しました - 設定に必要なエントロピーが低すぎます @@ -2633,7 +2666,7 @@ The installer will quit and all changes will be lost. The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. - %1 上のパーティションテーブルには既にプライマリパーティション %2 が配置されており、追加することができません。プライマリパーティションを消去して代わりに拡張パーティションを追加してください。 + %1 のパーティションテーブルにはすでに %2 個のプライマリパーティションがあり、これ以上追加できません。代わりに1つのプライマリパーティションを削除し、拡張パーティションを追加してください。 @@ -2661,12 +2694,12 @@ The installer will quit and all changes will be lost. <strong>Replace</strong> a partition with %1. - パーティションを %1 に<strong>置き換える。</strong> + パーティションを %1 に<strong>置き換える</strong>。 <strong>Manual</strong> partitioning. - <strong>手動</strong>でパーティションを設定する。 + <strong>手動</strong>パーティショニング。 @@ -2681,7 +2714,7 @@ The installer will quit and all changes will be lost. <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - ディスク <strong>%2</strong> (%3) 上のパーティションを %1 に<strong>置き換える。</strong> + ディスク <strong>%2</strong> (%3) のパーティションを %1 に<strong>置き換える</strong>。 @@ -2711,12 +2744,12 @@ The installer will quit and all changes will be lost. An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - %1 を起動するには、EFIシステムパーティションが必要です。<br/> <br/> EFIシステムパーティションを設定するには、戻って、<strong>%3</strong> フラグを有効にしたFAT32ファイルシステムを選択または作成し、マウントポイントを <strong>%2</strong> にします。<br/> <br/>EFIシステムパーティションを設定せずに続行すると、システムが起動しない場合があります。 + %1 を起動するには EFI システムパーティションが必要です。<br/> <br/>EFI システムパーティションを設定するには、戻って、<strong>%3</strong> フラグを有効にした FAT32 ファイルシステムを選択または作成し、マウントポイントを <strong>%2</strong> にします。<br/><br/>EFI システムパーティションを設定せずに続行すると、システムが起動しない場合があります。 An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - ％1 を起動するには、EFIシステムパーティションが必要です。<br/> <br/> パーティションはマウントポイント <strong>%2</strong> に設定されましたが、<strong>%3</strong> フラグが設定されていません。フラグを設定するには、戻ってパーティションを編集してください。フラグを設定せずに続行すると、システムが起動しない場合があります。 + %1 を起動するには EFI システムパーティションが必要です。<br/><br/>パーティションはマウントポイント <strong>%2</strong> に設定されましたが、<strong>%3</strong> フラグが設定されていません。フラグを設定するには、戻ってパーティションを編集してください。フラグを設定せずに続行すると、システムが起動しない場合があります。 @@ -2726,12 +2759,12 @@ The installer will quit and all changes will be lost. Option to use GPT on BIOS - BIOSでGPTを使用するためのオプション + BIOS で GPT を使用するためのオプション A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - GPTパーティションテーブルは、すべてのシステムに最適なオプションです。このインストーラーは、BIOSシステムのこのようなセットアップもサポートしています。<br/><br/>BIOSでGPTパーティションテーブルを設定するには（まだ行っていない場合）、前に戻ってパーティションテーブルをGPTに設定し、<strong>bios_grub</strong>フラグを有効にして 8 MB の未フォーマットのパーティションを作成します。GPTに設定したBIOSシステムで %1 を起動するには、未フォーマットの 8 MB パーティションが必要です。 + GPT パーティションテーブルは、すべてのシステムに最適なオプションです。このインストーラーは、BIOS システムのこのようなセットアップもサポートしています。<br/><br/>BIOS で GPT パーティションテーブルを設定するには（まだ行っていない場合）、前に戻ってパーティションテーブルを GPT に設定し、<strong>bios_grub</strong> フラグを有効にして 8 MB の未フォーマットのパーティションを作成します。GPT に設定した BIOS システムで %1 を起動するには、未フォーマットの 8 MB パーティションが必要です。 @@ -2741,12 +2774,12 @@ The installer will quit and all changes will be lost. A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されるおそれがあります。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong> (暗号化) を選択してください。 + ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されます。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong> (暗号化) を選択してください。 has at least one disk device available. - 少なくとも1枚のディスクは使用可能。 + は少なくとも1つのディスクデバイスを利用可能です。 @@ -2783,7 +2816,7 @@ The installer will quit and all changes will be lost. Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. - KDE Plasma デスクトップの外観を選んでください。この作業はスキップでき、インストール後に外観を設定することができます。外観を選択し、クリックすることにより外観のプレビューが表示されます。 + KDE Plasma デスクトップの外観を選んでください。この作業をスキップして、インストール後に外観を設定することもできます。外観の選択をクリックすると、外観のプレビューが表示されます。 @@ -2804,7 +2837,7 @@ The installer will quit and all changes will be lost. No files configured to save for later. - 保存するための設定ファイルがありません。 + 後で保存するよう設定されたファイルがありません。 @@ -3103,7 +3136,7 @@ Output: The file-system resize job has an invalid configuration and will not run. - ファイルシステムのサイズ変更ジョブが不当な設定であるため、作動しません。 + ファイルシステムのサイズ変更ジョブの設定が無効です。実行しません。 @@ -3695,20 +3728,20 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - <small>もし複数の人間がこのコンピュータを使用する場合、セットアップの後で複数のアカウントを作成できます。</small> + <small>複数の人がこのコンピューターを使用する場合は、セットアップ後に複数のアカウントを作成できます。</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> - <small>もし複数の人間がこのコンピュータを使用する場合、インストールの後で複数のアカウントを作成できます。</small> + <small>複数の人がこのコンピューターを使用する場合は、インストール後に複数のアカウントを作成できます。</small> UsersQmlViewStep - + Users ユーザー情報 @@ -3952,29 +3985,31 @@ Output: Installation Completed - + インストールが完了しました %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 がコンピューターにインストールされました。<br/> + 再起動して新しいシステムを使用するか、ライブ環境をこのまま使用することができます。 Close Installer - + インストーラーを閉じる Restart System - + システムを再起動 <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>インストールの完全なログは、ライブユーザーのホームディレクトリにある installation.log として入手できます。<br/> + このログは、ターゲットシステムの /var/log/installation.log にコピーされます。</p> @@ -4126,102 +4161,102 @@ Output: あなたの名前は何ですか？ - + Your Full Name あなたのフルネーム - + What name do you want to use to log in? ログイン時に使用する名前は何ですか？ - + Login Name ログイン名 - + If more than one person will use this computer, you can create multiple accounts after installation. 複数のユーザーがこのコンピュータを使用する場合は、インストール後に複数のアカウントを作成できます。 - + What is the name of this computer? このコンピュータの名前は何ですか？ - + Computer Name コンピュータの名前 - + This name will be used if you make the computer visible to others on a network. この名前は、コンピューターをネットワーク上の他のユーザーに表示する場合に使用されます。 - + Choose a password to keep your account safe. アカウントを安全に使うため、パスワードを選択してください - + Password パスワード - + Repeat Password パスワードを再度入力 - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. 同じパスワードを2回入力して、入力エラーをチェックできるようにします。適切なパスワードは文字、数字、句読点が混在する8文字以上のもので、定期的に変更する必要があります。 - + Validate passwords quality パスワードの品質を検証する - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. このボックスをオンにするとパスワードの強度チェックが行われ、弱いパスワードを使用できなくなります。 - + Log in automatically without asking for the password パスワードを要求せずに自動的にログインする - + Reuse user password as root password rootパスワードとしてユーザーパスワードを再利用する - + Use the same password for the administrator account. 管理者アカウントと同じパスワードを使用する。 - + Choose a root password to keep your account safe. アカウントを安全に保つために、rootパスワードを選択してください。 - + Root Password rootパスワード - + Repeat Root Password rootパスワードを再入力 - + Enter the same password twice, so that it can be checked for typing errors. 同じパスワードを2回入力して、入力エラーをチェックできるようにします。 diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts index 57bbdb4af2..ad7fbd0b5e 100644 --- a/lang/calamares_kk.ts +++ b/lang/calamares_kk.ts @@ -102,22 +102,42 @@ - - Tools - Саймандар + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Жөндеу ақпараты @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Алға - + &Back А&ртқа - + &Done - + &Cancel Ба&с тарту - + Cancel setup? - + Cancel installation? Орнатудан бас тарту керек пе? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users Пайдаланушылар @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts index c12caa7157..5a0d5394c3 100644 --- a/lang/calamares_kn.ts +++ b/lang/calamares_kn.ts @@ -102,22 +102,42 @@ - - Tools - ಉಪಕರಣಗಳು + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes ಹೌದು - + &No ಇಲ್ಲ @@ -302,17 +322,17 @@ ಮುಚ್ಚಿರಿ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next ಮುಂದಿನ - + &Back ಹಿಂದಿನ - + &Done - + &Cancel ರದ್ದುಗೊಳಿಸು - + Cancel setup? - + Cancel installation? ಅನುಸ್ಥಾಪನೆಯನ್ನು ರದ್ದುಮಾಡುವುದೇ? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed ಅನುಸ್ಥಾಪನೆ ವಿಫಲವಾಗಿದೆ - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts index 812068eba5..094e4b8d70 100644 --- a/lang/calamares_ko.ts +++ b/lang/calamares_ko.ts @@ -102,22 +102,42 @@ 인터페이스: - - Tools - 도구 + + Crashes Calamares, so that Dr. Konqui can look at it. + Dr. Konqui가 그것을 볼 수 있도록, Calamares를 충돌시킵니다. - + + Reloads the stylesheet from the branding directory. + 브랜딩 디렉터리에서 스타일 시트를 다시 불러옵니다. + + + + Uploads the session log to the configured pastebin. + 세션 로그를 구성된 pastebin에 업로드합니다. + + + + Send Session Log + 세션 로그 보내기 + + + Reload Stylesheet 스타일시트 새로고침 - + + Displays the tree of widget names in the log (for stylesheet debugging). + 로그에 위젯 이름의 트리를 표시합니다 (스타일 시트 디버깅 용). + + + Widget Tree 위젯 트리 - + Debug information 디버그 정보 @@ -284,13 +304,13 @@ - + &Yes 예(&Y) - + &No 아니오(&N) @@ -300,17 +320,17 @@ 닫기(&C) - + Install Log Paste URL 로그 붙여넣기 URL 설치 - + The upload was unsuccessful. No web-paste was done. 업로드에 실패했습니다. 웹 붙여넣기가 수행되지 않았습니다. - + Install log posted to %1 @@ -323,124 +343,124 @@ Link copied to clipboard 링크가 클립보드에 복사되었습니다. - + Calamares Initialization Failed 깔라마레스 초기화 실패 - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 가 설치될 수 없습니다. 깔라마레스가 모든 구성된 모듈을 불러올 수 없었습니다. 이것은 깔라마레스가 배포판에서 사용되는 방식에서 발생한 문제입니다. - + <br/>The following modules could not be loaded: 다음 모듈 불러오기 실패: - + Continue with setup? 설치를 계속하시겠습니까? - + Continue with installation? 설치를 계속하시겠습니까? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 설치 프로그램이 %2을(를) 설정하기 위해 디스크를 변경하려고 하는 중입니다.<br/><strong>이러한 변경은 취소할 수 없습니다.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 설치 관리자가 %2를 설치하기 위해 사용자의 디스크의 내용을 변경하려고 합니다. <br/> <strong>이 변경 작업은 되돌릴 수 없습니다.</strong> - + &Set up now 지금 설치 (&S) - + &Install now 지금 설치 (&I) - + Go &back 뒤로 이동 (&b) - + &Set up 설치 (&S) - + &Install 설치(&I) - + Setup is complete. Close the setup program. 설치가 완료 되었습니다. 설치 프로그램을 닫습니다. - + The installation is complete. Close the installer. 설치가 완료되었습니다. 설치 관리자를 닫습니다. - + Cancel setup without changing the system. 시스템을 변경 하지 않고 설치를 취소합니다. - + Cancel installation without changing the system. 시스템 변경 없이 설치를 취소합니다. - + &Next 다음 (&N) - + &Back 뒤로 (&B) - + &Done 완료 (&D) - + &Cancel 취소 (&C) - + Cancel setup? 설치를 취소 하시겠습니까? - + Cancel installation? 설치를 취소하시겠습니까? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. 현재 설정 프로세스를 취소하시겠습니까? 설치 프로그램이 종료되고 모든 변경 내용이 손실됩니다. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. 정말로 현재 설치 프로세스를 취소하시겠습니까? @@ -473,12 +493,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 설치 프로그램 - + %1 Installer %1 설치 관리자 @@ -486,7 +506,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... 시스템 정보 수집 중... @@ -734,22 +754,32 @@ The installer will quit and all changes will be lost. 숫자와 날짜 로케일이 %1로 설정됩니다. - + Network Installation. (Disabled: Incorrect configuration) 네트워크 설치. (사용안함: 잘못된 환경설정) - + Network Installation. (Disabled: Received invalid groups data) 네트워크 설치. (불가: 유효하지 않은 그룹 데이터를 수신했습니다) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) 네트워크 설치. (사용안함: 내부 오류) - + + Network Installation. (Disabled: No package list) + 네트워크 설치. (사용안함: 패키지 목록 없음) + + + + Package selection + 패키지 선택 + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) 네트워크 설치. (불가: 패키지 목록을 가져올 수 없습니다. 네트워크 연결을 확인해주세요) @@ -844,42 +874,42 @@ The installer will quit and all changes will be lost. 암호가 일치하지 않습니다! - + Setup Failed 설치 실패 - + Installation Failed 설치 실패 - + The setup of %1 did not complete successfully. %1 설정이 제대로 완료되지 않았습니다. - + The installation of %1 did not complete successfully. %1 설치가 제대로 완료되지 않았습니다. - + Setup Complete 설치 완료 - + Installation Complete 설치 완료 - + The setup of %1 is complete. %1 설치가 완료되었습니다. - + The installation of %1 is complete. %1의 설치가 완료되었습니다. @@ -1476,72 +1506,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space %1 GiB 이상의 사용 가능한 드라이브 공간이 있음 - + There is not enough drive space. At least %1 GiB is required. 드라이브 공간이 부족합니다. %1 GiB 이상이 필요합니다. - + has at least %1 GiB working memory %1 GiB 이상의 작동 메모리가 있습니다. - + The system does not have enough working memory. At least %1 GiB is required. 시스템에 충분한 작동 메모리가 없습니다. %1 GiB 이상이 필요합니다. - + is plugged in to a power source 전원 공급이 연결되어 있습니다 - + The system is not plugged in to a power source. 이 시스템은 전원 공급이 연결되어 있지 않습니다 - + is connected to the Internet 인터넷에 연결되어 있습니다 - + The system is not connected to the Internet. 이 시스템은 인터넷에 연결되어 있지 않습니다. - + is running the installer as an administrator (root) 설치 관리자를 관리자(루트)로 실행 중입니다 - + The setup program is not running with administrator rights. 설치 프로그램이 관리자 권한으로 실행되고 있지 않습니다. - + The installer is not running with administrator rights. 설치 관리자가 관리자 권한으로 동작하고 있지 않습니다. - + has a screen large enough to show the whole installer 전체 설치 프로그램을 표시할 수 있을 만큼 큰 화면이 있습니다 - + The screen is too small to display the setup program. 화면이 너무 작아서 설정 프로그램을 표시할 수 없습니다. - + The screen is too small to display the installer. 설치 관리자를 표시하기에는 화면이 너무 작습니다. @@ -1609,7 +1639,7 @@ The installer will quit and all changes will be lost. KDE Konsole을 설치한 후에 다시 시도해주세요! - + Executing script: &nbsp;<code>%1</code> 스크립트 실행: &nbsp;<code>%1</code> @@ -1881,98 +1911,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection 패키지 선택 - + Office software 오피스 소프트웨어 - + Office package 오피스 패키지 - + Browser software 브라우저 소프트웨어 - + Browser package 브라우저 패키지 - + Web browser 웹 브라우저 - + Kernel 커널 - + Services 서비스 - + Login 로그인 - + Desktop 데스크탑 - + Applications 애플리케이션 - + Communication 통신 - + Development 개발 - + Office 오피스 - + Multimedia 멀티미디어 - + Internet 인터넷 - + Theming 테마 - + Gaming 게임 - + Utilities 유틸리티 @@ -3697,12 +3726,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>둘 이상의 사용자가 이 컴퓨터를 사용할 경우, 설정 후 계정을 여러 개 만들 수 있습니다.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>둘 이상의 사용자가 이 컴퓨터를 사용할 경우 설치 후 계정을 여러 개 만들 수 있습니다.</small> @@ -3710,7 +3739,7 @@ Output: UsersQmlViewStep - + Users 사용자 @@ -4130,102 +4159,102 @@ Output: 이름이 무엇인가요? - + Your Full Name 전체 이름 - + What name do you want to use to log in? 로그인할 때 사용할 이름은 무엇인가요? - + Login Name 로그인 이름 - + If more than one person will use this computer, you can create multiple accounts after installation. 다수의 사용자가 이 컴퓨터를 사용하는 경우, 설치를 마친 후에 여러 계정을 만들 수 있습니다. - + What is the name of this computer? 이 컴퓨터의 이름은 무엇인가요? - + Computer Name 컴퓨터 이름 - + This name will be used if you make the computer visible to others on a network. 이 이름은 네트워크의 다른 사용자가 이 컴퓨터를 볼 수 있게 하는 경우에 사용됩니다. - + Choose a password to keep your account safe. 사용자 계정의 보안을 유지하기 위한 암호를 선택하세요. - + Password 비밀번호 - + Repeat Password 비밀번호 반복 - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. 입력 오류를 확인할 수 있도록 동일한 암호를 두 번 입력합니다. 올바른 암호에는 문자, 숫자 및 구두점이 혼합되어 있으며 길이는 8자 이상이어야 하며 정기적으로 변경해야 합니다. - + Validate passwords quality 암호 품질 검증 - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. 이 확인란을 선택하면 비밀번호 강도 검사가 수행되며 불충분한 비밀번호를 사용할 수 없습니다. - + Log in automatically without asking for the password 암호를 묻지 않고 자동으로 로그인합니다 - + Reuse user password as root password 사용자 암호를 루트 암호로 재사용합니다 - + Use the same password for the administrator account. 관리자 계정에 대해 같은 암호를 사용합니다. - + Choose a root password to keep your account safe. 당신의 계정을 안전하게 보호하기 위해서 루트 암호를 선택하세요. - + Root Password 루트 암호 - + Repeat Root Password 루트 암호 확인 - + Enter the same password twice, so that it can be checked for typing errors. 입력 오류를 확인하기 위해서 동일한 암호를 두번 입력해주세요. diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts index 2c6a263c2b..b83daef1a2 100644 --- a/lang/calamares_lo.ts +++ b/lang/calamares_lo.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -467,12 +487,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -480,7 +500,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -728,22 +748,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -838,42 +868,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1470,72 +1500,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1603,7 +1633,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1873,98 +1903,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3683,12 +3712,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3696,7 +3725,7 @@ Output: UsersQmlViewStep - + Users @@ -4080,102 +4109,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index 7e4fec5217..571a7b2894 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -102,22 +102,42 @@ Sąsaja: - - Tools - Įrankiai + + Crashes Calamares, so that Dr. Konqui can look at it. + Užstrigdina Calamares, kad Dr. Konqui galėtų pažiūrėti kas nutiko. - + + Reloads the stylesheet from the branding directory. + Iš naujo įkelia stilių aprašą iš prekių ženklo katalogo. + + + + Uploads the session log to the configured pastebin. + Išsiunčia seanso žurnalą į sukonfigūruotą įdėjimų dėklą. + + + + Send Session Log + Siųsti seanso žurnalą + + + Reload Stylesheet Iš naujo įkelti stilių aprašą - + + Displays the tree of widget names in the log (for stylesheet debugging). + Rodo žurnale valdiklių pavadinimų medį (stilių aprašo derinimui). + + + Widget Tree Valdiklių medis - + Debug information Derinimo informacija @@ -290,13 +310,13 @@ - + &Yes &Taip - + &No &Ne @@ -306,17 +326,17 @@ &Užverti - + Install Log Paste URL Diegimo žurnalo įdėjimo URL - + The upload was unsuccessful. No web-paste was done. Įkėlimas buvo nesėkmingas. Nebuvo atlikta jokio įdėjimo į saityną. - + Install log posted to %1 @@ -329,124 +349,124 @@ Link copied to clipboard Nuoroda nukopijuota į iškarpinę - + Calamares Initialization Failed Calamares inicijavimas nepavyko - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. Nepavyksta įdiegti %1. Calamares nepavyko įkelti visų sukonfigūruotų modulių. Tai yra problema, susijusi su tuo, kaip distribucija naudoja diegimo programą Calamares. - + <br/>The following modules could not be loaded: <br/>Nepavyko įkelti šių modulių: - + Continue with setup? Tęsti sąranką? - + Continue with installation? Tęsti diegimą? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 sąrankos programa, siekdama nustatyti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</strong> - + &Set up now Nu&statyti dabar - + &Install now Į&diegti dabar - + Go &back &Grįžti - + &Set up Nu&statyti - + &Install Į&diegti - + Setup is complete. Close the setup program. Sąranka užbaigta. Užverkite sąrankos programą. - + The installation is complete. Close the installer. Diegimas užbaigtas. Užverkite diegimo programą. - + Cancel setup without changing the system. Atsisakyti sąrankos, nieko sistemoje nekeičiant. - + Cancel installation without changing the system. Atsisakyti diegimo, nieko sistemoje nekeičiant. - + &Next &Toliau - + &Back &Atgal - + &Done A&tlikta - + &Cancel A&tsisakyti - + Cancel setup? Atsisakyti sąrankos? - + Cancel installation? Atsisakyti diegimo? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Ar tikrai norite atsisakyti dabartinio sąrankos proceso? Sąrankos programa užbaigs darbą ir visi pakeitimai bus prarasti. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Ar tikrai norite atsisakyti dabartinio diegimo proceso? @@ -479,12 +499,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CalamaresWindow - + %1 Setup Program %1 sąrankos programa - + %1 Installer %1 diegimo programa @@ -492,7 +512,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. CheckerContainer - + Gathering system information... Renkama sistemos informacija... @@ -740,22 +760,32 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Skaičių ir datų lokalė bus nustatyta į %1. - + Network Installation. (Disabled: Incorrect configuration) Tinklo diegimas. (Išjungtas: Neteisinga konfigūracija) - + Network Installation. (Disabled: Received invalid groups data) Tinklo diegimas. (Išjungtas: Gauti neteisingi grupių duomenys) - - Network Installation. (Disabled: internal error) - Tinklo diegimas. (Išjungtas: vidinė klaida) + + Network Installation. (Disabled: Internal error) + Tinklo diegimas. (Išjungtas: Vidinė klaida) + + + + Network Installation. (Disabled: No package list) + Tinklo diegimas. (Išjungtas: Nėra paketų sąrašo) + + + + Package selection + Paketų pasirinkimas - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Tinklo diegimas. (Išjungta: Nepavyksta gauti paketų sąrašus, patikrinkite savo tinklo ryšį) @@ -850,42 +880,42 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Jūsų slaptažodžiai nesutampa! - + Setup Failed Sąranka patyrė nesėkmę - + Installation Failed Diegimas nepavyko - + The setup of %1 did not complete successfully. %1 sąranka nebuvo užbaigta sėkmingai. - + The installation of %1 did not complete successfully. %1 nebuvo užbaigtas sėkmingai. - + Setup Complete Sąranka užbaigta - + Installation Complete Diegimas užbaigtas - + The setup of %1 is complete. %1 sąranka yra užbaigta. - + The installation of %1 is complete. %1 diegimas yra užbaigtas. @@ -1482,72 +1512,72 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. GeneralRequirements - + has at least %1 GiB available drive space turi bent %1 GiB laisvos vietos diske - + There is not enough drive space. At least %1 GiB is required. Neužtenka vietos diske. Reikia bent %1 GiB. - + has at least %1 GiB working memory turi bent %1 GiB darbinės atminties - + The system does not have enough working memory. At least %1 GiB is required. Sistemai neužtenka darbinės atminties. Reikia bent %1 GiB. - + is plugged in to a power source prijungta prie maitinimo šaltinio - + The system is not plugged in to a power source. Sistema nėra prijungta prie maitinimo šaltinio. - + is connected to the Internet prijungta prie Interneto - + The system is not connected to the Internet. Sistema nėra prijungta prie Interneto. - + is running the installer as an administrator (root) vykdo diegimo programą pagrindinio naudotojo (root) teisėmis - + The setup program is not running with administrator rights. Sąrankos programa yra vykdoma be administratoriaus teisių. - + The installer is not running with administrator rights. Diegimo programa yra vykdoma be administratoriaus teisių. - + has a screen large enough to show the whole installer turi ekraną, pakankamai didelį, kad rodytų visą diegimo programą - + The screen is too small to display the setup program. Ekranas yra per mažas, kad būtų parodyta sąrankos programa. - + The screen is too small to display the installer. Ekranas yra per mažas, kad būtų parodyta diegimo programa. @@ -1615,7 +1645,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Įdiekite KDE Konsole ir bandykite dar kartą! - + Executing script: &nbsp;<code>%1</code> Vykdomas scenarijus: &nbsp;<code>%1</code> @@ -1887,98 +1917,97 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. NetInstallViewStep - - + Package selection Paketų pasirinkimas - + Office software Raštinės programinė įranga - + Office package Raštinės paketas - + Browser software Naršyklės programinė įranga - + Browser package Naršyklės paketas - + Web browser Saityno naršyklė - + Kernel Branduolys - + Services Tarnybos - + Login Prisijungimas - + Desktop Darbalaukis - + Applications Programos - + Communication Komunikacija - + Development Plėtojimas - + Office Raštinė - + Multimedia Multimedija - + Internet Internetas - + Theming Apipavidalinimas - + Gaming Žaidimai - + Utilities Paslaugų programos @@ -3730,12 +3759,12 @@ Išvestis: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Jei šiuo kompiuteriu naudosis keli žmonės, po sąrankos galite sukurti papildomas paskyras.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galite sukurti papildomas paskyras.</small> @@ -3743,7 +3772,7 @@ Išvestis: UsersQmlViewStep - + Users Naudotojai @@ -4163,102 +4192,102 @@ Išvestis: Koks jūsų vardas? - + Your Full Name Jūsų visas vardas - + What name do you want to use to log in? Kokį vardą norite naudoti prisijungimui? - + Login Name Prisijungimo vardas - + If more than one person will use this computer, you can create multiple accounts after installation. Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galėsite sukurti papildomas paskyras. - + What is the name of this computer? Koks šio kompiuterio vardas? - + Computer Name Kompiuterio vardas - + This name will be used if you make the computer visible to others on a network. Šis vardas bus naudojamas, jeigu padarysite savo kompiuterį matomą kitiems naudotojams tinkle. - + Choose a password to keep your account safe. Apsaugokite savo paskyrą slaptažodžiu - + Password Slaptažodis - + Repeat Password Pakartokite slaptažodį - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus. Stiprus slaptažodis yra raidžių, skaičių ir punktuacijos ženklų mišinys, jis turi būti mažiausiai aštuonių simbolių, be to, turėtų būti reguliariai keičiamas. - + Validate passwords quality Tikrinti slaptažodžių kokybę - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Pažymėjus šį langelį, bus atliekamas slaptažodžio stiprumo tikrinimas ir negalėsite naudoti silpną slaptažodį. - + Log in automatically without asking for the password Prisijungti automatiškai, neklausiant slaptažodžio - + Reuse user password as root password Naudotojo slaptažodį naudoti pakartotinai kaip pagrindinio naudotojo (root) slaptažodį - + Use the same password for the administrator account. Naudoti tokį patį slaptažodį administratoriaus paskyrai. - + Choose a root password to keep your account safe. Pasirinkite pagrindinio naudotojo (root) slaptažodį, kad apsaugotumėte savo paskyrą. - + Root Password Pagrindinio naudotojo (Root) slaptažodis - + Repeat Root Password Pakartokite pagrindinio naudotojo (Root) slaptažodį - + Enter the same password twice, so that it can be checked for typing errors. Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus. diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts index 64f623b79b..092c814bcb 100644 --- a/lang/calamares_lv.ts +++ b/lang/calamares_lv.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -288,13 +308,13 @@ - + &Yes - + &No @@ -304,17 +324,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3705,12 +3734,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3718,7 +3747,7 @@ Output: UsersQmlViewStep - + Users @@ -4102,102 +4131,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts index dd96ecff36..27d50ddd96 100644 --- a/lang/calamares_mk.ts +++ b/lang/calamares_mk.ts @@ -102,22 +102,42 @@ - - Tools - Алатки + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Инсталацијата е готова. Исклучете го инсталерот. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts index 75ac2f8c05..581a834f3a 100644 --- a/lang/calamares_ml.ts +++ b/lang/calamares_ml.ts @@ -102,22 +102,42 @@ സമ്പർക്കമുഖം: - - Tools - ഉപകരണങ്ങൾ + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet ശൈലീപുസ്തകം പുതുക്കുക - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree വിഡ്ജറ്റ് ട്രീ - + Debug information ഡീബഗ് വിവരങ്ങൾ @@ -286,13 +306,13 @@ - + &Yes വേണം (&Y) - + &No വേണ്ട (&N) @@ -302,17 +322,17 @@ അടയ്ക്കുക (&C) - + Install Log Paste URL ഇൻസ്റ്റാൾ ലോഗ് പകർപ്പിന്റെ വിലാസം - + The upload was unsuccessful. No web-paste was done. അപ്‌ലോഡ് പരാജയമായിരുന്നു. വെബിലേക്ക് പകർത്തിയില്ല. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed കലാമാരേസ് സമാരംഭിക്കൽ പരാജയപ്പെട്ടു - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയില്ല. ക്രമീകരിച്ച എല്ലാ മൊഡ്യൂളുകളും ലോഡുചെയ്യാൻ കാലാമറെസിന് കഴിഞ്ഞില്ല. വിതരണത്തിൽ കാലാമറെസ് ഉപയോഗിക്കുന്ന രീതിയിലുള്ള ഒരു പ്രശ്നമാണിത്. - + <br/>The following modules could not be loaded: <br/>താഴെ പറയുന്ന മൊഡ്യൂളുകൾ ലഭ്യമാക്കാനായില്ല: - + Continue with setup? സജ്ജീകരണപ്രക്രിയ തുടരണോ? - + Continue with installation? ഇൻസ്റ്റളേഷൻ തുടരണോ? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %2 സജ്ജീകരിക്കുന്നതിന് %1 സജ്ജീകരണ പ്രോഗ്രാം നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %2 ഇൻസ്റ്റാളുചെയ്യുന്നതിന് %1 ഇൻസ്റ്റാളർ നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല.</strong> - + &Set up now ഉടൻ സജ്ജീകരിക്കുക (&S) - + &Install now ഉടൻ ഇൻസ്റ്റാൾ ചെയ്യുക (&I) - + Go &back പുറകോട്ടു പോകുക - + &Set up സജ്ജീകരിക്കുക (&S) - + &Install ഇൻസ്റ്റാൾ (&I) - + Setup is complete. Close the setup program. സജ്ജീകരണം പൂർത്തിയായി. പ്രയോഗം അടയ്ക്കുക. - + The installation is complete. Close the installer. ഇൻസ്റ്റളേഷൻ പൂർത്തിയായി. ഇൻസ്റ്റാളർ അടയ്ക്കുക - + Cancel setup without changing the system. സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ സജ്ജീകരണപ്രക്രിയ റദ്ദാക്കുക. - + Cancel installation without changing the system. സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ ഇൻസ്റ്റളേഷൻ റദ്ദാക്കുക. - + &Next അടുത്തത് (&N) - + &Back പുറകോട്ട് (&B) - + &Done ചെയ്‌തു - + &Cancel റദ്ദാക്കുക (&C) - + Cancel setup? സജ്ജീകരണം റദ്ദാക്കണോ? - + Cancel installation? ഇൻസ്റ്റളേഷൻ റദ്ദാക്കണോ? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. നിലവിലുള്ള സജ്ജീകരണപ്രക്രിയ റദ്ദാക്കണോ? സജ്ജീകരണപ്രയോഗം നിൽക്കുകയും എല്ലാ മാറ്റങ്ങളും നഷ്ടപ്പെടുകയും ചെയ്യും. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. നിലവിലുള്ള ഇൻസ്റ്റാൾ പ്രക്രിയ റദ്ദാക്കണോ? @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 സജ്ജീകരണപ്രയോഗം - + %1 Installer %1 ഇൻസ്റ്റാളർ @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... സിസ്റ്റത്തെക്കുറിച്ചുള്ള വിവരങ്ങൾ ശേഖരിക്കുന്നു... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. സംഖ്യ & തീയതി രീതി %1 ആയി ക്രമീകരിക്കും. - + Network Installation. (Disabled: Incorrect configuration) നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (പ്രവർത്തനരഹിതമാക്കി: തെറ്റായ ക്രമീകരണം) - + Network Installation. (Disabled: Received invalid groups data) നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (അപ്രാപ്‌തമാക്കി: അസാധുവായ ഗ്രൂപ്പുകളുടെ ഡാറ്റ ലഭിച്ചു) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + പാക്കേജു് തിരഞ്ഞെടുക്കല്‍ + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (അപ്രാപ്‌തമാക്കി: പാക്കേജ് ലിസ്റ്റുകൾ നേടാനായില്ല, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ പരിശോധിക്കുക) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. നിങ്ങളുടെ പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല! - + Setup Failed സജ്ജീകരണപ്രക്രിയ പരാജയപ്പെട്ടു - + Installation Failed ഇൻസ്റ്റളേഷൻ പരാജയപ്പെട്ടു - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete സജ്ജീകരണം പൂർത്തിയായി - + Installation Complete ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി - + The setup of %1 is complete. %1 ന്റെ സജ്ജീകരണം പൂർത്തിയായി. - + The installation of %1 is complete. %1 ന്റെ ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space %1 GiB ഡിസ്ക്സ്പെയ്സ് എങ്കിലും ലഭ്യമായിരിക്കണം. - + There is not enough drive space. At least %1 GiB is required. ആവശ്യത്തിനു ഡിസ്ക്സ്പെയ്സ് ലഭ്യമല്ല. %1 GiB എങ്കിലും വേണം. - + has at least %1 GiB working memory %1 GiB RAM എങ്കിലും ലഭ്യമായിരിക്കണം. - + The system does not have enough working memory. At least %1 GiB is required. സിസ്റ്റത്തിൽ ആവശ്യത്തിനു RAM ലഭ്യമല്ല. %1 GiB എങ്കിലും വേണം. - + is plugged in to a power source ഒരു ഊർജ്ജസ്രോതസ്സുമായി ബന്ധിപ്പിച്ചിരിക്കുന്നു - + The system is not plugged in to a power source. സിസ്റ്റം ഒരു ഊർജ്ജസ്രോതസ്സിലേക്ക് ബന്ധിപ്പിച്ചിട്ടില്ല. - + is connected to the Internet ഇന്റർനെറ്റിലേക്ക് ബന്ധിപ്പിച്ചിരിക്കുന്നു - + The system is not connected to the Internet. സിസ്റ്റം ഇന്റർനെറ്റുമായി ബന്ധിപ്പിച്ചിട്ടില്ല. - + is running the installer as an administrator (root) ഇൻസ്റ്റാളർ കാര്യനിർവാഹകരിൽ ഒരാളായിട്ടാണ് (root) പ്രവർത്തിപ്പിക്കുന്നത് - + The setup program is not running with administrator rights. സെറ്റപ്പ് പ്രോഗ്രാം അഡ്മിനിസ്ട്രേറ്റർ അവകാശങ്ങൾ ഇല്ലാതെയാണ് പ്രവർത്തിക്കുന്നത്. - + The installer is not running with administrator rights. ഇൻസ്റ്റാളർ അഡ്മിനിസ്ട്രേറ്റർ അവകാശങ്ങൾ ഇല്ലാതെയാണ് പ്രവർത്തിക്കുന്നത് - + has a screen large enough to show the whole installer മുഴുവൻ ഇൻസ്റ്റാളറും കാണിക്കാൻ തക്ക വലിപ്പമുള്ള ഒരു സ്ക്രീനുണ്ട് - + The screen is too small to display the setup program. സജ്ജീകരണ പ്രയോഗം കാണിക്കാൻ തക്ക വലുപ്പം സ്ക്രീനിനില്ല. - + The screen is too small to display the installer. ഇൻസ്റ്റാളർ കാണിക്കാൻ തക്ക വലുപ്പം സ്ക്രീനിനില്ല. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. കെഡിഇ കൺസോൾ ഇൻസ്റ്റാൾ ചെയ്ത് വീണ്ടും ശ്രമിക്കുക! - + Executing script: &nbsp;<code>%1</code> സ്ക്രിപ്റ്റ് നിർവ്വഹിക്കുന്നു:&nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection പാക്കേജു് തിരഞ്ഞെടുക്കല്‍ - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3699,12 +3728,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>ഒന്നിലധികം ആളുകൾ ഈ കമ്പ്യൂട്ടർ ഉപയോഗിക്കുമെങ്കിൽ, താങ്കൾക്ക് സജ്ജീകരണത്തിന് ശേഷം നിരവധി അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാം.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>ഒന്നിലധികം ആളുകൾ ഈ കമ്പ്യൂട്ടർ ഉപയോഗിക്കുമെങ്കിൽ, താങ്കൾക്ക് ഇൻസ്റ്റളേഷന് ശേഷം നിരവധി അക്കൗണ്ടുകൾ സൃഷ്ടിക്കാം.</small> @@ -3712,7 +3741,7 @@ Output: UsersQmlViewStep - + Users ഉപയോക്താക്കൾ @@ -4096,102 +4125,102 @@ Output: നിങ്ങളുടെ പേരെന്താണ് ? - + Your Full Name താങ്കളുടെ മുഴുവൻ പേരു് - + What name do you want to use to log in? ലോഗിൻ ചെയ്യാൻ നിങ്ങൾ ഏത് നാമം ഉപയോഗിക്കാനാണു ആഗ്രഹിക്കുന്നത്? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? ഈ കമ്പ്യൂട്ടറിന്റെ നാമം എന്താണ് ? - + Computer Name കമ്പ്യൂട്ടറിന്റെ പേര് - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. നിങ്ങളുടെ അക്കൗണ്ട് സുരക്ഷിതമായി സൂക്ഷിക്കാൻ ഒരു രഹസ്യവാക്ക് തിരഞ്ഞെടുക്കുക. - + Password രഹസ്യവാക്ക് - + Repeat Password രഹസ്യവാക്ക് വീണ്ടും - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. ഈ കള്ളി തിരഞ്ഞെടുക്കുമ്പോൾ, രഹസ്യവാക്കിന്റെ ബലപരിശോധന നടപ്പിലാക്കുകയും, ആയതിനാൽ താങ്കൾക്ക് ദുർബലമായ ഒരു രഹസ്യവാക്ക് ഉപയോഗിക്കാൻ സാധിക്കാതെ വരുകയും ചെയ്യും. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. അഡ്മിനിസ്ട്രേറ്റർ അക്കൗണ്ടിനും ഇതേ രഹസ്യവാക്ക് ഉപയോഗിക്കുക. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts index 402e61e30d..1fa074bc1d 100644 --- a/lang/calamares_mr.ts +++ b/lang/calamares_mr.ts @@ -102,22 +102,42 @@ अंतराफलक : - - Tools - साधने + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information दोषमार्जन माहिती @@ -286,13 +306,13 @@ - + &Yes &होय - + &No &नाही @@ -302,17 +322,17 @@ &बंद करा - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now &आता अधिष्ठापित करा - + Go &back &मागे जा - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. अधिष्ठापना संपूर्ण झाली. अधिष्ठापक बंद करा. - + Cancel setup without changing the system. - + Cancel installation without changing the system. प्रणालीत बदल न करता अधिष्टापना रद्द करा. - + &Next &पुढे - + &Back &मागे - + &Done &पूर्ण झाली - + &Cancel &रद्द करा - + Cancel setup? - + Cancel installation? अधिष्ठापना रद्द करायचे? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 अधिष्ठापक @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. तुमचा परवलीशब्द जुळत नाही - + Setup Failed - + Installation Failed अधिष्ठापना अयशस्वी झाली - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users वापरकर्ते @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts index a6b94c9aec..6c5f4fb586 100644 --- a/lang/calamares_nb.ts +++ b/lang/calamares_nb.ts @@ -102,22 +102,42 @@ Grensesnitt: - - Tools - Verktøy + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Debug informasjon @@ -286,13 +306,13 @@ - + &Yes &Ja - + &No &Nei @@ -302,17 +322,17 @@ &Lukk - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? Fortsette å sette opp? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 vil nå gjøre endringer på harddisken, for å installere %2. <br/><strong>Du vil ikke kunne omgjøre disse endringene.</strong> - + &Set up now - + &Install now &Installer nå - + Go &back Gå &tilbake - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Installasjonen er fullført. Lukk installeringsprogrammet. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Neste - + &Back &Tilbake - + &Done &Ferdig - + &Cancel &Avbryt - + Cancel setup? - + Cancel installation? Avbryte installasjon? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Vil du virkelig avbryte installasjonen? @@ -470,12 +490,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Installasjonsprogram @@ -483,7 +503,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. CheckerContainer - + Gathering system information... @@ -731,22 +751,32 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -841,42 +871,42 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Setup Failed - + Installation Failed Installasjon feilet - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Installasjon fullført - + The setup of %1 is complete. - + The installation of %1 is complete. Installasjonen av %1 er fullført. @@ -1473,72 +1503,72 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source er koblet til en strømkilde - + The system is not plugged in to a power source. Systemet er ikke koblet til en strømkilde. - + is connected to the Internet er tilkoblet Internett - + The system is not connected to the Internet. Systemet er ikke tilkoblet Internett. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1606,7 +1636,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. - + Executing script: &nbsp;<code>%1</code> @@ -1876,98 +1906,97 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3695,12 +3724,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3708,7 +3737,7 @@ Output: UsersQmlViewStep - + Users Brukere @@ -4092,102 +4121,102 @@ Output: Hva heter du? - + Your Full Name - + What name do you want to use to log in? Hvilket navn vil du bruke for å logge inn? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ne.ts b/lang/calamares_ne.ts index 8df2e202ea..0bea96a554 100644 --- a/lang/calamares_ne.ts +++ b/lang/calamares_ne.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts index add06a9efe..c3038912ea 100644 --- a/lang/calamares_ne_NP.ts +++ b/lang/calamares_ne_NP.ts @@ -102,22 +102,42 @@ - - Tools - औजारहरु + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. सेटअप सकियो । सेटअप प्रोग्राम बन्द गर्नु होस  - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. पासवर्डहरू मिलेन ।  - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index f88a2eeada..53c2848ecc 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Hulpmiddelen + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Stylesheet opnieuw inlezen. - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Widget-boom - + Debug information Debug informatie @@ -286,13 +306,13 @@ - + &Yes &ja - + &No &Nee @@ -302,17 +322,17 @@ &Sluiten - + Install Log Paste URL URL voor het verzenden van het installatielogboek - + The upload was unsuccessful. No web-paste was done. Het uploaden is mislukt. Web-plakken niet gedaan. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares Initialisatie mislukt - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 kan niet worden geïnstalleerd. Calamares kon niet alle geconfigureerde modules laden. Dit is een probleem met hoe Calamares wordt gebruikt door de distributie. - + <br/>The following modules could not be loaded: <br/>The volgende modules konden niet worden geladen: - + Continue with setup? Doorgaan met installatie? - + Continue with installation? Doorgaan met installatie? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Het %1 voorbereidingsprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Het %1 installatieprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</strong> - + &Set up now Nu &Inrichten - + &Install now Nu &installeren - + Go &back Ga &terug - + &Set up &Inrichten - + &Install &Installeer - + Setup is complete. Close the setup program. De voorbereiding is voltooid. Sluit het voorbereidingsprogramma. - + The installation is complete. Close the installer. De installatie is voltooid. Sluit het installatie-programma. - + Cancel setup without changing the system. Voorbereiding afbreken zonder aanpassingen aan het systeem. - + Cancel installation without changing the system. Installatie afbreken zonder aanpassingen aan het systeem. - + &Next &Volgende - + &Back &Terug - + &Done Voltooi&d - + &Cancel &Afbreken - + Cancel setup? Voorbereiding afbreken? - + Cancel installation? Installatie afbreken? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Wil je het huidige voorbereidingsproces echt afbreken? Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Wil je het huidige installatieproces echt afbreken? @@ -471,12 +491,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CalamaresWindow - + %1 Setup Program %1 Voorbereidingsprogramma - + %1 Installer %1 Installatieprogramma @@ -484,7 +504,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. CheckerContainer - + Gathering system information... Systeeminformatie verzamelen... @@ -732,22 +752,32 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. De getal- en datumnotatie worden ingesteld op %1. - + Network Installation. (Disabled: Incorrect configuration) Netwerkinstallatie. (Uitgeschakeld: Ongeldige configuratie) - + Network Installation. (Disabled: Received invalid groups data) Netwerkinstallatie. (Uitgeschakeld: ongeldige gegevens over groepen) - - Network Installation. (Disabled: internal error) - Netwerkinstallatie. (Uitgeschakeld: interne fout) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Pakketkeuze - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Netwerkinstallatie. (Uitgeschakeld: kon de pakketlijsten niet binnenhalen, controleer de netwerkconnectie) @@ -842,42 +872,42 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Je wachtwoorden komen niet overeen! - + Setup Failed Voorbereiding mislukt - + Installation Failed Installatie Mislukt - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Voorbereiden voltooid - + Installation Complete Installatie Afgerond. - + The setup of %1 is complete. De voorbereiden van %1 is voltooid. - + The installation of %1 is complete. De installatie van %1 is afgerond. @@ -1474,72 +1504,72 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. GeneralRequirements - + has at least %1 GiB available drive space tenminste %1 GiB vrije schijfruimte heeft - + There is not enough drive space. At least %1 GiB is required. Er is niet genoeg schijfruimte. Tenminste %1 GiB is vereist. - + has at least %1 GiB working memory tenminste %1 GiB werkgeheugen heeft - + The system does not have enough working memory. At least %1 GiB is required. Het systeem heeft niet genoeg intern geheugen. Tenminste %1 GiB is vereist. - + is plugged in to a power source aangesloten is op netstroom - + The system is not plugged in to a power source. Dit systeem is niet aangesloten op netstroom. - + is connected to the Internet verbonden is met het Internet - + The system is not connected to the Internet. Dit systeem is niet verbonden met het Internet. - + is running the installer as an administrator (root) is het installatieprogramma aan het uitvoeren als administrator (root) - + The setup program is not running with administrator rights. Het voorbereidingsprogramma draait zonder administratorrechten. - + The installer is not running with administrator rights. Het installatieprogramma draait zonder administratorrechten. - + has a screen large enough to show the whole installer heeft een scherm groot genoeg om het hele installatieprogramma te weergeven - + The screen is too small to display the setup program. Het scherm is te klein on het voorbereidingsprogramma te laten zien. - + The screen is too small to display the installer. Het scherm is te klein on het installatieprogramma te laten zien. @@ -1607,7 +1637,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Gelieve KDE Konsole te installeren en opnieuw te proberen! - + Executing script: &nbsp;<code>%1</code> Script uitvoeren: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. NetInstallViewStep - - + Package selection Pakketkeuze - + Office software Kantoor software - + Office package Kantoorpakket - + Browser software Browser software - + Browser package Browserpakket - + Web browser Webbrowser - + Kernel Kernel - + Services Diensten - + Login Login - + Desktop Desktop - + Applications Applicaties - + Communication Communicatie - + Development Ontwikkelen - + Office Kantoor - + Multimedia Multimedia - + Internet Internet - + Theming Thema - + Gaming Spellen - + Utilities Gereedschappen @@ -3700,12 +3729,12 @@ De installatie kan niet doorgaan. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie.</small> @@ -3713,7 +3742,7 @@ De installatie kan niet doorgaan. UsersQmlViewStep - + Users Gebruikers @@ -4119,102 +4148,102 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Wat is je naam? - + Your Full Name Volledige naam - + What name do you want to use to log in? Welke naam wil je gebruiken om in te loggen? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Wat is de naam van deze computer? - + Computer Name Computer Naam - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Kies een wachtwoord om uw account veilig te houden. - + Password Wachtwoord - + Repeat Password Herhaal wachtwoord - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Wanneer dit vakje is aangevinkt, wachtwoordssterkte zal worden gecontroleerd en je zal geen zwak wachtwoord kunnen gebruiken. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Gebruik hetzelfde wachtwoord voor het administratoraccount. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index 8aeb73ff15..21b7cfcba1 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -102,22 +102,42 @@ Interfejs: - - Tools - Narzędzia + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information Informacje debugowania @@ -290,13 +310,13 @@ - + &Yes &Tak - + &No &Nie @@ -306,17 +326,17 @@ Zam&knij - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard - + Calamares Initialization Failed Błąd inicjacji programu Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 nie może zostać zainstalowany. Calamares nie mógł wczytać wszystkich skonfigurowanych modułów. Jest to problem ze sposobem, w jaki Calamares jest używany przez dystrybucję. - + <br/>The following modules could not be loaded: <br/>Następujące moduły nie mogły zostać wczytane: - + Continue with setup? Kontynuować z programem instalacyjnym? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Instalator %1 zamierza przeprowadzić zmiany na Twoim dysku, aby zainstalować %2.<br/><strong>Nie będziesz mógł cofnąć tych zmian.</strong> - + &Set up now - + &Install now &Zainstaluj teraz - + Go &back &Cofnij się - + &Set up - + &Install Za&instaluj - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalacja ukończona pomyślnie. Możesz zamknąć instalator. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Anuluj instalację bez dokonywania zmian w systemie. - + &Next &Dalej - + &Back &Wstecz - + &Done &Ukończono - + &Cancel &Anuluj - + Cancel setup? Anulować ustawianie? - + Cancel installation? Anulować instalację? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Czy na pewno chcesz anulować obecny proces instalacji? @@ -474,12 +494,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CalamaresWindow - + %1 Setup Program - + %1 Installer Instalator %1 @@ -487,7 +507,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. CheckerContainer - + Gathering system information... Zbieranie informacji o systemie... @@ -735,22 +755,32 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Format liczb i daty zostanie ustawiony na %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalacja sieciowa. (Niedostępna: Otrzymano nieprawidłowe dane grupowe) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Wybór pakietów + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalacja sieciowa. (Wyłączona: Nie można pobrać listy pakietów, sprawdź swoje połączenie z siecią) @@ -845,42 +875,42 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Twoje hasła nie są zgodne! - + Setup Failed Nieudane ustawianie - + Installation Failed Wystąpił błąd instalacji - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Ustawianie ukończone - + Installation Complete Instalacja zakończona - + The setup of %1 is complete. Ustawianie %1 jest ukończone. - + The installation of %1 is complete. Instalacja %1 ukończyła się pomyślnie. @@ -1477,72 +1507,72 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source jest podłączony do źródła zasilania - + The system is not plugged in to a power source. System nie jest podłączony do źródła zasilania. - + is connected to the Internet jest podłączony do Internetu - + The system is not connected to the Internet. System nie jest podłączony do Internetu. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Instalator jest uruchomiony bez praw administratora. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Zbyt niska rozdzielczość ekranu, aby wyświetlić instalator. @@ -1610,7 +1640,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Zainstaluj KDE Konsole i spróbuj ponownie! - + Executing script: &nbsp;<code>%1</code> Wykonywanie skryptu: &nbsp;<code>%1</code> @@ -1880,98 +1910,97 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone. NetInstallViewStep - - + Package selection Wybór pakietów - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3721,12 +3750,12 @@ i nie uruchomi się UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3734,7 +3763,7 @@ i nie uruchomi się UsersQmlViewStep - + Users Użytkownicy @@ -4118,102 +4147,102 @@ i nie uruchomi się Jak się nazywasz? - + Your Full Name - + What name do you want to use to log in? Jakiego imienia chcesz używać do logowania się? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Jaka jest nazwa tego komputera? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Wybierz hasło, aby chronić swoje konto. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Użyj tego samego hasła dla konta administratora. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 524f0dfac3..e6191cdbbd 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Gerenciar configurações de automontagem @@ -102,22 +102,42 @@ Interface: - - Tools - Ferramentas + + Crashes Calamares, so that Dr. Konqui can look at it. + Trava o Calamares, para que o Dr. Konqui possa examiná-lo. - + + Reloads the stylesheet from the branding directory. + Recarrega a folha de estilo do diretório de marca. + + + + Uploads the session log to the configured pastebin. + Envia o registro da sessão para o pastebin configurado. + + + + Send Session Log + Enviar Registro da Sessão + + + Reload Stylesheet Recarregar folha de estilo - + + Displays the tree of widget names in the log (for stylesheet debugging). + Mostra a árvore de nomes de widget no registro (para a depuração da folha de estilo). + + + Widget Tree Árvore de widgets - + Debug information Informações de depuração @@ -286,13 +306,13 @@ - + &Yes &Sim - + &No &Não @@ -302,143 +322,147 @@ &Fechar - + Install Log Paste URL Colar URL de Registro de Instalação - + The upload was unsuccessful. No web-paste was done. Não foi possível fazer o upload. Nenhuma colagem foi feita na web. - + Install log posted to %1 Link copied to clipboard - + Registro de instalação postado em + +%1 + +Link copiado para a área de transferência - + Calamares Initialization Failed Falha na inicialização do Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 não pôde ser instalado. O Calamares não conseguiu carregar todos os módulos configurados. Este é um problema com o modo em que o Calamares está sendo utilizado pela distribuição. - + <br/>The following modules could not be loaded: <br/>Os seguintes módulos não puderam ser carregados: - + Continue with setup? Continuar com configuração? - + Continue with installation? Continuar com a instalação? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> O programa de configuração %1 está prestes a fazer mudanças no seu disco de modo a configurar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> O instalador %1 está prestes a fazer alterações no disco a fim de instalar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong> - + &Set up now &Configurar agora - + &Install now &Instalar agora - + Go &back &Voltar - + &Set up &Configurar - + &Install &Instalar - + Setup is complete. Close the setup program. A configuração está completa. Feche o programa de configuração. - + The installation is complete. Close the installer. A instalação está completa. Feche o instalador. - + Cancel setup without changing the system. Cancelar configuração sem alterar o sistema. - + Cancel installation without changing the system. Cancelar instalação sem modificar o sistema. - + &Next &Próximo - + &Back &Voltar - + &Done &Concluído - + &Cancel &Cancelar - + Cancel setup? Cancelar a configuração? - + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Você realmente quer cancelar o processo atual de configuração? O programa de configuração será fechado e todas as mudanças serão perdidas. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Você deseja realmente cancelar a instalação atual? @@ -471,12 +495,12 @@ O instalador será fechado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program Programa de configuração %1 - + %1 Installer Instalador %1 @@ -484,7 +508,7 @@ O instalador será fechado e todas as alterações serão perdidas. CheckerContainer - + Gathering system information... Coletando informações do sistema... @@ -732,22 +756,32 @@ O instalador será fechado e todas as alterações serão perdidas.A localidade dos números e datas será definida como %1. - + Network Installation. (Disabled: Incorrect configuration) Instalação via Rede. (Desabilitada: Configuração incorreta) - + Network Installation. (Disabled: Received invalid groups data) Instalação pela Rede. (Desabilitado: Recebidos dados de grupos inválidos) - - Network Installation. (Disabled: internal error) - Instalação de rede. (Desativada: erro interno) + + Network Installation. (Disabled: Internal error) + Instalação por Rede. (Desabilitada: Erro interno) + + + + Network Installation. (Disabled: No package list) + Instalação por Rede. (Desabilitada: Sem lista de pacotes) - + + Package selection + Seleção de pacotes + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalação pela Rede. (Desabilitada: Não foi possível adquirir lista de pacotes, verifique sua conexão com a internet) @@ -842,42 +876,42 @@ O instalador será fechado e todas as alterações serão perdidas.As senhas não estão iguais! - + Setup Failed A Configuração Falhou - + Installation Failed Falha na Instalação - + The setup of %1 did not complete successfully. - + A configuração de %1 não foi completada com sucesso. - + The installation of %1 did not complete successfully. - + A instalação de %1 não foi completada com sucesso. - + Setup Complete Configuração Concluída - + Installation Complete Instalação Completa - + The setup of %1 is complete. A configuração de %1 está concluída. - + The installation of %1 is complete. A instalação do %1 está completa. @@ -973,12 +1007,12 @@ O instalador será fechado e todas as alterações serão perdidas. Create new %1MiB partition on %3 (%2) with entries %4. - + Criar nova partição de %1MiB em %3 (%2) com entradas %4. Create new %1MiB partition on %3 (%2). - + Criar nova partição de %1MiB em %3 (%2). @@ -988,12 +1022,12 @@ O instalador será fechado e todas as alterações serão perdidas. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2) com entradas <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2). @@ -1341,7 +1375,7 @@ O instalador será fechado e todas as alterações serão perdidas. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Instalar %1 em <strong>nova</strong> partição do sistema %2 com recursos <em>%3</em> @@ -1351,27 +1385,27 @@ O instalador será fechado e todas as alterações serão perdidas. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong> e recursos <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Instalar %2 em partição do sistema %3 <strong>%1</strong> com recursos <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Configurar partição %3 <strong>%1</strong> com ponto de montagem <strong>%2</strong> e recursos <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Configurar partição %3 <strong>%1</strong> com ponto de montagem <strong>%2</strong>%4. @@ -1474,72 +1508,72 @@ O instalador será fechado e todas as alterações serão perdidas. GeneralRequirements - + has at least %1 GiB available drive space tenha pelo menos %1 GiB disponível de espaço no disco - + There is not enough drive space. At least %1 GiB is required. Não há espaço suficiente no disco. Pelo menos %1 GiB é requerido. - + has at least %1 GiB working memory tenha pelo menos %1 GiB de memória de trabalho - + The system does not have enough working memory. At least %1 GiB is required. O sistema não tem memória de trabalho o suficiente. Pelo menos %1 GiB é requerido. - + is plugged in to a power source está conectado a uma fonte de energia - + The system is not plugged in to a power source. O sistema não está conectado a uma fonte de energia. - + is connected to the Internet está conectado à Internet - + The system is not connected to the Internet. O sistema não está conectado à Internet. - + is running the installer as an administrator (root) está executando o instalador como administrador (root) - + The setup program is not running with administrator rights. O programa de configuração não está sendo executado com direitos de administrador. - + The installer is not running with administrator rights. O instalador não está sendo executado com permissões de administrador. - + has a screen large enough to show the whole installer tem uma tela grande o suficiente para mostrar todo o instalador - + The screen is too small to display the setup program. A tela é muito pequena para exibir o programa de configuração. - + The screen is too small to display the installer. A tela é muito pequena para exibir o instalador. @@ -1607,7 +1641,7 @@ O instalador será fechado e todas as alterações serão perdidas.Por favor, instale o Konsole do KDE e tente novamente! - + Executing script: &nbsp;<code>%1</code> Executando script: &nbsp;<code>%1</code> @@ -1879,98 +1913,97 @@ O instalador será fechado e todas as alterações serão perdidas. NetInstallViewStep - - + Package selection Seleção de pacotes - + Office software Software de office - + Office package Pacote office - + Browser software Softwares de browser - + Browser package Pacote de browser - + Web browser Navegador web - + Kernel Kernel - + Services Seriços - + Login Login - + Desktop Área de trabalho - + Applications Aplicações - + Communication Comunicação - + Development Desenvolvimento - + Office Escritório - + Multimedia Multimídia - + Internet Internet - + Theming Temas - + Gaming Jogos - + Utilities Utilitários @@ -3704,12 +3737,12 @@ Saída: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se mais de uma pessoa for utilizar este computador, você poderá criar múltiplas contas após terminar a configuração.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se mais de uma pessoa for utilizar este computador, você poderá criar múltiplas contas após terminar de instalar.</small> @@ -3717,7 +3750,7 @@ Saída: UsersQmlViewStep - + Users Usuários @@ -3961,29 +3994,31 @@ Saída: Installation Completed - + Instalação Completa %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 foi instalado no seu computador.<br/> + Você pode agora reiniciar em seu novo sistema, ou continuar usando o ambiente Live. Close Installer - + Fechar Instalador Restart System - + Reiniciar Sistema <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Um registro completo da instalação está disponível como installation.log no diretório home do usuário Live.<br/> + Esse registro é copiado para /var/log/installation.log do sistema alvo.</p> @@ -4135,102 +4170,102 @@ Saída: Qual é o seu nome? - + Your Full Name Seu nome completo - + What name do you want to use to log in? Qual nome você quer usar para entrar? - + Login Name Nome do Login - + If more than one person will use this computer, you can create multiple accounts after installation. Se mais de uma pessoa for usar este computador, você poderá criar múltiplas contas após a instalação. - + What is the name of this computer? Qual é o nome deste computador? - + Computer Name Nome do computador - + This name will be used if you make the computer visible to others on a network. Este nome será usado se você fizer o computador ficar visível para outros numa rede. - + Choose a password to keep your account safe. Escolha uma senha para manter a sua conta segura. - + Password Senha - + Repeat Password Repita a senha - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres, e deve ser alterada em intervalos regulares. - + Validate passwords quality Validar qualidade das senhas - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quando esta caixa estiver marcada, será feita a verificação da força da senha e você não poderá usar uma senha fraca. - + Log in automatically without asking for the password Entrar automaticamente sem perguntar pela senha - + Reuse user password as root password Reutilizar a senha de usuário como senha de root - + Use the same password for the administrator account. Usar a mesma senha para a conta de administrador. - + Choose a root password to keep your account safe. Escolha uma senha de root para manter sua conta segura. - + Root Password Senha de Root - + Repeat Root Password Repita a Senha de Root - + Enter the same password twice, so that it can be checked for typing errors. Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index c3ec77d14a..97d628eb1b 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -102,22 +102,42 @@ Interface: - - Tools - Ferramentas + + Crashes Calamares, so that Dr. Konqui can look at it. + Faz o Calamares falhar, para que o Dr. Konqui o possa observar. - + + Reloads the stylesheet from the branding directory. + Recarregar a folha de estilo do diretório de marca. + + + + Uploads the session log to the configured pastebin. + Envia o registo da sessão para o pastebin configurado. + + + + Send Session Log + Enviar registo de sessão + + + Reload Stylesheet Recarregar Folha de estilo - + + Displays the tree of widget names in the log (for stylesheet debugging). + Apresenta a árvore de nomes de widgets no registo (para depuração de folhas de estilo). + + + Widget Tree Árvore de Widgets - + Debug information Informação de depuração @@ -286,13 +306,13 @@ - + &Yes &Sim - + &No &Não @@ -302,17 +322,17 @@ &Fechar - + Install Log Paste URL Instalar o Registo Colar URL - + The upload was unsuccessful. No web-paste was done. O carregamento não teve êxito. Nenhuma pasta da web foi feita. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard Ligação copiada para a área de transferência - + Calamares Initialization Failed Falha na Inicialização do Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 não pode ser instalado. O Calamares não foi capaz de carregar todos os módulos configurados. Isto é um problema da maneira como o Calamares é usado pela distribuição. - + <br/>The following modules could not be loaded: <br/>Os módulos seguintes não puderam ser carregados: - + Continue with setup? Continuar com a configuração? - + Continue with installation? Continuar com a instalação? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> O programa de instalação %1 está prestes a fazer alterações no seu disco para configurar o %2.<br/><strong>Você não poderá desfazer essas alterações.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> O %1 instalador está prestes a fazer alterações ao seu disco em ordem para instalar %2.<br/><strong>Não será capaz de desfazer estas alterações.</strong> - + &Set up now &Instalar agora - + &Install now &Instalar agora - + Go &back Voltar &atrás - + &Set up &Instalar - + &Install &Instalar - + Setup is complete. Close the setup program. Instalação completa. Feche o programa de instalação. - + The installation is complete. Close the installer. A instalação está completa. Feche o instalador. - + Cancel setup without changing the system. Cancelar instalação sem alterar o sistema. - + Cancel installation without changing the system. Cancelar instalar instalação sem modificar o sistema. - + &Next &Próximo - + &Back &Voltar - + &Done &Feito - + &Cancel &Cancelar - + Cancel setup? Cancelar instalação? - + Cancel installation? Cancelar a instalação? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Quer mesmo cancelar o processo de instalação atual? O programa de instalação irá fechar todas as alterações serão perdidas. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Tem a certeza que pretende cancelar o atual processo de instalação? @@ -475,12 +495,12 @@ O instalador será encerrado e todas as alterações serão perdidas. CalamaresWindow - + %1 Setup Program %1 Programa de Instalação - + %1 Installer %1 Instalador @@ -488,7 +508,7 @@ O instalador será encerrado e todas as alterações serão perdidas. CheckerContainer - + Gathering system information... A recolher informação de sistema... @@ -736,22 +756,32 @@ O instalador será encerrado e todas as alterações serão perdidas.Os números e datas locais serão definidos para %1. - + Network Installation. (Disabled: Incorrect configuration) Instalação de rede. (Desativada: Configuração incorreta) - + Network Installation. (Disabled: Received invalid groups data) Instalação de Rede. (Desativada: Recebeu dados de grupos inválidos) - - Network Installation. (Disabled: internal error) - Instalação de rede. (Desativada: erro interno) + + Network Installation. (Disabled: Internal error) + Instalação de rede. (Desativada: Erro interno) + + + + Network Installation. (Disabled: No package list) + Instalação de rede. (Desativada: Sem lista de pacotes) + + + + Package selection + Seleção de pacotes - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalação de rede. (Desativada: Incapaz de buscar listas de pacotes, verifique a sua ligação de rede) @@ -846,42 +876,42 @@ O instalador será encerrado e todas as alterações serão perdidas.As suas palavras-passe não coincidem! - + Setup Failed Falha de Instalação - + Installation Failed Falha na Instalação - + The setup of %1 did not complete successfully. A configuração de %1 não foi concluída com sucesso. - + The installation of %1 did not complete successfully. A instalação de %1 não foi concluída com sucesso. - + Setup Complete Instalação Completa - + Installation Complete Instalação Completa - + The setup of %1 is complete. A instalação de %1 está completa. - + The installation of %1 is complete. A instalação de %1 está completa. @@ -1478,72 +1508,72 @@ O instalador será encerrado e todas as alterações serão perdidas. GeneralRequirements - + has at least %1 GiB available drive space tem pelo menos %1 GiB de espaço livre em disco - + There is not enough drive space. At least %1 GiB is required. Não existe espaço livre suficiente em disco. É necessário pelo menos %1 GiB. - + has at least %1 GiB working memory tem pelo menos %1 GiB de memória disponível - + The system does not have enough working memory. At least %1 GiB is required. O sistema não tem memória disponível suficiente. É necessário pelo menos %1 GiB. - + is plugged in to a power source está ligado a uma fonte de energia - + The system is not plugged in to a power source. O sistema não está ligado a uma fonte de energia. - + is connected to the Internet está ligado à internet - + The system is not connected to the Internet. O sistema não está ligado à internet. - + is running the installer as an administrator (root) está a executar o instalador como um administrador (root) - + The setup program is not running with administrator rights. O programa de instalação está agora a correr com direitos de administrador. - + The installer is not running with administrator rights. O instalador não está a ser executado com permissões de administrador. - + has a screen large enough to show the whole installer tem um ecrã grande o suficiente para mostrar todo o instalador - + The screen is too small to display the setup program. O ecrã é demasiado pequeno para mostrar o programa de instalação. - + The screen is too small to display the installer. O ecrã tem um tamanho demasiado pequeno para mostrar o instalador. @@ -1611,7 +1641,7 @@ O instalador será encerrado e todas as alterações serão perdidas.Por favor instale a consola KDE e tente novamente! - + Executing script: &nbsp;<code>%1</code> A executar script: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ O instalador será encerrado e todas as alterações serão perdidas. NetInstallViewStep - - + Package selection Seleção de pacotes - + Office software Programas de Escritório - + Office package Pacote de escritório - + Browser software Software de navegação - + Browser package Pacote de navegador - + Web browser Navegador - + Kernel Kernel - + Services Serviços - + Login Entrar - + Desktop Ambiente de trabalho - + Applications Aplicações - + Communication Comunicação - + Development Desenvolvimento - + Office Escritório - + Multimedia Multimédia - + Internet Internet - + Theming Temas - + Gaming Jogos - + Utilities Utilitários @@ -3708,12 +3737,12 @@ Saída de Dados: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Se mais de uma pessoa usar este computador, você pode criar várias contas após a configuração.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Se mais de uma pessoa usar este computador, você pode criar várias contas após a instalação.</small> @@ -3721,7 +3750,7 @@ Saída de Dados: UsersQmlViewStep - + Users Utilizadores @@ -4141,102 +4170,102 @@ Saída de Dados: Qual é o seu nome? - + Your Full Name O seu nome completo - + What name do you want to use to log in? Que nome deseja usar para iniciar a sessão? - + Login Name Nome de utilizador - + If more than one person will use this computer, you can create multiple accounts after installation. Se mais do que uma pessoa utilizar este computador, poderá criar várias contas após a instalação. - + What is the name of this computer? Qual o nome deste computador? - + Computer Name Nome do computador - + This name will be used if you make the computer visible to others on a network. Este nome será utilizado se tornar o computador visível a outros numa rede. - + Choose a password to keep your account safe. Escolha uma palavra-passe para manter a sua conta segura. - + Password Palavra-passe - + Repeat Password Repita a palavra-passe - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. Uma boa palavra-passe conterá uma mistura de letras, números e pontuação, deve ter pelo menos oito caracteres, e deve ser alterada a intervalos regulares. - + Validate passwords quality Validar qualidade das palavras-passe - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Quando esta caixa é assinalada, a verificação da força da palavra-passe é feita e não será possível utilizar uma palavra-passe fraca. - + Log in automatically without asking for the password Iniciar sessão automaticamente sem pedir a palavra-passe - + Reuse user password as root password Reutilizar palavra-passe de utilizador como palavra-passe de root - + Use the same password for the administrator account. Usar a mesma palavra-passe para a conta de administrador. - + Choose a root password to keep your account safe. Escolha uma palavra-passe de root para manter a sua conta segura. - + Root Password Palavra-passe de root - + Repeat Root Password Repetir palavra-passe de root - + Enter the same password twice, so that it can be checked for typing errors. Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index 8df2b6084d..15dabc5489 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -102,22 +102,42 @@ Interfața: - - Tools - Unelte + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Reincarcă stilul - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Lista widget - + Debug information Informație pentru depanare @@ -288,13 +308,13 @@ - + &Yes &Da - + &No &Nu @@ -304,17 +324,17 @@ În&chide - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? Continuați configurarea? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Programul de instalare %1 este pregătit să facă schimbări pe discul dumneavoastră pentru a instala %2.<br/><strong>Nu veți putea anula aceste schimbări.</strong> - + &Set up now - + &Install now &Instalează acum - + Go &back Î&napoi - + &Set up - + &Install Instalează - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. Instalarea este completă. Închide instalatorul. - + Cancel setup without changing the system. - + Cancel installation without changing the system. Anulează instalarea fără schimbarea sistemului. - + &Next &Următorul - + &Back &Înapoi - + &Done &Gata - + &Cancel &Anulează - + Cancel setup? - + Cancel installation? Anulez instalarea? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Doriți să anulați procesul curent de instalare? @@ -472,12 +492,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CalamaresWindow - + %1 Setup Program - + %1 Installer Program de instalare %1 @@ -485,7 +505,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. CheckerContainer - + Gathering system information... Se adună informații despre sistem... @@ -733,22 +753,32 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Formatul numerelor și datelor calendaristice va fi %1. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) Instalare prin rețea. (Dezactivată: S-au recepționat grupuri de date invalide) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Selecția pachetelor + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalarea rețelei. (Dezactivat: Nu se pot obține listele de pachete, verificați conexiunea la rețea) @@ -843,42 +873,42 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Parolele nu se potrivesc! - + Setup Failed - + Installation Failed Instalare eșuată - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete Instalarea s-a terminat - + The setup of %1 is complete. - + The installation of %1 is complete. Instalarea este %1 completă. @@ -1475,72 +1505,72 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source este alimentat cu curent - + The system is not plugged in to a power source. Sistemul nu este alimentat cu curent. - + is connected to the Internet este conectat la Internet - + The system is not connected to the Internet. Sistemul nu este conectat la Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. Programul de instalare nu rulează cu privilegii de administrator. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. Ecranu este prea mic pentru a afișa instalatorul. @@ -1608,7 +1638,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Trebuie să instalezi KDE Konsole și să încerci din nou! - + Executing script: &nbsp;<code>%1</code> Se execută scriptul: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. NetInstallViewStep - - + Package selection Selecția pachetelor - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3712,12 +3741,12 @@ Output UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3725,7 +3754,7 @@ Output UsersQmlViewStep - + Users Utilizatori @@ -4109,102 +4138,102 @@ Output Cum vă numiți? - + Your Full Name - + What name do you want to use to log in? Ce nume doriți să utilizați pentru logare? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Care este numele calculatorului? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Alegeți o parolă pentru a menține contul în siguranță. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. Folosește aceeași parolă pentru contul de administrator. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index ef195144f6..1cc038db7a 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Управлять настройками авто-монтирования @@ -102,22 +102,42 @@ Интерфейс: - - Tools - Инструменты + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + Отправить журнал сессии + + + Reload Stylesheet Перезагрузить таблицу стилей - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Дерево виджетов - + Debug information Отладочная информация @@ -290,13 +310,13 @@ - + &Yes &Да - + &No &Нет @@ -306,17 +326,17 @@ &Закрыть - + Install Log Paste URL Адрес для отправки журнала установки - + The upload was unsuccessful. No web-paste was done. Загрузка не удалась. Веб-вставка не была завершена. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard - + Calamares Initialization Failed Ошибка инициализации Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. Не удалось установить %1. Calamares не удалось загрузить все сконфигурированные модули. Эта проблема вызвана тем, как ваш дистрибутив использует Calamares. - + <br/>The following modules could not be loaded: <br/>Не удалось загрузить следующие модули: - + Continue with setup? Продолжить установку? - + Continue with installation? Продолжить установку? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong> - + &Set up now &Настроить сейчас - + &Install now Приступить к &установке - + Go &back &Назад - + &Set up &Настроить - + &Install &Установить - + Setup is complete. Close the setup program. Установка завершена. Закройте программу установки. - + The installation is complete. Close the installer. Установка завершена. Закройте установщик. - + Cancel setup without changing the system. Отменить установку без изменения системы. - + Cancel installation without changing the system. Отменить установку без изменения системы. - + &Next &Далее - + &Back &Назад - + &Done &Готово - + &Cancel О&тмена - + Cancel setup? Отменить установку? - + Cancel installation? Отменить установку? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Прервать процесс установки? Программа установки прекратит работу и все изменения будут потеряны. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Действительно прервать процесс установки? Программа установки сразу прекратит работу, все изменения будут потеряны. @@ -474,12 +494,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Программа установки %1 - + %1 Installer Программа установки %1 @@ -487,7 +507,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Сбор информации о системе... @@ -722,7 +742,7 @@ The installer will quit and all changes will be lost. Set timezone to %1/%2. - + Установить часовой пояс на %1/%2 @@ -735,22 +755,32 @@ The installer will quit and all changes will be lost. Региональным форматом чисел и дат будет установлен %1. - + Network Installation. (Disabled: Incorrect configuration) Сетевая установка. (Отключено: неверная конфигурация) - + Network Installation. (Disabled: Received invalid groups data) Установка по сети. (Отключено: получены неверные сведения о группах) - - Network Installation. (Disabled: internal error) - Сетевая установка. (Отключено: внутренняя ошибка) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + - + + Package selection + Выбор пакетов + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Установка по сети. (Отключено: не удается получить список пакетов, проверьте сетевое подключение) @@ -807,7 +837,7 @@ The installer will quit and all changes will be lost. '%1' is not allowed as username. - + '%1' нельзя использовать как имя пользователя @@ -832,7 +862,7 @@ The installer will quit and all changes will be lost. '%1' is not allowed as hostname. - + '%1' нельзя использовать как имя хоста @@ -845,42 +875,42 @@ The installer will quit and all changes will be lost. Пароли не совпадают! - + Setup Failed Сбой установки - + Installation Failed Установка завершилась неудачей - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Установка завершена - + Installation Complete Установка завершена - + The setup of %1 is complete. Установка %1 завершена. - + The installation of %1 is complete. Установка %1 завершена. @@ -1081,23 +1111,23 @@ The installer will quit and all changes will be lost. Preserving home directory - + Сохранение домашней папки Creating user %1 - + Создание пользователя %1 Configuring user %1 - + Настройка пользователя %1 Setting file permissions - + Установка прав доступа файла @@ -1477,72 +1507,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space доступно как минимум %1 ГБ свободного дискового пространства - + There is not enough drive space. At least %1 GiB is required. Недостаточно места на дисках. Необходимо как минимум %1 ГБ. - + has at least %1 GiB working memory доступно как минимум %1 ГБ оперативной памяти - + The system does not have enough working memory. At least %1 GiB is required. Недостаточно оперативной памяти. Необходимо как минимум %1 ГБ. - + is plugged in to a power source подключено сетевое питание - + The system is not plugged in to a power source. Сетевое питание не подключено. - + is connected to the Internet присутствует выход в сеть Интернет - + The system is not connected to the Internet. Отсутствует выход в Интернет. - + is running the installer as an administrator (root) запуск установщика с правами администратора (root) - + The setup program is not running with administrator rights. Программа установки запущена без прав администратора. - + The installer is not running with administrator rights. Программа установки не запущена с привилегиями администратора. - + has a screen large enough to show the whole installer экран достаточно большой, чтобы показать установщик полностью - + The screen is too small to display the setup program. Экран слишком маленький, чтобы отобразить программу установки. - + The screen is too small to display the installer. Экран слишком маленький, чтобы отобразить окно установщика. @@ -1610,7 +1640,7 @@ The installer will quit and all changes will be lost. Установите KDE Konsole и попробуйте ещё раз! - + Executing script: &nbsp;<code>%1</code> Выполняется сценарий: &nbsp;<code>%1</code> @@ -1849,7 +1879,7 @@ The installer will quit and all changes will be lost. Generate machine-id. - + Генерация идентификатора устройства @@ -1880,98 +1910,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Выбор пакетов - + Office software Офисное программное обеспечение - + Office package Офисный пакет - + Browser software Браузерное программное обеспечение - + Browser package Браузерный пакет - + Web browser Веб-браузер - + Kernel Ядро - + Services Сервисы - + Login - + Вход - + Desktop Рабочий стол - + Applications Приложения - + Communication Общение - + Development Разработка - + Office Офис - + Multimedia Мультимедиа - + Internet Интернет - + Theming Темы - + Gaming Игры - + Utilities Утилиты @@ -2020,7 +2049,7 @@ The installer will quit and all changes will be lost. Select your preferred Region, or use the default one based on your current location. - + Выберите ваш регион или используйте стандартный на основе вашего текущего местоположения. @@ -2032,12 +2061,12 @@ The installer will quit and all changes will be lost. Select your preferred Zone within your Region. - + Выберите ваш предпочитаемый пояс в регионе Zones - + Пояса @@ -3516,7 +3545,7 @@ Output: Preparing groups. - + Подготовка групп @@ -3721,12 +3750,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Если этот компьютер будет использоваться несколькими людьми, вы сможете создать учетные записи для них после установки.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Если этот компьютер используется несколькими людьми, Вы сможете создать соответствующие учетные записи сразу после установки.</small> @@ -3734,7 +3763,7 @@ Output: UsersQmlViewStep - + Users Пользователи @@ -3753,7 +3782,7 @@ Output: Key Column header for key/value - + Ключ @@ -3911,7 +3940,7 @@ Output: <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> Благодарим<a href="https://calamares.io/team/">команду Calamares </a> и <a href="https://www.transifex.com/calamares/calamares/">команду10команду переводчиков Calamares</a>.<br/><br/>Разработка <a href="https://calamares.io/">Calamares</a> спонсирована <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. @@ -3983,7 +4012,7 @@ Output: Restart System - + Перезапустить систему @@ -4119,102 +4148,102 @@ Output: Как Вас зовут? - + Your Full Name Ваше полное имя - + What name do you want to use to log in? Какое имя Вы хотите использовать для входа? - + Login Name Имя пользователя - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Какое имя у компьютера? - + Computer Name Имя компьютера - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Выберите пароль для защиты вашей учетной записи. - + Password Пароль - + Repeat Password Повторите пароль - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Когда этот флажок установлен, выполняется проверка надежности пароля, и вы не сможете использовать слабый пароль. - + Log in automatically without asking for the password - + Reuse user password as root password - + Использовать пароль пользователя как пароль суперпользователя - + Use the same password for the administrator account. Использовать тот же пароль для аккаунта администратора. - + Choose a root password to keep your account safe. - + Root Password - + Пароль суперпользователя - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. @@ -4251,7 +4280,7 @@ Output: Donate - + Пожертвовать diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts index ca2abdc584..f6ac64656d 100644 --- a/lang/calamares_si.ts +++ b/lang/calamares_si.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index c93cfe9924..c7b5c6809e 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -102,22 +102,42 @@ Rozhranie: - - Tools - Nástroje + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + - + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet Znovu načítať hárok so štýlmi - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Strom miniaplikácií - + Debug information Ladiace informácie @@ -290,13 +310,13 @@ - + &Yes _Áno - + &No _Nie @@ -306,17 +326,17 @@ _Zavrieť - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. Odovzdanie nebolo úspešné. Nebolo dokončené žiadne webové vloženie. - + Install log posted to %1 @@ -325,124 +345,124 @@ Link copied to clipboard - + Calamares Initialization Failed Zlyhala inicializácia inštalátora Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. Nie je možné nainštalovať %1. Calamares nemohol načítať všetky konfigurované moduly. Je problém s tým, ako sa Calamares používa pri distribúcii. - + <br/>The following modules could not be loaded: <br/>Nebolo možné načítať nasledujúce moduly - + Continue with setup? Pokračovať v inštalácii? - + Continue with installation? Pokračovať v inštalácii? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Inštalačný program distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Inštalátor distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</strong> - + &Set up now &Inštalovať teraz - + &Install now &Inštalovať teraz - + Go &back Prejsť s&päť - + &Set up &Inštalovať - + &Install _Inštalovať - + Setup is complete. Close the setup program. Inštalácia je dokončená. Zavrite inštalačný program. - + The installation is complete. Close the installer. Inštalácia je dokončená. Zatvorí inštalátor. - + Cancel setup without changing the system. Zrušenie inštalácie bez zmien v systéme. - + Cancel installation without changing the system. Zruší inštaláciu bez zmeny systému. - + &Next Ď&alej - + &Back &Späť - + &Done _Dokončiť - + &Cancel &Zrušiť - + Cancel setup? Zrušiť inštaláciu? - + Cancel installation? Zrušiť inštaláciu? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Naozaj chcete zrušiť aktuálny priebeh inštalácie? Inštalačný program bude ukončený a zmeny budú stratené. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Skutočne chcete zrušiť aktuálny priebeh inštalácie? @@ -475,12 +495,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CalamaresWindow - + %1 Setup Program Inštalačný program distribúcie %1 - + %1 Installer Inštalátor distribúcie %1 @@ -488,7 +508,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. CheckerContainer - + Gathering system information... Zbierajú sa informácie o počítači... @@ -737,22 +757,32 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Miestne nastavenie čísel a dátumov bude nastavené na %1. - + Network Installation. (Disabled: Incorrect configuration) Sieťová inštalácia. (Zakázaná: Nesprávna konfigurácia) - + Network Installation. (Disabled: Received invalid groups data) Sieťová inštalácia. (Zakázaná: Boli prijaté neplatné údaje o skupinách) - - Network Installation. (Disabled: internal error) - Sieťová inštalácia. (Zakázaná: vnútorná chyba) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Výber balíkov - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Sieťová inštalácia. (Zakázaná: Nie je možné získať zoznamy balíkov. Skontrolujte vaše sieťové pripojenie.) @@ -847,42 +877,42 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Vaše heslá sa nezhodujú! - + Setup Failed Inštalácia zlyhala - + Installation Failed Inštalácia zlyhala - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Inštalácia dokončená - + Installation Complete Inštalácia dokončená - + The setup of %1 is complete. Inštalácia distribúcie %1 je dokončená. - + The installation of %1 is complete. Inštalácia distribúcie %1s je dokončená. @@ -1479,72 +1509,72 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. GeneralRequirements - + has at least %1 GiB available drive space obsahuje aspoň %1 GiB voľného miesta na disku - + There is not enough drive space. At least %1 GiB is required. Nie je dostatok miesta na disku. Vyžaduje sa aspoň %1 GiB. - + has at least %1 GiB working memory obsahuje aspoň %1 GiB voľnej operačnej pamäte - + The system does not have enough working memory. At least %1 GiB is required. Počítač neobsahuje dostatok operačnej pamäte. Vyžaduje sa aspoň %1 GiB. - + is plugged in to a power source je pripojený k zdroju napájania - + The system is not plugged in to a power source. Počítač nie je pripojený k zdroju napájania. - + is connected to the Internet je pripojený k internetu - + The system is not connected to the Internet. Počítač nie je pripojený k internetu. - + is running the installer as an administrator (root) má spustený inštalátor s právami správcu (root) - + The setup program is not running with administrator rights. Inštalačný program nie je spustený s právami správcu. - + The installer is not running with administrator rights. Inštalátor nie je spustený s právami správcu. - + has a screen large enough to show the whole installer má obrazovku dostatočne veľkú na zobrazenie celého inštalátora - + The screen is too small to display the setup program. Obrazovka je príliš malá na to, aby bolo možné zobraziť inštalačný program. - + The screen is too small to display the installer. Obrazovka je príliš malá na to, aby bolo možné zobraziť inštalátor. @@ -1612,7 +1642,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. Prosím, nainštalujte Konzolu prostredia KDE a skúste to znovu! - + Executing script: &nbsp;<code>%1</code> Spúšťa sa skript: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ Inštalátor sa ukončí a všetky zmeny budú stratené. NetInstallViewStep - - + Package selection Výber balíkov - + Office software Kancelársky softvér - + Office package Kancelársky balík - + Browser software Prehliadač - + Browser package Balík prehliadača - + Web browser Webový prehliadač - + Kernel Jadro - + Services Služby - + Login Prihlásenie - + Desktop Pracovné prostredie - + Applications Aplikácie - + Communication Komunikácia - + Development Vývoj - + Office Kancelária - + Multimedia Multimédiá - + Internet Internet - + Theming Motívy - + Gaming Hry - + Utilities Nástroje @@ -3726,12 +3755,12 @@ Výstup: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Ak bude tento počítač používať viac ako jedna osoba, môžete nastaviť viacero účtov po inštalácii.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Ak bude tento počítač používať viac ako jedna osoba, môžete nastaviť viacero účtov po inštalácii.</small> @@ -3739,7 +3768,7 @@ Výstup: UsersQmlViewStep - + Users Používatelia @@ -4136,102 +4165,102 @@ Výstup: Aké je vaše meno? - + Your Full Name Vaše celé meno - + What name do you want to use to log in? Aké meno chcete použiť na prihlásenie? - + Login Name Prihlasovacie meno - + If more than one person will use this computer, you can create multiple accounts after installation. Ak bude tento počítač používať viac ako jedna osoba, môžete po inštalácii vytvoriť viacero účtov. - + What is the name of this computer? Aký je názov tohto počítača? - + Computer Name Názov počítača - + This name will be used if you make the computer visible to others on a network. Tento názov bude použitý, keď zviditeľníte počítač ostatným v sieti. - + Choose a password to keep your account safe. Zvoľte heslo pre zachovanie vášho účtu v bezpečí. - + Password Heslo - + Repeat Password Zopakovanie hesla - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom. Dobré heslo by malo obsahovať mix písmen, čísel a diakritiky, malo by mať dĺžku aspoň osem znakov a malo by byť pravidelne menené. - + Validate passwords quality Overiť kvalitu hesiel - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Keď je zaškrtnuté toto políčko, kontrola kvality hesla bude ukončená a nebudete môcť použiť slabé heslo. - + Log in automatically without asking for the password Prihlásiť automaticky bez pýtania hesla - + Reuse user password as root password Znovu použiť používateľské heslo ako heslo správcu - + Use the same password for the administrator account. Použiť rovnaké heslo pre účet správcu. - + Choose a root password to keep your account safe. Zvoľte heslo správcu pre zachovanie vášho účtu v bezpečí. - + Root Password Heslo správcu - + Repeat Root Password Zopakovanie hesla správcu - + Enter the same password twice, so that it can be checked for typing errors. Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom. diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts index 7a8bc6a57e..d173238707 100644 --- a/lang/calamares_sl.ts +++ b/lang/calamares_sl.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -290,13 +310,13 @@ - + &Yes - + &No @@ -306,17 +326,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Naprej - + &Back &Nazaj - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? Preklic namestitve? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Ali res želite preklicati trenutni namestitveni proces? @@ -474,12 +494,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Namestilnik @@ -487,7 +507,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. CheckerContainer - + Gathering system information... Zbiranje informacij o sistemu ... @@ -735,22 +755,32 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -845,42 +875,42 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Setup Failed - + Installation Failed Namestitev je spodletela - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1477,72 +1507,72 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source je priklopljen na vir napajanja - + The system is not plugged in to a power source. - + is connected to the Internet je povezan s spletom - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1610,7 +1640,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. - + Executing script: &nbsp;<code>%1</code> @@ -1880,98 +1910,97 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3717,12 +3746,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3730,7 +3759,7 @@ Output: UsersQmlViewStep - + Users @@ -4114,102 +4143,102 @@ Output: Vaše ime? - + Your Full Name - + What name do you want to use to log in? Katero ime želite uporabiti za prijavljanje? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Ime računalnika? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Izberite geslo za zaščito vašega računa. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts index 3dcf7ddf19..e5270710a6 100644 --- a/lang/calamares_sq.ts +++ b/lang/calamares_sq.ts @@ -102,22 +102,42 @@ Ndërfaqe: - - Tools - Mjete + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Ringarko Fletëstilin - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Pemë Widget-esh - + Debug information Të dhëna diagnostikimi @@ -286,13 +306,13 @@ - + &Yes &Po - + &No &Jo @@ -302,17 +322,17 @@ &Mbylle - + Install Log Paste URL URL Ngjitjeje Regjistri Instalimi - + The upload was unsuccessful. No web-paste was done. Ngarkimi s’qe i suksesshëm. S’u bë hedhje në web. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Gatitja e Calamares-it Dështoi - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 s’mund të instalohet. Calamares s’qe në gjendje të ngarkonte krejt modulet e formësuar. Ky është një problem që lidhet me mënyrën se si përdoret Calamares nga shpërndarja. - + <br/>The following modules could not be loaded: <br/>S’u ngarkuan dot modulet vijues: - + Continue with setup? Të vazhdohet me rregullimin? - + Continue with installation? Të vazhdohet me instalimin? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Programi i rregullimit %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të rregullojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Instaluesi %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të instalojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong> - + &Set up now &Rregulloje tani - + &Install now &Instaloje tani - + Go &back Kthehu &mbrapsht - + &Set up &Rregulloje - + &Install &Instaloje - + Setup is complete. Close the setup program. Rregullimi është i plotë. Mbylleni programin e rregullimit. - + The installation is complete. Close the installer. Instalimi u plotësua. Mbylleni instaluesin. - + Cancel setup without changing the system. Anuloje rregullimin pa ndryshuar sistemin. - + Cancel installation without changing the system. Anuloje instalimin pa ndryshuar sistemin. - + &Next Pas&uesi - + &Back &Mbrapsht - + &Done &U bë - + &Cancel &Anuloje - + Cancel setup? Të anulohet rregullimi? - + Cancel installation? Të anulohet instalimi? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Doni vërtet të anulohet procesi i tanishëm i rregullimit? Programi i rregullimit do të mbyllet dhe krejt ndryshimet do të humbin. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Doni vërtet të anulohet procesi i tanishëm i instalimit? @@ -471,12 +491,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CalamaresWindow - + %1 Setup Program Programi i Rregullimit të %1 - + %1 Installer Instalues %1 @@ -484,7 +504,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. CheckerContainer - + Gathering system information... Po grumbullohen të dhëna mbi sistemin… @@ -732,22 +752,32 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Si vendore për numra dhe data do të vihet %1. - + Network Installation. (Disabled: Incorrect configuration) Instalim Nga Rrjeti. (E çaktivizuar: Formësim i pasaktë) - + Network Installation. (Disabled: Received invalid groups data) Instalim Nga Rrjeti. (U çaktivizua: U morën të dhëna të pavlefshme grupesh) - - Network Installation. (Disabled: internal error) - Instalim Nga Rrjeti. (E çaktivizuar: gabim i brendshëm) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Përzgjedhje paketash - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Instalim Nga Rrjeti. (U çaktivizua: S’arrihet të sillen lista paketash, kontrolloni lidhjen tuaj në rrjet) @@ -842,42 +872,42 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Fjalëkalimet tuaj s’përputhen! - + Setup Failed Rregullimi Dështoi - + Installation Failed Instalimi Dështoi - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Rregullim i Plotësuar - + Installation Complete Instalimi u Plotësua - + The setup of %1 is complete. Rregullimi i %1 u plotësua. - + The installation of %1 is complete. Instalimi i %1 u plotësua. @@ -1474,72 +1504,72 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. GeneralRequirements - + has at least %1 GiB available drive space ka të paktën %1 GiB hapësirë të përdorshme - + There is not enough drive space. At least %1 GiB is required. S’ka hapësirë të mjaftueshme. Lypset të paktën %1 GiB. - + has at least %1 GiB working memory ka të paktën %1 GiB kujtesë të përdorshme - + The system does not have enough working memory. At least %1 GiB is required. Sistemi s’ka kujtesë të mjaftueshme për të punuar. Lypsen të paktën %1 GiB. - + is plugged in to a power source është në prizë - + The system is not plugged in to a power source. Sistemi s'është i lidhur me ndonjë burim rryme. - + is connected to the Internet është lidhur në Internet - + The system is not connected to the Internet. Sistemi s’është i lidhur në Internet. - + is running the installer as an administrator (root) po e xhiron instaluesin si një përgjegjës (rrënjë) - + The setup program is not running with administrator rights. Programi i rregullimit nuk po xhirohen me të drejta përgjegjësi. - + The installer is not running with administrator rights. Instaluesi s’po xhirohet me të drejta përgjegjësi. - + has a screen large enough to show the whole installer ka një ekran të mjaftueshëm për të shfaqur krejt instaluesin - + The screen is too small to display the setup program. Ekrani është shumë i vogël për të shfaqur programin e rregullimit. - + The screen is too small to display the installer. Ekrani është shumë i vogël për shfaqjen e instaluesit. @@ -1607,7 +1637,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. Ju lutemi, instaloni KDE Konsole dhe riprovoni! - + Executing script: &nbsp;<code>%1</code> Po përmbushet programthi: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej. NetInstallViewStep - - + Package selection Përzgjedhje paketash - + Office software Software zyrash - + Office package Paketë zyrash - + Browser software Software shfletuesi - + Browser package Paketë shfletuesi - + Web browser Shfletues - + Kernel Kernel - + Services Shërbime - + Login Hyrje - + Desktop Desktop - + Applications Aplikacione - + Communication Komunikim - + Development Zhvillim - + Office Zyrë - + Multimedia Multimedia - + Internet Internet - + Theming Tema - + Gaming Lojëra - + Utilities Të dobishme @@ -3702,12 +3731,12 @@ Përfundim: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas rregullimit.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni disa llogari, pas instalimit.</small> @@ -3715,7 +3744,7 @@ Përfundim: UsersQmlViewStep - + Users Përdorues @@ -4133,102 +4162,102 @@ Përfundim: Cili është emri juaj? - + Your Full Name Emri Juaj i Plotë - + What name do you want to use to log in? Ç’emër doni të përdorni për t’u futur? - + Login Name Emër Hyrjeje - + If more than one person will use this computer, you can create multiple accounts after installation. Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni llogari të shumta pas instalimit. - + What is the name of this computer? Cili është emri i këtij kompjuteri? - + Computer Name Emër Kompjuteri - + This name will be used if you make the computer visible to others on a network. Ky emër do të përdoret nëse e bëni kompjuterin të dukshëm për të tjerët në një rrjet. - + Choose a password to keep your account safe. Zgjidhni një fjalëkalim për ta mbajtur llogarinë tuaj të parrezikuar. - + Password Fjalëkalim - + Repeat Password Ripërsëritni Fjalëkalimin - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Jepeni të njëjtin fjalëkalim dy herë, që të kontrollohet për gabime shkrimi. Një fjalëkalim i mirë do të përmbante një përzierje shkronjash, numrash dhe shenjash pikësimi, do të duhej të ishte të paktën tetë shenja i gjatë, dhe do të duhej të ndryshohej periodikisht. - + Validate passwords quality Vlerëso cilësi fjalëkalimi - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Kur i vihet shenjë kësaj kutize, bëhet kontroll fortësie fjalëkalimi dhe s’do të jeni në gjendje të përdorni një fjalëkalim të dobët. - + Log in automatically without asking for the password Kryej hyrje vetvetiu, pa kërkuar fjalëkalimin. - + Reuse user password as root password Ripërdor fjalëkalim përdoruesi si fjalëkalim përdoruesi rrënjë - + Use the same password for the administrator account. Përdor të njëjtin fjalëkalim për llogarinë e përgjegjësit. - + Choose a root password to keep your account safe. Që ta mbani llogarinë tuaj të parrezik, zgjidhni një fjalëkalim rrënje - + Root Password Fjalëkalim Rrënje - + Repeat Root Password Përsëritni Fjalëkalim Rrënje - + Enter the same password twice, so that it can be checked for typing errors. Jepeni të njëjtin fjalëkalim dy herë, që të mund të kontrollohet për gabime shkrimi. diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts index 0909db92a0..c86c45f022 100644 --- a/lang/calamares_sr.ts +++ b/lang/calamares_sr.ts @@ -102,22 +102,42 @@ Сучеље: - - Tools - Алатке + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -288,13 +308,13 @@ - + &Yes - + &No @@ -304,17 +324,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? Наставити са подешавањем? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now &Инсталирај сада - + Go &back Иди &назад - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Следеће - + &Back &Назад - + &Done - + &Cancel &Откажи - + Cancel setup? - + Cancel installation? Отказати инсталацију? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Да ли стварно желите да прекинете текући процес инсталације? @@ -472,12 +492,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 инсталер @@ -485,7 +505,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -733,22 +753,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + Избор пакета + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -843,42 +873,42 @@ The installer will quit and all changes will be lost. Лозинке се не поклапају! - + Setup Failed - + Installation Failed Инсталација није успела - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1475,72 +1505,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1608,7 +1638,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Избор пакета - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3706,12 +3735,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3719,7 +3748,7 @@ Output: UsersQmlViewStep - + Users Корисници @@ -4103,102 +4132,102 @@ Output: Како се зовете? - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Како ћете звати ваш рачунар? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Изаберите лозинку да обезбедите свој налог. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts index 2d4f052273..229b98bd7d 100644 --- a/lang/calamares_sr@latin.ts +++ b/lang/calamares_sr@latin.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -288,13 +308,13 @@ - + &Yes - + &No @@ -304,17 +324,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &Dalje - + &Back &Nazad - + &Done - + &Cancel &Prekini - + Cancel setup? - + Cancel installation? Prekini instalaciju? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Da li stvarno želite prekinuti trenutni proces instalacije? @@ -472,12 +492,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CalamaresWindow - + %1 Setup Program - + %1 Installer %1 Instaler @@ -485,7 +505,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. CheckerContainer - + Gathering system information... @@ -733,22 +753,32 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -843,42 +873,42 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. Vaše lozinke se ne poklapaju - + Setup Failed - + Installation Failed Neuspješna instalacija - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1475,72 +1505,72 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source je priključen na izvor struje - + The system is not plugged in to a power source. - + is connected to the Internet ima vezu sa internetom - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1608,7 +1638,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. - + Executing script: &nbsp;<code>%1</code> @@ -1878,98 +1908,97 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3706,12 +3735,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3719,7 +3748,7 @@ Output: UsersQmlViewStep - + Users Korisnici @@ -4103,102 +4132,102 @@ Output: Kako se zovete? - + Your Full Name - + What name do you want to use to log in? Koje ime želite koristiti da se prijavite? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? Kako želite nazvati ovaj računar? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. Odaberite lozinku da biste zaštitili Vaš korisnički nalog. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index e30f2463c8..e1045e73bb 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -102,22 +102,42 @@ Gränssnitt: - - Tools - Verktyg + + Crashes Calamares, so that Dr. Konqui can look at it. + Kraschar Calamares, så att Dr. Konqui kan titta på det. + + + + Reloads the stylesheet from the branding directory. + Laddar om stilmall från branding katalogen. + + + + Uploads the session log to the configured pastebin. + Laddar upp sessionsloggen till den konfigurerade pastebin. + + + + Send Session Log + Skicka Session Logg - + Reload Stylesheet Ladda om stilmall - + + Displays the tree of widget names in the log (for stylesheet debugging). + Visar trädet med widgetnamn i loggen (för stilmalls felsökning). + + + Widget Tree Widgetträd - + Debug information Avlusningsinformation @@ -286,13 +306,13 @@ - + &Yes &Ja - + &No &Nej @@ -302,17 +322,17 @@ &Stäng - + Install Log Paste URL URL till installationslogg - + The upload was unsuccessful. No web-paste was done. Sändningen misslyckades. Ingenting sparades på webbplatsen. - + Install log posted to %1 @@ -325,123 +345,123 @@ Link copied to clipboard Länken kopierades till urklipp - + Calamares Initialization Failed Initieringen av Calamares misslyckades - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 kan inte installeras. Calamares kunde inte ladda alla konfigurerade moduler. Detta är ett problem med hur Calamares används av distributionen. - + <br/>The following modules could not be loaded: <br/>Följande moduler kunde inte hämtas: - + Continue with setup? Fortsätt med installation? - + Continue with installation? Vill du fortsätta med installationen? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1-installeraren är på väg att göra ändringar på disk för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1-installeraren är på väg att göra ändringar för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</strong> - + &Set up now &Installera nu - + &Install now &Installera nu - + Go &back Gå &bakåt - + &Set up &Installera - + &Install &Installera - + Setup is complete. Close the setup program. Installationen är klar. Du kan avsluta installationsprogrammet. - + The installation is complete. Close the installer. Installationen är klar. Du kan avsluta installationshanteraren. - + Cancel setup without changing the system. Avbryt inställningarna utan att förändra systemet. - + Cancel installation without changing the system. Avbryt installationen utan att förändra systemet. - + &Next &Nästa - + &Back &Bakåt - + &Done &Klar - + &Cancel Avbryt - + Cancel setup? Avbryt inställningarna? - + Cancel installation? Avbryt installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Vill du verkligen avbryta den nuvarande uppstartsprocessen? Uppstartsprogrammet kommer avsluta och alla ändringar kommer förloras. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Är du säker på att du vill avsluta installationen i förtid? @@ -474,12 +494,12 @@ Alla ändringar kommer att gå förlorade. CalamaresWindow - + %1 Setup Program %1 Installationsprogram - + %1 Installer %1-installationsprogram @@ -487,7 +507,7 @@ Alla ändringar kommer att gå förlorade. CheckerContainer - + Gathering system information... Samlar systeminformation... @@ -735,22 +755,32 @@ Alla ändringar kommer att gå förlorade. Systemspråket för siffror och datum kommer sättas till %1. - + Network Installation. (Disabled: Incorrect configuration) Nätverksinstallation. (Inaktiverad: inkorrekt konfiguration) - + Network Installation. (Disabled: Received invalid groups data) Nätverksinstallation. (Inaktiverad: Fick felaktig gruppdata) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) Nätverksinstallation. (Inaktiverad: internt fel) - + + Network Installation. (Disabled: No package list) + Nätverksinstallation. (Inaktiverad: Ingen paketlista) + + + + Package selection + Paketval + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Nätverksinstallation. (Inaktiverad: Kan inte hämta paketlistor, kontrollera nätverksanslutningen) @@ -845,42 +875,42 @@ Alla ändringar kommer att gå förlorade. Lösenorden överensstämmer inte! - + Setup Failed Inställningarna misslyckades - + Installation Failed Installationen misslyckades - + The setup of %1 did not complete successfully. Installationen av %1 slutfördes inte korrekt. - + The installation of %1 did not complete successfully. Installationen av %1 slutfördes inte korrekt. - + Setup Complete Inställningarna är klara - + Installation Complete Installationen är klar - + The setup of %1 is complete. Inställningarna för %1 är klara. - + The installation of %1 is complete. Installationen av %1 är klar. @@ -1477,72 +1507,72 @@ Alla ändringar kommer att gå förlorade. GeneralRequirements - + has at least %1 GiB available drive space har minst %1 GiB tillgängligt på hårddisken - + There is not enough drive space. At least %1 GiB is required. Det finns inte tillräckligt med hårddiskutrymme. Minst %1 GiB krävs. - + has at least %1 GiB working memory har minst %1 GiB arbetsminne - + The system does not have enough working memory. At least %1 GiB is required. Systemet har inte tillräckligt med fungerande minne. Minst %1 GiB krävs. - + is plugged in to a power source är ansluten till en strömkälla - + The system is not plugged in to a power source. Systemet är inte anslutet till någon strömkälla. - + is connected to the Internet är ansluten till internet - + The system is not connected to the Internet. Systemet är inte anslutet till internet. - + is running the installer as an administrator (root) körs installationsprogammet med administratörsrättigheter (root) - + The setup program is not running with administrator rights. Installationsprogammet körs inte med administratörsrättigheter. - + The installer is not running with administrator rights. Installationsprogammet körs inte med administratörsrättigheter. - + has a screen large enough to show the whole installer har en tillräckligt stor skärm för att visa hela installationsprogrammet - + The screen is too small to display the setup program. Skärmen är för liten för att visa installationsprogrammet. - + The screen is too small to display the installer. Skärmen är för liten för att visa installationshanteraren. @@ -1610,7 +1640,7 @@ Alla ändringar kommer att gå förlorade. Installera KDE Konsole och försök igen! - + Executing script: &nbsp;<code>%1</code> Kör skript: &nbsp;<code>%1</code> @@ -1883,98 +1913,97 @@ Sök på kartan genom att dra NetInstallViewStep - - + Package selection Paketval - + Office software Kontors programvara - + Office package Kontors paket - + Browser software Webbläsare - + Browser package Webbläsare - + Web browser Webbläsare - + Kernel Kärna - + Services Tjänster - + Login Inloggning - + Desktop Skrivbord - + Applications Program - + Communication Kommunikation - + Development Utveckling - + Office Kontorsprogram - + Multimedia Multimedia - + Internet Internet - + Theming Teman - + Gaming Gaming - + Utilities Verktyg @@ -3708,12 +3737,12 @@ Installationen kan inte fortsätta.</p> UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Om mer än en person skall använda datorn så kan du skapa flera användarkonton när inställningarna är klara.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Om mer än en person skall använda datorn så kan du skapa flera användarkonton när installationen är klar.</small> @@ -3721,7 +3750,7 @@ Installationen kan inte fortsätta.</p> UsersQmlViewStep - + Users Användare @@ -4141,102 +4170,102 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand Vad heter du? - + Your Full Name Ditt Fullständiga namn - + What name do you want to use to log in? Vilket namn vill du använda för att logga in? - + Login Name Inloggningsnamn - + If more than one person will use this computer, you can create multiple accounts after installation. Om mer än en person skall använda datorn så kan du skapa flera användarkonton efter installationen. - + What is the name of this computer? Vad är namnet på datorn? - + Computer Name Datornamn - + This name will be used if you make the computer visible to others on a network. Detta namn kommer användas om du gör datorn synlig för andra i ett nätverk. - + Choose a password to keep your account safe. Välj ett lösenord för att hålla ditt konto säkert. - + Password Lösenord - + Repeat Password Repetera Lösenord - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel. Ett bra lösenord innehåller en blandning av bokstäver, nummer och interpunktion, bör vara minst åtta tecken långt, och bör ändras regelbundet. - + Validate passwords quality Validera lösenords kvalite - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. När den här rutan är förkryssad kommer kontroll av lösenordsstyrka att genomföras, och du kommer inte kunna använda ett svagt lösenord. - + Log in automatically without asking for the password Logga in automatiskt utan att fråga efter ett lösenord. - + Reuse user password as root password Återanvänd användarlösenord som root lösenord - + Use the same password for the administrator account. Använd samma lösenord för administratörskontot. - + Choose a root password to keep your account safe. Välj ett root lösenord för att hålla ditt konto säkert. - + Root Password Root Lösenord - + Repeat Root Password Repetera Root Lösenord - + Enter the same password twice, so that it can be checked for typing errors. Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel. diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts index acbe41d0d8..2b8af99bfb 100644 --- a/lang/calamares_te.ts +++ b/lang/calamares_te.ts @@ -104,22 +104,42 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి ఇంటర్ఫేస్ - - Tools - టూల్స్ + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet రీలోడ్ స్టైల్షీట్ - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree విడ్జెట్ ట్రీ - + Debug information డీబగ్ సమాచారం @@ -288,13 +308,13 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి - + &Yes - + &No @@ -304,17 +324,17 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -323,123 +343,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) - + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3696,12 +3725,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3709,7 +3738,7 @@ Output: UsersQmlViewStep - + Users @@ -4093,102 +4122,102 @@ Output: మీ పేరు ఏమిటి ? - + Your Full Name - + What name do you want to use to log in? ప్రవేశించడానికి ఈ పేరుని ఉపయోగిస్తారు - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. మీ ఖాతా ను భద్రపరుచుకోవడానికి ఒక మంత్రమును ఎంచుకోండి - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts index 7c5eb677b8..9b69b06f6c 100644 --- a/lang/calamares_tg.ts +++ b/lang/calamares_tg.ts @@ -102,22 +102,42 @@ Интерфейс: - - Tools - Абзорҳо + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Аз нав бор кардани варақаи услубҳо - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Дарахти виҷетҳо - + Debug information Иттилооти ислоҳи нуқсонҳо @@ -286,13 +306,13 @@ - + &Yes &Ҳа - + &No &Не @@ -302,17 +322,17 @@ &Пӯшидан - + Install Log Paste URL Гузоштани нишонии URL-и сабти рӯйдодҳои насб - + The upload was unsuccessful. No web-paste was done. Боркунӣ иҷро нашуд. Гузариш ба шабака иҷро нашуд. - + Install log posted to %1 @@ -321,124 +341,124 @@ Link copied to clipboard - + Calamares Initialization Failed Омодашавии Calamares қатъ шуд - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 насб карда намешавад. Calamares ҳамаи модулҳои танзимкардашударо бор карда натавонист. Ин мушкилие мебошад, ки бо ҳамин роҳ Calamares дар дистрибутиви ҷорӣ кор мекунад. - + <br/>The following modules could not be loaded: <br/>Модулҳои зерин бор карда намешаванд: - + Continue with setup? Танзимкуниро идома медиҳед? - + Continue with installation? Насбкуниро идома медиҳед? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Барномаи танзимкунии %1 барои танзим кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Насбкунандаи %1 барои насб кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</strong> - + &Set up now &Ҳозир танзим карда шавад - + &Install now &Ҳозир насб карда шавад - + Go &back &Бозгашт - + &Set up &Танзим кардан - + &Install &Насб кардан - + Setup is complete. Close the setup program. Танзим ба анҷом расид. Барномаи танзимкуниро пӯшед. - + The installation is complete. Close the installer. Насб ба анҷом расид. Барномаи насбкуниро пӯшед. - + Cancel setup without changing the system. Бекор кардани танзимкунӣ бе тағйирдиҳии низом. - + Cancel installation without changing the system. Бекор кардани насбкунӣ бе тағйирдиҳии низом. - + &Next &Навбатӣ - + &Back &Ба қафо - + &Done &Анҷоми кор - + &Cancel &Бекор кардан - + Cancel setup? Танзимкуниро бекор мекунед? - + Cancel installation? Насбкуниро бекор мекунед? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Шумо дар ҳақиқат мехоҳед, ки раванди танзимкунии ҷориро бекор намоед? Барномаи танзимкунӣ хомӯш карда мешавад ва ҳамаи тағйирот гум карда мешаванд. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Шумо дар ҳақиқат мехоҳед, ки раванди насбкунии ҷориро бекор намоед? @@ -471,12 +491,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Барномаи танзимкунии %1 - + %1 Installer Насбкунандаи %1 @@ -484,7 +504,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Ҷамъкунии иттилооти низомӣ... @@ -732,22 +752,32 @@ The installer will quit and all changes will be lost. Низоми рақамҳо ва санаҳо ба %1 танзим карда мешавад. - + Network Installation. (Disabled: Incorrect configuration) Насбкунии шабака. (Ғайрифаъол: Танзимоти нодуруст) - + Network Installation. (Disabled: Received invalid groups data) Насбкунии шабака. (Ғайрифаъол: Иттилооти гурӯҳии нодуруст қабул шуд) - - Network Installation. (Disabled: internal error) - Насбкунии шабака. (Ғайрифаъол: Хатои дохилӣ) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Интихоби бастаҳо - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Насбкунии шабака. (Ғайрифаъол: Рӯйхати қуттиҳо гирифта намешавад. Пайвасти шабакаро тафтиш кунед) @@ -842,42 +872,42 @@ The installer will quit and all changes will be lost. Ниҳонвожаҳои шумо мувофиқат намекунанд! - + Setup Failed Танзимкунӣ қатъ шуд - + Installation Failed Насбкунӣ қатъ шуд - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Анҷоми танзимкунӣ - + Installation Complete Насбкунӣ ба анҷом расид - + The setup of %1 is complete. Танзимкунии %1 ба анҷом расид. - + The installation of %1 is complete. Насбкунии %1 ба анҷом расид. @@ -1474,72 +1504,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space ақаллан %1 ГБ фазои диск дастрас аст - + There is not enough drive space. At least %1 GiB is required. Дар диск фазои кофӣ нест. Ақаллан %1 ГБ лозим аст. - + has at least %1 GiB working memory ақаллан %1 ГБ ҳофизаи корӣ дастрас аст - + The system does not have enough working memory. At least %1 GiB is required. Низом дорои ҳофизаи кории кофӣ намебошад. Ақаллан %1 ГБ лозим аст. - + is plugged in to a power source низом ба манбаи барқ пайваст карда шуд - + The system is not plugged in to a power source. Компютер бояд ба манбаи барқ пайваст карда шавад - + is connected to the Internet пайвасти Интернет дастрас аст - + The system is not connected to the Internet. Компютер ба Интернет пайваст карда нашуд. - + is running the installer as an administrator (root) насбкунанда бо ҳуқуқҳои маъмурӣ (root) иҷро шуда истодааст. - + The setup program is not running with administrator rights. Барномаи насбкунӣ бе ҳуқуқҳои маъмурӣ иҷро шуда истодааст. - + The installer is not running with administrator rights. Насбкунанда бе ҳуқуқҳои маъмурӣ иҷро шуда истодааст. - + has a screen large enough to show the whole installer экран равзанаи насбкунандаро ба таври пурра нишон медиҳад - + The screen is too small to display the setup program. Экран барои нишон додани барномаи насбкунӣ хеле хурд аст. - + The screen is too small to display the installer. Экран барои нишон додани насбкунанда хеле хурд аст. @@ -1607,7 +1637,7 @@ The installer will quit and all changes will be lost. Лутфан, KDE Konsole-ро насб намуда, аз нав кӯшиш кунед! - + Executing script: &nbsp;<code>%1</code> Иҷрокунии нақши: &nbsp;<code>%1</code> @@ -1879,98 +1909,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Интихоби бастаҳо - + Office software Нармафзори идорӣ - + Office package Бастаҳои идорӣ - + Browser software Нармафзори браузерӣ - + Browser package Бастаҳои браузерӣ - + Web browser Браузери сомона - + Kernel Ҳаста - + Services Хидматҳо - + Login Воридшавӣ - + Desktop Мизи корӣ - + Applications Барномаҳо - + Communication Воситаҳои алоқа - + Development Барномарезӣ - + Office Идора - + Multimedia Мултимедиа - + Internet Интернет - + Theming Мавзӯъҳо - + Gaming Бозиҳо - + Utilities Барномаҳои муфид @@ -3704,12 +3733,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз танзимкунӣ якчанд ҳисобро эҷод намоед.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед.</small> @@ -3717,7 +3746,7 @@ Output: UsersQmlViewStep - + Users Корбарон @@ -4135,102 +4164,102 @@ Output: Номи шумо чист? - + Your Full Name Номи пурраи шумо - + What name do you want to use to log in? Кадом номро барои ворид шудан ба низом истифода мебаред? - + Login Name Номи корбар - + If more than one person will use this computer, you can create multiple accounts after installation. Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед. - + What is the name of this computer? Номи ин компютер чист? - + Computer Name Номи компютери шумо - + This name will be used if you make the computer visible to others on a network. Ин ном истифода мешавад, агар шумо компютери худро барои дигарон дар шабака намоён кунед. - + Choose a password to keep your account safe. Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаеро интихоб намоед. - + Password Ниҳонвожаро ворид намоед - + Repeat Password Ниҳонвожаро тасдиқ намоед - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. Ниҳонвожаи хуб бояд дар омезиш калимаҳо, рақамҳо ва аломатҳои китобатиро дар бар гирад, ақаллан аз ҳашт аломат иборат шавад ва мунтазам иваз карда шавад. - + Validate passwords quality Санҷиши сифати ниҳонвожаҳо - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Агар шумо ин имконро интихоб кунед, қувваи ниҳонвожа тафтиш карда мешавад ва шумо ниҳонвожаи заифро истифода карда наметавонед. - + Log in automatically without asking for the password Ба таври худкор бе дархости ниҳонвожа ворид карда шавад - + Reuse user password as root password Ниҳонвожаи корбар ҳам барои ниҳонвожаи root истифода карда шавад - + Use the same password for the administrator account. Ниҳонвожаи ягона барои ҳисоби маъмурӣ истифода бурда шавад. - + Choose a root password to keep your account safe. Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаи root-ро интихоб намоед. - + Root Password Ниҳонвожаи root - + Repeat Root Password Ниҳонвожаи root-ро тасдиқ намоед - + Enter the same password twice, so that it can be checked for typing errors. Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts index 120620f91b..5fc69ea822 100644 --- a/lang/calamares_th.ts +++ b/lang/calamares_th.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information ข้อมูลดีบั๊ก @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? ดำเนินการติดตั้งต่อหรือไม่? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> ตัวติดตั้ง %1 กำลังพยายามที่จะทำการเปลี่ยนแปลงในดิสก์ของคุณเพื่อติดตั้ง %2<br/><strong>คุณจะไม่สามารถยกเลิกการเปลี่ยนแปลงเหล่านี้ได้</strong> - + &Set up now - + &Install now &ติดตั้งตอนนี้ - + Go &back กลั&บไป - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next &N ถัดไป - + &Back &B ย้อนกลับ - + &Done - + &Cancel &C ยกเลิก - + Cancel setup? - + Cancel installation? ยกเลิกการติดตั้ง? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. คุณต้องการยกเลิกกระบวนการติดตั้งที่กำลังดำเนินการอยู่หรือไม่? @@ -468,12 +488,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer ตัวติดตั้ง %1 @@ -481,7 +501,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... กำลังรวบรวมข้อมูลของระบบ... @@ -729,22 +749,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -839,42 +869,42 @@ The installer will quit and all changes will be lost. รหัสผ่านของคุณไม่ตรงกัน! - + Setup Failed - + Installation Failed การติดตั้งล้มเหลว - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete การติดตั้งเสร็จสิ้น - + The setup of %1 is complete. - + The installation of %1 is complete. การติดตั้ง %1 เสร็จสิ้น @@ -1471,72 +1501,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source เชื่อมต่อปลั๊กเข้ากับแหล่งจ่ายไฟ - + The system is not plugged in to a power source. - + is connected to the Internet เชื่อมต่อกับอินเทอร์เน็ต - + The system is not connected to the Internet. ระบบไม่ได้เชื่อมต่อกับอินเทอร์เน็ต - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1604,7 +1634,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1874,98 +1904,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel เคอร์เนล - + Services บริการ - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3684,12 +3713,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3697,7 +3726,7 @@ Output: UsersQmlViewStep - + Users ผู้ใช้ @@ -4081,102 +4110,102 @@ Output: ชื่อของคุณคือ? - + Your Full Name ชื่อเต็มของคุณ - + What name do you want to use to log in? ชื่อที่คุณต้องการใช้ในการล็อกอิน? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? คอมพิวเตอร์เครื่องนี้ชื่อ? - + Computer Name ชื่อคอมพิวเตอร์ - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. เลือกรหัสผ่านเพื่อรักษาบัญชีผู้ใช้ของคุณให้ปลอดภัย - + Password รหัสผ่าน - + Repeat Password กรอกรหัสผ่านซ้ำ - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index 6d20b7370d..d289683cbb 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Otomatik bağlama ayarlarını yönet @@ -102,22 +102,42 @@ Arayüz: - - Tools - Araçlar + + Crashes Calamares, so that Dr. Konqui can look at it. + Calamares çöker, böylece Dr. Konqui bakabilir. - + + Reloads the stylesheet from the branding directory. + Stil sayfasını marka dizininden yeniden yükler. + + + + Uploads the session log to the configured pastebin. + Oturum günlüğünü yapılandırılmış pastebin'e yükler. + + + + Send Session Log + Oturum Günlüğünü Gönder + + + Reload Stylesheet Stil Sayfasını Yeniden Yükle - + + Displays the tree of widget names in the log (for stylesheet debugging). + Günlükte pencere öğesi adlarının ağacını görüntüler (stil sayfası hata ayıklaması için). + + + Widget Tree Gereç Ağacı - + Debug information Hata ayıklama bilgisi @@ -286,13 +306,13 @@ - + &Yes &Evet - + &No &Hayır @@ -302,143 +322,147 @@ &Kapat - + Install Log Paste URL Günlük Yapıştırma URL'sini Yükle - + The upload was unsuccessful. No web-paste was done. Yükleme başarısız oldu. Web yapıştırması yapılmadı. - + Install log posted to %1 Link copied to clipboard - + Şurada yayınlanan günlüğü yükle + +%1 + +link panoya kopyalandı - + Calamares Initialization Failed Calamares Başlatılamadı - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 yüklenemedi. Calamares yapılandırılmış modüllerin bazılarını yükleyemedi. Bu, Calamares'in kullandığınız dağıtıma uyarlamasından kaynaklanan bir sorundur. - + <br/>The following modules could not be loaded: <br/>Aşağıdaki modüller yüklenemedi: - + Continue with setup? Kuruluma devam et? - + Continue with installation? Kurulum devam etsin mi? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 sistem kurulum uygulaması,%2 ayarlamak için diskinizde değişiklik yapmak üzere. <br/><strong>Bu değişiklikleri geri alamayacaksınız.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 sistem yükleyici %2 yüklemek için diskinizde değişiklik yapacak.<br/><strong>Bu değişiklikleri geri almak mümkün olmayacak.</strong> - + &Set up now &Şimdi kur - + &Install now &Şimdi yükle - + Go &back Geri &git - + &Set up &Kur - + &Install &Yükle - + Setup is complete. Close the setup program. Kurulum tamamlandı. Kurulum programını kapatın. - + The installation is complete. Close the installer. Yükleme işi tamamlandı. Sistem yükleyiciyi kapatın. - + Cancel setup without changing the system. Sistemi değiştirmeden kurulumu iptal edin. - + Cancel installation without changing the system. Sistemi değiştirmeden kurulumu iptal edin. - + &Next &Sonraki - + &Back &Geri - + &Done &Tamam - + &Cancel &Vazgeç - + Cancel setup? Kurulum iptal edilsin mi? - + Cancel installation? Yüklemeyi iptal et? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Mevcut kurulum işlemini gerçekten iptal etmek istiyor musunuz? Kurulum uygulaması sonlandırılacak ve tüm değişiklikler kaybedilecek. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Yükleme işlemini gerçekten iptal etmek istiyor musunuz? @@ -471,12 +495,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CalamaresWindow - + %1 Setup Program %1 Kurulum Uygulaması - + %1 Installer %1 Yükleniyor @@ -484,7 +508,7 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. CheckerContainer - + Gathering system information... Sistem bilgileri toplanıyor... @@ -733,22 +757,32 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek. Sayılar ve günler için sistem yereli %1 olarak ayarlanacak. - + Network Installation. (Disabled: Incorrect configuration) Ağ Kurulum. (Devre dışı: Yanlış yapılandırma) - + Network Installation. (Disabled: Received invalid groups data) Ağ Kurulum. (Devre dışı: Geçersiz grup verileri alındı) - - Network Installation. (Disabled: internal error) - Ağ Kurulum. (Devre dışı: dahili hata) + + Network Installation. (Disabled: Internal error) + Ağ Kurulumu. (Devre Dışı: Dahili hata) - + + Network Installation. (Disabled: No package list) + Ağ Kurulumu. (Devre Dışı: Paket listesi yok) + + + + Package selection + Paket seçimi + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Ağ Üzerinden Kurulum. (Devre Dışı: Paket listeleri alınamıyor, ağ bağlantısını kontrol ediniz) @@ -845,42 +879,42 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.Parolanız eşleşmiyor! - + Setup Failed Kurulum Başarısız - + Installation Failed Kurulum Başarısız - + The setup of %1 did not complete successfully. - + %1 kurulumu başarısız oldu tamamlanmadı. - + The installation of %1 did not complete successfully. - + %1 kurulumu başarısız oldu tamamlanmadı. - + Setup Complete Kurulum Tamanlandı - + Installation Complete Kurulum Tamamlandı - + The setup of %1 is complete. %1 kurulumu tamamlandı. - + The installation of %1 is complete. Kurulum %1 oranında tamamlandı. @@ -976,12 +1010,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Create new %1MiB partition on %3 (%2) with entries %4. - + %3 (%2) üzerinde %4 girdisi ile yeni bir %1MiB bölüm oluşturun. Create new %1MiB partition on %3 (%2). - + %3 (%2) üzerinde yeni bir %1MiB bölüm oluşturun. @@ -991,12 +1025,12 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + <strong>%3</strong> (%2) üzerinde <em>%4</em> girdisi ile yeni bir <strong>%1MiB</strong> bölüm oluşturun. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + <strong>%3</strong> (%2) üzerinde yeni bir <strong>%1MiB</strong> bölüm oluşturun. @@ -1344,7 +1378,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + <em>%3</em> özelliklerine sahip <strong>yeni</strong> %2 sistem bölümüne %1 yükleyin @@ -1354,27 +1388,27 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + <strong>%1</strong> bağlama noktası ve <em>%3</em> özelliklerine sahip <strong>yeni</strong> %2 bölümü kurun. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Bağlama noktası <strong>%1</strong> %3 olan <strong>yeni</strong> %2 bölümü kurun. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + <em>%4</em> özelliklerine sahip %3 sistem bölümü <strong>%1</strong> üzerine %2 yükleyin. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Bağlama noktası <strong>%2</strong> ve özellikleri <em>%4</em> ile %3 bölümüne <strong>%1</strong> kurun. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + <strong>%2</strong> %4 bağlama noktası ile %3 bölümüne <strong>%1</strong> kurun. @@ -1477,73 +1511,73 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir. GeneralRequirements - + has at least %1 GiB available drive space En az %1 GB disk sürücü alanı var - + There is not enough drive space. At least %1 GiB is required. Yeterli disk sürücü alanı mevcut değil. En az %1 GB disk alanı gereklidir. - + has at least %1 GiB working memory En az %1 GB bellek var - + The system does not have enough working memory. At least %1 GiB is required. Yeterli ram bellek gereksinimi karşılanamıyor. En az %1 GB ram bellek gereklidir. - + is plugged in to a power source Bir güç kaynağına takılı olduğundan... - + The system is not plugged in to a power source. Sistem güç kaynağına bağlı değil. - + is connected to the Internet İnternete bağlı olduğundan... - + The system is not connected to the Internet. Sistem internete bağlı değil. - + is running the installer as an administrator (root) yükleyiciyi yönetici (kök) olarak çalıştırıyor - + The setup program is not running with administrator rights. Kurulum uygulaması yönetici haklarıyla çalışmıyor. - + The installer is not running with administrator rights. Sistem yükleyici yönetici haklarına sahip olmadan çalışmıyor. - + has a screen large enough to show the whole installer yükleyicinin tamamını gösterecek kadar büyük bir ekrana sahip - + The screen is too small to display the setup program. Kurulum uygulamasını görüntülemek için ekran çok küçük. - + The screen is too small to display the installer. Ekran, sistem yükleyiciyi görüntülemek için çok küçük. @@ -1611,7 +1645,7 @@ Sistem güç kaynağına bağlı değil. Lütfen KDE Konsole yükle ve tekrar dene! - + Executing script: &nbsp;<code>%1</code> Komut durumu: &nbsp;<code>%1</code> @@ -1883,98 +1917,97 @@ Sistem güç kaynağına bağlı değil. NetInstallViewStep - - + Package selection Paket seçimi - + Office software Ofis yazılımı - + Office package Ofis paketi - + Browser software Tarayıcı yazılımı - + Browser package Tarayıcı paketi - + Web browser İnternet tarayıcısı - + Kernel Çekirdek - + Services Servisler - + Login Oturum aç - + Desktop Masaüstü - + Applications Uygulamalar - + Communication İletişim - + Development Gelişim - + Office Ofis - + Multimedia Multimedya - + Internet İnternet - + Theming Temalar - + Gaming Oyunlar - + Utilities Bileşenler @@ -3711,12 +3744,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Bu bilgisayarı birden fazla kişi kullanacaksa, kurulumdan sonra birden fazla kullanıcı hesabı oluşturabilirsiniz.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Bu bilgisayarı birden fazla kişi kullanacaksa, kurulum bittikten sonra birden fazla kullanıcı hesabı oluşturabilirsiniz.</small> @@ -3724,7 +3757,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. UsersQmlViewStep - + Users Kullanıcı Tercihleri @@ -3968,29 +4001,31 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. Installation Completed - + Yükleme Tamamlandı %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 bilgisayarınıza yüklendi.<br/> + Kurduğunuz sistemi şimdi yeniden başlayabilir veya Canlı ortamı kullanmaya devam edebilirsiniz. Close Installer - + Yükleyiciyi Kapat Restart System - + Sistemi Yeniden Başlat <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Kurulumun tam günlüğü, Live kullanıcısının ana dizininde installation.log olarak mevcuttur.<br/> + Bu günlük, hedef sistemin /var/log/installation.log dosyasına kopyalanır.</p> @@ -4142,102 +4177,102 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Adınız nedir? - + Your Full Name Tam Adınız - + What name do you want to use to log in? Giriş için hangi adı kullanmak istersiniz? - + Login Name Kullanıcı adı - + If more than one person will use this computer, you can create multiple accounts after installation. Bu bilgisayarı birden fazla kişi kullanacaksa, kurulumdan sonra birden fazla hesap oluşturabilirsiniz. - + What is the name of this computer? Bu bilgisayarın adı nedir? - + Computer Name Bilgisayar Adı - + This name will be used if you make the computer visible to others on a network. Bilgisayarı ağ üzerinde herkese görünür yaparsanız bu ad kullanılacaktır. - + Choose a password to keep your account safe. Hesabınızın güvenliğini sağlamak için bir parola belirleyiniz. - + Password Şifre - + Repeat Password Şifreyi Tekrarla - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin. İyi bir şifre, harflerin, sayıların ve noktalama işaretlerinin bir karışımını içerecektir, en az sekiz karakter uzunluğunda olmalı ve düzenli aralıklarla değiştirilmelidir. - + Validate passwords quality Parola kalitesini doğrulayın - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Bu kutu işaretlendiğinde parola gücü kontrolü yapılır ve zayıf bir parola kullanamazsınız. - + Log in automatically without asking for the password Parola sormadan otomatik olarak oturum açın - + Reuse user password as root password Kullanıcı şifresini yetkili kök şifre olarak kullan - + Use the same password for the administrator account. Yönetici ile kullanıcı aynı şifreyi kullansın. - + Choose a root password to keep your account safe. Hesabınızı güvende tutmak için bir kök şifre seçin. - + Root Password Kök Şifre - + Repeat Root Password Kök Şifresini Tekrarla - + Enter the same password twice, so that it can be checked for typing errors. Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin. diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts index db4b54756f..b5a94cf863 100644 --- a/lang/calamares_uk.ts +++ b/lang/calamares_uk.ts @@ -102,22 +102,42 @@ Інтерфейс: - - Tools - Інструменти + + Crashes Calamares, so that Dr. Konqui can look at it. + Ініціює аварійне завершення роботи Calamares, щоб дані можна було переглянути у Dr. Konqui. + + + + Reloads the stylesheet from the branding directory. + Перезавантажує таблицю стилів із каталогу бренда. + + + + Uploads the session log to the configured pastebin. + Вивантажує журнал сеансу до налаштованої служби зберігання. + + + + Send Session Log + Надіслати журнал сеансу - + Reload Stylesheet Перезавантажити таблицю стилів - + + Displays the tree of widget names in the log (for stylesheet debugging). + Показує ієрархію назв віджетів у журналі (для діагностики таблиці стилів). + + + Widget Tree Дерево віджетів - + Debug information Діагностична інформація @@ -290,13 +310,13 @@ - + &Yes &Так - + &No &Ні @@ -306,17 +326,17 @@ &Закрити - + Install Log Paste URL Адреса для вставлення журналу встановлення - + The upload was unsuccessful. No web-paste was done. Не вдалося вивантажити дані. - + Install log posted to %1 @@ -329,124 +349,124 @@ Link copied to clipboard Посилання скопійовано до буфера обміну - + Calamares Initialization Failed Помилка ініціалізації Calamares - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 неможливо встановити. Calamares не зміг завантажити всі налаштовані модулі. Ця проблема зв'язана з тим, як Calamares використовується дистрибутивом. - + <br/>The following modules could not be loaded: <br/>Не вдалося завантажити наступні модулі: - + Continue with setup? Продовжити встановлення? - + Continue with installation? Продовжити встановлення? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Програма налаштування %1 збирається внести зміни до вашого диска, щоб налаштувати %2. <br/><strong> Ви не зможете скасувати ці зміни.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Засіб встановлення %1 має намір внести зміни до розподілу вашого диска, щоб встановити %2.<br/><strong>Ці зміни неможливо буде скасувати.</strong> - + &Set up now &Налаштувати зараз - + &Install now &Встановити зараз - + Go &back Перейти &назад - + &Set up &Налаштувати - + &Install &Встановити - + Setup is complete. Close the setup program. Встановлення виконано. Закрити програму встановлення. - + The installation is complete. Close the installer. Встановлення виконано. Завершити роботу засобу встановлення. - + Cancel setup without changing the system. Скасувати налаштування без зміни системи. - + Cancel installation without changing the system. Скасувати встановлення без зміни системи. - + &Next &Вперед - + &Back &Назад - + &Done &Закінчити - + &Cancel &Скасувати - + Cancel setup? Скасувати налаштування? - + Cancel installation? Скасувати встановлення? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Ви насправді бажаєте скасувати поточну процедуру налаштовування? Роботу програми для налаштовування буде завершено, а усі зміни буде втрачено. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Чи ви насправді бажаєте скасувати процес встановлення? @@ -479,12 +499,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program Програма для налаштовування %1 - + %1 Installer Засіб встановлення %1 @@ -492,7 +512,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... Збираємо інформацію про систему... @@ -740,22 +760,32 @@ The installer will quit and all changes will be lost. %1 буде встановлено як локаль чисел та дат. - + Network Installation. (Disabled: Incorrect configuration) Встановлення за допомогою мережі. (Вимкнено: помилкові налаштування) - + Network Installation. (Disabled: Received invalid groups data) Встановлення через мережу. (Вимкнено: Отримано неправильні дані про групи) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) Встановлення з мережі. (Вимкнено: внутрішня помилка) - + + Network Installation. (Disabled: No package list) + Встановлення з мережі. (Вимкнено: немає списку пакунків) + + + + Package selection + Вибір пакетів + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Встановлення через мережу. (Вимкнено: Неможливо отримати список пакетів, перевірте ваше підключення до мережі) @@ -850,42 +880,42 @@ The installer will quit and all changes will be lost. Паролі не збігаються! - + Setup Failed Помилка встановлення - + Installation Failed Помилка під час встановлення - + The setup of %1 did not complete successfully. Налаштування %1 не завершено успішно. - + The installation of %1 did not complete successfully. Встановлення %1 не завершено успішно. - + Setup Complete Налаштовування завершено - + Installation Complete Встановлення завершено - + The setup of %1 is complete. Налаштовування %1 завершено. - + The installation of %1 is complete. Встановлення %1 завершено. @@ -1482,72 +1512,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space містить принаймні %1 ГіБ місця на диску - + There is not enough drive space. At least %1 GiB is required. На диску недостатньо місця. Потрібно принаймні %1 ГіБ. - + has at least %1 GiB working memory має принаймні %1 ГіБ робочої пам'яті - + The system does not have enough working memory. At least %1 GiB is required. У системі немає достатнього об'єму робочої пам'яті. Потрібно принаймні %1 ГіБ. - + is plugged in to a power source підключена до джерела живлення - + The system is not plugged in to a power source. Система не підключена до джерела живлення. - + is connected to the Internet з'єднано з мережею Інтернет - + The system is not connected to the Internet. Система не з'єднана з мережею Інтернет. - + is running the installer as an administrator (root) виконує засіб встановлення від імені адміністратора (root) - + The setup program is not running with administrator rights. Програму для налаштовування запущено не від імені адміністратора. - + The installer is not running with administrator rights. Засіб встановлення запущено без прав адміністратора. - + has a screen large enough to show the whole installer має достатньо великий для усього вікна засобу встановлення екран - + The screen is too small to display the setup program. Екран є замалим для показу вікна засобу налаштовування. - + The screen is too small to display the installer. Екран замалий для показу вікна засобу встановлення. @@ -1615,7 +1645,7 @@ The installer will quit and all changes will be lost. Будь ласка встановіть KDE Konsole і спробуйте знову! - + Executing script: &nbsp;<code>%1</code> Виконується скрипт: &nbsp;<code>%1</code> @@ -1887,98 +1917,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection Вибір пакетів - + Office software Офісні програми - + Office package Офісний пакунок - + Browser software Браузери - + Browser package Пакунок браузера - + Web browser Переглядач інтернету - + Kernel Ядро - + Services Служби - + Login Вхід до системи - + Desktop Стільниця - + Applications Програми - + Communication Спілкування - + Development Розробка - + Office Офіс - + Multimedia Звук та відео - + Internet Інтернет - + Theming Теми - + Gaming Ігри - + Utilities Інструменти @@ -3731,12 +3760,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після налаштовування.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після встановлення.</small> @@ -3744,7 +3773,7 @@ Output: UsersQmlViewStep - + Users Користувачі @@ -4163,102 +4192,102 @@ Output: Ваше ім'я? - + Your Full Name Ваше ім'я повністю - + What name do you want to use to log in? Яке ім'я ви бажаєте використовувати для входу? - + Login Name Запис для входу - + If more than one person will use this computer, you can create multiple accounts after installation. Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після встановлення. - + What is the name of this computer? Назва цього комп'ютера? - + Computer Name Назва комп'ютера - + This name will be used if you make the computer visible to others on a network. Цю назву буде використано, якщо ви зробите комп'ютер видимим іншим у мережі. - + Choose a password to keep your account safe. Оберіть пароль, щоб тримати ваш обліковий рахунок у безпеці. - + Password Пароль - + Repeat Password Повторіть пароль - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Введіть один й той самий пароль двічі, для перевірки щодо помилок введення. Надійному паролю слід містити суміш літер, чисел та розділових знаків, бути довжиною хоча б вісім символів та регулярно змінюватись. - + Validate passwords quality Перевіряти якість паролів - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Якщо позначено цей пункт, буде виконано перевірку складності пароля. Ви не зможете скористатися надто простим паролем. - + Log in automatically without asking for the password Входити автоматично без пароля - + Reuse user password as root password Використати пароль користувача як пароль root - + Use the same password for the administrator account. Використовувати той самий пароль і для облікового рахунку адміністратора. - + Choose a root password to keep your account safe. Виберіть пароль root для захисту вашого облікового запису. - + Root Password Пароль root - + Repeat Root Password Повторіть пароль root - + Enter the same password twice, so that it can be checked for typing errors. Введіть один й той самий пароль двічі, щоб убезпечитися від помилок при введенні. diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts index 0acd364cb8..2a9c67dcab 100644 --- a/lang/calamares_ur.ts +++ b/lang/calamares_ur.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -286,13 +306,13 @@ - + &Yes - + &No @@ -302,17 +322,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -321,123 +341,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -469,12 +489,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -482,7 +502,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -730,22 +750,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -840,42 +870,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1472,72 +1502,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1605,7 +1635,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1875,98 +1905,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3694,12 +3723,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3707,7 +3736,7 @@ Output: UsersQmlViewStep - + Users @@ -4091,102 +4120,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts index 130ea84331..dc5c7a4ca8 100644 --- a/lang/calamares_uz.ts +++ b/lang/calamares_uz.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -467,12 +487,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -480,7 +500,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -728,22 +748,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -838,42 +868,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1470,72 +1500,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1603,7 +1633,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1873,98 +1903,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3683,12 +3712,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3696,7 +3725,7 @@ Output: UsersQmlViewStep - + Users @@ -4080,102 +4109,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts index 719af5c43d..5ac35384cd 100644 --- a/lang/calamares_vi.ts +++ b/lang/calamares_vi.ts @@ -102,22 +102,42 @@ Giao diện: - - Tools - Công cụ + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet Tải lại bảng định kiểu - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree Cây công cụ - + Debug information Thông tin gỡ lỗi @@ -284,13 +304,13 @@ - + &Yes &Có - + &No &Không @@ -300,17 +320,17 @@ Đón&g - + Install Log Paste URL URL để gửi nhật ký cài đặt - + The upload was unsuccessful. No web-paste was done. Tải lên không thành công. Không có quá trình gửi lên web nào được thực hiện. - + Install log posted to %1 @@ -319,124 +339,124 @@ Link copied to clipboard - + Calamares Initialization Failed Khởi tạo không thành công - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 không thể được cài đặt.Không thể tải tất cả các mô-đun đã định cấu hình. Đây là vấn đề với cách phân phối sử dụng. - + <br/>The following modules could not be loaded: <br/> Không thể tải các mô-đun sau: - + Continue with setup? Tiếp tục thiết lập? - + Continue with installation? Tiếp tục cài đặt? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> Chương trình thiết lập %1 sắp thực hiện các thay đổi đối với đĩa của bạn để thiết lập %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> Trình cài đặt %1 sắp thực hiện các thay đổi đối với đĩa của bạn để cài đặt %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </strong> - + &Set up now &Thiết lập ngay - + &Install now &Cài đặt ngay - + Go &back &Quay lại - + &Set up &Thiết lập - + &Install &Cài đặt - + Setup is complete. Close the setup program. Thiết lập hoàn tất. Đóng chương trình cài đặt. - + The installation is complete. Close the installer. Quá trình cài đặt hoàn tất. Đóng trình cài đặt. - + Cancel setup without changing the system. Hủy thiết lập mà không thay đổi hệ thống. - + Cancel installation without changing the system. Hủy cài đặt mà không thay đổi hệ thống. - + &Next &Tiếp - + &Back &Quay lại - + &Done &Xong - + &Cancel &Hủy - + Cancel setup? Hủy thiết lập? - + Cancel installation? Hủy cài đặt? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Bạn có thực sự muốn hủy quá trình thiết lập hiện tại không? Chương trình thiết lập sẽ thoát và tất cả các thay đổi sẽ bị mất. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Bạn có thực sự muốn hủy quá trình cài đặt hiện tại không? @@ -469,12 +489,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< CalamaresWindow - + %1 Setup Program %1 Thiết lập chương trình - + %1 Installer %1 cài đặt hệ điều hành @@ -482,7 +502,7 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< CheckerContainer - + Gathering system information... Thu thập thông tin hệ thống ... @@ -730,22 +750,32 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Định dạng ngôn ngữ của số và ngày tháng sẽ được chuyển thành %1. - + Network Installation. (Disabled: Incorrect configuration) Cài đặt mạng. (Tắt: Sai cấu hình) - + Network Installation. (Disabled: Received invalid groups data) Cài đặt mạng. (Tắt: Nhận được dữ liệu nhóm bị sai) - - Network Installation. (Disabled: internal error) - Cài đặt mạng. (Tắt: Lỗi nội bộ) + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + Chọn phân vùng - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) Cài đặt mạng. (Tắt: Không thể lấy được danh sách gói ứng dụng, kiểm tra kết nối mạng) @@ -840,42 +870,42 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Mật khẩu nhập lại không khớp! - + Setup Failed Thiết lập không thành công - + Installation Failed Cài đặt thất bại - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete Thiết lập xong - + Installation Complete Cài đặt xong - + The setup of %1 is complete. Thiết lập %1 đã xong. - + The installation of %1 is complete. Cài đặt của %1 đã xong. @@ -1472,72 +1502,72 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< GeneralRequirements - + has at least %1 GiB available drive space có ít nhất %1 GiB dung lượng ổ đĩa khả dụng - + There is not enough drive space. At least %1 GiB is required. Không có đủ dung lượng ổ đĩa. Ít nhất %1 GiB là bắt buộc. - + has at least %1 GiB working memory có ít nhất %1 GiB bộ nhớ làm việc - + The system does not have enough working memory. At least %1 GiB is required. Hệ thống không có đủ bộ nhớ hoạt động. Ít nhất %1 GiB là bắt buộc. - + is plugged in to a power source được cắm vào nguồn điện - + The system is not plugged in to a power source. Hệ thống chưa được cắm vào nguồn điện. - + is connected to the Internet được kết nối với Internet - + The system is not connected to the Internet. Hệ thống không được kết nối với Internet. - + is running the installer as an administrator (root) đang chạy trình cài đặt với tư cách quản trị viên (root) - + The setup program is not running with administrator rights. Chương trình thiết lập không chạy với quyền quản trị viên. - + The installer is not running with administrator rights. Trình cài đặt không chạy với quyền quản trị viên. - + has a screen large enough to show the whole installer có màn hình đủ lớn để hiển thị toàn bộ trình cài đặt - + The screen is too small to display the setup program. Màn hình quá nhỏ để hiển thị chương trình cài đặt. - + The screen is too small to display the installer. Màn hình quá nhỏ để hiển thị trình cài đặt. @@ -1605,7 +1635,7 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< Vui lòng cài đặt KDE Konsole rồi thử lại! - + Executing script: &nbsp;<code>%1</code> Đang thực thi kịch bản: &nbsp;<code>%1</code> @@ -1877,98 +1907,97 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.< NetInstallViewStep - - + Package selection Chọn phân vùng - + Office software Phần mềm văn phòng - + Office package Gói văn phòng - + Browser software Phần mềm trình duyệt - + Browser package Gói trình duyệt - + Web browser Trình duyệt web - + Kernel Lõi - + Services Dịch vụ - + Login Đăng nhập - + Desktop Màn hình chính - + Applications Ứng dụng - + Communication Cộng đồng - + Development Phát triển - + Office Văn phòng - + Multimedia Đa phương tiện - + Internet Mạng Internet - + Theming Chủ đề - + Gaming Trò chơi - + Utilities Tiện ích @@ -3693,12 +3722,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small> Nếu nhiều người cùng sử dụng máy tính này, bạn có thể tạo nhiều tài khoản sau khi thiết lập. </small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small> Nếu nhiều người cùng sử dụng máy tính này, bạn có thể tạo nhiều tài khoản sau khi cài đặt. </small> @@ -3706,7 +3735,7 @@ Output: UsersQmlViewStep - + Users Người dùng @@ -4123,102 +4152,102 @@ Output: Hãy cho Vigo biết tên đầy đủ của bạn? - + Your Full Name Tên đầy đủ - + What name do you want to use to log in? Bạn muốn dùng tên nào để đăng nhập máy tính? - + Login Name Tên đăng nhập - + If more than one person will use this computer, you can create multiple accounts after installation. Tạo nhiều tài khoản sau khi cài đặt nếu có nhiều người dùng chung. - + What is the name of this computer? Tên của máy tính này là? - + Computer Name Tên máy tính - + This name will be used if you make the computer visible to others on a network. Tên này sẽ hiển thị khi bạn kết nối vào một mạng. - + Choose a password to keep your account safe. Chọn mật khẩu để giữ máy tính an toàn. - + Password Mật khẩu - + Repeat Password Lặp lại mật khẩu - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Nhập lại mật khẩu hai lần để kiểm tra. Một mật khẩu tốt phải có ít nhất 8 ký tự và bao gồm chữ, số, ký hiệu đặc biệt. Nên được thay đổi thường xuyên. - + Validate passwords quality Xác thực chất lượng mật khẩu - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. Khi tích chọn, bạn có thể chọn mật khẩu yếu. - + Log in automatically without asking for the password Tự động đăng nhập không hỏi mật khẩu - + Reuse user password as root password Dùng lại mật khẩu người dùng như mật khẩu quản trị - + Use the same password for the administrator account. Dùng cùng một mật khẩu cho tài khoản quản trị. - + Choose a root password to keep your account safe. Chọn mật khẩu quản trị để giữ máy tính an toàn. - + Root Password Mật khẩu quản trị - + Repeat Root Password Lặp lại mật khẩu quản trị - + Enter the same password twice, so that it can be checked for typing errors. Nhập lại mật khẩu hai lần để kiểm tra. diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts index 3b29572d73..f910b6faac 100644 --- a/lang/calamares_zh.ts +++ b/lang/calamares_zh.ts @@ -102,22 +102,42 @@ - - Tools + + Crashes Calamares, so that Dr. Konqui can look at it. - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree - + Debug information @@ -284,13 +304,13 @@ - + &Yes - + &No @@ -300,17 +320,17 @@ - + Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -319,123 +339,123 @@ Link copied to clipboard - + Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: - + Continue with setup? - + Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now - + &Install now - + Go &back - + &Set up - + &Install - + Setup is complete. Close the setup program. - + The installation is complete. Close the installer. - + Cancel setup without changing the system. - + Cancel installation without changing the system. - + &Next - + &Back - + &Done - + &Cancel - + Cancel setup? - + Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. @@ -467,12 +487,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program - + %1 Installer @@ -480,7 +500,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... @@ -728,22 +748,32 @@ The installer will quit and all changes will be lost. - + Network Installation. (Disabled: Incorrect configuration) - + Network Installation. (Disabled: Received invalid groups data) - - Network Installation. (Disabled: internal error) + + Network Installation. (Disabled: Internal error) - + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) @@ -838,42 +868,42 @@ The installer will quit and all changes will be lost. - + Setup Failed - + Installation Failed - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete - + Installation Complete - + The setup of %1 is complete. - + The installation of %1 is complete. @@ -1470,72 +1500,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space - + There is not enough drive space. At least %1 GiB is required. - + has at least %1 GiB working memory - + The system does not have enough working memory. At least %1 GiB is required. - + is plugged in to a power source - + The system is not plugged in to a power source. - + is connected to the Internet - + The system is not connected to the Internet. - + is running the installer as an administrator (root) - + The setup program is not running with administrator rights. - + The installer is not running with administrator rights. - + has a screen large enough to show the whole installer - + The screen is too small to display the setup program. - + The screen is too small to display the installer. @@ -1603,7 +1633,7 @@ The installer will quit and all changes will be lost. - + Executing script: &nbsp;<code>%1</code> @@ -1873,98 +1903,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection - + Office software - + Office package - + Browser software - + Browser package - + Web browser - + Kernel - + Services - + Login - + Desktop - + Applications - + Communication - + Development - + Office - + Multimedia - + Internet - + Theming - + Gaming - + Utilities @@ -3683,12 +3712,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> @@ -3696,7 +3725,7 @@ Output: UsersQmlViewStep - + Users @@ -4080,102 +4109,102 @@ Output: - + Your Full Name - + What name do you want to use to log in? - + Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. - + What is the name of this computer? - + Computer Name - + This name will be used if you make the computer visible to others on a network. - + Choose a password to keep your account safe. - + Password - + Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password - + Reuse user password as root password - + Use the same password for the administrator account. - + Choose a root password to keep your account safe. - + Root Password - + Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index d8d256e1cf..a285512e7b 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -103,22 +103,42 @@ 接口： - - Tools - 工具 + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + - + Reload Stylesheet 重载样式表 - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree 树形控件 - + Debug information 调试信息 @@ -285,13 +305,13 @@ - + &Yes &是 - + &No &否 @@ -301,17 +321,17 @@ &关闭 - + Install Log Paste URL 安装日志粘贴 URL - + The upload was unsuccessful. No web-paste was done. 上传失败，未完成网页粘贴。 - + Install log posted to %1 @@ -320,124 +340,124 @@ Link copied to clipboard - + Calamares Initialization Failed Calamares初始化失败 - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. ％1无法安装。 Calamares无法加载所有已配置的模块。这个问题是发行版配置Calamares不当导致的。 - + <br/>The following modules could not be loaded: <br/>无法加载以下模块： - + Continue with setup? 要继续安装吗？ - + Continue with installation? 继续安装？ - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> 为了安装%2, %1 安装程序即将对磁盘进行更改。<br/><strong>这些更改无法撤销。</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 安装程序将在您的磁盘上做出变更以安装 %2。<br/><strong>您将无法复原这些变更。</strong> - + &Set up now 现在安装(&S) - + &Install now 现在安装 (&I) - + Go &back 返回 (&B) - + &Set up 安装(&S) - + &Install 安装(&I) - + Setup is complete. Close the setup program. 安装完成。关闭安装程序。 - + The installation is complete. Close the installer. 安装已完成。请关闭安装程序。 - + Cancel setup without changing the system. 取消安装，保持系统不变。 - + Cancel installation without changing the system. 取消安装，并不做任何更改。 - + &Next 下一步(&N) - + &Back 后退(&B) - + &Done &完成 - + &Cancel 取消(&C) - + Cancel setup? 取消安装？ - + Cancel installation? 取消安装？ - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. 确定要取消当前安装吗? 安装程序将会退出，所有修改都会丢失。 - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. 确定要取消当前的安装吗？ @@ -470,12 +490,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 安装程序 - + %1 Installer %1 安装程序 @@ -483,7 +503,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... 正在收集系统信息 ... @@ -731,22 +751,32 @@ The installer will quit and all changes will be lost. 数字和日期地域将设置为 %1。 - + Network Installation. (Disabled: Incorrect configuration) 网络安装。（禁用：错误的设置） - + Network Installation. (Disabled: Received invalid groups data) 联网安装。（已禁用：收到无效组数据） - - Network Installation. (Disabled: internal error) - 网络安装。（已禁用：内部错误） + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + 软件包选择 - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) 网络安装。（已禁用：无法获取软件包列表，请检查网络连接） @@ -843,42 +873,42 @@ The installer will quit and all changes will be lost. 密码不匹配！ - + Setup Failed 安装失败 - + Installation Failed 安装失败 - + The setup of %1 did not complete successfully. - + The installation of %1 did not complete successfully. - + Setup Complete 安装完成 - + Installation Complete 安装完成 - + The setup of %1 is complete. %1 安装完成。 - + The installation of %1 is complete. %1 的安装操作已完成。 @@ -1476,72 +1506,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space 有至少 %1 GB 可用磁盘空间 - + There is not enough drive space. At least %1 GiB is required. 没有足够的磁盘空间。至少需要 %1 GB。 - + has at least %1 GiB working memory 至少 %1 GB 可用内存 - + The system does not have enough working memory. At least %1 GiB is required. 系统没有足够的内存。至少需要 %1 GB。 - + is plugged in to a power source 已连接到电源 - + The system is not plugged in to a power source. 系统未连接到电源。 - + is connected to the Internet 已连接到互联网 - + The system is not connected to the Internet. 系统未连接到互联网。 - + is running the installer as an administrator (root) 正以管理员(root)权限运行安装器 - + The setup program is not running with administrator rights. 安装器未以管理员权限运行 - + The installer is not running with administrator rights. 安装器未以管理员权限运行 - + has a screen large enough to show the whole installer 有一个足够大的屏幕来显示整个安装器 - + The screen is too small to display the setup program. 屏幕太小无法显示安装程序。 - + The screen is too small to display the installer. 屏幕不能完整显示安装器。 @@ -1609,7 +1639,7 @@ The installer will quit and all changes will be lost. 请安装 KDE Konsole 后重试！ - + Executing script: &nbsp;<code>%1</code> 正在运行脚本：&nbsp;<code>%1</code> @@ -1881,98 +1911,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection 软件包选择 - + Office software 办公软件 - + Office package 办公软件包 - + Browser software 浏览器软件 - + Browser package 浏览器安装包 - + Web browser 网页浏览器 - + Kernel 内核 - + Services 服务 - + Login 登录 - + Desktop 桌面 - + Applications 应用程序 - + Communication 通讯 - + Development 开发 - + Office 办公 - + Multimedia 多媒体 - + Internet 互联网 - + Theming 主题化 - + Gaming 游戏 - + Utilities 实用工具 @@ -3699,12 +3728,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>如果有多人要使用此计算机，您可以在安装后创建多个账户。</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>如果有多人要使用此计算机，您可以在安装后创建多个账户。</small> @@ -3712,7 +3741,7 @@ Output: UsersQmlViewStep - + Users 用户 @@ -4131,102 +4160,102 @@ Output: 您的姓名？ - + Your Full Name 全名 - + What name do you want to use to log in? 您想要使用的登录用户名是？ - + Login Name 登录名 - + If more than one person will use this computer, you can create multiple accounts after installation. 如果有多人要使用此计算机，您可以在安装后创建多个账户。 - + What is the name of this computer? 计算机名称为？ - + Computer Name 计算机名称 - + This name will be used if you make the computer visible to others on a network. 将计算机设置为对其他网络上计算机可见时将使用此名称。 - + Choose a password to keep your account safe. 选择一个密码来保证您的账户安全。 - + Password 密码 - + Repeat Password 重复密码 - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. 输入相同密码两次，以检查输入错误。好的密码包含字母，数字，标点的组合，应当至少为 8 个字符长，并且应按一定周期更换。 - + Validate passwords quality 验证密码质量 - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. 若选中此项，密码强度检测会开启，你将不被允许使用弱密码。 - + Log in automatically without asking for the password 不询问密码自动登录 - + Reuse user password as root password 重用用户密码作为 root 密码 - + Use the same password for the administrator account. 为管理员帐号使用同样的密码。 - + Choose a root password to keep your account safe. 选择一个 root 密码来保证您的账户安全。 - + Root Password Root 密码 - + Repeat Root Password 重复 Root 密码 - + Enter the same password twice, so that it can be checked for typing errors. 输入相同密码两次，以检查输入错误。 diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts index 9753874569..c0f0c73c8a 100644 --- a/lang/calamares_zh_TW.ts +++ b/lang/calamares_zh_TW.ts @@ -102,22 +102,42 @@ 介面： - - Tools - 工具 + + Crashes Calamares, so that Dr. Konqui can look at it. + - + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + Reload Stylesheet 重新載入樣式表 - + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + Widget Tree 小工具樹 - + Debug information 除錯資訊 @@ -284,13 +304,13 @@ - + &Yes 是(&Y) - + &No 否(&N) @@ -300,17 +320,17 @@ 關閉(&C) - + Install Log Paste URL 安裝紀錄檔張貼 URL - + The upload was unsuccessful. No web-paste was done. 上傳不成功。並未完成網路張貼。 - + Install log posted to %1 @@ -323,124 +343,124 @@ Link copied to clipboard 連結已複製到剪貼簿 - + Calamares Initialization Failed Calamares 初始化失敗 - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 無法安裝。Calamares 無法載入所有已設定的模組。散佈版使用 Calamares 的方式有問題。 - + <br/>The following modules could not be loaded: <br/>以下的模組無法載入： - + Continue with setup? 繼續安裝？ - + Continue with installation? 繼續安裝？ - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> %1 設定程式將在您的磁碟上做出變更以設定 %2。<br/><strong>您將無法復原這些變更。</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> %1 安裝程式將在您的磁碟上做出變更以安裝 %2。<br/><strong>您將無法復原這些變更。</strong> - + &Set up now 馬上進行設定 (&S) - + &Install now 現在安裝 (&I) - + Go &back 上一步 (&B) - + &Set up 設定 (&S) - + &Install 安裝(&I) - + Setup is complete. Close the setup program. 設定完成。關閉設定程式。 - + The installation is complete. Close the installer. 安裝完成。關閉安裝程式。 - + Cancel setup without changing the system. 取消安裝，不更改系統。 - + Cancel installation without changing the system. 不變更系統並取消安裝。 - + &Next 下一步 (&N) - + &Back 返回 (&B) - + &Done 完成(&D) - + &Cancel 取消(&C) - + Cancel setup? 取消設定？ - + Cancel installation? 取消安裝？ - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. 真的想要取消目前的設定程序嗎？ 設定程式將會結束，所有變更都將會遺失。 - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. 您真的想要取消目前的安裝程序嗎？ @@ -473,12 +493,12 @@ The installer will quit and all changes will be lost. CalamaresWindow - + %1 Setup Program %1 設定程式 - + %1 Installer %1 安裝程式 @@ -486,7 +506,7 @@ The installer will quit and all changes will be lost. CheckerContainer - + Gathering system information... 收集系統資訊中... @@ -734,22 +754,32 @@ The installer will quit and all changes will be lost. 數字與日期語系會設定為%1。 - + Network Installation. (Disabled: Incorrect configuration) 網路安裝。（已停用：設定不正確） - + Network Installation. (Disabled: Received invalid groups data) 網路安裝。（已停用：收到無效的群組資料） - - Network Installation. (Disabled: internal error) - 網路安裝。（已停用：內部錯誤） + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + 軟體包選擇 - + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) 網路安裝。（已停用：無法擷取軟體包清單，請檢查您的網路連線） @@ -844,42 +874,42 @@ The installer will quit and all changes will be lost. 密碼不符！ - + Setup Failed 設定失敗 - + Installation Failed 安裝失敗 - + The setup of %1 did not complete successfully. %1 的設定並未成功完成。 - + The installation of %1 did not complete successfully. %1 的安裝並未成功完成。 - + Setup Complete 設定完成 - + Installation Complete 安裝完成 - + The setup of %1 is complete. %1 的設定完成。 - + The installation of %1 is complete. %1 的安裝已完成。 @@ -1476,72 +1506,72 @@ The installer will quit and all changes will be lost. GeneralRequirements - + has at least %1 GiB available drive space 有至少 %1 GiB 的可用磁碟空間 - + There is not enough drive space. At least %1 GiB is required. 沒有足夠的磁碟空間。至少需要 %1 GiB。 - + has at least %1 GiB working memory 有至少 %1 GiB 的可用記憶體 - + The system does not have enough working memory. At least %1 GiB is required. 系統沒有足夠的記憶體。至少需要 %1 GiB。 - + is plugged in to a power source 已插入外接電源 - + The system is not plugged in to a power source. 系統未插入外接電源。 - + is connected to the Internet 已連上網際網路 - + The system is not connected to the Internet. 系統未連上網際網路 - + is running the installer as an administrator (root) 以管理員 (root) 權限執行安裝程式 - + The setup program is not running with administrator rights. 設定程式並未以管理員權限執行。 - + The installer is not running with administrator rights. 安裝程式並未以管理員權限執行。 - + has a screen large enough to show the whole installer 螢幕夠大，可以顯示整個安裝程式 - + The screen is too small to display the setup program. 螢幕太小了，沒辦法顯示設定程式。 - + The screen is too small to display the installer. 螢幕太小了，沒辦法顯示安裝程式。 @@ -1609,7 +1639,7 @@ The installer will quit and all changes will be lost. 請安裝 KDE Konsole 並再試一次！ - + Executing script: &nbsp;<code>%1</code> 正在執行指令稿：&nbsp;<code>%1</code> @@ -1881,98 +1911,97 @@ The installer will quit and all changes will be lost. NetInstallViewStep - - + Package selection 軟體包選擇 - + Office software 辦公軟體 - + Office package 辦公套件 - + Browser software 瀏覽器軟體 - + Browser package 瀏覽器套件 - + Web browser 網頁瀏覽器 - + Kernel 內核 - + Services 服務 - + Login 登入 - + Desktop 桌面 - + Applications 應用程式 - + Communication 通訊 - + Development 開發 - + Office 辦公 - + Multimedia 多媒體 - + Internet 網際網路 - + Theming 主題 - + Gaming 遊戲 - + Utilities 實用工具 @@ -3697,12 +3726,12 @@ Output: UsersPage - + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> <small>如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。</small> - + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> <small>如果將會有多於一人使用這臺電腦，您可以在安裝後設定多個帳號。</small> @@ -3710,7 +3739,7 @@ Output: UsersQmlViewStep - + Users 使用者 @@ -4130,102 +4159,102 @@ Output: 該如何稱呼您？ - + Your Full Name 您的全名 - + What name do you want to use to log in? 您想使用何種登入名稱？ - + Login Name 登入名稱 - + If more than one person will use this computer, you can create multiple accounts after installation. 若有多於一個人使用此電腦，您可以在安裝後建立多個帳號。 - + What is the name of this computer? 這部電腦的名字是？ - + Computer Name 電腦名稱 - + This name will be used if you make the computer visible to others on a network. 若您將此電腦設定為讓網路上的其他電腦可見時將會使用此名稱。 - + Choose a password to keep your account safe. 輸入密碼以確保帳號的安全性。 - + Password 密碼 - + Repeat Password 確認密碼 - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. 輸入同一個密碼兩次，以檢查輸入錯誤。一個好的密碼包含了字母、數字及標點符號的組合、至少八個字母長，且按一固定週期更換。 - + Validate passwords quality 驗證密碼品質 - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. 當此勾選框被勾選，密碼強度檢查即完成，您也無法再使用弱密碼。 - + Log in automatically without asking for the password 自動登入，無需輸入密碼 - + Reuse user password as root password 重用使用者密碼為 root 密碼 - + Use the same password for the administrator account. 為管理員帳號使用同樣的密碼。 - + Choose a root password to keep your account safe. 選擇 root 密碼來維護您的帳號安全。 - + Root Password Root 密碼 - + Repeat Root Password 確認 Root 密碼 - + Enter the same password twice, so that it can be checked for typing errors. 輸入同樣的密碼兩次，這樣可以檢查輸入錯誤。 From 74ce0ba84dce0dabf6d5c925c4c86f06fc957bd8 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 29 Mar 2021 14:06:43 +0200 Subject: [PATCH 045/492] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calamares.desktop b/calamares.desktop index 1f25c1f109..53f32bdcca 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -179,10 +179,10 @@ Name[sq]=Instalo Sistemin Icon[sq]=calamares GenericName[sq]=Instalues Sistemi Comment[sq]=Calamares — Instalues Sistemi -Name[fi_FI]=Asenna Järjestelmä +Name[fi_FI]=Asenna järjestelmä Icon[fi_FI]=calamares -GenericName[fi_FI]=Järjestelmän Asennusohjelma -Comment[fi_FI]=Calamares — Järjestelmän Asentaja +GenericName[fi_FI]=Järjestelmän asennusohjelma +Comment[fi_FI]=Calamares — Järjestelmän asentaja Name[sr@latin]=Instaliraj sistem Name[sr]=Инсталирај систем Icon[sr]=calamares From 4d0cae4a9bcc7adce34d486a60f00a537a5bfc57 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 29 Mar 2021 14:06:43 +0200 Subject: [PATCH 046/492] i18n: [python] Automatic merge of Transifex translations --- lang/python.pot | 157 ++++++++++-------- lang/python/ar/LC_MESSAGES/python.po | 14 +- lang/python/as/LC_MESSAGES/python.po | 14 +- lang/python/ast/LC_MESSAGES/python.po | 14 +- lang/python/az/LC_MESSAGES/python.po | 14 +- lang/python/az_AZ/LC_MESSAGES/python.po | 14 +- lang/python/be/LC_MESSAGES/python.po | 14 +- lang/python/bg/LC_MESSAGES/python.po | 14 +- lang/python/bn/LC_MESSAGES/python.po | 14 +- lang/python/ca/LC_MESSAGES/python.po | 14 +- lang/python/ca@valencia/LC_MESSAGES/python.po | 14 +- lang/python/cs_CZ/LC_MESSAGES/python.po | 14 +- lang/python/da/LC_MESSAGES/python.po | 14 +- lang/python/de/LC_MESSAGES/python.po | 14 +- lang/python/el/LC_MESSAGES/python.po | 14 +- lang/python/en_GB/LC_MESSAGES/python.po | 14 +- lang/python/eo/LC_MESSAGES/python.po | 14 +- lang/python/es/LC_MESSAGES/python.po | 14 +- lang/python/es_MX/LC_MESSAGES/python.po | 14 +- lang/python/es_PR/LC_MESSAGES/python.po | 14 +- lang/python/et/LC_MESSAGES/python.po | 14 +- lang/python/eu/LC_MESSAGES/python.po | 14 +- lang/python/fa/LC_MESSAGES/python.po | 14 +- lang/python/fi_FI/LC_MESSAGES/python.po | 26 +-- lang/python/fr/LC_MESSAGES/python.po | 14 +- lang/python/fr_CH/LC_MESSAGES/python.po | 14 +- lang/python/fur/LC_MESSAGES/python.po | 14 +- lang/python/gl/LC_MESSAGES/python.po | 14 +- lang/python/gu/LC_MESSAGES/python.po | 14 +- lang/python/he/LC_MESSAGES/python.po | 16 +- lang/python/hi/LC_MESSAGES/python.po | 14 +- lang/python/hr/LC_MESSAGES/python.po | 14 +- lang/python/hu/LC_MESSAGES/python.po | 14 +- lang/python/id/LC_MESSAGES/python.po | 14 +- lang/python/id_ID/LC_MESSAGES/python.po | 14 +- lang/python/ie/LC_MESSAGES/python.po | 14 +- lang/python/is/LC_MESSAGES/python.po | 14 +- lang/python/it_IT/LC_MESSAGES/python.po | 14 +- lang/python/ja/LC_MESSAGES/python.po | 14 +- lang/python/kk/LC_MESSAGES/python.po | 14 +- lang/python/kn/LC_MESSAGES/python.po | 14 +- lang/python/ko/LC_MESSAGES/python.po | 18 +- lang/python/lo/LC_MESSAGES/python.po | 14 +- lang/python/lt/LC_MESSAGES/python.po | 14 +- lang/python/lv/LC_MESSAGES/python.po | 14 +- lang/python/mk/LC_MESSAGES/python.po | 14 +- lang/python/ml/LC_MESSAGES/python.po | 14 +- lang/python/mr/LC_MESSAGES/python.po | 14 +- lang/python/nb/LC_MESSAGES/python.po | 14 +- lang/python/ne/LC_MESSAGES/python.po | 14 +- lang/python/ne_NP/LC_MESSAGES/python.po | 14 +- lang/python/nl/LC_MESSAGES/python.po | 14 +- lang/python/pl/LC_MESSAGES/python.po | 14 +- lang/python/pt_BR/LC_MESSAGES/python.po | 14 +- lang/python/pt_PT/LC_MESSAGES/python.po | 14 +- lang/python/ro/LC_MESSAGES/python.po | 14 +- lang/python/ru/LC_MESSAGES/python.po | 14 +- lang/python/si/LC_MESSAGES/python.po | 14 +- lang/python/sk/LC_MESSAGES/python.po | 14 +- lang/python/sl/LC_MESSAGES/python.po | 14 +- lang/python/sq/LC_MESSAGES/python.po | 14 +- lang/python/sr/LC_MESSAGES/python.po | 14 +- lang/python/sr@latin/LC_MESSAGES/python.po | 14 +- lang/python/sv/LC_MESSAGES/python.po | 14 +- lang/python/te/LC_MESSAGES/python.po | 14 +- lang/python/tg/LC_MESSAGES/python.po | 14 +- lang/python/th/LC_MESSAGES/python.po | 14 +- lang/python/tr_TR/LC_MESSAGES/python.po | 14 +- lang/python/uk/LC_MESSAGES/python.po | 14 +- lang/python/ur/LC_MESSAGES/python.po | 14 +- lang/python/uz/LC_MESSAGES/python.po | 14 +- lang/python/vi/LC_MESSAGES/python.po | 14 +- lang/python/zh/LC_MESSAGES/python.po | 14 +- lang/python/zh_CN/LC_MESSAGES/python.po | 14 +- lang/python/zh_TW/LC_MESSAGES/python.po | 14 +- 75 files changed, 613 insertions(+), 598 deletions(-) diff --git a/lang/python.pot b/lang/python.pot index 28f17ae174..7b88670663 100644 --- a/lang/python.pot +++ b/lang/python.pot @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" @@ -12,19 +12,19 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." -msgstr "" +msgstr "Configure GRUB." #: src/modules/mount/main.py:30 msgid "Mounting partitions." -msgstr "" +msgstr "Mounting partitions." #: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 @@ -36,172 +36,179 @@ msgstr "" #: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" -msgstr "" +msgstr "Configuration Error" #: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 #: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." -msgstr "" +msgstr "No partitions are defined for 
{!s}
to use." #: src/modules/services-systemd/main.py:26 msgid "Configure systemd services" -msgstr "" +msgstr "Configure systemd services" #: src/modules/services-systemd/main.py:59 #: src/modules/services-openrc/main.py:93 msgid "Cannot modify service" -msgstr "" +msgstr "Cannot modify service" #: src/modules/services-systemd/main.py:60 msgid "" "systemctl {arg!s} call in chroot returned error code {num!s}." msgstr "" +"systemctl {arg!s} call in chroot returned error code {num!s}." #: src/modules/services-systemd/main.py:63 #: src/modules/services-systemd/main.py:67 msgid "Cannot enable systemd service {name!s}." -msgstr "" +msgstr "Cannot enable systemd service {name!s}." #: src/modules/services-systemd/main.py:65 msgid "Cannot enable systemd target {name!s}." -msgstr "" +msgstr "Cannot enable systemd target {name!s}." #: src/modules/services-systemd/main.py:69 msgid "Cannot disable systemd target {name!s}." -msgstr "" +msgstr "Cannot disable systemd target {name!s}." #: src/modules/services-systemd/main.py:71 msgid "Cannot mask systemd unit {name!s}." -msgstr "" +msgstr "Cannot mask systemd unit {name!s}." #: src/modules/services-systemd/main.py:73 msgid "" -"Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}." +"Unknown systemd commands {command!s} and " +"{suffix!s} for unit {name!s}." msgstr "" +"Unknown systemd commands {command!s} and " +"{suffix!s} for unit {name!s}." #: src/modules/umount/main.py:31 msgid "Unmount file systems." -msgstr "" +msgstr "Unmount file systems." #: src/modules/unpackfs/main.py:35 msgid "Filling up filesystems." -msgstr "" +msgstr "Filling up filesystems." #: src/modules/unpackfs/main.py:255 msgid "rsync failed with error code {}." -msgstr "" +msgstr "rsync failed with error code {}." #: src/modules/unpackfs/main.py:300 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "" +msgstr "Unpacking image {}/{}, file {}/{}" #: src/modules/unpackfs/main.py:315 msgid "Starting to unpack {}" -msgstr "" +msgstr "Starting to unpack {}" #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 msgid "Failed to unpack image \"{}\"" -msgstr "" +msgstr "Failed to unpack image \"{}\"" #: src/modules/unpackfs/main.py:431 msgid "No mount point for root partition" -msgstr "" +msgstr "No mount point for root partition" #: src/modules/unpackfs/main.py:432 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" -msgstr "" +msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" #: src/modules/unpackfs/main.py:437 msgid "Bad mount point for root partition" -msgstr "" +msgstr "Bad mount point for root partition" #: src/modules/unpackfs/main.py:438 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" -msgstr "" +msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing" #: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 #: src/modules/unpackfs/main.py:478 msgid "Bad unsquash configuration" -msgstr "" +msgstr "Bad unsquash configuration" #: src/modules/unpackfs/main.py:455 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" -msgstr "" +msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel" #: src/modules/unpackfs/main.py:459 msgid "The source filesystem \"{}\" does not exist" -msgstr "" +msgstr "The source filesystem \"{}\" does not exist" #: src/modules/unpackfs/main.py:465 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" +"Failed to find unsquashfs, make sure you have the squashfs-tools package " +"installed" #: src/modules/unpackfs/main.py:479 msgid "The destination \"{}\" in the target system is not a directory" -msgstr "" +msgstr "The destination \"{}\" in the target system is not a directory" #: src/modules/displaymanager/main.py:514 msgid "Cannot write KDM configuration file" -msgstr "" +msgstr "Cannot write KDM configuration file" #: src/modules/displaymanager/main.py:515 msgid "KDM config file {!s} does not exist" -msgstr "" +msgstr "KDM config file {!s} does not exist" #: src/modules/displaymanager/main.py:576 msgid "Cannot write LXDM configuration file" -msgstr "" +msgstr "Cannot write LXDM configuration file" #: src/modules/displaymanager/main.py:577 msgid "LXDM config file {!s} does not exist" -msgstr "" +msgstr "LXDM config file {!s} does not exist" #: src/modules/displaymanager/main.py:660 msgid "Cannot write LightDM configuration file" -msgstr "" +msgstr "Cannot write LightDM configuration file" #: src/modules/displaymanager/main.py:661 msgid "LightDM config file {!s} does not exist" -msgstr "" +msgstr "LightDM config file {!s} does not exist" #: src/modules/displaymanager/main.py:735 msgid "Cannot configure LightDM" -msgstr "" +msgstr "Cannot configure LightDM" #: src/modules/displaymanager/main.py:736 msgid "No LightDM greeter installed." -msgstr "" +msgstr "No LightDM greeter installed." #: src/modules/displaymanager/main.py:767 msgid "Cannot write SLIM configuration file" -msgstr "" +msgstr "Cannot write SLIM configuration file" #: src/modules/displaymanager/main.py:768 msgid "SLIM config file {!s} does not exist" -msgstr "" +msgstr "SLIM config file {!s} does not exist" #: src/modules/displaymanager/main.py:894 msgid "No display managers selected for the displaymanager module." -msgstr "" +msgstr "No display managers selected for the displaymanager module." #: src/modules/displaymanager/main.py:895 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" +"The displaymanagers list is empty or undefined in both globalstorage and " +"displaymanager.conf." #: src/modules/displaymanager/main.py:977 msgid "Display manager configuration was incomplete" -msgstr "" +msgstr "Display manager configuration was incomplete" #: src/modules/initcpiocfg/main.py:28 msgid "Configuring mkinitcpio." -msgstr "" +msgstr "Configuring mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 @@ -209,139 +216,147 @@ msgstr "" #: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." -msgstr "" +msgstr "No root mount point is given for 
{!s}
to use." #: src/modules/luksopenswaphookcfg/main.py:26 msgid "Configuring encrypted swap." -msgstr "" +msgstr "Configuring encrypted swap." #: src/modules/rawfs/main.py:26 msgid "Installing data." -msgstr "" +msgstr "Installing data." #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" -msgstr "" +msgstr "Configure OpenRC services" #: src/modules/services-openrc/main.py:57 msgid "Cannot add service {name!s} to run-level {level!s}." -msgstr "" +msgstr "Cannot add service {name!s} to run-level {level!s}." #: src/modules/services-openrc/main.py:59 msgid "Cannot remove service {name!s} from run-level {level!s}." -msgstr "" +msgstr "Cannot remove service {name!s} from run-level {level!s}." #: src/modules/services-openrc/main.py:61 msgid "" "Unknown service-action {arg!s} for service {name!s} in run-" "level {level!s}." msgstr "" +"Unknown service-action {arg!s} for service {name!s} in run-" +"level {level!s}." #: src/modules/services-openrc/main.py:94 msgid "" "rc-update {arg!s} call in chroot returned error code {num!s}." msgstr "" +"rc-update {arg!s} call in chroot returned error code {num!s}." #: src/modules/services-openrc/main.py:101 msgid "Target runlevel does not exist" -msgstr "" +msgstr "Target runlevel does not exist" #: src/modules/services-openrc/main.py:102 msgid "" "The path for runlevel {level!s} is {path!s}, which does not " "exist." msgstr "" +"The path for runlevel {level!s} is {path!s}, which does not " +"exist." #: src/modules/services-openrc/main.py:110 msgid "Target service does not exist" -msgstr "" +msgstr "Target service does not exist" #: src/modules/services-openrc/main.py:111 msgid "" -"The path for service {name!s} is {path!s}, which does not exist." +"The path for service {name!s} is {path!s}, which does not " +"exist." msgstr "" +"The path for service {name!s} is {path!s}, which does not " +"exist." #: src/modules/plymouthcfg/main.py:27 msgid "Configure Plymouth theme" -msgstr "" +msgstr "Configure Plymouth theme" #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 msgid "Install packages." -msgstr "" +msgstr "Install packages." #: src/modules/packages/main.py:57 #, python-format msgid "Processing packages (%(count)d / %(total)d)" -msgstr "" +msgstr "Processing packages (%(count)d / %(total)d)" #: src/modules/packages/main.py:62 #, python-format msgid "Installing one package." msgid_plural "Installing %(num)d packages." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Installing one package." +msgstr[1] "Installing %(num)d packages." #: src/modules/packages/main.py:65 #, python-format msgid "Removing one package." msgid_plural "Removing %(num)d packages." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Removing one package." +msgstr[1] "Removing %(num)d packages." #: src/modules/bootloader/main.py:43 msgid "Install bootloader." -msgstr "" +msgstr "Install bootloader." #: src/modules/hwclock/main.py:26 msgid "Setting hardware clock." -msgstr "" +msgstr "Setting hardware clock." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "Creating initramfs with mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "Failed to run mkinitfs on the target" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" -msgstr "" +msgstr "The exit code was {}" #: src/modules/dracut/main.py:27 msgid "Creating initramfs with dracut." -msgstr "" +msgstr "Creating initramfs with dracut." #: src/modules/dracut/main.py:49 msgid "Failed to run dracut on the target" -msgstr "" +msgstr "Failed to run dracut on the target" #: src/modules/initramfscfg/main.py:32 msgid "Configuring initramfs." -msgstr "" +msgstr "Configuring initramfs." #: src/modules/openrcdmcryptcfg/main.py:26 msgid "Configuring OpenRC dmcrypt service." -msgstr "" +msgstr "Configuring OpenRC dmcrypt service." #: src/modules/fstab/main.py:29 msgid "Writing fstab." -msgstr "" +msgstr "Writing fstab." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." -msgstr "" +msgstr "Dummy python job." #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 #: src/modules/dummypython/main.py:94 msgid "Dummy python step {}" -msgstr "" +msgstr "Dummy python step {}" #: src/modules/localecfg/main.py:30 msgid "Configuring locales." -msgstr "" +msgstr "Configuring locales." #: src/modules/networkcfg/main.py:28 msgid "Saving network configuration." -msgstr "" +msgstr "Saving network configuration." diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po index a161e69e1f..e6dbf1b966 100644 --- a/lang/python/ar/LC_MESSAGES/python.po +++ b/lang/python/ar/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: aboodilankaboot, 2019\n" "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "جاري تركيب الأقسام" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "خطأ في الضبط" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po index 9c4a1172c1..234569f18e 100644 --- a/lang/python/as/LC_MESSAGES/python.po +++ b/lang/python/as/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Deep Jyoti Choudhury , 2020\n" "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB কনফিগাৰ কৰক।" msgid "Mounting partitions." msgstr "বিভাজন মাউন্ট্ কৰা।" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "কনফিগাৰেচন ত্ৰুটি" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।" @@ -213,7 +213,7 @@ msgstr "mkinitcpio কনফিগাৰ কৰি আছে।" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "ব্যৱহাৰৰ বাবে 
{!s}
ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।" diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po index ecc658fd0c..61bd860db2 100644 --- a/lang/python/ast/LC_MESSAGES/python.po +++ b/lang/python/ast/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: enolp , 2020\n" "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -212,7 +212,7 @@ msgstr "Configurando mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index 9e51b86ace..c0f992eedd 100644 --- a/lang/python/az/LC_MESSAGES/python.po +++ b/lang/python/az/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xəyyam Qocayev , 2020\n" "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB tənzimləmələri" msgid "Mounting partitions." msgstr "Disk bölmələri qoşulur." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Tənzimləmə xətası" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
istifadə etmək üçün bölmələr təyin edilməyib" @@ -220,7 +220,7 @@ msgstr "mkinitcpio tənzimlənir." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index e261162ead..a62ed8b68e 100644 --- a/lang/python/az_AZ/LC_MESSAGES/python.po +++ b/lang/python/az_AZ/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xəyyam Qocayev , 2020\n" "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB tənzimləmələri" msgid "Mounting partitions." msgstr "Disk bölmələri qoşulur." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Tənzimləmə xətası" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
istifadə etmək üçün bölmələr təyin edilməyib" @@ -220,7 +220,7 @@ msgstr "mkinitcpio tənzimlənir." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po index 834db9fedb..f6c46cf059 100644 --- a/lang/python/be/LC_MESSAGES/python.po +++ b/lang/python/be/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Źmicier Turok , 2020\n" "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n" @@ -29,22 +29,22 @@ msgstr "Наладзіць GRUB." msgid "Mounting partitions." msgstr "Мантаванне раздзелаў." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Памылка канфігурацыі" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Раздзелы для 
{!s}
не вызначаныя." @@ -215,7 +215,7 @@ msgstr "Наладка mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Каранёвы пункт мантавання для
{!s}
не пададзены." diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index fa64c358b6..de59004dac 100644 --- a/lang/python/bg/LC_MESSAGES/python.po +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Georgi Georgiev (Жоро) , 2020\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po index 9c50ff4ddf..934f294582 100644 --- a/lang/python/bn/LC_MESSAGES/python.po +++ b/lang/python/bn/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n" "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n" @@ -29,22 +29,22 @@ msgstr "কনফিগার করুন জিআরইউবি।" msgid "Mounting partitions." msgstr "মাউন্ট করছে পার্টিশনগুলো।" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "কনফিগারেশন ত্রুটি" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
{!এস}
ব্যবহার করার জন্য।" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po index c119de08f6..87643308e3 100644 --- a/lang/python/ca/LC_MESSAGES/python.po +++ b/lang/python/ca/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Davidmp , 2020\n" "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n" @@ -29,22 +29,22 @@ msgstr "Configura el GRUB." msgid "Mounting partitions." msgstr "Es munten les particions." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Error de configuració" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "No s'han definit particions perquè les usi 
{!s}
." @@ -218,7 +218,7 @@ msgstr "Es configura mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po index 65b88c1b86..042a7b6a5f 100644 --- a/lang/python/ca@valencia/LC_MESSAGES/python.po +++ b/lang/python/ca@valencia/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Raul , 2021\n" "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n" @@ -29,22 +29,22 @@ msgstr "Configura el GRUB" msgid "Mounting partitions." msgstr "S'estan muntant les particions." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "S'ha produït un error en la configuració." -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "No s'han definit particions perquè les use 
{!s}
." @@ -220,7 +220,7 @@ msgstr "S'està configurant mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po index 127e4e82f5..18d8327c09 100644 --- a/lang/python/cs_CZ/LC_MESSAGES/python.po +++ b/lang/python/cs_CZ/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pavel Borecki , 2020\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n" @@ -31,22 +31,22 @@ msgstr "Nastavování zavaděče GRUB." msgid "Mounting partitions." msgstr "Připojování oddílů." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Chyba nastavení" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Pro 
{!s}
nejsou zadány žádné oddíly." @@ -220,7 +220,7 @@ msgstr "Nastavování mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Pro 
{!s}
není zadán žádný přípojný bod." diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po index 42997f18fa..7da9d8ca6c 100644 --- a/lang/python/da/LC_MESSAGES/python.po +++ b/lang/python/da/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: scootergrisen, 2020\n" "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n" @@ -30,22 +30,22 @@ msgstr "Konfigurer GRUB." msgid "Mounting partitions." msgstr "Monterer partitioner." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Fejl ved konfiguration" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Der er ikke angivet nogle partitioner som 
{!s}
kan bruge." @@ -218,7 +218,7 @@ msgstr "Konfigurerer mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po index 725c69d2df..44d7603fac 100644 --- a/lang/python/de/LC_MESSAGES/python.po +++ b/lang/python/de/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Andreas Eitel , 2020\n" "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n" @@ -31,22 +31,22 @@ msgstr "GRUB konfigurieren." msgid "Mounting partitions." msgstr "Hänge Partitionen ein." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigurationsfehler" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Für 
{!s}
sind keine zu verwendenden Partitionen definiert." @@ -222,7 +222,7 @@ msgstr "Konfiguriere mkinitcpio. " #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po index 89a4bec841..1d29a1ae10 100644 --- a/lang/python/el/LC_MESSAGES/python.po +++ b/lang/python/el/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Efstathios Iosifidis , 2017\n" "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po index 25e68de3a1..618f1c1c7a 100644 --- a/lang/python/en_GB/LC_MESSAGES/python.po +++ b/lang/python/en_GB/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Jason Collins , 2018\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po index 71d1598512..278f61970b 100644 --- a/lang/python/eo/LC_MESSAGES/python.po +++ b/lang/python/eo/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kurt Ankh Phoenix , 2018\n" "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po index bd8470f0c0..02345b5e70 100644 --- a/lang/python/es/LC_MESSAGES/python.po +++ b/lang/python/es/LC_MESSAGES/python.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Pier Jose Gotta Perez , 2020\n" "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n" @@ -34,22 +34,22 @@ msgstr "Configure GRUB - menú de arranque multisistema -" msgid "Mounting partitions." msgstr "Montando particiones" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Error de configuración" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "No hay definidas particiones en 1{!s}1 para usar." @@ -227,7 +227,7 @@ msgstr "Configurando mkinitcpio - sistema de arranque básico -." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po index 10cb57b525..37171cb0ec 100644 --- a/lang/python/es_MX/LC_MESSAGES/python.po +++ b/lang/python/es_MX/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Logan 8192 , 2018\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po index 3906ff2a15..a78dbcabad 100644 --- a/lang/python/es_PR/LC_MESSAGES/python.po +++ b/lang/python/es_PR/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po index dd11cd504b..cc010ec734 100644 --- a/lang/python/et/LC_MESSAGES/python.po +++ b/lang/python/et/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Madis Otenurm, 2019\n" "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po index a8a763cddc..87f335bb69 100644 --- a/lang/python/eu/LC_MESSAGES/python.po +++ b/lang/python/eu/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Ander Elortondo, 2019\n" "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po index d8eaa23635..14b5d0b5f3 100644 --- a/lang/python/fa/LC_MESSAGES/python.po +++ b/lang/python/fa/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: alireza jamshidi , 2020\n" "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n" @@ -30,22 +30,22 @@ msgstr "در حال پیکربندی گراب." msgid "Mounting partitions." msgstr "در حال سوار کردن افرازها." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "خطای پیکربندی" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "هیچ افرازی برای استفادهٔ 
{!s}
تعریف نشده." @@ -214,7 +214,7 @@ msgstr "پیکربندی mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
{!s}
داده نشده." diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po index 9f4a671f8c..1526d5b45a 100644 --- a/lang/python/fi_FI/LC_MESSAGES/python.po +++ b/lang/python/fi_FI/LC_MESSAGES/python.po @@ -4,16 +4,16 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Kimmo Kujansuu , 2020 +# Kimmo Kujansuu , 2021 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Kimmo Kujansuu , 2020\n" +"Last-Translator: Kimmo Kujansuu , 2021\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,22 +29,22 @@ msgstr "Määritä GRUB." msgid "Mounting partitions." msgstr "Yhdistä osiot." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Määritysvirhe" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Ei ole määritetty käyttämään osioita 
{!s}
." @@ -84,8 +84,8 @@ msgid "" "Unknown systemd commands {command!s} and " "{suffix!s} for unit {name!s}." msgstr "" -"Tuntematon systemd-komennot {command!s} ja " -"{suffix!s} yksikölle {name!s}." +"Tuntematon systemd komento {command!s} ja " +"{suffix!s} laite {name!s}." #: src/modules/umount/main.py:31 msgid "Unmount file systems." @@ -215,7 +215,7 @@ msgstr "Määritetään mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" @@ -346,12 +346,12 @@ msgstr "Fstab kirjoittaminen." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." -msgstr "Harjoitus python-työ." +msgstr "Harjoitus python job." #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 #: src/modules/dummypython/main.py:94 msgid "Dummy python step {}" -msgstr "Harjoitus python-vaihe {}" +msgstr "Harjoitus python vaihe {}" #: src/modules/localecfg/main.py:30 msgid "Configuring locales." diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index 6a3db6c8bc..568181c5e2 100644 --- a/lang/python/fr/LC_MESSAGES/python.po +++ b/lang/python/fr/LC_MESSAGES/python.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Arnaud Ferraris , 2019\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" @@ -37,22 +37,22 @@ msgstr "Configuration du GRUB." msgid "Mounting partitions." msgstr "Montage des partitions." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erreur de configuration" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" "Aucune partition n'est définie pour être utilisée par 
{!s}
." @@ -226,7 +226,7 @@ msgstr "Configuration de mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po index 938df68cdc..219e71fd06 100644 --- a/lang/python/fr_CH/LC_MESSAGES/python.po +++ b/lang/python/fr_CH/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po index c47de86ab5..44eb8b50ed 100644 --- a/lang/python/fur/LC_MESSAGES/python.po +++ b/lang/python/fur/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Fabio Tomat , 2020\n" "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n" @@ -29,22 +29,22 @@ msgstr "Configure GRUB." msgid "Mounting partitions." msgstr "Montaç des partizions." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erôr di configurazion" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "No je stade definide nissune partizion di doprâ par 
{!s}
." @@ -219,7 +219,7 @@ msgstr "Daûr a configurâ di mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po index 6fd93ff6ea..dd1abe7a53 100644 --- a/lang/python/gl/LC_MESSAGES/python.po +++ b/lang/python/gl/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Xosé, 2018\n" "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po index ac7503bf98..588606614f 100644 --- a/lang/python/gu/LC_MESSAGES/python.po +++ b/lang/python/gu/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index 2d56896b1a..21cdc6a561 100644 --- a/lang/python/he/LC_MESSAGES/python.po +++ b/lang/python/he/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Eli Shleifer , 2017 -# Omeritzics Games , 2020 +# Omer I.S. , 2020 # Yaron Shahrabani , 2020 # #, fuzzy @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yaron Shahrabani , 2020\n" "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n" @@ -31,22 +31,22 @@ msgstr "הגדרת GRUB." msgid "Mounting partitions." msgstr "מחיצות מעוגנות." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "שגיאת הגדרות" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "לא הוגדרו מחיצות לשימוש של 
{!s}
." @@ -216,7 +216,7 @@ msgstr "mkinitcpio מותקן." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
{!s}
." diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po index 17548934d3..719a123432 100644 --- a/lang/python/hi/LC_MESSAGES/python.po +++ b/lang/python/hi/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Panwar108 , 2020\n" "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n" @@ -29,22 +29,22 @@ msgstr "GRUB विन्यस्त करना।" msgid "Mounting partitions." msgstr "विभाजन माउंट करना।" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "विन्यास त्रुटि" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।" @@ -214,7 +214,7 @@ msgstr "mkinitcpio को विन्यस्त करना।" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po index 20a9c53bde..0ccbd948c3 100644 --- a/lang/python/hr/LC_MESSAGES/python.po +++ b/lang/python/hr/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lovro Kudelić , 2020\n" "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n" @@ -29,22 +29,22 @@ msgstr "Konfigurirajte GRUB." msgid "Mounting partitions." msgstr "Montiranje particija." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Greška konfiguracije" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nema definiranih particija za 
{!s}
korištenje." @@ -217,7 +217,7 @@ msgstr "Konfiguriranje mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po index a4a8ec01fb..1a4034f14b 100644 --- a/lang/python/hu/LC_MESSAGES/python.po +++ b/lang/python/hu/LC_MESSAGES/python.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Lajos Pasztor , 2019\n" "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n" @@ -32,22 +32,22 @@ msgstr "GRUB konfigurálása." msgid "Mounting partitions." msgstr "Partíciók csatolása." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigurációs hiba" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nincsenek partíciók meghatározva a 
{!s}
használatához." @@ -219,7 +219,7 @@ msgstr "mkinitcpio konfigurálása." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nincs root csatolási pont megadva a 
{!s}
használatához." diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po index c07ac963cd..5ba45ae051 100644 --- a/lang/python/id/LC_MESSAGES/python.po +++ b/lang/python/id/LC_MESSAGES/python.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Drajat Hasan , 2021\n" "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n" @@ -32,22 +32,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Kesalahan Konfigurasi" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -212,7 +212,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/id_ID/LC_MESSAGES/python.po b/lang/python/id_ID/LC_MESSAGES/python.po index d13214e2c5..1cbcd75199 100644 --- a/lang/python/id_ID/LC_MESSAGES/python.po +++ b/lang/python/id_ID/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/calamares/teams/20061/id_ID/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po index a12ad39053..eb96deb152 100644 --- a/lang/python/ie/LC_MESSAGES/python.po +++ b/lang/python/ie/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Caarmi, 2020\n" "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n" @@ -29,22 +29,22 @@ msgstr "Configurante GRUB." msgid "Mounting partitions." msgstr "Montente partitiones." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Errore de configuration" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Null partition es definit por usa de 
{!s}
." @@ -211,7 +211,7 @@ msgstr "Configurante mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po index 27baf76572..8a57cabf5f 100644 --- a/lang/python/is/LC_MESSAGES/python.po +++ b/lang/python/is/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Kristján Magnússon, 2018\n" "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po index 0fd943b0d5..1933817ba5 100644 --- a/lang/python/it_IT/LC_MESSAGES/python.po +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Saverio , 2020\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" @@ -31,22 +31,22 @@ msgstr "Configura GRUB." msgid "Mounting partitions." msgstr "Montaggio partizioni." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Errore di Configurazione" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nessuna partizione definita per l'uso con 
{!s}
." @@ -221,7 +221,7 @@ msgstr "Configurazione di mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nessun punto di mount root è dato in l'uso per 
{!s}
" diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po index bed2831d91..fb22addaf9 100644 --- a/lang/python/ja/LC_MESSAGES/python.po +++ b/lang/python/ja/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: UTUMI Hirosi , 2020\n" "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n" @@ -31,22 +31,22 @@ msgstr "GRUBを設定にします。" msgid "Mounting partitions." msgstr "パーティションのマウント。" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "コンフィグレーションエラー" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
に使用するパーティションが定義されていません。" @@ -214,7 +214,7 @@ msgstr "mkinitcpioを設定しています。" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr " 
{!s}
を使用するのにルートマウントポイントが与えられていません。" diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po index c9dfa28756..64d0eae02f 100644 --- a/lang/python/kk/LC_MESSAGES/python.po +++ b/lang/python/kk/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po index 031fb8b703..86580ad77b 100644 --- a/lang/python/kn/LC_MESSAGES/python.po +++ b/lang/python/kn/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index 66dab263f7..528ae5e3b0 100644 --- a/lang/python/ko/LC_MESSAGES/python.po +++ b/lang/python/ko/LC_MESSAGES/python.po @@ -5,16 +5,16 @@ # # Translators: # Ji-Hyeon Gim , 2018 -# JungHee Lee , 2020 +# Bruce Lee , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: JungHee Lee , 2020\n" +"Last-Translator: Bruce Lee , 2020\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,22 +30,22 @@ msgstr "GRUB 구성" msgid "Mounting partitions." msgstr "파티션 마운트 중." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "구성 오류" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "사용할 
{!s}
에 대해 정의된 파티션이 없음." @@ -214,7 +214,7 @@ msgstr "mkinitcpio 구성 중." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "
{!s}
에서 사용할 루트 마운트 지점이 제공되지 않음." diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po index 806ae45326..fdbc1b6ba8 100644 --- a/lang/python/lo/LC_MESSAGES/python.po +++ b/lang/python/lo/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po index 2414ce45c3..69e5ad171f 100644 --- a/lang/python/lt/LC_MESSAGES/python.po +++ b/lang/python/lt/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Moo, 2020\n" "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n" @@ -30,22 +30,22 @@ msgstr "Konfigūruoti GRUB." msgid "Mounting partitions." msgstr "Prijungiami skaidiniai." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigūracijos klaida" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
{!s}
naudojimui." @@ -218,7 +218,7 @@ msgstr "Konfigūruojama mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po index 4244d3f241..0c28a383c4 100644 --- a/lang/python/lv/LC_MESSAGES/python.po +++ b/lang/python/lv/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po index 719bec2e04..44307a32b5 100644 --- a/lang/python/mk/LC_MESSAGES/python.po +++ b/lang/python/mk/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Martin Ristovski , 2018\n" "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po index 869a934c9f..546d72695e 100644 --- a/lang/python/ml/LC_MESSAGES/python.po +++ b/lang/python/ml/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Balasankar C , 2019\n" "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "ക്രമീകരണത്തിൽ പിഴവ്" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po index 496df5d1fb..21677bf5c6 100644 --- a/lang/python/mr/LC_MESSAGES/python.po +++ b/lang/python/mr/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po index fd1c4d9fb8..153a01d9a4 100644 --- a/lang/python/nb/LC_MESSAGES/python.po +++ b/lang/python/nb/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 865ac004d9acf2568b2e4b389e0007c7_fba755c <3516cc82d94f87187da1e036e5f09e42_616112>, 2017\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n" @@ -29,22 +29,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ne/LC_MESSAGES/python.po b/lang/python/ne/LC_MESSAGES/python.po index 3cc33bd071..ef9c472e96 100644 --- a/lang/python/ne/LC_MESSAGES/python.po +++ b/lang/python/ne/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Nepali (https://www.transifex.com/calamares/teams/20061/ne/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po index eabefb956a..7a80aa9b9d 100644 --- a/lang/python/ne_NP/LC_MESSAGES/python.po +++ b/lang/python/ne_NP/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po index 75e43b7bef..69cd3c7dd3 100644 --- a/lang/python/nl/LC_MESSAGES/python.po +++ b/lang/python/nl/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Adriaan de Groot , 2020\n" "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n" @@ -30,22 +30,22 @@ msgstr "GRUB instellen." msgid "Mounting partitions." msgstr "Partities mounten." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Configuratiefout" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Geen partities gedefinieerd voor 
{!s}
om te gebruiken." @@ -223,7 +223,7 @@ msgstr "Instellen van mkinitcpio" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po index f6e8c43637..1b899113fd 100644 --- a/lang/python/pl/LC_MESSAGES/python.po +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Piotr Strębski , 2020\n" "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" @@ -31,22 +31,22 @@ msgstr "Konfiguracja GRUB." msgid "Mounting partitions." msgstr "Montowanie partycji." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Błąd konfiguracji" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -217,7 +217,7 @@ msgstr "Konfigurowanie mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po index 894c1defd4..6803c6287e 100644 --- a/lang/python/pt_BR/LC_MESSAGES/python.po +++ b/lang/python/pt_BR/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Guilherme, 2020\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" @@ -30,22 +30,22 @@ msgstr "Configurar GRUB." msgid "Mounting partitions." msgstr "Montando partições." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erro de Configuração." -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Sem partições definidas para uso por 
{!s}
." @@ -219,7 +219,7 @@ msgstr "Configurando mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po index 6998406929..e3298f22cc 100644 --- a/lang/python/pt_PT/LC_MESSAGES/python.po +++ b/lang/python/pt_PT/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Hugo Carvalho , 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" @@ -31,22 +31,22 @@ msgstr "Configurar o GRUB." msgid "Mounting partitions." msgstr "A montar partições." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Erro de configuração" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nenhuma partição está definida para 
{!s}
usar." @@ -222,7 +222,7 @@ msgstr "A configurar o mkintcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nenhum ponto de montagem root é fornecido para 
{!s}
usar." diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po index 962e340df9..efafa2872b 100644 --- a/lang/python/ro/LC_MESSAGES/python.po +++ b/lang/python/ro/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Sebastian Brici , 2018\n" "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n" @@ -30,22 +30,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -210,7 +210,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po index 39d136eca5..e6ce31f074 100644 --- a/lang/python/ru/LC_MESSAGES/python.po +++ b/lang/python/ru/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: ZIzA, 2020\n" "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n" @@ -30,22 +30,22 @@ msgstr "Настройте GRUB." msgid "Mounting partitions." msgstr "Монтирование разделов." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Ошибка конфигурации" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Не определены разделы для использования 
{!S}
." @@ -211,7 +211,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po index 2cddc8df4d..a92013b920 100644 --- a/lang/python/si/LC_MESSAGES/python.po +++ b/lang/python/si/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po index df3e12fb73..a9f0e12e14 100644 --- a/lang/python/sk/LC_MESSAGES/python.po +++ b/lang/python/sk/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Dušan Kazik , 2020\n" "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n" @@ -29,22 +29,22 @@ msgstr "Konfigurácia zavádzača GRUB." msgid "Mounting partitions." msgstr "Pripájanie oddielov." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Chyba konfigurácie" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Nie sú určené žiadne oddiely na použitie pre 
{!s}
." @@ -213,7 +213,7 @@ msgstr "Konfigurácia mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre 
{!s}
." diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po index c9e2d93fd7..e58838407d 100644 --- a/lang/python/sl/LC_MESSAGES/python.po +++ b/lang/python/sl/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po index dce2a61161..a0303533e3 100644 --- a/lang/python/sq/LC_MESSAGES/python.po +++ b/lang/python/sq/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Besnik Bleta , 2020\n" "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n" @@ -29,22 +29,22 @@ msgstr "Formësoni GRUB-in." msgid "Mounting partitions." msgstr "Po montohen pjesë." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Gabim Formësimi" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "S’ka pjesë të përkufizuara për 
{!s}
për t’u përdorur." @@ -218,7 +218,7 @@ msgstr "Po formësohet mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po index 80deb2340c..f4b5652bff 100644 --- a/lang/python/sr/LC_MESSAGES/python.po +++ b/lang/python/sr/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Slobodan Simić , 2020\n" "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n" @@ -29,22 +29,22 @@ msgstr "Подеси ГРУБ" msgid "Mounting partitions." msgstr "Монтирање партиција." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Грешка поставе" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -209,7 +209,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po index af221bf28e..5daee27b29 100644 --- a/lang/python/sr@latin/LC_MESSAGES/python.po +++ b/lang/python/sr@latin/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po index 26193da007..83330e1bfa 100644 --- a/lang/python/sv/LC_MESSAGES/python.po +++ b/lang/python/sv/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Luna Jernberg , 2020\n" "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n" @@ -31,22 +31,22 @@ msgstr "Konfigurera GRUB." msgid "Mounting partitions." msgstr "Monterar partitioner." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Konfigurationsfel" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Inga partitioner är definerade för 
{!s}
att använda." @@ -219,7 +219,7 @@ msgstr "Konfigurerar mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po index fbeb6e9f62..3f334d59dd 100644 --- a/lang/python/te/LC_MESSAGES/python.po +++ b/lang/python/te/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po index fd7e50aa0e..0cf6d80f78 100644 --- a/lang/python/tg/LC_MESSAGES/python.po +++ b/lang/python/tg/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Victor Ibragimov , 2020\n" "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n" @@ -29,22 +29,22 @@ msgstr "Танзимоти GRUB." msgid "Mounting partitions." msgstr "Васлкунии қисмҳои диск." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Хатои танзимкунӣ" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Ягон қисми диск барои истифодаи 
{!s}
муайян карда нашуд." @@ -219,7 +219,7 @@ msgstr "Танзимкунии mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Нуқтаи васли реша (root) барои истифодаи 
{!s}
дода нашуд." diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po index 62d6347888..876a1f1a5f 100644 --- a/lang/python/th/LC_MESSAGES/python.po +++ b/lang/python/th/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po index 1cd7b3ca47..a576509654 100644 --- a/lang/python/tr_TR/LC_MESSAGES/python.po +++ b/lang/python/tr_TR/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Demiray Muhterem , 2020\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n" @@ -30,22 +30,22 @@ msgstr "GRUB'u yapılandır." msgid "Mounting partitions." msgstr "Disk bölümlemeleri bağlanıyor." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Yapılandırma Hatası" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "
{!s}
kullanması için hiçbir bölüm tanımlanmadı." @@ -218,7 +218,7 @@ msgstr "Mkinitcpio yapılandırılıyor." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "
{!s}
kullanması için kök bağlama noktası verilmedi." diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po index e925155626..d4cf0b6f84 100644 --- a/lang/python/uk/LC_MESSAGES/python.po +++ b/lang/python/uk/LC_MESSAGES/python.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: Yuri Chornoivan , 2020\n" "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n" @@ -31,22 +31,22 @@ msgstr "Налаштовування GRUB." msgid "Mounting partitions." msgstr "Монтування розділів." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Помилка налаштовування" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Не визначено розділів для використання 
{!s}
." @@ -224,7 +224,7 @@ msgstr "Налаштовуємо mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po index 73fb106cbf..fa1c761785 100644 --- a/lang/python/ur/LC_MESSAGES/python.po +++ b/lang/python/ur/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po index cdb117a1ff..a1a9fe88dc 100644 --- a/lang/python/uz/LC_MESSAGES/python.po +++ b/lang/python/uz/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po index 727c12ae56..7f4fd3b67b 100644 --- a/lang/python/vi/LC_MESSAGES/python.po +++ b/lang/python/vi/LC_MESSAGES/python.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: T. Tran , 2020\n" "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n" @@ -29,22 +29,22 @@ msgstr "Cấu hình GRUB" msgid "Mounting partitions." msgstr "Đang gắn kết các phân vùng." -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "Lỗi cấu hình" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "Không có phân vùng nào được định nghĩa cho 
{!s}
để dùng." @@ -215,7 +215,7 @@ msgstr "Đang cấu hình mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "Không có điểm kết nối gốc cho 
{!s}
để dùng." diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po index 797480febb..0ff1233a20 100644 --- a/lang/python/zh/LC_MESSAGES/python.po +++ b/lang/python/zh/LC_MESSAGES/python.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Language-Team: Chinese (https://www.transifex.com/calamares/teams/20061/zh/)\n" "MIME-Version: 1.0\n" @@ -25,22 +25,22 @@ msgstr "" msgid "Mounting partitions." msgstr "" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "" @@ -205,7 +205,7 @@ msgstr "" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po index bd8cd6074c..ac6d2d50c6 100644 --- a/lang/python/zh_CN/LC_MESSAGES/python.po +++ b/lang/python/zh_CN/LC_MESSAGES/python.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 玉堂白鹤 , 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n" @@ -33,22 +33,22 @@ msgstr "配置 GRUB." msgid "Mounting partitions." msgstr "挂载分区。" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "配置错误" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "没有分配分区给 
{!s}
。" @@ -215,7 +215,7 @@ msgstr "配置 mkinitcpio." #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr " 未设置 
{!s}
要使用的根挂载点。" diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po index e59cb57003..254d0e1ec8 100644 --- a/lang/python/zh_TW/LC_MESSAGES/python.po +++ b/lang/python/zh_TW/LC_MESSAGES/python.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-14 16:14+0100\n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" "Last-Translator: 黃柏諺 , 2020\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n" @@ -30,22 +30,22 @@ msgstr "設定 GRUB。" msgid "Mounting partitions." msgstr "正在掛載分割區。" -#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198 +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:373 -#: src/modules/fstab/main.py:379 src/modules/localecfg/main.py:135 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" msgstr "設定錯誤" -#: src/modules/mount/main.py:146 src/modules/initcpiocfg/main.py:199 +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 -#: src/modules/fstab/main.py:374 +#: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." msgstr "沒有分割區被定義為 
{!s}
以供使用。" @@ -212,7 +212,7 @@ msgstr "正在設定 mkinitcpio。" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 -#: src/modules/fstab/main.py:380 src/modules/localecfg/main.py:136 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "沒有給定的根掛載點 
{!s}
以供使用。" From 1155b6fc3d6668f0abd66ba7b71ff5208a5ca0d3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 14:14:05 +0200 Subject: [PATCH 047/492] [partition] Improve debug-output a little --- src/modules/partition/gui/ChoicePage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index f6b49cb2f5..ec11f6cc09 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -1402,7 +1402,7 @@ ChoicePage::setupActions() } else { - cDebug() << "Replace button suppressed because none can be replaced."; + cDebug() << "No partitions available for replace-action."; force_uncheck( m_grp, m_replaceButton ); } @@ -1412,7 +1412,7 @@ ChoicePage::setupActions() } else { - cDebug() << "Alongside button suppressed because none can be resized."; + cDebug() << "No partitions available for resize-action."; force_uncheck( m_grp, m_alongsideButton ); } @@ -1422,8 +1422,8 @@ ChoicePage::setupActions() } else { - cDebug() << "Erase button suppressed" - << "mount?" << atLeastOneIsMounted << "raid?" << isInactiveRAID; + cDebug() << "No partitions (" + << "any-mounted?" << atLeastOneIsMounted << "is-raid?" << isInactiveRAID << ") for erase-action."; force_uncheck( m_grp, m_eraseButton ); } From 70bf033dc001fc37e5e46bb2a3236b660aaf1e7b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 14:17:40 +0200 Subject: [PATCH 048/492] [partition] Improve logging readability - The entire queue is one long output, so print them with SubEntry --- src/modules/partition/core/PartitionCoreModule.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 058c10d181..14f9f70cbd 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -659,10 +659,10 @@ PartitionCoreModule::dumpQueue() const cDebug() << "# Queue:"; for ( auto info : m_deviceInfos ) { - cDebug() << "## Device:" << info->device->name(); + cDebug() << Logger::SubEntry << "## Device:" << info->device->name(); for ( const auto& job : info->jobs() ) { - cDebug() << "-" << job->prettyName(); + cDebug() << Logger::SubEntry << "-" << job->prettyName(); } } } From 7b09344a8b7f55c1699caa3ae5bcd516c2b78791 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 14:24:56 +0200 Subject: [PATCH 049/492] [partition] Update next-button You'll need a VM with 2 disks to demonstrate: - Configure Calamares to pick "none" as initial action on the partition page (this is a safe choice), - Enter partition page, - No action is selected, and the next> button is greyed out. - Click erase; notice next> is now available. - Change devices, notice no action is selected, but next> is still available. Clicking on it, though, does nothing. When changing to "no action", update the next-button's availability. --- src/modules/partition/gui/ChoicePage.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index ec11f6cc09..98435021cc 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -517,6 +517,7 @@ ChoicePage::applyActionChoice( InstallChoice choice ) break; case InstallChoice::NoChoice: case InstallChoice::Manual: + updateNextEnabled(); break; } updateActionChoicePreview( choice ); From 0446f03613ab1ea1c45a7d6bc4c30ce73ecdb57b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 14:38:39 +0200 Subject: [PATCH 050/492] [partition] Remove overly-chatty debugging from fs-name-lookup --- src/modules/partition/core/PartUtils.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 065f88d99b..9243829cb2 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -481,7 +481,6 @@ findFS( QString fsName, FileSystem::Type* fsType ) FileSystem::Type tmpType = FileSystem::typeForName( fsName, fsLanguage ); if ( tmpType != FileSystem::Unknown ) { - cDebug() << "Found filesystem" << fsName; if ( fsType ) { *fsType = tmpType; @@ -496,7 +495,6 @@ findFS( QString fsName, FileSystem::Type* fsType ) if ( 0 == QString::compare( fsName, FileSystem::nameForType( t, fsLanguage ), Qt::CaseInsensitive ) ) { QString fsRealName = FileSystem::nameForType( t, fsLanguage ); - cDebug() << "Filesystem name" << fsName << "translated to" << fsRealName; if ( fsType ) { *fsType = t; @@ -505,7 +503,7 @@ findFS( QString fsName, FileSystem::Type* fsType ) } } - cDebug() << "Filesystem" << fsName << "not found, using ext4"; + cWarning() << "Filesystem" << fsName << "not found, using ext4"; fsName = QStringLiteral( "ext4" ); // fsType can be used to check whether fsName was a valid filesystem. if ( fsType ) From 785042ccf3789bca4c56dda9336096b646c3c0bc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 14:41:56 +0200 Subject: [PATCH 051/492] [partition] Improve formatting of logging while loading configuration --- src/modules/partition/gui/PartitionViewStep.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 6755b64c6a..c282909246 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -518,6 +518,8 @@ PartitionViewStep::onLeave() void PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { + Logger::Once o; + m_config->setConfigurationMap( configurationMap ); // Copy the efiSystemPartition setting to the global storage. It is needed not only in @@ -528,7 +530,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) // Set up firmwareType global storage entry. This is used, e.g. by the bootloader module. QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) ); - cDebug() << "Setting firmwareType to" << firmwareType; + cDebug() << o << "Setting firmwareType to" << firmwareType; gs->insert( "firmwareType", firmwareType ); // Read and parse key efiSystemPartitionSize @@ -568,7 +570,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) QString fsRealName = PartUtils::findFS( fsName, &fsType ); if ( fsRealName == fsName ) { - cDebug() << "Partition-module setting *defaultFileSystemType*" << fsRealName; + cDebug() << o << "Partition-module setting *defaultFileSystemType*" << fsRealName; } else if ( fsType != FileSystem::Unknown ) { From d4f28e863f3ee5d5ff9cfa6a9d60b1bc3bf72c98 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 15:23:55 +0200 Subject: [PATCH 052/492] [libcalamares] Allow rvalue Once to be used in logging --- src/libcalamares/utils/Logger.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index 7b17754e8f..9afc78b22c 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -60,7 +60,7 @@ class DLLEXPORT CDebug : public QDebug virtual ~CDebug(); friend CDebug& operator<<( CDebug&&, const FuncSuppressor& ); - friend CDebug& operator<<( CDebug&&, Once& ); + friend CDebug& operator<<( CDebug&&, const Once& ); private: QString m_msg; @@ -297,14 +297,14 @@ class Once : m( true ) { } - friend CDebug& operator<<( CDebug&&, Once& ); + friend CDebug& operator<<( CDebug&&, const Once& ); private: - bool m = false; + mutable bool m = false; }; inline CDebug& -operator<<( CDebug&& s, Once& o ) +operator<<( CDebug&& s, const Once& o ) { if ( o.m ) { From 1fe337d6ed5d36836062240d49cd05706b30797c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 15:25:57 +0200 Subject: [PATCH 053/492] [partition] Improve logging of device-checking - Avoid lots of function headers between the checks applied to each individual device. --- src/modules/partition/core/PartUtils.cpp | 30 +++++++++++++----------- src/modules/partition/core/PartUtils.h | 13 +++++++--- src/modules/partition/gui/ChoicePage.cpp | 12 ++++++---- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 9243829cb2..368d04af24 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -72,15 +72,15 @@ getRequiredStorageGiB( bool& ok ) } bool -canBeReplaced( Partition* candidate ) +canBeReplaced( Partition* candidate, const Logger::Once& o ) { if ( !candidate ) { - cDebug() << "Partition* is NULL"; + cDebug() << o << "Partition* is NULL"; return false; } - cDebug() << "Checking if" << convenienceName( candidate ) << "can be replaced."; + cDebug() << o << "Checking if" << convenienceName( candidate ) << "can be replaced."; if ( candidate->isMounted() ) { cDebug() << Logger::SubEntry << "NO, it is mounted."; @@ -100,7 +100,7 @@ canBeReplaced( Partition* candidate ) if ( availableStorageB > requiredStorageB ) { - cDebug() << "Partition" << convenienceName( candidate ) << "authorized for replace install."; + cDebug() << o << "Partition" << convenienceName( candidate ) << "authorized for replace install."; return true; } else @@ -117,15 +117,15 @@ canBeReplaced( Partition* candidate ) bool -canBeResized( Partition* candidate ) +canBeResized( Partition* candidate, const Logger::Once& o ) { if ( !candidate ) { - cDebug() << "Partition* is NULL"; + cDebug() << o << "Partition* is NULL"; return false; } - cDebug() << "Checking if" << convenienceName( candidate ) << "can be resized."; + cDebug() << o << "Checking if" << convenienceName( candidate ) << "can be resized."; if ( !candidate->fileSystem().supportGrow() || !candidate->fileSystem().supportShrink() ) { cDebug() << Logger::SubEntry << "NO, filesystem" << candidate->fileSystem().name() @@ -177,7 +177,7 @@ canBeResized( Partition* candidate ) if ( availableStorageB > advisedStorageB ) { - cDebug() << "Partition" << convenienceName( candidate ) << "authorized for resize + autopartition install."; + cDebug() << o << "Partition" << convenienceName( candidate ) << "authorized for resize + autopartition install."; return true; } else @@ -196,9 +196,9 @@ canBeResized( Partition* candidate ) bool -canBeResized( DeviceModel* dm, const QString& partitionPath ) +canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once& o ) { - cDebug() << "Checking if" << partitionPath << "can be resized."; + cDebug() << o << "Checking if" << partitionPath << "can be resized."; QString partitionWithOs = partitionPath; if ( partitionWithOs.startsWith( "/dev/" ) ) { @@ -208,7 +208,7 @@ canBeResized( DeviceModel* dm, const QString& partitionPath ) Partition* candidate = CalamaresUtils::Partition::findPartitionByPath( { dev }, partitionWithOs ); if ( candidate ) { - return canBeResized( candidate ); + return canBeResized( candidate, o ); } } cDebug() << Logger::SubEntry << "no Partition* found for" << partitionWithOs; @@ -357,6 +357,8 @@ findPartitionPathForMountPoint( const FstabEntryList& fstab, const QString& moun OsproberEntryList runOsprober( DeviceModel* dm ) { + Logger::Once o; + QString osproberOutput; QProcess osprober; osprober.setProgram( "os-prober" ); @@ -411,18 +413,18 @@ runOsprober( DeviceModel* dm ) QString homePath = findPartitionPathForMountPoint( fstabEntries, "/home" ); osproberEntries.append( - { prettyName, path, file, QString(), canBeResized( dm, path ), lineColumns, fstabEntries, homePath } ); + { prettyName, path, file, QString(), canBeResized( dm, path, o ), lineColumns, fstabEntries, homePath } ); osproberCleanLines.append( line ); } } if ( osproberCleanLines.count() > 0 ) { - cDebug() << "os-prober lines after cleanup:" << Logger::DebugList( osproberCleanLines ); + cDebug() << o << "os-prober lines after cleanup:" << Logger::DebugList( osproberCleanLines ); } else { - cDebug() << "os-prober gave no output."; + cDebug() << o << "os-prober gave no output."; } Calamares::JobQueue::instance()->globalStorage()->insert( "osproberLines", osproberCleanLines ); diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h index f210cc3ab3..aec345882c 100644 --- a/src/modules/partition/core/PartUtils.h +++ b/src/modules/partition/core/PartUtils.h @@ -24,6 +24,10 @@ class DeviceModel; class Partition; +namespace Logger +{ + class Once; +} namespace PartUtils { @@ -41,26 +45,29 @@ QString convenienceName( const Partition* const candidate ); * @brief canBeReplaced checks whether the given Partition satisfies the criteria * for replacing it with the new OS. * @param candidate the candidate partition to replace. + * @param o applied to debug-logging. * @return true if the criteria are met, otherwise false. */ -bool canBeReplaced( Partition* candidate ); +bool canBeReplaced( Partition* candidate, const Logger::Once& o ); /** * @brief canBeReplaced checks whether the given Partition satisfies the criteria * for resizing (shrinking) it to make room for a new OS. * @param candidate the candidate partition to resize. + * @param o applied to debug-logging. * @return true if the criteria are met, otherwise false. */ -bool canBeResized( Partition* candidate ); +bool canBeResized( Partition* candidate, const Logger::Once& o ); /** * @brief canBeReplaced checks whether the given Partition satisfies the criteria * for resizing (shrinking) it to make room for a new OS. * @param dm the DeviceModel instance. * @param partitionPath the device path of the candidate partition to resize. + * @param o applied to debug-logging. * @return true if the criteria are met, otherwise false. */ -bool canBeResized( DeviceModel* dm, const QString& partitionPath ); +bool canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once& o ); /** * @brief runOsprober executes os-prober, parses the output and writes relevant diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 98435021cc..d6d7a9e3a6 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -986,7 +986,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) SelectionFilter filter = []( const QModelIndex& index ) { return PartUtils::canBeResized( - static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ) ); + static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), Logger::Once() ); }; m_beforePartitionBarsView->setSelectionFilter( filter ); m_beforePartitionLabelsView->setSelectionFilter( filter ); @@ -1075,7 +1075,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) { SelectionFilter filter = []( const QModelIndex& index ) { return PartUtils::canBeReplaced( - static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ) ); + static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), Logger::Once() ); }; m_beforePartitionBarsView->setSelectionFilter( filter ); m_beforePartitionLabelsView->setSelectionFilter( filter ); @@ -1220,10 +1220,12 @@ operator<<( QDebug& s, PartitionIterator& it ) void ChoicePage::setupActions() { + Logger::Once o; + Device* currentDevice = selectedDevice(); OsproberEntryList osproberEntriesForCurrentDevice = getOsproberEntriesForDevice( currentDevice ); - cDebug() << "Setting up actions for" << currentDevice->deviceNode() << "with" + cDebug() << o << "Setting up actions for" << currentDevice->deviceNode() << "with" << osproberEntriesForCurrentDevice.count() << "entries."; if ( currentDevice->partitionTable() ) @@ -1269,12 +1271,12 @@ ChoicePage::setupActions() for ( auto it = PartitionIterator::begin( currentDevice ); it != PartitionIterator::end( currentDevice ); ++it ) { - if ( PartUtils::canBeResized( *it ) ) + if ( PartUtils::canBeResized( *it, o ) ) { cDebug() << Logger::SubEntry << "contains resizable" << it; atLeastOneCanBeResized = true; } - if ( PartUtils::canBeReplaced( *it ) ) + if ( PartUtils::canBeReplaced( *it, o ) ) { cDebug() << Logger::SubEntry << "contains replaceable" << it; atLeastOneCanBeReplaced = true; From bf7b41f548c51d6ee2d2df6c893ce29d2a00a443 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 15:29:28 +0200 Subject: [PATCH 054/492] [libcalamares] Document the Once class for logging --- src/libcalamares/utils/Logger.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index 7b17754e8f..b2e8cf0e88 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -290,6 +290,17 @@ operator<<( QDebug& s, const Pointer& p ) return s; } +/** @brief Convenience object for supplying SubEntry to a debug stream + * + * In a function with convoluted control paths, it may be unclear + * when to supply SubEntry to a debug stream -- it is convenient + * for the **first** debug statement from a given function to print + * the function header, and all subsequent onces to get SubEntry. + * + * Create an object of type Once and send it (first) to all CDebug + * objects; this will print the function header only once within the + * lifetime of that Once object. + */ class Once { public: From 7a26143fbc3224d7023f748b14727d286831be71 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Mar 2021 15:52:55 +0200 Subject: [PATCH 055/492] [partition] All action-changes should update next --- src/modules/partition/gui/ChoicePage.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index d6d7a9e3a6..093f74b391 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -482,8 +482,6 @@ ChoicePage::applyActionChoice( InstallChoice choice ) [] {}, this ); } - updateNextEnabled(); - connect( m_beforePartitionBarsView->selectionModel(), SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ), this, @@ -507,7 +505,6 @@ ChoicePage::applyActionChoice( InstallChoice choice ) }, this ); } - updateNextEnabled(); connect( m_beforePartitionBarsView->selectionModel(), SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ), @@ -517,9 +514,9 @@ ChoicePage::applyActionChoice( InstallChoice choice ) break; case InstallChoice::NoChoice: case InstallChoice::Manual: - updateNextEnabled(); break; } + updateNextEnabled(); updateActionChoicePreview( choice ); } From 6726a926a439fc1ef37e9e3c2809613fd6a5e3fb Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Mon, 29 Mar 2021 12:44:34 -0600 Subject: [PATCH 056/492] [logUpload] Configurable upload size limit A key 'sizeLimit' added to uploadServer field in branding.desc to limit the size of logFile to upload. --- src/branding/default/branding.desc | 18 +++++++++++------- src/libcalamaresui/Branding.cpp | 6 ++++-- src/libcalamaresui/Branding.h | 2 +- src/libcalamaresui/ViewManager.cpp | 2 +- src/libcalamaresui/utils/Paste.cpp | 18 +++++++++++------- src/libcalamaresui/utils/TestPaste.cpp | 6 +++--- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 90f92b5f17..98e887e766 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -220,13 +220,17 @@ slideshowAPI: 2 # These options are to customize online uploading of logs to pastebins: -# - type : Defines the kind of pastebin service to be used. Currently -# it accepts two values: -# - none : disables the pastebin functionality -# - fiche : use fiche pastebin server -# - url : Defines the address of pastebin service to be used. -# Takes string as input. Important bits are the host and port, -# the scheme is not used. +# - type : Defines the kind of pastebin service to be used. Currently +# it accepts two values: +# - none : disables the pastebin functionality +# - fiche : use fiche pastebin server +# - url : Defines the address of pastebin service to be used. +# Takes string as input. Important bits are the host and port, +# the scheme is not used. +# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted. +# Takes integer as input. If <=0, no limit will be forced, +# else only last 'n' KiB of log file will be pasted. uploadServer : type : "fiche" url : "http://termbin.com:9999" + sizeLimit : 20 diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 3668c0b4bc..c074b74034 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -153,15 +153,17 @@ uploadServerFromMap( const QVariantMap& map ) QString typestring = map[ "type" ].toString(); QString urlstring = map[ "url" ].toString(); + qint64 sizeLimit = map[ "sizeLimit" ].toLongLong(); if ( typestring.isEmpty() || urlstring.isEmpty() ) { - return Branding::UploadServerInfo( Branding::UploadServerType::None, QUrl() ); + return Branding::UploadServerInfo( Branding::UploadServerType::None, QUrl(), -1 ); } bool bogus = false; // we don't care about type-name lookup success here return Branding::UploadServerInfo( names.find( typestring, bogus ), - QUrl( urlstring, QUrl::ParsingMode::StrictMode ) ); + QUrl( urlstring, QUrl::ParsingMode::StrictMode ), + sizeLimit ); } /** @brief Load the @p map with strings from @p config diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 831b2adec4..f36d3c58c4 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -226,7 +226,7 @@ class UIDLLEXPORT Branding : public QObject * This is both the type (which may be none, in which case the URL * is irrelevant and usually empty) and the URL for the upload. */ - using UploadServerInfo = QPair< UploadServerType, QUrl >; + using UploadServerInfo = std::tuple< UploadServerType, QUrl, qint64 >; UploadServerInfo uploadServer() const { return m_uploadServer; } /** diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 704655c8b5..6e02401570 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -144,7 +144,7 @@ void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { bool shouldOfferWebPaste - = Calamares::Branding::instance()->uploadServer().first != Calamares::Branding::UploadServerType::None; + = std::get<2>(Calamares::Branding::instance()->uploadServer()) != Calamares::Branding::UploadServerType::None; cError() << "Installation failed:" << message; cDebug() << Logger::SubEntry << "- message:" << message; diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 40e3141083..779a8aca01 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -30,7 +30,7 @@ using namespace CalamaresUtils::Units; * Returns an empty QByteArray() on any kind of error. */ STATICTEST QByteArray -logFileContents() +logFileContents( qint64 sizeLimit ) { const QString name = Logger::logFile(); QFile pasteSourceFile( name ); @@ -40,11 +40,15 @@ logFileContents() return QByteArray(); } QFileInfo fi( pasteSourceFile ); - if ( fi.size() > 16_KiB ) + sizeLimit *= 1024; //For KiB to bytes + cDebug() << "Log upload size limit was set to " << sizeLimit << " bytes"; + if ( fi.size() > sizeLimit and sizeLimit > 0 ) { - pasteSourceFile.seek( fi.size() - 16_KiB ); + // Fixme : this following line is not getting pasted + cDebug() << "Only last " << sizeLimit << " bytes of log file (" << fi.size() << ") uploaded" ; + pasteSourceFile.seek( fi.size() - sizeLimit ); } - return pasteSourceFile.read( 16_KiB ); + return pasteSourceFile.read( sizeLimit ); } @@ -101,7 +105,7 @@ ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* par QString CalamaresUtils::Paste::doLogUpload( QObject* parent ) { - auto [ type, serverUrl ] = Calamares::Branding::instance()->uploadServer(); + auto [ type, serverUrl, sizeLimit ] = Calamares::Branding::instance()->uploadServer(); if ( !serverUrl.isValid() ) { cWarning() << "Upload configure with invalid URL"; @@ -113,7 +117,7 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent ) return QString(); } - QByteArray pasteData = logFileContents(); + QByteArray pasteData = logFileContents( sizeLimit ); if ( pasteData.isEmpty() ) { // An error has already been logged @@ -165,6 +169,6 @@ CalamaresUtils::Paste::doLogUploadUI( QWidget* parent ) bool CalamaresUtils::Paste::isEnabled() { - auto [ type, serverUrl ] = Calamares::Branding::instance()->uploadServer(); + auto [ type, serverUrl, sizeLimit ] = Calamares::Branding::instance()->uploadServer(); return type != Calamares::Branding::UploadServerType::None; } diff --git a/src/libcalamaresui/utils/TestPaste.cpp b/src/libcalamaresui/utils/TestPaste.cpp index d21d6b81e5..da55395e05 100644 --- a/src/libcalamaresui/utils/TestPaste.cpp +++ b/src/libcalamaresui/utils/TestPaste.cpp @@ -16,7 +16,7 @@ #include #include -extern QByteArray logFileContents(); +extern QByteArray logFileContents( qint64 sizeLimit ); extern QString ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent ); class TestPaste : public QObject @@ -37,13 +37,13 @@ TestPaste::testGetLogFile() { QFile::remove( Logger::logFile() ); // This test assumes nothing **else** has set up logging yet - QByteArray contentsOfLogfileBefore = logFileContents(); + QByteArray contentsOfLogfileBefore = logFileContents( 16 ); QVERIFY( contentsOfLogfileBefore.isEmpty() ); Logger::setupLogLevel( Logger::LOGDEBUG ); Logger::setupLogfile(); - QByteArray contentsOfLogfileAfterSetup = logFileContents(); + QByteArray contentsOfLogfileAfterSetup = logFileContents( 16 ); QVERIFY( !contentsOfLogfileAfterSetup.isEmpty() ); } From 6a6557e320835e56165aa385c505e4f2b0c53426 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Mon, 29 Mar 2021 13:22:56 -0600 Subject: [PATCH 057/492] [logUpload] fixes --- src/branding/default/branding.desc | 2 +- src/libcalamaresui/ViewManager.cpp | 2 +- src/libcalamaresui/utils/Paste.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 98e887e766..b95c47cfec 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -233,4 +233,4 @@ slideshowAPI: 2 uploadServer : type : "fiche" url : "http://termbin.com:9999" - sizeLimit : 20 + sizeLimit : -1 diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 6e02401570..61fc462ef3 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -144,7 +144,7 @@ void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { bool shouldOfferWebPaste - = std::get<2>(Calamares::Branding::instance()->uploadServer()) != Calamares::Branding::UploadServerType::None; + = std::get<0>(Calamares::Branding::instance()->uploadServer()) != Calamares::Branding::UploadServerType::None; cError() << "Installation failed:" << message; cDebug() << Logger::SubEntry << "- message:" << message; diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 779a8aca01..6d2142626b 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -40,7 +40,7 @@ logFileContents( qint64 sizeLimit ) return QByteArray(); } QFileInfo fi( pasteSourceFile ); - sizeLimit *= 1024; //For KiB to bytes + sizeLimit = ( sizeLimit < 0 ) ? 1024*1024 : sizeLimit * 1024; //For KiB to bytes cDebug() << "Log upload size limit was set to " << sizeLimit << " bytes"; if ( fi.size() > sizeLimit and sizeLimit > 0 ) { From c013036f31999d493e322104abb761955fafe0bd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 30 Mar 2021 11:52:05 +0200 Subject: [PATCH 058/492] CI: automate signing the tag and tarball - Get a signature on CHANGES at the start, so that the key is cached by gpg; that way the tag-signing has the key, and will not time-out (which breaks tarball generation, and means that I need to **watch** the release script, rather than fire-and-forget). --- ci/RELEASE.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ci/RELEASE.sh b/ci/RELEASE.sh index 706d4c2ea7..f30bf8992e 100755 --- a/ci/RELEASE.sh +++ b/ci/RELEASE.sh @@ -75,6 +75,12 @@ fi # # BUILDDIR=$(mktemp -d --suffix=-build --tmpdir=.) +KEY_ID="CFDDC96F12B1915C" + +# Try to make gpg cache the signing key, so we can leave the process +# to run and sign. +rm -f CHANGES.gpg +gpg -s -u $KEY_ID CHANGES ### Build with default compiler # @@ -124,7 +130,6 @@ test -n "$V" || { echo "Could not obtain version in $BUILDDIR ." ; exit 1 ; } # # This is the signing key ID associated with the GitHub account adriaandegroot, # which is used to create all "verified" tags in the Calamares repo. -KEY_ID="CFDDC96F12B1915C" git tag -u "$KEY_ID" -m "Release v$V" "v$V" || { echo "Could not sign tag v$V." ; exit 1 ; } ### Create the tarball @@ -145,6 +150,7 @@ test -d "$TMPDIR" || { echo "Could not create tarball-build directory." ; exit 1 tar xzf "$TAR_FILE" -C "$TMPDIR" || { echo "Could not unpack tarball." ; exit 1 ; } test -d "$TMPDIR/$TAR_V" || { echo "Tarball did not contain source directory." ; exit 1 ; } ( cd "$TMPDIR/$TAR_V" && cmake . && make -j4 && make test ) || { echo "Tarball build failed in $TMPDIR ." ; exit 1 ; } +gpg -s -u $KEY_ID --detach --armor $TAR_FILE # Sign the tarball ### Cleanup # @@ -157,7 +163,6 @@ rm -rf "$TMPDIR" # From tarball cat < Date: Tue, 30 Mar 2021 08:13:29 -0600 Subject: [PATCH 059/492] [logUpload] suggestionsAndFixes --- src/libcalamaresui/Branding.cpp | 4 ++-- src/libcalamaresui/utils/Paste.cpp | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index c074b74034..74fd94a6e1 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -153,7 +153,7 @@ uploadServerFromMap( const QVariantMap& map ) QString typestring = map[ "type" ].toString(); QString urlstring = map[ "url" ].toString(); - qint64 sizeLimit = map[ "sizeLimit" ].toLongLong(); + qint64 sizeLimitKiB = map[ "sizeLimit" ].toLongLong(); if ( typestring.isEmpty() || urlstring.isEmpty() ) { @@ -163,7 +163,7 @@ uploadServerFromMap( const QVariantMap& map ) bool bogus = false; // we don't care about type-name lookup success here return Branding::UploadServerInfo( names.find( typestring, bogus ), QUrl( urlstring, QUrl::ParsingMode::StrictMode ), - sizeLimit ); + sizeLimitKiB ); } /** @brief Load the @p map with strings from @p config diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 6d2142626b..56c944bd4a 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -30,8 +30,10 @@ using namespace CalamaresUtils::Units; * Returns an empty QByteArray() on any kind of error. */ STATICTEST QByteArray -logFileContents( qint64 sizeLimit ) +logFileContents( qint64 sizeLimitKiB ) { + if( sizeLimitKiB == 0 ) + return QByteArray(); const QString name = Logger::logFile(); QFile pasteSourceFile( name ); if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) @@ -40,15 +42,16 @@ logFileContents( qint64 sizeLimit ) return QByteArray(); } QFileInfo fi( pasteSourceFile ); - sizeLimit = ( sizeLimit < 0 ) ? 1024*1024 : sizeLimit * 1024; //For KiB to bytes - cDebug() << "Log upload size limit was set to " << sizeLimit << " bytes"; - if ( fi.size() > sizeLimit and sizeLimit > 0 ) + if( sizeLimitKiB < 0 ) + sizeLimitKiB = 1024; + qint64 sizeLimitBytes = CalamaresUtils::KiBtoBytes( ( unsigned long long ) sizeLimitKiB ); + cDebug() << "Log upload size limit was set to" << sizeLimitKiB << "KiB"; + if ( fi.size() > sizeLimitBytes and sizeLimitBytes > 0 ) { - // Fixme : this following line is not getting pasted - cDebug() << "Only last " << sizeLimit << " bytes of log file (" << fi.size() << ") uploaded" ; - pasteSourceFile.seek( fi.size() - sizeLimit ); + cDebug() << "Only last" << sizeLimitBytes << "bytes of log file (sized" << fi.size() << "bytes) uploaded" ; + pasteSourceFile.seek( fi.size() - sizeLimitBytes + 1_KiB ); } - return pasteSourceFile.read( sizeLimit ); + return pasteSourceFile.read( sizeLimitBytes + 1_KiB ); } From b42f86f20f5db3c145bc04c829b8835c87cfdfeb Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Tue, 30 Mar 2021 08:28:30 -0600 Subject: [PATCH 060/492] [logUpload] suggestionsAndFixes-part2 --- src/libcalamaresui/utils/Paste.cpp | 6 +++--- src/libcalamaresui/utils/TestPaste.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 56c944bd4a..377522333e 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -108,7 +108,7 @@ ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* par QString CalamaresUtils::Paste::doLogUpload( QObject* parent ) { - auto [ type, serverUrl, sizeLimit ] = Calamares::Branding::instance()->uploadServer(); + auto [ type, serverUrl, sizeLimitKiB ] = Calamares::Branding::instance()->uploadServer(); if ( !serverUrl.isValid() ) { cWarning() << "Upload configure with invalid URL"; @@ -120,7 +120,7 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent ) return QString(); } - QByteArray pasteData = logFileContents( sizeLimit ); + QByteArray pasteData = logFileContents( sizeLimitKiB ); if ( pasteData.isEmpty() ) { // An error has already been logged @@ -172,6 +172,6 @@ CalamaresUtils::Paste::doLogUploadUI( QWidget* parent ) bool CalamaresUtils::Paste::isEnabled() { - auto [ type, serverUrl, sizeLimit ] = Calamares::Branding::instance()->uploadServer(); + auto [ type, serverUrl, sizeLimitKiB ] = Calamares::Branding::instance()->uploadServer(); return type != Calamares::Branding::UploadServerType::None; } diff --git a/src/libcalamaresui/utils/TestPaste.cpp b/src/libcalamaresui/utils/TestPaste.cpp index da55395e05..68e9729075 100644 --- a/src/libcalamaresui/utils/TestPaste.cpp +++ b/src/libcalamaresui/utils/TestPaste.cpp @@ -16,7 +16,7 @@ #include #include -extern QByteArray logFileContents( qint64 sizeLimit ); +extern QByteArray logFileContents( qint64 sizeLimitKiB ); extern QString ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent ); class TestPaste : public QObject From 9302ad14682d4aaf274835a73b6e7d929d39237d Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Wed, 31 Mar 2021 20:15:02 +0400 Subject: [PATCH 061/492] [partition] Erase disk FS choice --- src/modules/partition/core/Config.cpp | 20 +++++++++++++++++++ src/modules/partition/core/Config.h | 10 ++++++++++ .../partition/core/PartitionActions.cpp | 4 ++++ .../partition/core/PartitionCoreModule.cpp | 1 + src/modules/partition/gui/ChoicePage.cpp | 11 ++++++++-- src/modules/partition/gui/ChoicePage.h | 2 ++ src/modules/partition/partition.conf | 2 +- 7 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp index 0afcee83d6..a603cedd0f 100644 --- a/src/modules/partition/core/Config.cpp +++ b/src/modules/partition/core/Config.cpp @@ -207,6 +207,15 @@ Config::setSwapChoice( Config::SwapChoice c ) } } +void +Config::setEraseFsTypeChoice(const QString& choice) +{ + if(choice != m_eraseFsTypeChoice){ + m_eraseFsTypeChoice = choice; + } +} + + bool Config::allowManualPartitioning() const { @@ -240,6 +249,17 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) gs->insert( "allowManualPartitioning", CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ) ); + if ( configurationMap.contains( "availableFileSystemTypes" ) ) { + if(configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::List ){ + m_eraseFsTypes.clear(); + m_eraseFsTypes.append(configurationMap.value( "availableFileSystemTypes" ).toStringList()); + m_eraseFsTypeChoice = m_eraseFsTypes[0]; + } else if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::String ){ + m_eraseFsTypes.append(configurationMap.value( "availableFileSystemTypes" ).toString()); + m_eraseFsTypeChoice = m_eraseFsTypes[0]; + } + } + if ( configurationMap.contains( "requiredPartitionTableType" ) && configurationMap.value( "requiredPartitionTableType" ).type() == QVariant::List ) { diff --git a/src/modules/partition/core/Config.h b/src/modules/partition/core/Config.h index 57230b6e85..5cdd14c9d7 100644 --- a/src/modules/partition/core/Config.h +++ b/src/modules/partition/core/Config.h @@ -54,6 +54,8 @@ class Config : public QObject static const NamedEnumTable< SwapChoice >& swapChoiceNames(); using SwapChoiceSet = QSet< SwapChoice >; + using EraseFsTypesSet = QStringList; + void setConfigurationMap( const QVariantMap& ); void updateGlobalStorage() const; @@ -94,6 +96,11 @@ class Config : public QObject */ SwapChoice swapChoice() const { return m_swapChoice; } + EraseFsTypesSet eraseFsTypes() const {return m_eraseFsTypes; } + + QString eraseFsType() const {return m_eraseFsTypeChoice; } + + ///@brief Is manual partitioning allowed (not explicitly disnabled in the config file)? bool allowManualPartitioning() const; @@ -102,6 +109,7 @@ public Q_SLOTS: void setInstallChoice( InstallChoice ); void setSwapChoice( int ); ///< Translates a button ID or so to SwapChoice void setSwapChoice( SwapChoice ); + void setEraseFsTypeChoice( const QString& ); Q_SIGNALS: void installChoiceChanged( InstallChoice ); @@ -109,6 +117,8 @@ public Q_SLOTS: private: SwapChoiceSet m_swapChoices; + EraseFsTypesSet m_eraseFsTypes; + QString m_eraseFsTypeChoice; SwapChoice m_initialSwapChoice = NoSwap; SwapChoice m_swapChoice = NoSwap; InstallChoice m_initialInstallChoice = NoChoice; diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index 1a3f6246be..0dab5747fc 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -109,6 +109,10 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO partType = isEfi ? PartitionTable::gpt : PartitionTable::msdos; } + FileSystem::Type type; + PartUtils::findFS(o.defaultFsType, &type); + core->initLayout( type == FileSystem::Unknown ? FileSystem::Ext4 : type); + core->createPartitionTable( dev, partType ); if ( isEfi ) diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 058c10d181..4370ffa0d5 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -381,6 +381,7 @@ PartitionCoreModule::createPartitionTable( Device* device, PartitionTable::Table OperationHelper helper( partitionModelForDevice( device ), this ); deviceInfo->makeJob< CreatePartitionTableJob >( type ); + } } diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index f6b49cb2f5..a8f31d416d 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -246,6 +246,14 @@ ChoicePage::setupChoices() m_eraseButton->addOptionsComboBox( m_eraseSwapChoiceComboBox ); } + if ( m_config->eraseFsTypes().count() > 1) + { + m_eraseFsTypesChoiceComboBox = new QComboBox; + m_eraseFsTypesChoiceComboBox->addItems(m_config->eraseFsTypes()); + connect(m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, [this](const auto& currentString){m_config->setEraseFsTypeChoice(currentString); onActionChanged();}); + m_eraseButton->addOptionsComboBox( m_eraseFsTypesChoiceComboBox ); + } + m_itemsLayout->addWidget( m_alongsideButton ); m_itemsLayout->addWidget( m_replaceButton ); m_itemsLayout->addWidget( m_eraseButton ); @@ -442,9 +450,8 @@ ChoicePage::applyActionChoice( InstallChoice choice ) case InstallChoice::Erase: { auto gs = Calamares::JobQueue::instance()->globalStorage(); - PartitionActions::Choices::AutoPartitionOptions options { gs->value( "defaultPartitionTableType" ).toString(), - gs->value( "defaultFileSystemType" ).toString(), + m_config->eraseFsType(), m_encryptWidget->passphrase(), gs->value( "efiSystemPartition" ).toString(), CalamaresUtils::GiBtoBytes( diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h index 89bd775d74..f43578ba5e 100644 --- a/src/modules/partition/gui/ChoicePage.h +++ b/src/modules/partition/gui/ChoicePage.h @@ -139,6 +139,8 @@ private slots: Calamares::PrettyRadioButton* m_replaceButton; Calamares::PrettyRadioButton* m_somethingElseButton; QComboBox* m_eraseSwapChoiceComboBox; // UI, see also m_eraseSwapChoice + QComboBox* m_eraseFsTypesChoiceComboBox; // UI, see also m_eraseSwapChoice + DeviceInfoWidget* m_deviceInfoWidget; diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index e5de696591..19d3e17453 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -137,7 +137,7 @@ initialSwapChoice: none # If nothing is specified, Calamares defaults to "ext4". # # Names are case-sensitive and defined by KPMCore. -defaultFileSystemType: "ext4" +availableFileSystemTypes: ["ext4", "btrfs", "f2fs"] # Show/hide LUKS related functionality in automated partitioning modes. # Disable this if you choose not to deploy early unlocking support in GRUB2 From c1aa0b581e159fe31fb305f49002cdd9a3478ca4 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Thu, 1 Apr 2021 00:25:37 -0600 Subject: [PATCH 062/492] [logUpload] suggestionsAndFixes-part3 - Resolved the problem of incomplete log upload - sizeLimit = 0 fixed (turns off paste functionality) - Documentation update - sizeLimit < 0 now needs no hardcoded upper limit - Calamares::Branding::uploadServerFromMap() serves sizeLimit in bytes --- src/branding/default/branding.desc | 8 ++++--- src/libcalamaresui/Branding.cpp | 4 ++-- src/libcalamaresui/Branding.h | 5 +++-- src/libcalamaresui/ViewManager.cpp | 3 ++- src/libcalamaresui/utils/Paste.cpp | 29 ++++++++++++++------------ src/libcalamaresui/utils/TestPaste.cpp | 2 +- 6 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index b95c47cfec..938d9eeb2a 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -227,9 +227,11 @@ slideshowAPI: 2 # - url : Defines the address of pastebin service to be used. # Takes string as input. Important bits are the host and port, # the scheme is not used. -# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted. -# Takes integer as input. If <=0, no limit will be forced, -# else only last 'n' KiB of log file will be pasted. +# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted. +# Takes integer as input. If < 0, no limit will be forced, +# else only last (approximately) 'n' KiB of log file will be pasted. +# Please note that upload size may be slightly over the limit (due +# to last minute logging), so provide a suitable value. uploadServer : type : "fiche" url : "http://termbin.com:9999" diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 74fd94a6e1..82bd5c5f89 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -157,13 +157,13 @@ uploadServerFromMap( const QVariantMap& map ) if ( typestring.isEmpty() || urlstring.isEmpty() ) { - return Branding::UploadServerInfo( Branding::UploadServerType::None, QUrl(), -1 ); + return Branding::UploadServerInfo( Branding::UploadServerType::None, QUrl(), 0 ); } bool bogus = false; // we don't care about type-name lookup success here return Branding::UploadServerInfo( names.find( typestring, bogus ), QUrl( urlstring, QUrl::ParsingMode::StrictMode ), - sizeLimitKiB ); + ( sizeLimitKiB >=0 ) ? sizeLimitKiB * 1024 : -1 ); } /** @brief Load the @p map with strings from @p config diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index f36d3c58c4..ba49f87c3d 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -223,8 +223,9 @@ class UIDLLEXPORT Branding : public QObject /** @brief Upload server configuration * - * This is both the type (which may be none, in which case the URL - * is irrelevant and usually empty) and the URL for the upload. + * This object has 3 items : the type (which may be none, in which case the URL + * is irrelevant and usually empty), the URL for the upload and the size limit of upload + * in bytes (for configuration value < 0, it serves -1, which stands for having no limit). */ using UploadServerInfo = std::tuple< UploadServerType, QUrl, qint64 >; UploadServerInfo uploadServer() const { return m_uploadServer; } diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 61fc462ef3..3a8360e254 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -144,7 +144,8 @@ void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { bool shouldOfferWebPaste - = std::get<0>(Calamares::Branding::instance()->uploadServer()) != Calamares::Branding::UploadServerType::None; + = std::get<0>(Calamares::Branding::instance()->uploadServer()) != Calamares::Branding::UploadServerType::None + and std::get<2>(Calamares::Branding::instance()->uploadServer()) != 0; cError() << "Installation failed:" << message; cDebug() << Logger::SubEntry << "- message:" << message; diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 377522333e..642b450040 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -30,10 +30,12 @@ using namespace CalamaresUtils::Units; * Returns an empty QByteArray() on any kind of error. */ STATICTEST QByteArray -logFileContents( qint64 sizeLimitKiB ) +logFileContents( const qint64 sizeLimitBytes ) { - if( sizeLimitKiB == 0 ) - return QByteArray(); + if( sizeLimitBytes != -1 ) + { + cDebug() << "Log upload size limit was limited to" << sizeLimitBytes << "bytes"; + } const QString name = Logger::logFile(); QFile pasteSourceFile( name ); if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) @@ -41,17 +43,18 @@ logFileContents( qint64 sizeLimitKiB ) cWarning() << "Could not open log file" << name; return QByteArray(); } + if( sizeLimitBytes == -1 ) + { + return pasteSourceFile.readAll(); + } QFileInfo fi( pasteSourceFile ); - if( sizeLimitKiB < 0 ) - sizeLimitKiB = 1024; - qint64 sizeLimitBytes = CalamaresUtils::KiBtoBytes( ( unsigned long long ) sizeLimitKiB ); - cDebug() << "Log upload size limit was set to" << sizeLimitKiB << "KiB"; - if ( fi.size() > sizeLimitBytes and sizeLimitBytes > 0 ) + if ( fi.size() > sizeLimitBytes ) { cDebug() << "Only last" << sizeLimitBytes << "bytes of log file (sized" << fi.size() << "bytes) uploaded" ; - pasteSourceFile.seek( fi.size() - sizeLimitBytes + 1_KiB ); + fi.refresh(); + pasteSourceFile.seek( fi.size() - sizeLimitBytes ); } - return pasteSourceFile.read( sizeLimitBytes + 1_KiB ); + return pasteSourceFile.read( sizeLimitBytes ); } @@ -108,7 +111,7 @@ ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* par QString CalamaresUtils::Paste::doLogUpload( QObject* parent ) { - auto [ type, serverUrl, sizeLimitKiB ] = Calamares::Branding::instance()->uploadServer(); + auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer(); if ( !serverUrl.isValid() ) { cWarning() << "Upload configure with invalid URL"; @@ -120,7 +123,7 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent ) return QString(); } - QByteArray pasteData = logFileContents( sizeLimitKiB ); + QByteArray pasteData = logFileContents( sizeLimitBytes ); if ( pasteData.isEmpty() ) { // An error has already been logged @@ -172,6 +175,6 @@ CalamaresUtils::Paste::doLogUploadUI( QWidget* parent ) bool CalamaresUtils::Paste::isEnabled() { - auto [ type, serverUrl, sizeLimitKiB ] = Calamares::Branding::instance()->uploadServer(); + auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer(); return type != Calamares::Branding::UploadServerType::None; } diff --git a/src/libcalamaresui/utils/TestPaste.cpp b/src/libcalamaresui/utils/TestPaste.cpp index 68e9729075..84de65cd91 100644 --- a/src/libcalamaresui/utils/TestPaste.cpp +++ b/src/libcalamaresui/utils/TestPaste.cpp @@ -16,7 +16,7 @@ #include #include -extern QByteArray logFileContents( qint64 sizeLimitKiB ); +extern QByteArray logFileContents( qint64 sizeLimitBytes ); extern QString ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent ); class TestPaste : public QObject From c73e9ec89fa14543bc7ac25f91ee1afde0c5969d Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Thu, 1 Apr 2021 01:05:55 -0600 Subject: [PATCH 063/492] [logUpload] Ran styleScript --- src/libcalamaresui/Branding.cpp | 2 +- src/libcalamaresui/ViewManager.cpp | 6 +++--- src/libcalamaresui/utils/Paste.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 82bd5c5f89..348e993239 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -163,7 +163,7 @@ uploadServerFromMap( const QVariantMap& map ) bool bogus = false; // we don't care about type-name lookup success here return Branding::UploadServerInfo( names.find( typestring, bogus ), QUrl( urlstring, QUrl::ParsingMode::StrictMode ), - ( sizeLimitKiB >=0 ) ? sizeLimitKiB * 1024 : -1 ); + ( sizeLimitKiB >= 0 ) ? sizeLimitKiB * 1024 : -1 ); } /** @brief Load the @p map with strings from @p config diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 3a8360e254..c55b5dd67d 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -143,9 +143,9 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - bool shouldOfferWebPaste - = std::get<0>(Calamares::Branding::instance()->uploadServer()) != Calamares::Branding::UploadServerType::None - and std::get<2>(Calamares::Branding::instance()->uploadServer()) != 0; + bool shouldOfferWebPaste = std::get< 0 >( Calamares::Branding::instance()->uploadServer() ) + != Calamares::Branding::UploadServerType::None + and std::get< 2 >( Calamares::Branding::instance()->uploadServer() ) != 0; cError() << "Installation failed:" << message; cDebug() << Logger::SubEntry << "- message:" << message; diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 642b450040..a29d6d3627 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -32,9 +32,9 @@ using namespace CalamaresUtils::Units; STATICTEST QByteArray logFileContents( const qint64 sizeLimitBytes ) { - if( sizeLimitBytes != -1 ) + if ( sizeLimitBytes != -1 ) { - cDebug() << "Log upload size limit was limited to" << sizeLimitBytes << "bytes"; + cDebug() << "Log upload size limit was limited to" << sizeLimitBytes << "bytes"; } const QString name = Logger::logFile(); QFile pasteSourceFile( name ); @@ -43,14 +43,14 @@ logFileContents( const qint64 sizeLimitBytes ) cWarning() << "Could not open log file" << name; return QByteArray(); } - if( sizeLimitBytes == -1 ) + if ( sizeLimitBytes == -1 ) { return pasteSourceFile.readAll(); } QFileInfo fi( pasteSourceFile ); if ( fi.size() > sizeLimitBytes ) { - cDebug() << "Only last" << sizeLimitBytes << "bytes of log file (sized" << fi.size() << "bytes) uploaded" ; + cDebug() << "Only last" << sizeLimitBytes << "bytes of log file (sized" << fi.size() << "bytes) uploaded"; fi.refresh(); pasteSourceFile.seek( fi.size() - sizeLimitBytes ); } From b897619558b57d8388a865b33d401678b7f5feff Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Fri, 2 Apr 2021 07:40:03 -0600 Subject: [PATCH 064/492] [logUpload] Added some basic tests --- src/libcalamaresui/Branding.cpp | 8 +++++--- src/libcalamaresui/utils/TestPaste.cpp | 12 ++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 348e993239..b9445ba833 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -18,6 +18,7 @@ #include "utils/ImageRegistry.h" #include "utils/Logger.h" #include "utils/NamedEnum.h" +#include "utils/Units.h" #include "utils/Yaml.h" #include @@ -161,9 +162,10 @@ uploadServerFromMap( const QVariantMap& map ) } bool bogus = false; // we don't care about type-name lookup success here - return Branding::UploadServerInfo( names.find( typestring, bogus ), - QUrl( urlstring, QUrl::ParsingMode::StrictMode ), - ( sizeLimitKiB >= 0 ) ? sizeLimitKiB * 1024 : -1 ); + return Branding::UploadServerInfo( + names.find( typestring, bogus ), + QUrl( urlstring, QUrl::ParsingMode::StrictMode ), + sizeLimitKiB >= 0 ? CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( sizeLimitKiB ) ) : -1 ); } /** @brief Load the @p map with strings from @p config diff --git a/src/libcalamaresui/utils/TestPaste.cpp b/src/libcalamaresui/utils/TestPaste.cpp index 84de65cd91..6fea608fee 100644 --- a/src/libcalamaresui/utils/TestPaste.cpp +++ b/src/libcalamaresui/utils/TestPaste.cpp @@ -37,14 +37,18 @@ TestPaste::testGetLogFile() { QFile::remove( Logger::logFile() ); // This test assumes nothing **else** has set up logging yet - QByteArray contentsOfLogfileBefore = logFileContents( 16 ); - QVERIFY( contentsOfLogfileBefore.isEmpty() ); + QByteArray logLimitedBefore = logFileContents( 16 ); + QVERIFY( logLimitedBefore.isEmpty() ); + QByteArray logUnlimitedBefore = logFileContents( -1 ); + QVERIFY( logUnlimitedBefore.isEmpty() ); Logger::setupLogLevel( Logger::LOGDEBUG ); Logger::setupLogfile(); - QByteArray contentsOfLogfileAfterSetup = logFileContents( 16 ); - QVERIFY( !contentsOfLogfileAfterSetup.isEmpty() ); + QByteArray logLimitedAfter = logFileContents( 16 ); + QVERIFY( !logLimitedAfter.isEmpty() ); + QByteArray logUnlimitedAfter = logFileContents( -1 ); + QVERIFY( !logUnlimitedAfter.isEmpty() ); } void From 8a413866a1c8c77bc2f737dd1e06e4b6c4cd75cc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 2 Apr 2021 16:05:26 +0200 Subject: [PATCH 065/492] [calamares] Make --version print extended versioning information --- src/calamares/CalamaresApplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index 164b3ed5c7..d9645db5e7 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -10,7 +10,7 @@ #include "CalamaresApplication.h" #include "CalamaresConfig.h" -#include "CalamaresVersion.h" +#include "CalamaresVersionX.h" #include "CalamaresWindow.h" #include "progresstree/ProgressTreeView.h" From 5691f958336849456603fa38f9ff86c9f0bb0e81 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Fri, 2 Apr 2021 23:50:41 -0600 Subject: [PATCH 066/492] [logUpload] Added one more test --- src/libcalamaresui/utils/TestPaste.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/libcalamaresui/utils/TestPaste.cpp b/src/libcalamaresui/utils/TestPaste.cpp index 6fea608fee..2245c76c4c 100644 --- a/src/libcalamaresui/utils/TestPaste.cpp +++ b/src/libcalamaresui/utils/TestPaste.cpp @@ -10,6 +10,7 @@ */ #include "Paste.h" +#include "network/Manager.h" #include "utils/Logger.h" @@ -30,6 +31,7 @@ class TestPaste : public QObject private Q_SLOTS: void testGetLogFile(); void testFichePaste(); + void testUploadSize(); }; void @@ -64,7 +66,19 @@ TestPaste::testFichePaste() QVERIFY( !s.isEmpty() ); } +void +TestPaste::testUploadSize() +{ + QByteArray logContent = logFileContents( 100 ); + QString s = ficheLogUpload( logContent, QUrl( "http://termbin.com:9999" ), nullptr ); + + QVERIFY( !s.isEmpty() ); + + QUrl url( s ); + QByteArray returnedData = CalamaresUtils::Network::Manager::instance().synchronousGet( url ); + QCOMPARE( returnedData.size(), 100 ); +} QTEST_GUILESS_MAIN( TestPaste ) #include "utils/moc-warnings.h" From 4912de589384f82e43db52943ec82b6a0063b698 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 9 Apr 2021 13:32:48 +0200 Subject: [PATCH 067/492] [partition] reduce warnings with unsafe-option - Move variables closer to where they are needed - Do the winnowing / selection always, but in unsafe mode return the un-winnowed list of devices - Massage build documentation a little --- src/modules/partition/CMakeLists.txt | 5 +++-- src/modules/partition/core/DeviceList.cpp | 16 +++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index 07f1eaf5d1..bffb2128cd 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -8,8 +8,9 @@ # want to allow unsafe partitioning choices (e.g. doing things to the # current disk). Set DEBUG_PARTITION_UNSAFE to allow that (it turns off # some filtering of devices). If you **do** allow unsafe partitioning, -# it will error out unless you **also** switch **off** DEBUG_PARTITION_LAME, -# at which point you are welcome to shoot yourself in the foot. +# it will error out at runtime unless you **also** switch **off** +# DEBUG_PARTITION_LAME, at which point you are welcome to shoot +# yourself in the foot. option( DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF ) option( DEBUG_PARTITION_LAME "Unsafe partitioning will error out on exec." ON ) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 2fce62e9d9..395b6b4840 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -118,8 +118,6 @@ erase( DeviceList& l, DeviceList::iterator& it ) QList< Device* > getDevices( DeviceType which ) { - bool writableOnly = ( which == DeviceType::WritableOnly ); - CoreBackend* backend = CoreBackendManager::self()->backend(); #if defined( WITH_KPMCORE4API ) DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) ); @@ -129,14 +127,18 @@ getDevices( DeviceType which ) #ifdef DEBUG_PARTITION_UNSAFE cWarning() << "Allowing unsafe partitioning choices." << devices.count() << "candidates."; + DeviceList unsafeDevices = devices; #ifdef DEBUG_PARTITION_LAME cDebug() << Logger::SubEntry << "it has been lamed, and will fail."; #endif -#else +#endif + cDebug() << "Removing unsuitable devices:" << devices.count() << "candidates."; + bool writableOnly = ( which == DeviceType::WritableOnly ); // Remove the device which contains / from the list for ( DeviceList::iterator it = devices.begin(); it != devices.end(); ) + { if ( !( *it ) ) { cDebug() << Logger::SubEntry << "Skipping nullptr device"; @@ -166,9 +168,13 @@ getDevices( DeviceType which ) { ++it; } -#endif - + } + cDebug() << Logger::SubEntry << "there are" << devices.count() << "devices left."; +#ifdef DEBUG_PARTITION_UNSAFE + return unsafeDevices; +#else return devices; +#endif } } // namespace PartUtils From ea61ac4386bc74a35685fed41d7c1990ae58a8fd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 12 Apr 2021 17:21:33 +0200 Subject: [PATCH 068/492] [locale] Set *locale* GS key when needed The code path for setting the locale / language automatically emits currentLanguageStatusChanged(), but the code that updates GS connects to currentLanguageCodeChaged(). This was altered in the 3.2.28 release cycle. Since then, automcatic locale selection wasn't setting *locale* in GS, so that a click-through kind of locale selection would not set it; then the packages module has no *locale* setting for localization packages. The combination of status and code signals (machine- and human- readable) is ok. Introduce a setter to the language that does the necessary signalling, so that setting the language automatically also DTRT. FIXES #1671 --- src/modules/locale/Config.cpp | 18 +++++++++++++----- src/modules/locale/Config.h | 2 ++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp index 1417e5b89a..854d65eef9 100644 --- a/src/modules/locale/Config.cpp +++ b/src/modules/locale/Config.cpp @@ -259,8 +259,7 @@ Config::setCurrentLocation( const CalamaresUtils::Locale::TimeZoneData* location auto newLocale = automaticLocaleConfiguration(); if ( !m_selectedLocaleConfiguration.explicit_lang ) { - m_selectedLocaleConfiguration.setLanguage( newLocale.language() ); - emit currentLanguageStatusChanged( currentLanguageStatus() ); + setLanguage( newLocale.language() ); } if ( !m_selectedLocaleConfiguration.explicit_lc ) { @@ -302,11 +301,20 @@ Config::localeConfiguration() const void Config::setLanguageExplicitly( const QString& language ) { - m_selectedLocaleConfiguration.setLanguage( language ); m_selectedLocaleConfiguration.explicit_lang = true; + setLanguage( language ); +} + +void +Config::setLanguage( const QString& language ) +{ + if ( language != m_selectedLocaleConfiguration.language() ) + { + m_selectedLocaleConfiguration.setLanguage( language ); - emit currentLanguageStatusChanged( currentLanguageStatus() ); - emit currentLanguageCodeChanged( currentLanguageCode() ); + emit currentLanguageStatusChanged( currentLanguageStatus() ); + emit currentLanguageCodeChanged( currentLanguageCode() ); + } } void diff --git a/src/modules/locale/Config.h b/src/modules/locale/Config.h index 4383f6bb06..bcdaf0bbfe 100644 --- a/src/modules/locale/Config.h +++ b/src/modules/locale/Config.h @@ -95,6 +95,8 @@ class Config : public QObject } public Q_SLOTS: + /// Set the language, but do not mark it as user-choice + void setLanguage( const QString& language ); /// Set a language by user-choice, overriding future location changes void setLanguageExplicitly( const QString& language ); /// Set LC (formats) by user-choice, overriding future location changes From 44ec9d14a67191d59460086bd1935cc66cee3a22 Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Tue, 13 Apr 2021 17:27:23 +0200 Subject: [PATCH 069/492] Update main.py adding sway to desktop_environments --- src/modules/displaymanager/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index fad03eede9..4a365f6952 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -195,6 +195,7 @@ def update_from_desktop_file(self, root_mount_point): DesktopEnvironment('/usr/bin/dwm', 'dwm'), DesktopEnvironment('/usr/bin/jwm', 'jwm'), DesktopEnvironment('/usr/bin/icewm-session', 'icewm-session'), + DesktopEnvironment('/usr/bin/sway', 'sway'), ] From 9651cc0cd75c8bf10b3428a0d3866518ba4fbeb1 Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Tue, 13 Apr 2021 17:47:02 +0200 Subject: [PATCH 070/492] Update main.py --- src/modules/displaymanager/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index fad03eede9..b91027c71c 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -195,6 +195,7 @@ def update_from_desktop_file(self, root_mount_point): DesktopEnvironment('/usr/bin/dwm', 'dwm'), DesktopEnvironment('/usr/bin/jwm', 'jwm'), DesktopEnvironment('/usr/bin/icewm-session', 'icewm-session'), + DesktopEnvironment('/usr/bin/fvwm3', 'fvwm3'), ] From 3c398bd15eca0dc33e6f8a29365ea0dc10f3b12e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 13 Apr 2021 16:45:01 +0200 Subject: [PATCH 071/492] [netinstall] Only wrap-up if the packages list is OK Avoid situation where the YAML is ok but doesn't contain a list of netinstall packages, so the packages list (the model) is still empty. FIXES #1673 --- src/modules/netinstall/Config.h | 4 +++- src/modules/netinstall/LoaderQueue.cpp | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index b676a7d398..58931c6361 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -49,10 +49,12 @@ class Config : public QObject FailedNetworkError, FailedBadData, FailedNoData - }; + /// Human-readable, translated representation of the status QString status() const; + /// Internal code for the status + Status statusCode() const { return m_status; } void setStatus( Status s ); bool required() const { return m_required; } diff --git a/src/modules/netinstall/LoaderQueue.cpp b/src/modules/netinstall/LoaderQueue.cpp index f8ba17cffb..76307d380b 100644 --- a/src/modules/netinstall/LoaderQueue.cpp +++ b/src/modules/netinstall/LoaderQueue.cpp @@ -25,6 +25,9 @@ * On destruction, a new call to fetchNext() is queued, so that * the queue continues loading. Calling release() before the * destructor skips the fetchNext(), ending the queue-loading. + * + * Calling done(b) is the same as release(), **plus** done() + * is called on the queue if @p b is @c true. */ class FetchNextUnless { @@ -41,6 +44,14 @@ class FetchNextUnless } } void release() { m_q = nullptr; } + void done( bool b ) + { + if ( b && m_q ) + { + QMetaObject::invokeMethod( m_q, "done", Qt::QueuedConnection ); + } + release(); + } private: LoaderQueue* m_q = nullptr; @@ -138,7 +149,7 @@ LoaderQueue::fetch( const QUrl& url ) void LoaderQueue::dataArrived() { - FetchNextUnless finished( this ); + FetchNextUnless next( this ); if ( !m_reply || !m_reply->isFinished() ) { @@ -170,16 +181,14 @@ LoaderQueue::dataArrived() if ( groups.IsSequence() ) { - finished.release(); m_config->loadGroupList( CalamaresUtils::yamlSequenceToVariant( groups ) ); - emit done(); + next.done( m_config->statusCode() == Config::Status::Ok ); } else if ( groups.IsMap() ) { - finished.release(); auto map = CalamaresUtils::yamlMapToVariant( groups ); m_config->loadGroupList( map.value( "groups" ).toList() ); - emit done(); + next.done( m_config->statusCode() == Config::Status::Ok ); } else { From 5af37b0be3e3e922f1f5fa8697fb713748ebb334 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 13 Apr 2021 20:17:28 +0200 Subject: [PATCH 072/492] [netinstall] Stub of tests for fallback-loading --- src/modules/netinstall/CMakeLists.txt | 2 + src/modules/netinstall/Tests.cpp | 69 +++++++++++++++++++ .../netinstall/tests/1a-single-bad.conf | 7 ++ .../netinstall/tests/1b-single-small.conf | 7 ++ src/modules/netinstall/tests/data-small.yaml | 12 ++++ 5 files changed, 97 insertions(+) create mode 100644 src/modules/netinstall/tests/1a-single-bad.conf create mode 100644 src/modules/netinstall/tests/1b-single-small.conf create mode 100644 src/modules/netinstall/tests/data-small.yaml diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt index ec926c9d31..6b7270db1e 100644 --- a/src/modules/netinstall/CMakeLists.txt +++ b/src/modules/netinstall/CMakeLists.txt @@ -26,6 +26,8 @@ calamares_add_test( netinstalltest SOURCES Tests.cpp + Config.cpp + LoaderQueue.cpp PackageTreeItem.cpp PackageModel.cpp LIBRARIES diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index 0b59658c16..b8826c6bea 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -7,13 +7,17 @@ * */ +#include "Config.h" #include "PackageModel.h" #include "PackageTreeItem.h" #include "utils/Logger.h" +#include "utils/NamedEnum.h" #include "utils/Variant.h" #include "utils/Yaml.h" +#include + #include class ItemTests : public QObject @@ -40,6 +44,9 @@ private Q_SLOTS: void testCompare(); void testModel(); void testExampleFiles(); + + void testUrlFallback_data(); + void testUrlFallback(); }; ItemTests::ItemTests() {} @@ -326,6 +333,68 @@ ItemTests::testExampleFiles() } } +void +ItemTests::testUrlFallback_data() +{ + QTest::addColumn< QString >( "filename" ); + QTest::addColumn< int >( "status" ); + QTest::addColumn< int >( "count" ); + + using S = Config::Status; + + QTest::newRow( "first" ) << "tests/1a-single-bad.conf" << smash( S::FailedNoData ) << 0; + QTest::newRow( "second" ) << "tests/1b-single-small.conf" << smash( S::Ok ) << 2; +} + +void +ItemTests::testUrlFallback() +{ + Logger::setupLogLevel( Logger::LOGDEBUG ); + QFETCH( QString, filename ); + QFETCH( int, status ); + QFETCH( int, count ); + + cDebug() << "Loading" << filename; + + // BUILD_AS_TEST is the source-directory path + QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) ); + QVERIFY( fi.exists() ); + + Config c; + + QFile yamlFile( fi.fileName() ); + if ( yamlFile.exists() && yamlFile.open( QFile::ReadOnly | QFile::Text ) ) + { + QString ba( yamlFile.readAll() ); + QVERIFY( ba.length() > 0 ); + QHash< QString, QString > replace; + replace.insert( "TESTDIR", BUILD_AS_TEST ); + QString correctedDocument = KMacroExpander::expandMacros( ba, replace, '$' ); + + try + { + YAML::Node yamldoc = YAML::Load( correctedDocument.toUtf8() ); + auto map = CalamaresUtils::yamlToVariant( yamldoc ).toMap(); + QVERIFY( map.count() > 0 ); + c.setConfigurationMap( map ); + } + catch ( YAML::Exception& e ) + { + bool badYaml = true; + QVERIFY( !badYaml ); + } + } + else + { + QCOMPARE( QStringLiteral( "not found" ), fi.fileName() ); + } + + // Each of the configs sets required to **true**, which is not the default + QVERIFY( c.required() ); + QCOMPARE( smash( c.statusCode() ), status ); + QCOMPARE( c.model()->rowCount(), count ); +} + QTEST_GUILESS_MAIN( ItemTests ) diff --git a/src/modules/netinstall/tests/1a-single-bad.conf b/src/modules/netinstall/tests/1a-single-bad.conf new file mode 100644 index 0000000000..c08d3870cd --- /dev/null +++ b/src/modules/netinstall/tests/1a-single-bad.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: + - file://$TESTDIR/bad.yaml diff --git a/src/modules/netinstall/tests/1b-single-small.conf b/src/modules/netinstall/tests/1b-single-small.conf new file mode 100644 index 0000000000..2de9b4db22 --- /dev/null +++ b/src/modules/netinstall/tests/1b-single-small.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: + - file://$TESTDIR/data-small.yaml diff --git a/src/modules/netinstall/tests/data-small.yaml b/src/modules/netinstall/tests/data-small.yaml new file mode 100644 index 0000000000..8e92736b24 --- /dev/null +++ b/src/modules/netinstall/tests/data-small.yaml @@ -0,0 +1,12 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +- name: "Default" + description: "Default group" + hidden: true + selected: true + critical: false + packages: + - base + - chakra-live-skel From 294d07db7b8d517c604add592df81c4ac8ef33ec Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 14 Apr 2021 11:32:04 +0200 Subject: [PATCH 073/492] [netinstall] When starting to load YAML data, set appropriate status - if a list is required, then we don't have data yet and should complain; otherwise we're OK even if no data is ever added. --- src/modules/netinstall/Config.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 2d663829cd..135e28c27f 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -152,6 +152,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) if ( m_queue && m_queue->count() > 0 ) { cDebug() << "Loading netinstall from" << m_queue->count() << "alternate sources."; + setStatus( required() ? Status::FailedNoData : Status::Ok ); connect( m_queue, &LoaderQueue::done, this, &Config::loadingDone ); m_queue->load(); } From a21665011f8645470cf3708789bd4ff65228d71e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 14 Apr 2021 12:00:02 +0200 Subject: [PATCH 074/492] [netinstall] The status is ready (done) when the queue is done - Don't signal ready every time data is sent to the model, since if the model ends up empty, loading will continue with the next fallback entry. --- src/modules/netinstall/Config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 135e28c27f..1656f7a06d 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -97,7 +97,6 @@ Config::loadGroupList( const QVariantList& groupData ) { setStatus( Status::Ok ); } - emit statusReady(); } void @@ -108,6 +107,7 @@ Config::loadingDone() m_queue->deleteLater(); m_queue = nullptr; } + emit statusReady(); } From dfedc0fb21f93052b8d2ecb93ebd8285737011a5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 14 Apr 2021 12:06:33 +0200 Subject: [PATCH 075/492] [netinstall] Extend tests - add an "empty" groups file - run an event loop to give the loader the opportunity to load --- src/modules/netinstall/Tests.cpp | 17 +++++++++++++---- .../netinstall/tests/1a-single-empty.conf | 7 +++++++ src/modules/netinstall/tests/data-empty.yaml | 6 ++++++ 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 src/modules/netinstall/tests/1a-single-empty.conf create mode 100644 src/modules/netinstall/tests/data-empty.yaml diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index b8826c6bea..0903554706 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -342,8 +342,9 @@ ItemTests::testUrlFallback_data() using S = Config::Status; - QTest::newRow( "first" ) << "tests/1a-single-bad.conf" << smash( S::FailedNoData ) << 0; - QTest::newRow( "second" ) << "tests/1b-single-small.conf" << smash( S::Ok ) << 2; + QTest::newRow( "bad" ) << "1a-single-bad.conf" << smash( S::FailedBadData ) << 0; + QTest::newRow( "empty" ) << "1a-single-empty.conf" << smash( S::FailedNoData ) << 0; + QTest::newRow( "second" ) << "1b-single-small.conf" << smash( S::Ok ) << 2; } void @@ -357,7 +358,8 @@ ItemTests::testUrlFallback() cDebug() << "Loading" << filename; // BUILD_AS_TEST is the source-directory path - QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) ); + QString testdir = QString( "%1/tests" ).arg( BUILD_AS_TEST ); + QFile fi( QString( "%1/%2" ).arg( testdir, filename ) ); QVERIFY( fi.exists() ); Config c; @@ -368,7 +370,7 @@ ItemTests::testUrlFallback() QString ba( yamlFile.readAll() ); QVERIFY( ba.length() > 0 ); QHash< QString, QString > replace; - replace.insert( "TESTDIR", BUILD_AS_TEST ); + replace.insert( "TESTDIR", testdir ); QString correctedDocument = KMacroExpander::expandMacros( ba, replace, '$' ); try @@ -391,6 +393,13 @@ ItemTests::testUrlFallback() // Each of the configs sets required to **true**, which is not the default QVERIFY( c.required() ); + + // Now give the loader time to complete + QEventLoop loop; + connect( &c, &Config::statusReady, &loop, &QEventLoop::quit ); + QTimer::singleShot( std::chrono::seconds(1), &loop, &QEventLoop::quit ); + loop.exec(); + QCOMPARE( smash( c.statusCode() ), status ); QCOMPARE( c.model()->rowCount(), count ); } diff --git a/src/modules/netinstall/tests/1a-single-empty.conf b/src/modules/netinstall/tests/1a-single-empty.conf new file mode 100644 index 0000000000..2444a0435a --- /dev/null +++ b/src/modules/netinstall/tests/1a-single-empty.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: + - file://$TESTDIR/data-empty.yaml diff --git a/src/modules/netinstall/tests/data-empty.yaml b/src/modules/netinstall/tests/data-empty.yaml new file mode 100644 index 0000000000..065a0a0678 --- /dev/null +++ b/src/modules/netinstall/tests/data-empty.yaml @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +bogus: true + From bd118bb457708c86a60a6b3debf931ea1fcce837 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 14 Apr 2021 12:14:24 +0200 Subject: [PATCH 076/492] [netinstall] Massage test data - hidden groups aren't counted at all - count() at top-level of the model counts groups --- src/modules/netinstall/tests/data-small.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/netinstall/tests/data-small.yaml b/src/modules/netinstall/tests/data-small.yaml index 8e92736b24..6554cf738a 100644 --- a/src/modules/netinstall/tests/data-small.yaml +++ b/src/modules/netinstall/tests/data-small.yaml @@ -1,12 +1,17 @@ # SPDX-FileCopyrightText: no # SPDX-License-Identifier: CC0-1.0 # ---- - name: "Default" description: "Default group" - hidden: true + hidden: false selected: true critical: false packages: - base +- name: "Second" + description: "Second group" + hidden: false + selected: true + critical: false + packages: - chakra-live-skel From 67effe421490e76696533c7804650e98df596d0a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 14 Apr 2021 13:04:40 +0200 Subject: [PATCH 077/492] [netinstall] check in test that loading did not time out --- src/modules/netinstall/Tests.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index 0903554706..392faa34a8 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -397,9 +397,13 @@ ItemTests::testUrlFallback() // Now give the loader time to complete QEventLoop loop; connect( &c, &Config::statusReady, &loop, &QEventLoop::quit ); + QSignalSpy spy( &c, &Config::statusReady ); QTimer::singleShot( std::chrono::seconds(1), &loop, &QEventLoop::quit ); loop.exec(); + // Check it didn't time out + QCOMPARE( spy.count(), 1 ); + // Check YAML-loading results QCOMPARE( smash( c.statusCode() ), status ); QCOMPARE( c.model()->rowCount(), count ); } From cf0119ed4aa4e3d816077a6f6312172ef643526b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 10:20:47 +0200 Subject: [PATCH 078/492] [initcpiocfg][plymouthcfg] Consistent find-plymouth code - drop the debugging line because that has already been logged by the call to `runCommand()` that backs `target_env_call()`. - use the same (top-level) function rather than having a function and elsewhere a very-similar method. --- src/modules/initcpiocfg/main.py | 5 ++--- src/modules/plymouthcfg/main.py | 18 +++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index cdfeadd0f8..4fb0923cd3 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -92,6 +92,7 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point): with open(path, "w") as mkinitcpio_file: mkinitcpio_file.write("\n".join(mklins) + "\n") + def detect_plymouth(): """ Checks existence (runnability) of plymouth in the target system. @@ -99,10 +100,8 @@ def detect_plymouth(): @return True if plymouth exists in the target, False otherwise """ # Used to only check existence of path /usr/bin/plymouth in target - isPlymouth = target_env_call(["sh", "-c", "which plymouth"]) - debug("which plymouth exit code: {!s}".format(isPlymouth)) + return target_env_call(["sh", "-c", "which plymouth"]) == 0 - return isPlymouth == 0 def modify_mkinitcpio_conf(partitions, root_mount_point): """ diff --git a/src/modules/plymouthcfg/main.py b/src/modules/plymouthcfg/main.py index c51314e7f3..5e66fce67b 100644 --- a/src/modules/plymouthcfg/main.py +++ b/src/modules/plymouthcfg/main.py @@ -27,6 +27,16 @@ def pretty_name(): return _("Configure Plymouth theme") +def detect_plymouth(): + """ + Checks existence (runnability) of plymouth in the target system. + + @return True if plymouth exists in the target, False otherwise + """ + # Used to only check existence of path /usr/bin/plymouth in target + return target_env_call(["sh", "-c", "which plymouth"]) == 0 + + class PlymouthController: def __init__(self): @@ -42,14 +52,8 @@ def setTheme(self): plymouth_theme + '|', "-i", "/etc/plymouth/plymouthd.conf"]) - def detect(self): - isPlymouth = target_env_call(["sh", "-c", "which plymouth"]) - debug("which plymouth exit code: {!s}".format(isPlymouth)) - - return isPlymouth - def run(self): - if self.detect() == 0: + if detect_plymouth(): if (("plymouth_theme" in libcalamares.job.configuration) and (libcalamares.job.configuration["plymouth_theme"] is not None)): self.setTheme() From bd2fb552b50b589dc14191ee51e71fa80a86809b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 11:20:04 +0200 Subject: [PATCH 079/492] [netinstall] let queue finish properly - if the queue is emptied, there was no usable data; set failure to NoData rather than BadData. - FetchNextUnless::done() is done only if the parameter is true (that is, it's done!); otherwise should continue. --- src/modules/netinstall/LoaderQueue.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/modules/netinstall/LoaderQueue.cpp b/src/modules/netinstall/LoaderQueue.cpp index 76307d380b..0644514c35 100644 --- a/src/modules/netinstall/LoaderQueue.cpp +++ b/src/modules/netinstall/LoaderQueue.cpp @@ -26,8 +26,9 @@ * the queue continues loading. Calling release() before the * destructor skips the fetchNext(), ending the queue-loading. * - * Calling done(b) is the same as release(), **plus** done() - * is called on the queue if @p b is @c true. + * Calling done(b) is a conditional release: if @p b is @c true, + * queues a call to done() on the queue and releases it; otherwise, + * does nothing. */ class FetchNextUnless { @@ -46,11 +47,14 @@ class FetchNextUnless void release() { m_q = nullptr; } void done( bool b ) { - if ( b && m_q ) + if ( b ) { - QMetaObject::invokeMethod( m_q, "done", Qt::QueuedConnection ); + if ( m_q ) + { + QMetaObject::invokeMethod( m_q, "done", Qt::QueuedConnection ); + } + release(); } - release(); } private: @@ -94,7 +98,7 @@ LoaderQueue::fetchNext() { if ( m_queue.isEmpty() ) { - m_config->setStatus( Config::Status::FailedBadData ); + m_config->setStatus( Config::Status::FailedNoData ); emit done(); return; } From 850825f70fb6953ffc775f8c49c6792cd538aa10 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 11:32:04 +0200 Subject: [PATCH 080/492] [netinstall] Leave the last status on the queue - Reaching the end means there's no data, but leave the last load result (presumably bad-something) around rather than overwriting. --- src/modules/netinstall/LoaderQueue.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/netinstall/LoaderQueue.cpp b/src/modules/netinstall/LoaderQueue.cpp index 0644514c35..50b3354ba5 100644 --- a/src/modules/netinstall/LoaderQueue.cpp +++ b/src/modules/netinstall/LoaderQueue.cpp @@ -98,7 +98,6 @@ LoaderQueue::fetchNext() { if ( m_queue.isEmpty() ) { - m_config->setStatus( Config::Status::FailedNoData ); emit done(); return; } From 9569105575804aea7186b5f2c40cccc169ec0cfe Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 11:32:34 +0200 Subject: [PATCH 081/492] [netinstall] Extend tests with YAML syntax error and no-files-at-all --- src/modules/netinstall/Tests.cpp | 4 +++- src/modules/netinstall/tests/1a-single-error.conf | 7 +++++++ src/modules/netinstall/tests/1c-none.conf | 6 ++++++ src/modules/netinstall/tests/data-error.yaml | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/modules/netinstall/tests/1a-single-error.conf create mode 100644 src/modules/netinstall/tests/1c-none.conf create mode 100644 src/modules/netinstall/tests/data-error.yaml diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index 392faa34a8..9a02d4969f 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -342,9 +342,11 @@ ItemTests::testUrlFallback_data() using S = Config::Status; - QTest::newRow( "bad" ) << "1a-single-bad.conf" << smash( S::FailedBadData ) << 0; + QTest::newRow( "bad" ) << "1a-single-bad.conf" << smash( S::FailedBadConfiguration ) << 0; QTest::newRow( "empty" ) << "1a-single-empty.conf" << smash( S::FailedNoData ) << 0; + QTest::newRow( "error" ) << "1a-single-error.conf" << smash( S::FailedBadData ) << 0; QTest::newRow( "second" ) << "1b-single-small.conf" << smash( S::Ok ) << 2; + QTest::newRow( "none" ) << "1c-none.conf" << smash( S::FailedNoData ) << 0; } void diff --git a/src/modules/netinstall/tests/1a-single-error.conf b/src/modules/netinstall/tests/1a-single-error.conf new file mode 100644 index 0000000000..a602b17e18 --- /dev/null +++ b/src/modules/netinstall/tests/1a-single-error.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: + - file://$TESTDIR/data-error.yaml diff --git a/src/modules/netinstall/tests/1c-none.conf b/src/modules/netinstall/tests/1c-none.conf new file mode 100644 index 0000000000..e0f097dcf2 --- /dev/null +++ b/src/modules/netinstall/tests/1c-none.conf @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: [] diff --git a/src/modules/netinstall/tests/data-error.yaml b/src/modules/netinstall/tests/data-error.yaml new file mode 100644 index 0000000000..fd445df8fc --- /dev/null +++ b/src/modules/netinstall/tests/data-error.yaml @@ -0,0 +1,5 @@ +derp +derp +herpa-derp: no +-- +# This file is not valid YAML From 4dd6ecd54e30ba705d55d42f9cae52be4a512b3d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 11:39:00 +0200 Subject: [PATCH 082/492] [netinstall] Edge cases of zero, or unset, groups urls - consumers may wait for loadingDone(), so always emit that even if no URL list is set. --- src/modules/netinstall/Config.cpp | 15 ++++++--------- src/modules/netinstall/Tests.cpp | 1 + src/modules/netinstall/tests/1c-unset.conf | 5 +++++ 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 src/modules/netinstall/tests/1c-unset.conf diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp index 1656f7a06d..c163d72a06 100644 --- a/src/modules/netinstall/Config.cpp +++ b/src/modules/netinstall/Config.cpp @@ -136,26 +136,23 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) // Lastly, load the groups data const QString key = QStringLiteral( "groupsUrl" ); const auto& groupsUrlVariant = configurationMap.value( key ); + m_queue = new LoaderQueue( this ); if ( groupsUrlVariant.type() == QVariant::String ) { - m_queue = new LoaderQueue( this ); m_queue->append( SourceItem::makeSourceItem( groupsUrlVariant.toString(), configurationMap ) ); } else if ( groupsUrlVariant.type() == QVariant::List ) { - m_queue = new LoaderQueue( this ); for ( const auto& s : groupsUrlVariant.toStringList() ) { m_queue->append( SourceItem::makeSourceItem( s, configurationMap ) ); } } - if ( m_queue && m_queue->count() > 0 ) - { - cDebug() << "Loading netinstall from" << m_queue->count() << "alternate sources."; - setStatus( required() ? Status::FailedNoData : Status::Ok ); - connect( m_queue, &LoaderQueue::done, this, &Config::loadingDone ); - m_queue->load(); - } + + setStatus( required() ? Status::FailedNoData : Status::Ok ); + cDebug() << "Loading netinstall from" << m_queue->count() << "alternate sources."; + connect( m_queue, &LoaderQueue::done, this, &Config::loadingDone ); + m_queue->load(); } void diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index 9a02d4969f..06223a7091 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -347,6 +347,7 @@ ItemTests::testUrlFallback_data() QTest::newRow( "error" ) << "1a-single-error.conf" << smash( S::FailedBadData ) << 0; QTest::newRow( "second" ) << "1b-single-small.conf" << smash( S::Ok ) << 2; QTest::newRow( "none" ) << "1c-none.conf" << smash( S::FailedNoData ) << 0; + QTest::newRow( "unset" ) << "1c-unset.conf" << smash( S::FailedNoData ) << 0; } void diff --git a/src/modules/netinstall/tests/1c-unset.conf b/src/modules/netinstall/tests/1c-unset.conf new file mode 100644 index 0000000000..b25dbb6ea3 --- /dev/null +++ b/src/modules/netinstall/tests/1c-unset.conf @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true From 21d24eeb8d5948124be865f9fc5d6ae299dcd85b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 11:47:37 +0200 Subject: [PATCH 083/492] [netinstall] Add tests for fallback loading - first success that has data is kept --- src/modules/netinstall/Tests.cpp | 5 ++- .../netinstall/tests/1b-single-large.conf | 7 ++++ .../netinstall/tests/1d-fallback-large.conf | 10 +++++ .../netinstall/tests/1d-fallback-small.conf | 10 +++++ src/modules/netinstall/tests/data-large.yaml | 38 +++++++++++++++++++ 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 src/modules/netinstall/tests/1b-single-large.conf create mode 100644 src/modules/netinstall/tests/1d-fallback-large.conf create mode 100644 src/modules/netinstall/tests/1d-fallback-small.conf create mode 100644 src/modules/netinstall/tests/data-large.yaml diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index 06223a7091..ff7d8b2536 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -345,9 +345,12 @@ ItemTests::testUrlFallback_data() QTest::newRow( "bad" ) << "1a-single-bad.conf" << smash( S::FailedBadConfiguration ) << 0; QTest::newRow( "empty" ) << "1a-single-empty.conf" << smash( S::FailedNoData ) << 0; QTest::newRow( "error" ) << "1a-single-error.conf" << smash( S::FailedBadData ) << 0; - QTest::newRow( "second" ) << "1b-single-small.conf" << smash( S::Ok ) << 2; + QTest::newRow( "two" ) << "1b-single-small.conf" << smash( S::Ok ) << 2; + QTest::newRow( "five" ) << "1b-single-large.conf" << smash( S::Ok ) << 5; QTest::newRow( "none" ) << "1c-none.conf" << smash( S::FailedNoData ) << 0; QTest::newRow( "unset" ) << "1c-unset.conf" << smash( S::FailedNoData ) << 0; + QTest::newRow( "fallback-small" ) << "1d-fallback-small.conf" << smash( S::Ok ) << 2; + QTest::newRow( "fallback-large" ) << "1d-fallback-large.conf" << smash( S::Ok ) << 5; } void diff --git a/src/modules/netinstall/tests/1b-single-large.conf b/src/modules/netinstall/tests/1b-single-large.conf new file mode 100644 index 0000000000..eee67e664a --- /dev/null +++ b/src/modules/netinstall/tests/1b-single-large.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: + - file://$TESTDIR/data-large.yaml diff --git a/src/modules/netinstall/tests/1d-fallback-large.conf b/src/modules/netinstall/tests/1d-fallback-large.conf new file mode 100644 index 0000000000..5abb05ca89 --- /dev/null +++ b/src/modules/netinstall/tests/1d-fallback-large.conf @@ -0,0 +1,10 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: + - file://$TESTDIR/data-nonexistent.yaml + - file://$TESTDIR/data-bad.yaml + - file://$TESTDIR/data-large.yaml + - file://$TESTDIR/data-small.yaml diff --git a/src/modules/netinstall/tests/1d-fallback-small.conf b/src/modules/netinstall/tests/1d-fallback-small.conf new file mode 100644 index 0000000000..e38a7d65f3 --- /dev/null +++ b/src/modules/netinstall/tests/1d-fallback-small.conf @@ -0,0 +1,10 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: + - file://$TESTDIR/data-nonexistent.yaml + - file://$TESTDIR/data-bad.yaml + - file://$TESTDIR/data-small.yaml + - file://$TESTDIR/data-large.yaml diff --git a/src/modules/netinstall/tests/data-large.yaml b/src/modules/netinstall/tests/data-large.yaml new file mode 100644 index 0000000000..7b47aa3b6e --- /dev/null +++ b/src/modules/netinstall/tests/data-large.yaml @@ -0,0 +1,38 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +- name: "Default" + description: "Default group" + hidden: false + selected: true + critical: false + packages: + - base +- name: "Two" + description: "group 2" + hidden: false + selected: true + critical: false + packages: + - chakra-live-two +- name: "Three" + description: "group 3" + hidden: false + selected: true + critical: false + packages: + - chakra-live-three +- name: "Four" + description: "group 4" + hidden: false + selected: true + critical: false + packages: + - chakra-live-four +- name: "Five" + description: "group 5" + hidden: false + selected: true + critical: false + packages: + - chakra-live-five From 165e55986632de5501dd08e09e4cf2a9659f1fd8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 11:54:18 +0200 Subject: [PATCH 084/492] [netinstall] Extend tests with mixed fallbacks - insert bad or empty URLs in between successful loads, check tail end of loading process. --- src/modules/netinstall/Tests.cpp | 6 ++++++ src/modules/netinstall/tests/1d-fallback-bad.conf | 10 ++++++++++ src/modules/netinstall/tests/1d-fallback-mixed.conf | 13 +++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 src/modules/netinstall/tests/1d-fallback-bad.conf create mode 100644 src/modules/netinstall/tests/1d-fallback-mixed.conf diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index ff7d8b2536..9f38f6fbf3 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -349,8 +349,14 @@ ItemTests::testUrlFallback_data() QTest::newRow( "five" ) << "1b-single-large.conf" << smash( S::Ok ) << 5; QTest::newRow( "none" ) << "1c-none.conf" << smash( S::FailedNoData ) << 0; QTest::newRow( "unset" ) << "1c-unset.conf" << smash( S::FailedNoData ) << 0; + // Finds small, then stops QTest::newRow( "fallback-small" ) << "1d-fallback-small.conf" << smash( S::Ok ) << 2; + // Finds large, then stops QTest::newRow( "fallback-large" ) << "1d-fallback-large.conf" << smash( S::Ok ) << 5; + // Finds empty, finds small + QTest::newRow( "fallback-mixed" ) << "1d-fallback-mixed.conf" << smash( S::Ok ) << 2; + // Finds empty, then bad + QTest::newRow( "fallback-bad" ) << "1d-fallback-bad.conf" << smash( S::FailedBadConfiguration ) << 0; } void diff --git a/src/modules/netinstall/tests/1d-fallback-bad.conf b/src/modules/netinstall/tests/1d-fallback-bad.conf new file mode 100644 index 0000000000..1a36f7854e --- /dev/null +++ b/src/modules/netinstall/tests/1d-fallback-bad.conf @@ -0,0 +1,10 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: + - file://$TESTDIR/data-nonexistent.yaml + - file://$TESTDIR/data-empty.yaml + - file://$TESTDIR/data-empty.yaml + - file://$TESTDIR/data-bad.yaml diff --git a/src/modules/netinstall/tests/1d-fallback-mixed.conf b/src/modules/netinstall/tests/1d-fallback-mixed.conf new file mode 100644 index 0000000000..79cf677f9f --- /dev/null +++ b/src/modules/netinstall/tests/1d-fallback-mixed.conf @@ -0,0 +1,13 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +required: true +groupsUrl: + - file://$TESTDIR/data-nonexistent.yaml + - file://$TESTDIR/data-empty.yaml + - file://$TESTDIR/data-bad.yaml + - file://$TESTDIR/data-empty.yaml + - file://$TESTDIR/data-small.yaml + - file://$TESTDIR/data-large.yaml + - file://$TESTDIR/data-bad.yaml From 59ea88f1ade3045fcdc846e64ccdb6e7c3f9cf87 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 13 Apr 2021 12:29:06 +0200 Subject: [PATCH 085/492] [packagechoose] Remove the *package* member The single-values *package* member in a PackageItem was not used, so remove it -- to show that it really isn't used. This is prep- work for putting the package name *back*, as multi-valued, and using the *packages* module. --- src/modules/packagechooser/PackageModel.cpp | 5 ----- src/modules/packagechooser/PackageModel.h | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp index 1072b8b3ba..bb48ab888e 100644 --- a/src/modules/packagechooser/PackageModel.cpp +++ b/src/modules/packagechooser/PackageModel.cpp @@ -35,23 +35,19 @@ roleNames() PackageItem::PackageItem() {} PackageItem::PackageItem( const QString& a_id, - const QString& a_package, const QString& a_name, const QString& a_description ) : id( a_id ) - , package( a_package ) , name( a_name ) , description( a_description ) { } PackageItem::PackageItem( const QString& a_id, - const QString& a_package, const QString& a_name, const QString& a_description, const QString& screenshotPath ) : id( a_id ) - , package( a_package ) , name( a_name ) , description( a_description ) , screenshot( screenshotPath ) @@ -60,7 +56,6 @@ PackageItem::PackageItem( const QString& a_id, PackageItem::PackageItem::PackageItem( const QVariantMap& item_map ) : id( CalamaresUtils::getString( item_map, "id" ) ) - , package( CalamaresUtils::getString( item_map, "package" ) ) , name( CalamaresUtils::Locale::TranslatedString( item_map, "name" ) ) , description( CalamaresUtils::Locale::TranslatedString( item_map, "description" ) ) , screenshot( CalamaresUtils::getString( item_map, "screenshot" ) ) diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h index 375cf28c45..fc1d787f1f 100644 --- a/src/modules/packagechooser/PackageModel.h +++ b/src/modules/packagechooser/PackageModel.h @@ -31,8 +31,6 @@ const NamedEnumTable< PackageChooserMode >& roleNames(); struct PackageItem { QString id; - // FIXME: unused - QString package; CalamaresUtils::Locale::TranslatedString name; CalamaresUtils::Locale::TranslatedString description; QPixmap screenshot; @@ -44,7 +42,7 @@ struct PackageItem * This constructor sets all the text members, * but leaves the screenshot blank. Set that separately. */ - PackageItem( const QString& id, const QString& package, const QString& name, const QString& description ); + PackageItem( const QString& id, const QString& name, const QString& description ); /** @brief Creates a PackageItem from given strings. * @@ -53,7 +51,6 @@ struct PackageItem * a filesystem path, whatever QPixmap understands. */ PackageItem( const QString& id, - const QString& package, const QString& name, const QString& description, const QString& screenshotPath ); From dd52e108394cbaaa3f8934ccc8168434464bf6c7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 13 Apr 2021 13:39:47 +0200 Subject: [PATCH 086/492] [packagechooser] Introduce a Config object Rip out most of the ViewStep that deals with configuration, move it to a Config object (not one that supports QML yet, though), and massage the model a little. --- src/modules/packagechooser/CMakeLists.txt | 1 + src/modules/packagechooser/Config.cpp | 170 ++++++++++++++++++ src/modules/packagechooser/Config.h | 61 +++++++ .../packagechooser/PackageChooserViewStep.cpp | 163 ++--------------- .../packagechooser/PackageChooserViewStep.h | 13 +- src/modules/packagechooser/PackageModel.cpp | 2 +- src/modules/packagechooser/PackageModel.h | 2 +- 7 files changed, 251 insertions(+), 161 deletions(-) create mode 100644 src/modules/packagechooser/Config.cpp create mode 100644 src/modules/packagechooser/Config.h diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt index ad9cc85274..e6c2c5b1df 100644 --- a/src/modules/packagechooser/CMakeLists.txt +++ b/src/modules/packagechooser/CMakeLists.txt @@ -45,6 +45,7 @@ calamares_add_plugin( packagechooser TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES + Config.cpp PackageChooserPage.cpp PackageChooserViewStep.cpp PackageModel.cpp diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp new file mode 100644 index 0000000000..aa383d3c8e --- /dev/null +++ b/src/modules/packagechooser/Config.cpp @@ -0,0 +1,170 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "Config.h" + +#ifdef HAVE_XML +#include "ItemAppData.h" +#endif + +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "utils/Logger.h" +#include "utils/Variant.h" + + +Config::Config( const QString& defaultId, QObject* parent ) + : Calamares::ModuleSystem::Config( parent ) + , m_model( new PackageListModel( this ) ) + , m_mode( PackageChooserMode::Required ) + , m_defaultId( defaultId ) +{ +} + +Config::~Config() {} + +const PackageItem& +Config::introductionPackage() const +{ + for ( int i = 0; i < m_model->packageCount(); ++i ) + { + const auto& package = m_model->packageData( i ); + if ( package.isNonePackage() ) + { + return package; + } + } + + static PackageItem* defaultIntroduction = nullptr; + if ( !defaultIntroduction ) + { + defaultIntroduction = new PackageItem( + QString(), + QT_TR_NOOP( "Package Selection" ), + QT_TR_NOOP( "Please pick a product from the list. The selected product will be installed." ) ); + defaultIntroduction->screenshot = QPixmap( QStringLiteral( ":/images/no-selection.png" ) ); + // TODO: enable better translation + // defaultIntroduction->name.setContext( metaObject()->className() ); + // defaultIntroduction->description.setContext( metaObject()->className() ); + } + return *defaultIntroduction; +} + +void +Config::updateGlobalStorage( const QStringList& selected ) const +{ + QString key = QStringLiteral( "packagechooser_%1" ).arg( m_id ); + QString value = selected.join( ',' ); + Calamares::JobQueue::instance()->globalStorage()->insert( key, value ); + + cDebug() << "PackageChooser" << key << "selected" << value; +} + + +static void +fillModel( PackageListModel* model, const QVariantList& items ) +{ + if ( items.isEmpty() ) + { + cWarning() << "No *items* for PackageChooser module."; + return; + } + +#ifdef HAVE_APPSTREAM + std::unique_ptr< AppStream::Pool > pool; + bool poolOk = false; +#endif + + cDebug() << "Loading PackageChooser model items from config"; + int item_index = 0; + for ( const auto& item_it : items ) + { + ++item_index; + QVariantMap item_map = item_it.toMap(); + if ( item_map.isEmpty() ) + { + cWarning() << "PackageChooser entry" << item_index << "is not valid."; + continue; + } + + if ( item_map.contains( "appdata" ) ) + { +#ifdef HAVE_XML + model->addPackage( fromAppData( item_map ) ); +#else + cWarning() << "Loading AppData XML is not supported."; +#endif + } + else if ( item_map.contains( "appstream" ) ) + { +#ifdef HAVE_APPSTREAM + if ( !pool ) + { + pool = std::make_unique< AppStream::Pool >(); + pool->setLocale( QStringLiteral( "ALL" ) ); + poolOk = pool->load(); + } + if ( pool && poolOk ) + { + model->addPackage( fromAppStream( *pool, item_map ) ); + } +#else + cWarning() << "Loading AppStream data is not supported."; +#endif + } + else + { + model->addPackage( PackageItem( item_map ) ); + } + } +} + +void +Config::setConfigurationMap( const QVariantMap& configurationMap ) +{ + QString mode = CalamaresUtils::getString( configurationMap, "mode" ); + bool mode_ok = false; + if ( !mode.isEmpty() ) + { + m_mode = packageChooserModeNames().find( mode, mode_ok ); + } + if ( !mode_ok ) + { + m_mode = PackageChooserMode::Required; + } + + m_id = CalamaresUtils::getString( configurationMap, "id" ); + if ( m_id.isEmpty() ) + { + m_id = m_defaultId; + } + + m_defaultModelIndex = QModelIndex(); + if ( configurationMap.contains( "items" ) ) + { + fillModel( m_model, configurationMap.value( "items" ).toList() ); + } + + QString default_item_id = CalamaresUtils::getString( configurationMap, "default" ); + // find default item + if ( !default_item_id.isEmpty() ) + { + for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n ) + { + QModelIndex item_idx = m_model->index( item_n, 0 ); + QVariant item_id = m_model->data( item_idx, PackageListModel::IdRole ); + + if ( item_id.toString() == default_item_id ) + { + m_defaultModelIndex = item_idx; + break; + } + } + } +} diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h new file mode 100644 index 0000000000..6a65c8788e --- /dev/null +++ b/src/modules/packagechooser/Config.h @@ -0,0 +1,61 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef PACKAGECHOOSER_CONFIG_H +#define PACKAGECHOOSER_CONFIG_H + +#include "PackageModel.h" + +#include "modulesystem/Config.h" + +#include + +class Config : public Calamares::ModuleSystem::Config +{ + Q_OBJECT + +public: + Config( const QString& defaultId, QObject* parent = nullptr ); + ~Config() override; + + void setConfigurationMap( const QVariantMap& ) override; + + PackageChooserMode mode() const { return m_mode; } + PackageListModel* model() const { return m_model; } + QModelIndex defaultSelectionIndex() const { return m_defaultModelIndex; } + + /** @brief Returns an "introductory package" which describes packagechooser + * + * If the model contains a "none" package, returns that one on + * the assumption that it is one to describe the whole; otherwise + * returns a totally generic description. + */ + const PackageItem& introductionPackage() const; + + /** @brief Write selection to global storage + * + * Updates the GS keys for this packagechooser, marking all + * (and only) the packages in @p selected as selected. + */ + void updateGlobalStorage( const QStringList& selected ) const; + /// As updateGlobalStorage() with an empty selection list + void updateGlobalStorage() const { updateGlobalStorage( QStringList() ); } + +private: + PackageListModel* m_model = nullptr; + QModelIndex m_defaultModelIndex; + + // Configuration + PackageChooserMode m_mode = PackageChooserMode::Optional; + QString m_id; + QString m_defaultId; +}; + + +#endif diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp index d576f27537..05d0d3cfd1 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.cpp +++ b/src/modules/packagechooser/PackageChooserViewStep.cpp @@ -9,20 +9,22 @@ #include "PackageChooserViewStep.h" +#include "Config.h" +#include "PackageChooserPage.h" +#include "PackageModel.h" + #ifdef HAVE_XML #include "ItemAppData.h" #endif + #ifdef HAVE_APPSTREAM #include "ItemAppStream.h" #include #include #endif -#include "PackageChooserPage.h" -#include "PackageModel.h" #include "GlobalStorage.h" #include "JobQueue.h" - #include "locale/TranslatableConfiguration.h" #include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" @@ -35,9 +37,8 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserViewStepFactory, registerPlug PackageChooserViewStep::PackageChooserViewStep( QObject* parent ) : Calamares::ViewStep( parent ) + , m_config( new Config( moduleInstanceKey().id(), this ) ) , m_widget( nullptr ) - , m_model( nullptr ) - , m_mode( PackageChooserMode::Required ) , m_stepName( nullptr ) { emit nextStatusChanged( false ); @@ -50,7 +51,6 @@ PackageChooserViewStep::~PackageChooserViewStep() { m_widget->deleteLater(); } - delete m_model; delete m_stepName; } @@ -67,19 +67,10 @@ PackageChooserViewStep::widget() { if ( !m_widget ) { - m_widget = new PackageChooserPage( m_mode, nullptr ); + m_widget = new PackageChooserPage( m_config->mode(), nullptr ); connect( m_widget, &PackageChooserPage::selectionChanged, [=]() { emit nextStatusChanged( this->isNextEnabled() ); } ); - - if ( m_model ) - { - hookupModel(); - } - else - { - cWarning() << "PackageChooser Widget created before model."; - } } return m_widget; } @@ -88,18 +79,13 @@ PackageChooserViewStep::widget() bool PackageChooserViewStep::isNextEnabled() const { - if ( !m_model ) - { - return false; - } - if ( !m_widget ) { // No way to have changed anything return true; } - switch ( m_mode ) + switch ( m_config->mode() ) { case PackageChooserMode::Optional: case PackageChooserMode::OptionalMultiple: @@ -139,22 +125,14 @@ PackageChooserViewStep::onActivate() { if ( !m_widget->hasSelection() ) { - m_widget->setSelection( m_defaultIdx ); + m_widget->setSelection( m_config->defaultSelectionIndex() ); } } void PackageChooserViewStep::onLeave() { - QString key = QStringLiteral( "packagechooser_%1" ).arg( m_id ); - QString value; - if ( m_widget->hasSelection() ) - { - value = m_widget->selectedPackageIds().join( ',' ); - } - Calamares::JobQueue::instance()->globalStorage()->insert( key, value ); - - cDebug() << "PackageChooser" << key << "selected" << value; + m_config->updateGlobalStorage( m_widget->selectedPackageIds() ); } Calamares::JobList @@ -167,23 +145,7 @@ PackageChooserViewStep::jobs() const void PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - QString mode = CalamaresUtils::getString( configurationMap, "mode" ); - bool mode_ok = false; - if ( !mode.isEmpty() ) - { - m_mode = roleNames().find( mode, mode_ok ); - } - if ( !mode_ok ) - { - m_mode = PackageChooserMode::Required; - } - - m_id = CalamaresUtils::getString( configurationMap, "id" ); - if ( m_id.isEmpty() ) - { - // Not set, so use the instance id - m_id = moduleInstanceKey().id(); - } + m_config->setConfigurationMap( configurationMap ); bool labels_ok = false; auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok ); @@ -195,117 +157,22 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap } } - QString default_item_id = CalamaresUtils::getString( configurationMap, "default" ); - m_defaultIdx = QModelIndex(); - - bool first_time = !m_model; - if ( configurationMap.contains( "items" ) ) - { - fillModel( configurationMap.value( "items" ).toList() ); - } - - if ( first_time && m_widget && m_model ) + if ( m_widget ) { hookupModel(); } - - // find default item - if ( first_time && m_model && !default_item_id.isEmpty() ) - { - for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n ) - { - QModelIndex item_idx = m_model->index( item_n, 0 ); - QVariant item_id = m_model->data( item_idx, PackageListModel::IdRole ); - - if ( item_id.toString() == default_item_id ) - { - m_defaultIdx = item_idx; - break; - } - } - } } -void -PackageChooserViewStep::fillModel( const QVariantList& items ) -{ - if ( !m_model ) - { - m_model = new PackageListModel( nullptr ); - } - - if ( items.isEmpty() ) - { - cWarning() << "No *items* for PackageChooser module."; - return; - } - -#ifdef HAVE_APPSTREAM - std::unique_ptr< AppStream::Pool > pool; - bool poolOk = false; -#endif - - cDebug() << "Loading PackageChooser model items from config"; - int item_index = 0; - for ( const auto& item_it : items ) - { - ++item_index; - QVariantMap item_map = item_it.toMap(); - if ( item_map.isEmpty() ) - { - cWarning() << "PackageChooser entry" << item_index << "is not valid."; - continue; - } - - if ( item_map.contains( "appdata" ) ) - { -#ifdef HAVE_XML - m_model->addPackage( fromAppData( item_map ) ); -#else - cWarning() << "Loading AppData XML is not supported."; -#endif - } - else if ( item_map.contains( "appstream" ) ) - { -#ifdef HAVE_APPSTREAM - if ( !pool ) - { - pool = std::make_unique< AppStream::Pool >(); - pool->setLocale( QStringLiteral( "ALL" ) ); - poolOk = pool->load(); - } - if ( pool && poolOk ) - { - m_model->addPackage( fromAppStream( *pool, item_map ) ); - } -#else - cWarning() << "Loading AppStream data is not supported."; -#endif - } - else - { - m_model->addPackage( PackageItem( item_map ) ); - } - } -} void PackageChooserViewStep::hookupModel() { - if ( !m_model || !m_widget ) + if ( !m_config->model() || !m_widget ) { cError() << "Can't hook up model until widget and model both exist."; return; } - m_widget->setModel( m_model ); - for ( int i = 0; i < m_model->packageCount(); ++i ) - { - const auto& package = m_model->packageData( i ); - if ( package.id.isEmpty() ) - { - m_widget->setIntroduction( package ); - break; - } - } + m_widget->setModel( m_config->model() ); + m_widget->setIntroduction( m_config->introductionPackage() ); } diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h index 9dfd2bdee8..7561f2bd73 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.h +++ b/src/modules/packagechooser/PackageChooserViewStep.h @@ -15,12 +15,9 @@ #include "utils/PluginFactory.h" #include "viewpages/ViewStep.h" -#include "PackageModel.h" - -#include -#include #include +class Config; class PackageChooserPage; class PLUGINDLLEXPORT PackageChooserViewStep : public Calamares::ViewStep @@ -49,17 +46,11 @@ class PLUGINDLLEXPORT PackageChooserViewStep : public Calamares::ViewStep void setConfigurationMap( const QVariantMap& configurationMap ) override; private: - void fillModel( const QVariantList& items ); void hookupModel(); + Config* m_config; PackageChooserPage* m_widget; - PackageListModel* m_model; - - // Configuration - PackageChooserMode m_mode; - QString m_id; CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar - QModelIndex m_defaultIdx; }; CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory ) diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp index bb48ab888e..f1c8b30560 100644 --- a/src/modules/packagechooser/PackageModel.cpp +++ b/src/modules/packagechooser/PackageModel.cpp @@ -13,7 +13,7 @@ #include "utils/Variant.h" const NamedEnumTable< PackageChooserMode >& -roleNames() +packageChooserModeNames() { static const NamedEnumTable< PackageChooserMode > names { { "optional", PackageChooserMode::Optional }, diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h index fc1d787f1f..0ced3ffb31 100644 --- a/src/modules/packagechooser/PackageModel.h +++ b/src/modules/packagechooser/PackageModel.h @@ -26,7 +26,7 @@ enum class PackageChooserMode RequiredMultiple // one or more }; -const NamedEnumTable< PackageChooserMode >& roleNames(); +const NamedEnumTable< PackageChooserMode >& packageChooserModeNames(); struct PackageItem { From a7f983db5f6575579e6aef46c33b7727ccc087bc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 13:46:19 +0200 Subject: [PATCH 087/492] [packagechooser] Add *packageNames* to package items This is prep-work for connecting to the *packages* module by simply installing packages straight from packagechooser, rather than using a workaround. --- src/modules/packagechooser/PackageModel.cpp | 5 ++--- src/modules/packagechooser/PackageModel.h | 14 ++++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp index f1c8b30560..55300f940a 100644 --- a/src/modules/packagechooser/PackageModel.cpp +++ b/src/modules/packagechooser/PackageModel.cpp @@ -34,9 +34,7 @@ packageChooserModeNames() PackageItem::PackageItem() {} -PackageItem::PackageItem( const QString& a_id, - const QString& a_name, - const QString& a_description ) +PackageItem::PackageItem( const QString& a_id, const QString& a_name, const QString& a_description ) : id( a_id ) , name( a_name ) , description( a_description ) @@ -59,6 +57,7 @@ PackageItem::PackageItem::PackageItem( const QVariantMap& item_map ) , name( CalamaresUtils::Locale::TranslatedString( item_map, "name" ) ) , description( CalamaresUtils::Locale::TranslatedString( item_map, "description" ) ) , screenshot( CalamaresUtils::getString( item_map, "screenshot" ) ) + , packageNames( CalamaresUtils::getStringList( item_map, "packages" ) ) { if ( name.isEmpty() && id.isEmpty() ) { diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h index 0ced3ffb31..0da0e4a538 100644 --- a/src/modules/packagechooser/PackageModel.h +++ b/src/modules/packagechooser/PackageModel.h @@ -34,6 +34,7 @@ struct PackageItem CalamaresUtils::Locale::TranslatedString name; CalamaresUtils::Locale::TranslatedString description; QPixmap screenshot; + QStringList packageNames; /// @brief Create blank PackageItem PackageItem(); @@ -50,16 +51,21 @@ struct PackageItem * @p screenshotPath, which may be a QRC path (:/path/in/qrc) or * a filesystem path, whatever QPixmap understands. */ - PackageItem( const QString& id, - const QString& name, - const QString& description, - const QString& screenshotPath ); + PackageItem( const QString& id, const QString& name, const QString& description, const QString& screenshotPath ); /** @brief Creates a PackageItem from a QVariantMap * * This is intended for use when loading PackageItems from a * configuration map. It will look up the various keys in the map * and handle translation strings as well. + * + * The following keys are used: + * - *id*: the identifier for this item; if it is the empty string + * then this is the special "no-package". + * - *name* (and *name[lang]*): for the name and its translations + * - *description* (and *description[lang]*) + * - *screenshot*: a path to a screenshot for this package + * - *packages*: a list of package names */ PackageItem( const QVariantMap& map ); From 35f4a81768685e109aa2e822f2a93c5312b50f67 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 14:29:39 +0200 Subject: [PATCH 088/492] [libcalamares] Extend packages service API - convenience method to install a (string) list of packages (doesn't do the installation, but adds to GS the list, so that the packages module can handle it). --- src/libcalamares/packages/Globals.cpp | 34 +++++++++++++++++++++------ src/libcalamares/packages/Globals.h | 8 +++++++ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/libcalamares/packages/Globals.cpp b/src/libcalamares/packages/Globals.cpp index c5e882436b..aedbc21193 100644 --- a/src/libcalamares/packages/Globals.cpp +++ b/src/libcalamares/packages/Globals.cpp @@ -12,11 +12,11 @@ #include "GlobalStorage.h" #include "utils/Logger.h" -bool -CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, - const Calamares::ModuleSystem::InstanceKey& module, - const QVariantList& installPackages, - const QVariantList& tryInstallPackages ) +static bool +additions( Calamares::GlobalStorage* gs, + const QString& key, + const QVariantList& installPackages, + const QVariantList& tryInstallPackages ) { static const char PACKAGEOP[] = "packageOperations"; @@ -25,8 +25,6 @@ CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, QVariantList packageOperations = gs->contains( PACKAGEOP ) ? gs->value( PACKAGEOP ).toList() : QVariantList(); cDebug() << "Existing package operations length" << packageOperations.length(); - const QString key = module.toString(); - // Clear out existing operations for this module, going backwards: // Sometimes we remove an item, and we don't want the index to // fall off the end of the list. @@ -66,3 +64,25 @@ CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, } return false; } + +bool +CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, + const QVariantList& installPackages, + const QVariantList& tryInstallPackages ) +{ + return additions( gs, module.toString(), installPackages, tryInstallPackages ); +} + +bool +CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, + const QStringList& installPackages ) +{ + QVariantList l; + for ( const auto& s : installPackages ) + { + l << s; + } + return additions( gs, module.toString(), l, QVariantList() ); +} diff --git a/src/libcalamares/packages/Globals.h b/src/libcalamares/packages/Globals.h index a47cf5ae17..a83152ff27 100644 --- a/src/libcalamares/packages/Globals.h +++ b/src/libcalamares/packages/Globals.h @@ -28,6 +28,14 @@ bool setGSPackageAdditions( Calamares::GlobalStorage* gs, const Calamares::ModuleSystem::InstanceKey& module, const QVariantList& installPackages, const QVariantList& tryInstallPackages ); +/** @brief Sets the install-packages GS keys for the given module + * + * This replaces previously-set install-packages lists. Use this with + * plain lists of package names. It does not support try-install. + */ +bool setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, + const QStringList& installPackages ); // void setGSPackageRemovals( const Calamares::ModuleSystem::InstanceKey& key, const QVariantList& removePackages ); } // namespace Packages } // namespace CalamaresUtils From ed14c49a033d649964fb4a7579809fe64a176e2b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 14:38:39 +0200 Subject: [PATCH 089/492] [libcalamares] Extend (configuration) translated string with context Make it possible to pass in a context for strings not-from-config maps, to allow programmatically set, but translatable, strings. --- .../locale/TranslatableConfiguration.cpp | 8 +++++++- src/libcalamares/locale/TranslatableConfiguration.h | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/locale/TranslatableConfiguration.cpp b/src/libcalamares/locale/TranslatableConfiguration.cpp index 1f0811c9d6..c10307aee8 100644 --- a/src/libcalamares/locale/TranslatableConfiguration.cpp +++ b/src/libcalamares/locale/TranslatableConfiguration.cpp @@ -23,9 +23,15 @@ namespace CalamaresUtils { namespace Locale { +TranslatedString::TranslatedString( const QString& key, const char* context ) + : m_context( context ) +{ + m_strings[ QString() ] = key; +} + TranslatedString::TranslatedString( const QString& string ) + : TranslatedString( string, nullptr ) { - m_strings[ QString() ] = string; } TranslatedString::TranslatedString( const QVariantMap& map, const QString& key, const char* context ) diff --git a/src/libcalamares/locale/TranslatableConfiguration.h b/src/libcalamares/locale/TranslatableConfiguration.h index c45c8f5232..04897c0a41 100644 --- a/src/libcalamares/locale/TranslatableConfiguration.h +++ b/src/libcalamares/locale/TranslatableConfiguration.h @@ -50,11 +50,23 @@ class DLLEXPORT TranslatedString * metaObject()->className() as context (from a QObject based class) * to give the TranslatedString the same context as other calls * to tr() within that class. + * + * The @p context, if any, should point to static data; it is + * **not** owned by the TranslatedString. */ TranslatedString( const QVariantMap& map, const QString& key, const char* context = nullptr ); /** @brief Not-actually-translated string. */ TranslatedString( const QString& string ); + /** @brief Proxy for calling QObject::tr() + * + * This is like the two constructors above, with an empty map an a + * non-null context. It will end up calling tr() with that context. + * + * The @p context, if any, should point to static data; it is + * **not** owned by the TranslatedString. + */ + TranslatedString( const QString& key, const char* context ); /// @brief Empty string TranslatedString() : TranslatedString( QString() ) From 5e77d65424ff7038a2dfb6b8e13bb416eb252636 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 14:53:13 +0200 Subject: [PATCH 090/492] [packagechooser] Add install-method to pick *packages* module --- src/modules/packagechooser/Config.cpp | 69 +++++++++++++++---- src/modules/packagechooser/Config.h | 29 +++++++- .../packagechooser/PackageChooserPage.h | 1 + .../packagechooser/PackageChooserViewStep.cpp | 2 +- src/modules/packagechooser/PackageModel.cpp | 20 ------ src/modules/packagechooser/PackageModel.h | 9 --- 6 files changed, 85 insertions(+), 45 deletions(-) diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index aa383d3c8e..78c4179080 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -15,11 +15,43 @@ #include "GlobalStorage.h" #include "JobQueue.h" +#include "packages/Globals.h" #include "utils/Logger.h" #include "utils/Variant.h" +const NamedEnumTable< PackageChooserMode >& +packageChooserModeNames() +{ + static const NamedEnumTable< PackageChooserMode > names { + { "optional", PackageChooserMode::Optional }, + { "required", PackageChooserMode::Required }, + { "optionalmultiple", PackageChooserMode::OptionalMultiple }, + { "requiredmultiple", PackageChooserMode::RequiredMultiple }, + // and a bunch of aliases + { "zero-or-one", PackageChooserMode::Optional }, + { "radio", PackageChooserMode::Required }, + { "one", PackageChooserMode::Required }, + { "set", PackageChooserMode::OptionalMultiple }, + { "zero-or-more", PackageChooserMode::OptionalMultiple }, + { "multiple", PackageChooserMode::RequiredMultiple }, + { "one-or-more", PackageChooserMode::RequiredMultiple } + }; + return names; +} + +const NamedEnumTable< PackageChooserMethod >& +PackageChooserMethodNames() +{ + static const NamedEnumTable< PackageChooserMethod > names { + { "legacy", PackageChooserMethod::Legacy }, + { "custom", PackageChooserMethod::Legacy }, + { "contextualprocess", PackageChooserMethod::Legacy }, + { "packages", PackageChooserMethod::Packages }, + }; + return names; +} -Config::Config( const QString& defaultId, QObject* parent ) +Config::Config( const Calamares::ModuleSystem::InstanceKey& defaultId, QObject* parent ) : Calamares::ModuleSystem::Config( parent ) , m_model( new PackageListModel( this ) ) , m_mode( PackageChooserMode::Required ) @@ -44,14 +76,14 @@ Config::introductionPackage() const static PackageItem* defaultIntroduction = nullptr; if ( !defaultIntroduction ) { - defaultIntroduction = new PackageItem( - QString(), - QT_TR_NOOP( "Package Selection" ), - QT_TR_NOOP( "Please pick a product from the list. The selected product will be installed." ) ); + const auto name = QT_TR_NOOP( "Package Selection" ); + const auto description + = QT_TR_NOOP( "Please pick a product from the list. The selected product will be installed." ); + defaultIntroduction = new PackageItem( QString(), name, description ); defaultIntroduction->screenshot = QPixmap( QStringLiteral( ":/images/no-selection.png" ) ); - // TODO: enable better translation - // defaultIntroduction->name.setContext( metaObject()->className() ); - // defaultIntroduction->description.setContext( metaObject()->className() ); + defaultIntroduction->name = CalamaresUtils::Locale::TranslatedString( name, metaObject()->className() ); + defaultIntroduction->description + = CalamaresUtils::Locale::TranslatedString( description, metaObject()->className() ); } return *defaultIntroduction; } @@ -60,10 +92,23 @@ void Config::updateGlobalStorage( const QStringList& selected ) const { QString key = QStringLiteral( "packagechooser_%1" ).arg( m_id ); - QString value = selected.join( ',' ); - Calamares::JobQueue::instance()->globalStorage()->insert( key, value ); - cDebug() << "PackageChooser" << key << "selected" << value; + if ( m_method == PackageChooserMethod::Legacy ) + { + QString value = selected.join( ',' ); + Calamares::JobQueue::instance()->globalStorage()->insert( key, value ); + + cDebug() << "PackageChooser" << key << "selected" << value; + } + else if ( m_method == PackageChooserMethod::Packages ) + { + CalamaresUtils::Packages::setGSPackageAdditions( + Calamares::JobQueue::instance()->globalStorage(), m_defaultId, selected ); + } + else + { + cWarning() << "Unknown packagechooser method" << smash( m_method ); + } } @@ -142,7 +187,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) m_id = CalamaresUtils::getString( configurationMap, "id" ); if ( m_id.isEmpty() ) { - m_id = m_defaultId; + m_id = m_defaultId.id(); } m_defaultModelIndex = QModelIndex(); diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h index 6a65c8788e..d07b4a0107 100644 --- a/src/modules/packagechooser/Config.h +++ b/src/modules/packagechooser/Config.h @@ -13,15 +13,34 @@ #include "PackageModel.h" #include "modulesystem/Config.h" +#include "modulesystem/InstanceKey.h" #include +enum class PackageChooserMode +{ + Optional, // zero or one + Required, // exactly one + OptionalMultiple, // zero or more + RequiredMultiple // one or more +}; + +const NamedEnumTable< PackageChooserMode >& packageChooserModeNames(); + +enum class PackageChooserMethod +{ + Legacy, // use contextualprocess or other custom + Packages, // use the packages module +}; + +const NamedEnumTable< PackageChooserMethod >& PackageChooserMethodNames(); + class Config : public Calamares::ModuleSystem::Config { Q_OBJECT public: - Config( const QString& defaultId, QObject* parent = nullptr ); + Config( const Calamares::ModuleSystem::InstanceKey& defaultId, QObject* parent = nullptr ); ~Config() override; void setConfigurationMap( const QVariantMap& ) override; @@ -51,10 +70,14 @@ class Config : public Calamares::ModuleSystem::Config PackageListModel* m_model = nullptr; QModelIndex m_defaultModelIndex; - // Configuration + /// Selection mode for this module PackageChooserMode m_mode = PackageChooserMode::Optional; + /// How this module stores to GS + PackageChooserMethod m_method = PackageChooserMethod::Legacy; + /// Id (used to identify settings from this module in GS) QString m_id; - QString m_defaultId; + /// Value to use for id if none is set in the config file + Calamares::ModuleSystem::InstanceKey m_defaultId; }; diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h index 4f485c890d..90c2b28a64 100644 --- a/src/modules/packagechooser/PackageChooserPage.h +++ b/src/modules/packagechooser/PackageChooserPage.h @@ -10,6 +10,7 @@ #ifndef PACKAGECHOOSERPAGE_H #define PACKAGECHOOSERPAGE_H +#include "Config.h" #include "PackageModel.h" #include diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp index 05d0d3cfd1..a15fd0f55c 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.cpp +++ b/src/modules/packagechooser/PackageChooserViewStep.cpp @@ -37,7 +37,7 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserViewStepFactory, registerPlug PackageChooserViewStep::PackageChooserViewStep( QObject* parent ) : Calamares::ViewStep( parent ) - , m_config( new Config( moduleInstanceKey().id(), this ) ) + , m_config( new Config( moduleInstanceKey(), this ) ) , m_widget( nullptr ) , m_stepName( nullptr ) { diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp index 55300f940a..05a90f2203 100644 --- a/src/modules/packagechooser/PackageModel.cpp +++ b/src/modules/packagechooser/PackageModel.cpp @@ -12,26 +12,6 @@ #include "utils/Logger.h" #include "utils/Variant.h" -const NamedEnumTable< PackageChooserMode >& -packageChooserModeNames() -{ - static const NamedEnumTable< PackageChooserMode > names { - { "optional", PackageChooserMode::Optional }, - { "required", PackageChooserMode::Required }, - { "optionalmultiple", PackageChooserMode::OptionalMultiple }, - { "requiredmultiple", PackageChooserMode::RequiredMultiple }, - // and a bunch of aliases - { "zero-or-one", PackageChooserMode::Optional }, - { "radio", PackageChooserMode::Required }, - { "one", PackageChooserMode::Required }, - { "set", PackageChooserMode::OptionalMultiple }, - { "zero-or-more", PackageChooserMode::OptionalMultiple }, - { "multiple", PackageChooserMode::RequiredMultiple }, - { "one-or-more", PackageChooserMode::RequiredMultiple } - }; - return names; -} - PackageItem::PackageItem() {} PackageItem::PackageItem( const QString& a_id, const QString& a_name, const QString& a_description ) diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h index 0da0e4a538..b27c0ed3bf 100644 --- a/src/modules/packagechooser/PackageModel.h +++ b/src/modules/packagechooser/PackageModel.h @@ -18,15 +18,6 @@ #include #include -enum class PackageChooserMode -{ - Optional, // zero or one - Required, // exactly one - OptionalMultiple, // zero or more - RequiredMultiple // one or more -}; - -const NamedEnumTable< PackageChooserMode >& packageChooserModeNames(); struct PackageItem { From 91a29c58855b125e96d91da3a28ba59498d7ea55 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 17 Apr 2021 14:36:33 +0200 Subject: [PATCH 091/492] [packagechooser] Add getters for the *packages* members to the model --- src/modules/packagechooser/PackageModel.cpp | 27 +++++++++++++++++++++ src/modules/packagechooser/PackageModel.h | 13 ++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp index 05a90f2203..239705490c 100644 --- a/src/modules/packagechooser/PackageModel.cpp +++ b/src/modules/packagechooser/PackageModel.cpp @@ -79,6 +79,33 @@ PackageListModel::addPackage( PackageItem&& p ) } } +QStringList +PackageListModel::getInstallPackagesForName( const QString& id ) const +{ + for ( const auto& p : qAsConst( m_packages ) ) + { + if ( p.id == id ) + { + return p.packageNames; + } + } + return QStringList(); +} + +QStringList +PackageListModel::getInstallPackagesForNames( const QStringList& ids ) const +{ + QStringList l; + for ( const auto& p : qAsConst( m_packages ) ) + { + if ( ids.contains( p.id ) ) + { + l.append( p.packageNames ); + } + } + return l; +} + int PackageListModel::rowCount( const QModelIndex& index ) const { diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h index b27c0ed3bf..71003197de 100644 --- a/src/modules/packagechooser/PackageModel.h +++ b/src/modules/packagechooser/PackageModel.h @@ -98,6 +98,19 @@ class PackageListModel : public QAbstractListModel /// @brief Direct (non-abstract) count of package data int packageCount() const { return m_packages.count(); } + /** @brief Does a name lookup (based on id) and returns the packages member + * + * If there is a package with the given @p id, returns its packages + * (e.g. the names of underlying packages to install for it); returns + * an empty list if the id is not found. + */ + QStringList getInstallPackagesForName( const QString& id ) const; + /** @brief Name-lookup all the @p ids and returns the packages members + * + * Concatenates installPackagesForName() for each id in @p ids. + */ + QStringList getInstallPackagesForNames( const QStringList& ids ) const; + enum Roles : int { NameRole = Qt::DisplayRole, From 65e78e59154dd63fd77c1eecd11efad52e8ed1c7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 17 Apr 2021 14:39:24 +0200 Subject: [PATCH 092/492] [packagechooser] Use packages list instead of ids - don't pass the item IDs to packages module, use the packages lists for each item - document the item list in more detail (including the packages member and new install-method item) --- src/modules/packagechooser/Config.cpp | 3 +- .../packagechooser/packagechooser.conf | 113 ++++++++++++------ 2 files changed, 78 insertions(+), 38 deletions(-) diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index 78c4179080..0a0358c6b0 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -102,8 +102,9 @@ Config::updateGlobalStorage( const QStringList& selected ) const } else if ( m_method == PackageChooserMethod::Packages ) { + QStringList packageNames = m_model->getInstallPackagesForNames( selected ); CalamaresUtils::Packages::setGSPackageAdditions( - Calamares::JobQueue::instance()->globalStorage(), m_defaultId, selected ); + Calamares::JobQueue::instance()->globalStorage(), m_defaultId, packageNames ); } else { diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf index bb824c5e72..51032929e5 100644 --- a/src/modules/packagechooser/packagechooser.conf +++ b/src/modules/packagechooser/packagechooser.conf @@ -3,26 +3,45 @@ # # Configuration for the low-density software chooser --- -# The packagechooser writes a GlobalStorage value for the choice that -# has been made. The key is *packagechooser_*. If *id* is set here, -# it is substituted into the key name. If it is not set, the module's -# instance name is used; see the *instances* section of `settings.conf`. -# If there is just one packagechooser module, and no *id* is set, -# resulting GS key is probably *packagechooser_packagechooser*. -# -# The GS value is a comma-separated list of the IDs of the selected -# packages, or an empty string if none is selected. -# -# id: "" - # Software selection mode, to set whether the software packages # can be chosen singly, or multiply. # -# Possible modes are "optional", "required" (for zero or one) +# Possible modes are "optional", "required" (for zero-or-one or exactly-one) # or "optionalmultiple", "requiredmultiple" (for zero-or-more # or one-or-more). mode: required +# Software installation method: +# +# - "legacy" or "custom" or "contextualprocess" +# When set to "legacy", writes a GlobalStorage value for the choice that +# has been made. The key is *packagechooser_*. Normally, the module's +# instance name is used; see the *instances* section of `settings.conf`. +# If there is just one packagechooser module, and no special instance is set, +# resulting GS key is probably *packagechooser_packagechooser*. +# You can set "id" to change that, but it is not recommended. +# +# The GS value is a comma-separated list of the IDs of the selected +# packages, or an empty string if none is selected. +# +# With "legacy" installation, you should have a contextualprocess or similar +# module somewhere in the `exec` phase to process the GlobalStorage key +# and actually **do** something for the packages. +# +# - "packages" +# When set to "packages", writes GlobalStorage values suitable for +# consumption by the *packages* module (which should appear later +# in the `exec` section. These package settings will then be handed +# off to whatever package manager is configured there. +# +# There is no need to put this module in the `exec` section. There +# are no jobs that this module provides. You should put **other** +# modules, either *contextualprocess* or *packages* or some custom +# module, in the `exec` section to do the actual work. +method: legacy +# id: "" + + # Human-visible strings in this module. These are all optional. # The following translated keys are used: # - *step*, used in the overall progress view (left-hand pane) @@ -49,27 +68,45 @@ labels: # as a source for the data. # # For data provided by the list: the item has an id, which is used in -# setting the value of *packagechooser_*. The following fields -# are mandatory: -# -# - *id* : ID for the product. The ID "" is special, and is used for -# "no package selected". Only include this if the mode allows -# selecting none. -# - *package* : Package name for the product. While mandatory, this is -# not actually used anywhere. -# - *name* : Human-readable name of the product. To provide translations, -# add a *[lang]* decoration as part of the key name, -# e.g. `name[nl]` for Dutch. -# The list of usable languages can be found in -# `CMakeLists.txt` or as part of the debug output of Calamares. -# - *description* : Human-readable description. These can be translated -# as well. -# - *screenshot* : Path to a single screenshot of the product. May be -# a filesystem path or a QRC path, -# e.g. ":/images/no-selection.png". -# -# Use the empty string "" as ID / key for the "no selection" item if -# you want to customize the display of that item as well. +# setting the value of *packagechooser_*. The following field +# is mandatory: +# +# - *id* +# ID for the product. The ID "" is special, and is used for +# "no package selected". Only include this if the mode allows +# selecting none. The name and description given for the "no package +# selected" item are displayed when the module starts. +# +# Each item must adhere to one of three "styles" of item. Which styles +# are supported depends on compile-time dependencies of Calamares. +# Both AppData and AppStream may **optionally** be available. +# +# # Generic Items # +# +# These items are always supported. They require the most configuration +# **in this file** and duplicate information that may be available elsewhere +# (e.g. in AppData or AppStream), but do not require any additional +# dependencies. These items have the following **mandatory** fields: +# +# - *name* +# Human-readable name of the product. To provide translations, +# add a *[lang]* decoration as part of the key name, e.g. `name[nl]` +# for Dutch. The list of usable languages can be found in +# `CMakeLists.txt` or as part of the debug output of Calamares. +# - *description* +# Human-readable description. These can be translated as well. +# - *screenshot* +# Path to a single screenshot of the product. May be a filesystem +# path or a QRC path, e.g. ":/images/no-selection.png". +# +# The following field is **optional** for an item: +# +# - *packages* : +# List of package names for the product. If using the *method* +# "packages", consider this item mandatory (because otherwise +# selecting the item would install no packages). +# +# # AppData Items # # # For data provided by AppData XML: the item has an *appdata* # key which points to an AppData XML file in the local filesystem. @@ -84,6 +121,8 @@ labels: # **may** specify an ID or screenshot path, as above. This will override # the settings from AppData. # +# # AppStream Items # +# # For data provided by AppStream cache: the item has an *appstream* # key which matches the AppStream identifier in the cache (e.g. # *org.kde.kwrite.desktop*). Data is retrieved from the AppStream @@ -93,19 +132,19 @@ labels: # key which will override the data from AppStream. items: - id: "" - package: "" + # packages: [] # This item installs no packages name: "No Desktop" name[nl]: "Geen desktop" description: "Please pick a desktop environment from the list. If you don't want to install a desktop, that's fine, your system will start up in text-only mode and you can install a desktop environment later." description[nl]: "Kies eventueel een desktop-omgeving uit deze lijst. Als u geen desktop-omgeving wenst te gebruiken, kies er dan geen. In dat geval start het systeem straks op in tekst-modus en kunt u later alsnog een desktop-omgeving installeren." screenshot: ":/images/no-selection.png" - id: kde - package: kde + packages: [ kde-frameworks, kde-plasma, kde-gear ] name: Plasma Desktop description: "KDE Plasma Desktop, simple by default, a clean work area for real-world usage which intends to stay out of your way. Plasma is powerful when needed, enabling the user to create the workflow that makes them more effective to complete their tasks." screenshot: ":/images/kde.png" - id: gnome - package: gnome + packages: [ gnome-all ] name: GNOME description: GNU Networked Object Modeling Environment Desktop screenshot: ":/images/gnome.png" From d72e42f7bad512766cdb3eebaeacbeb12227fbf7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 14:38:39 +0200 Subject: [PATCH 093/492] [libcalamares] Extend (configuration) translated string with context Make it possible to pass in a context for strings not-from-config maps, to allow programmatically set, but translatable, strings. --- .../locale/TranslatableConfiguration.cpp | 8 +++++++- src/libcalamares/locale/TranslatableConfiguration.h | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/locale/TranslatableConfiguration.cpp b/src/libcalamares/locale/TranslatableConfiguration.cpp index 1f0811c9d6..c10307aee8 100644 --- a/src/libcalamares/locale/TranslatableConfiguration.cpp +++ b/src/libcalamares/locale/TranslatableConfiguration.cpp @@ -23,9 +23,15 @@ namespace CalamaresUtils { namespace Locale { +TranslatedString::TranslatedString( const QString& key, const char* context ) + : m_context( context ) +{ + m_strings[ QString() ] = key; +} + TranslatedString::TranslatedString( const QString& string ) + : TranslatedString( string, nullptr ) { - m_strings[ QString() ] = string; } TranslatedString::TranslatedString( const QVariantMap& map, const QString& key, const char* context ) diff --git a/src/libcalamares/locale/TranslatableConfiguration.h b/src/libcalamares/locale/TranslatableConfiguration.h index c45c8f5232..04897c0a41 100644 --- a/src/libcalamares/locale/TranslatableConfiguration.h +++ b/src/libcalamares/locale/TranslatableConfiguration.h @@ -50,11 +50,23 @@ class DLLEXPORT TranslatedString * metaObject()->className() as context (from a QObject based class) * to give the TranslatedString the same context as other calls * to tr() within that class. + * + * The @p context, if any, should point to static data; it is + * **not** owned by the TranslatedString. */ TranslatedString( const QVariantMap& map, const QString& key, const char* context = nullptr ); /** @brief Not-actually-translated string. */ TranslatedString( const QString& string ); + /** @brief Proxy for calling QObject::tr() + * + * This is like the two constructors above, with an empty map an a + * non-null context. It will end up calling tr() with that context. + * + * The @p context, if any, should point to static data; it is + * **not** owned by the TranslatedString. + */ + TranslatedString( const QString& key, const char* context ); /// @brief Empty string TranslatedString() : TranslatedString( QString() ) From 0143aa5515e69b83248716028ac4c9156a18588f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 17 Apr 2021 22:13:16 +0200 Subject: [PATCH 094/492] [libcalamares] Make the branding-loading messages follow same format as the others --- src/libcalamares/utils/Retranslator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp index 46bafab854..7f0d89ef9e 100644 --- a/src/libcalamares/utils/Retranslator.cpp +++ b/src/libcalamares/utils/Retranslator.cpp @@ -113,7 +113,7 @@ BrandingLoader::tryLoad( QTranslator* translator ) } else { - cDebug() << Logger::SubEntry << "Branding using default, system locale not found:" << m_localeName; + cDebug() << Logger::SubEntry << "Branding no translation for" << m_localeName << "using default (en)"; // TODO: this loads something completely different return translator->load( m_prefix + "en" ); } From cfbe72235072420d8c8a515d6b58f036aa7257b7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 18 Apr 2021 13:19:55 +0200 Subject: [PATCH 095/492] [libcalamares] Test the translated string with real translations - introduce a bogus translation context, load translations, and check that the context-enabled translator does its job. --- src/libcalamares/CMakeLists.txt | 19 +++++++++++++++ src/libcalamares/locale/Tests.cpp | 28 ++++++++++++++++++++++ src/libcalamares/testdata/localetest_nl.ts | 15 ++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 src/libcalamares/testdata/localetest_nl.ts diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 69533cfffb..285359faa4 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -215,10 +215,29 @@ calamares_add_test( ${geoip_src} ) +# Build up translations for this one test +set( trans_file "localetest" ) +set( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc ) +set( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx ) +set( calamares_i18n_qrc_content "localetest_nl.qm" ) +configure_file( ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${trans_infile} @ONLY ) + +qt5_add_translation(QM_FILES "${CMAKE_CURRENT_SOURCE_DIR}/testdata/localetest_nl.ts") + +# Run the resource compiler (rcc_options should already be set) +add_custom_command( + OUTPUT ${trans_outfile} + COMMAND "${Qt5Core_RCC_EXECUTABLE}" + ARGS ${rcc_options} --format-version 1 -name ${trans_file} -o ${trans_outfile} ${trans_infile} + MAIN_DEPENDENCY ${trans_infile} + DEPENDS ${QM_FILES} +) + calamares_add_test( libcalamareslocaletest SOURCES locale/Tests.cpp + ${trans_outfile} ) calamares_add_test( diff --git a/src/libcalamares/locale/Tests.cpp b/src/libcalamares/locale/Tests.cpp index b701ce8492..05e8f610c1 100644 --- a/src/libcalamares/locale/Tests.cpp +++ b/src/libcalamares/locale/Tests.cpp @@ -16,6 +16,7 @@ #include "CalamaresVersion.h" #include "GlobalStorage.h" #include "utils/Logger.h" +#include "utils/Retranslator.h" #include @@ -33,6 +34,7 @@ private Q_SLOTS: void testTranslatableLanguages(); void testTranslatableConfig1(); void testTranslatableConfig2(); + void testTranslatableConfigContext(); void testLanguageScripts(); void testEsperanto(); @@ -246,6 +248,32 @@ LocaleTests::testTranslatableConfig2() QCOMPARE( ts3.count(), 1 ); // The empty string } +void +LocaleTests::testTranslatableConfigContext() +{ + using TS = CalamaresUtils::Locale::TranslatedString; + + const QString original( "Quit" ); + TS quitUntranslated( original ); + TS quitTranslated( original, metaObject()->className() ); + + QCOMPARE( quitUntranslated.get(), original ); + QCOMPARE( quitTranslated.get(), original ); + + // Load translation data from QRC + QVERIFY( QFile::exists( ":/lang/localetest_nl.qm" ) ); + QTranslator t; + QVERIFY( t.load( QString( ":/lang/localetest_nl" ) ) ); + QCoreApplication::installTranslator( &t ); + + // Translation doesn't affect the one without context + QCOMPARE( quitUntranslated.get(), original ); + // But the translation **does** affect this class' context + QCOMPARE( quitTranslated.get(), QStringLiteral( "Ophouden" ) ); + QCOMPARE( tr( "Quit" ), QStringLiteral( "Ophouden" ) ); +} + + void LocaleTests::testRegions() { diff --git a/src/libcalamares/testdata/localetest_nl.ts b/src/libcalamares/testdata/localetest_nl.ts new file mode 100644 index 0000000000..65a3a284b4 --- /dev/null +++ b/src/libcalamares/testdata/localetest_nl.ts @@ -0,0 +1,15 @@ + + + + + + LocaleTests + + + Quit + Ophouden + + + From 1af8796b2b317fb1e7bc17484efb1c1c50be103b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 18 Apr 2021 13:35:18 +0200 Subject: [PATCH 096/492] [libcalamares] Refactor translations-for-a-test CMake code - turn the translations-QRC phase into a function, just in case other tests need translations as well. - This CMake code might work as the base of translation-wrangling for plugins (externally). --- src/libcalamares/CMakeLists.txt | 56 ++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 285359faa4..9615cedb89 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -215,29 +215,49 @@ calamares_add_test( ${geoip_src} ) -# Build up translations for this one test -set( trans_file "localetest" ) -set( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc ) -set( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx ) -set( calamares_i18n_qrc_content "localetest_nl.qm" ) -configure_file( ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${trans_infile} @ONLY ) - -qt5_add_translation(QM_FILES "${CMAKE_CURRENT_SOURCE_DIR}/testdata/localetest_nl.ts") - -# Run the resource compiler (rcc_options should already be set) -add_custom_command( - OUTPUT ${trans_outfile} - COMMAND "${Qt5Core_RCC_EXECUTABLE}" - ARGS ${rcc_options} --format-version 1 -name ${trans_file} -o ${trans_outfile} ${trans_infile} - MAIN_DEPENDENCY ${trans_infile} - DEPENDS ${QM_FILES} -) +function ( calamares_qrc_translations basename ) + set( NAME ${ARGV0} ) + set( options "" ) + set( oneValueArgs SUBDIRECTORY OUTPUT_VARIABLE ) + set( multiValueArgs LANGUAGES ) + cmake_parse_arguments( _qrt "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) + + if( NOT _qrt_OUTPUT_VARIABLE ) + set( _qrt_OUTPUT_VARIABLE "qrc_translations_${basename}" ) + endif() + + set( translations_qrc_infile ${CMAKE_CURRENT_BINARY_DIR}/${basename}.qrc ) + set( translations_qrc_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${basename}.cxx ) + + # Must use this variable name because of the @ substitution + set( calamares_i18n_qrc_content "" ) + set( calamares_i18n_ts_filelist "" ) + foreach( lang ${_qrt_LANGUAGES} ) + string( APPEND calamares_i18n_qrc_content "${basename}_${lang}.qm" ) + list( APPEND calamares_i18n_ts_filelist "${CMAKE_CURRENT_SOURCE_DIR}/${_qrt_SUBDIRECTORY}/${basename}_${lang}.ts" ) + endforeach() + + configure_file( ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${translations_qrc_infile} @ONLY ) + qt5_add_translation(QM_FILES ${calamares_i18n_ts_filelist}) + + # Run the resource compiler (rcc_options should already be set) + add_custom_command( + OUTPUT ${translations_qrc_outfile} + COMMAND "${Qt5Core_RCC_EXECUTABLE}" + ARGS ${rcc_options} --format-version 1 -name ${basename} -o ${translations_qrc_outfile} ${translations_qrc_infile} + MAIN_DEPENDENCY ${translations_qrc_infile} + DEPENDS ${QM_FILES} + ) + + set( ${_qrt_OUTPUT_VARIABLE} ${translations_qrc_outfile} PARENT_SCOPE ) +endfunction() +calamares_qrc_translations( localetest OUTPUT_VARIABLE localetest_qrc SUBDIRECTORY testdata LANGUAGES nl ) calamares_add_test( libcalamareslocaletest SOURCES locale/Tests.cpp - ${trans_outfile} + ${localetest_qrc} ) calamares_add_test( From 788c84dc41040bd625aed8e41dc2848adb75e7f5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 18 Apr 2021 13:37:58 +0200 Subject: [PATCH 097/492] [netinstall] SPDX-tag the syntax-error file --- src/modules/netinstall/tests/data-error.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/netinstall/tests/data-error.yaml b/src/modules/netinstall/tests/data-error.yaml index fd445df8fc..1445f8923a 100644 --- a/src/modules/netinstall/tests/data-error.yaml +++ b/src/modules/netinstall/tests/data-error.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# derp derp herpa-derp: no From 117418fe6024b6693e6489083f9071835731f3f4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 19 Apr 2021 15:47:55 +0200 Subject: [PATCH 098/492] [partition] Fix partitioning summary - the %4 is left-over from the feature-summary string, - replace it with ""; don't change the source string because that will break translations right now. --- src/modules/partition/jobs/FillGlobalStorageJob.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index f79918e647..7f76f20d79 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -264,7 +264,8 @@ FillGlobalStorageJob::prettyDescription() const "%2%4." ) .arg( path ) .arg( mountPoint ) - .arg( fsType ) ); + .arg( fsType ) + .arg( QString() ); } } } From 231fa815c1e96daa66b7718e9edc27facb4af472 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 19 Apr 2021 16:10:29 +0200 Subject: [PATCH 099/492] [partition] Forgotten ) --- src/modules/partition/jobs/FillGlobalStorageJob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index 7f76f20d79..40e67d620b 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -265,7 +265,7 @@ FillGlobalStorageJob::prettyDescription() const .arg( path ) .arg( mountPoint ) .arg( fsType ) - .arg( QString() ); + .arg( QString() ) ); } } } From 4299ea1d4f3785031e83ca2e7f5e570442fb9de5 Mon Sep 17 00:00:00 2001 From: Jerrod Frost Date: Thu, 22 Apr 2021 11:18:41 -0500 Subject: [PATCH 100/492] Add Luet PackageManager support Sabayon is being rebuilt into MocaccinoOS with a new packagemanager. --- src/modules/packages/main.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 7cd7f3f0b2..ac4801fb37 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -255,6 +255,22 @@ def update_system(self): # Doesn't need to update the system explicitly pass + class PMLuet(PackageManager): + backend = "luet" + + def install(self, pkgs, from_local=False): + check_target_env_call(["luet", "install", "-y"] + pkgs) + + def remove(self, pkgs): + check_target_env_call(["luet", "uninstall", "-y"] + pkgs) + + def update_db(self): + # Luet checks for DB update everytime its ran. + pass + + def update_system(self): + check_target_env_call(["luet", "upgrade", "-y"]) + class PMPackageKit(PackageManager): backend = "packagekit" From e400f79673aeff4bccba6c3438e42a813d4ca6fc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 16 Apr 2021 14:29:39 +0200 Subject: [PATCH 101/492] [libcalamares] Extend packages service API - convenience method to install a (string) list of packages (doesn't do the installation, but adds to GS the list, so that the packages module can handle it). --- src/libcalamares/packages/Globals.cpp | 34 +++++++++++++++++++++------ src/libcalamares/packages/Globals.h | 8 +++++++ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/libcalamares/packages/Globals.cpp b/src/libcalamares/packages/Globals.cpp index c5e882436b..aedbc21193 100644 --- a/src/libcalamares/packages/Globals.cpp +++ b/src/libcalamares/packages/Globals.cpp @@ -12,11 +12,11 @@ #include "GlobalStorage.h" #include "utils/Logger.h" -bool -CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, - const Calamares::ModuleSystem::InstanceKey& module, - const QVariantList& installPackages, - const QVariantList& tryInstallPackages ) +static bool +additions( Calamares::GlobalStorage* gs, + const QString& key, + const QVariantList& installPackages, + const QVariantList& tryInstallPackages ) { static const char PACKAGEOP[] = "packageOperations"; @@ -25,8 +25,6 @@ CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, QVariantList packageOperations = gs->contains( PACKAGEOP ) ? gs->value( PACKAGEOP ).toList() : QVariantList(); cDebug() << "Existing package operations length" << packageOperations.length(); - const QString key = module.toString(); - // Clear out existing operations for this module, going backwards: // Sometimes we remove an item, and we don't want the index to // fall off the end of the list. @@ -66,3 +64,25 @@ CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, } return false; } + +bool +CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, + const QVariantList& installPackages, + const QVariantList& tryInstallPackages ) +{ + return additions( gs, module.toString(), installPackages, tryInstallPackages ); +} + +bool +CalamaresUtils::Packages::setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, + const QStringList& installPackages ) +{ + QVariantList l; + for ( const auto& s : installPackages ) + { + l << s; + } + return additions( gs, module.toString(), l, QVariantList() ); +} diff --git a/src/libcalamares/packages/Globals.h b/src/libcalamares/packages/Globals.h index a47cf5ae17..a83152ff27 100644 --- a/src/libcalamares/packages/Globals.h +++ b/src/libcalamares/packages/Globals.h @@ -28,6 +28,14 @@ bool setGSPackageAdditions( Calamares::GlobalStorage* gs, const Calamares::ModuleSystem::InstanceKey& module, const QVariantList& installPackages, const QVariantList& tryInstallPackages ); +/** @brief Sets the install-packages GS keys for the given module + * + * This replaces previously-set install-packages lists. Use this with + * plain lists of package names. It does not support try-install. + */ +bool setGSPackageAdditions( Calamares::GlobalStorage* gs, + const Calamares::ModuleSystem::InstanceKey& module, + const QStringList& installPackages ); // void setGSPackageRemovals( const Calamares::ModuleSystem::InstanceKey& key, const QVariantList& removePackages ); } // namespace Packages } // namespace CalamaresUtils From 049b9f9c7484b711a20116fd34bf4c5641f3a27b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 11:46:14 +0200 Subject: [PATCH 102/492] [libcalamares] Test the packages service API - check that the variant and the string-list version of the API do the same thing, check independence of settings for different instance keys. --- src/libcalamares/packages/Tests.cpp | 195 ++++++++++++++++++++++++---- 1 file changed, 172 insertions(+), 23 deletions(-) diff --git a/src/libcalamares/packages/Tests.cpp b/src/libcalamares/packages/Tests.cpp index 0a9be3a205..09159abdfb 100644 --- a/src/libcalamares/packages/Tests.cpp +++ b/src/libcalamares/packages/Tests.cpp @@ -24,7 +24,15 @@ private Q_SLOTS: void initTestCase(); void testEmpty(); + void testAdd_data(); + /** @brief Test various add calls, for a "clean" GS + * + * Check that adding through the variant- and the stringlist-API + * does the same thing. + */ void testAdd(); + /// Test replacement and mixing string-list with variant calls + void testAddMixed(); }; void @@ -46,38 +54,179 @@ PackagesTests::testEmpty() // Adding nothing at all does nothing QVERIFY( !CalamaresUtils::Packages::setGSPackageAdditions( &gs, k, QVariantList(), QVariantList() ) ); QVERIFY( !gs.contains( topKey ) ); + + QVERIFY( !CalamaresUtils::Packages::setGSPackageAdditions( &gs, k, QStringList() ) ); + QVERIFY( !gs.contains( topKey ) ); +} + +void +PackagesTests::testAdd_data() +{ + QTest::addColumn< QStringList >( "packages" ); + + QTest::newRow( "one" ) << QStringList { QString( "vim" ) }; + QTest::newRow( "two" ) << QStringList { QString( "vim" ), QString( "emacs" ) }; + QTest::newRow( "one-again" ) << QStringList { QString( "nano" ) }; + QTest::newRow( "six" ) << QStringList { QString( "vim" ), QString( "emacs" ), QString( "nano" ), + QString( "kate" ), QString( "gedit" ), QString( "sublime" ) }; + // There is no "de-duplication" so this will insert "cim" twice + QTest::newRow( "dups" ) << QStringList { QString( "cim" ), QString( "vim" ), QString( "cim" ) }; } void PackagesTests::testAdd() { Calamares::GlobalStorage gs; + + const QString extraEditor( "notepad++" ); const QString topKey( "packageOperations" ); Calamares::ModuleSystem::InstanceKey k( "this", "that" ); + Calamares::ModuleSystem::InstanceKey otherInstance( "this", "other" ); + + QFETCH( QStringList, packages ); + QVERIFY( !packages.contains( extraEditor ) ); + + { + QVERIFY( !gs.contains( topKey ) ); + QVERIFY( + CalamaresUtils::Packages::setGSPackageAdditions( &gs, k, QVariant( packages ).toList(), QVariantList() ) ); + QVERIFY( gs.contains( topKey ) ); + auto actionList = gs.value( topKey ).toList(); + QCOMPARE( actionList.length(), 1 ); + auto action = actionList[ 0 ].toMap(); + QVERIFY( action.contains( "install" ) ); + auto op = action[ "install" ].toList(); + QCOMPARE( op.length(), packages.length() ); + for ( const auto& s : qAsConst( packages ) ) + { + QVERIFY( op.contains( s ) ); + } + cDebug() << op; + } + { + QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( &gs, otherInstance, packages ) ); + QVERIFY( gs.contains( topKey ) ); + auto actionList = gs.value( topKey ).toList(); + QCOMPARE( actionList.length(), 2 ); // One for each instance key! + auto action = actionList[ 0 ].toMap(); + auto secondaction = actionList[ 1 ].toMap(); + auto op = action[ "install" ].toList(); + auto secondop = secondaction[ "install" ].toList(); + QCOMPARE( op, secondop ); + } + + { + // Replace one and expect differences + packages << extraEditor; + QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( &gs, otherInstance, packages ) ); + QVERIFY( gs.contains( topKey ) ); + auto actionList = gs.value( topKey ).toList(); + QCOMPARE( actionList.length(), 2 ); // One for each instance key! + for ( const auto& actionVariant : qAsConst( actionList ) ) + { + auto action = actionVariant.toMap(); + QVERIFY( action.contains( "install" ) ); + QVERIFY( action.contains( "source" ) ); + if ( action[ "source" ].toString() == otherInstance.toString() ) + { + auto op = action[ "install" ].toList(); + QCOMPARE( op.length(), packages.length() ); // changed from original length, though + for ( const auto& s : qAsConst( packages ) ) + { + QVERIFY( op.contains( s ) ); + } + } + else + { + // This is the "original" instance, so it's missing extraEditor + auto op = action[ "install" ].toList(); + QCOMPARE( op.length(), packages.length()-1 ); // changed from original length + QVERIFY( !op.contains( extraEditor ) ); + } + } + } +} - QVERIFY( !gs.contains( topKey ) ); - QVERIFY( - CalamaresUtils::Packages::setGSPackageAdditions( &gs, k, QVariantList { QString( "vim" ) }, QVariantList() ) ); - QVERIFY( gs.contains( topKey ) ); - auto actionList = gs.value( topKey ).toList(); - QCOMPARE( actionList.length(), 1 ); - auto action = actionList[ 0 ].toMap(); - QVERIFY( action.contains( "install" ) ); - auto op = action[ "install" ].toList(); - QCOMPARE( op.length(), 1 ); - cDebug() << op; - - QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( - &gs, k, QVariantList { QString( "vim" ), QString( "emacs" ) }, QVariantList() ) ); - QVERIFY( gs.contains( topKey ) ); - actionList = gs.value( topKey ).toList(); - QCOMPARE( actionList.length(), 1 ); - action = actionList[ 0 ].toMap(); - QVERIFY( action.contains( "install" ) ); - op = action[ "install" ].toList(); - QCOMPARE( op.length(), 2 ); - QCOMPARE( action[ "source" ].toString(), k.toString() ); - cDebug() << op; +void +PackagesTests::testAddMixed() +{ + Calamares::GlobalStorage gs; + + const QString extraEditor( "notepad++" ); + const QString topKey( "packageOperations" ); + Calamares::ModuleSystem::InstanceKey k( "this", "that" ); + Calamares::ModuleSystem::InstanceKey otherInstance( "this", "other" ); + + // Just one + { + QVERIFY( !gs.contains( topKey ) ); + QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( + &gs, k, QVariantList { QString( "vim" ) }, QVariantList() ) ); + QVERIFY( gs.contains( topKey ) ); + auto actionList = gs.value( topKey ).toList(); + QCOMPARE( actionList.length(), 1 ); + auto action = actionList[ 0 ].toMap(); + QVERIFY( action.contains( "install" ) ); + auto op = action[ "install" ].toList(); + QCOMPARE( op.length(), 1 ); + QCOMPARE( op[ 0 ], QString( "vim" ) ); + cDebug() << op; + } + + // Replace with two packages + { + QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( + &gs, k, QVariantList { QString( "vim" ), QString( "emacs" ) }, QVariantList() ) ); + QVERIFY( gs.contains( topKey ) ); + auto actionList = gs.value( topKey ).toList(); + QCOMPARE( actionList.length(), 1 ); + auto action = actionList[ 0 ].toMap(); + QVERIFY( action.contains( "install" ) ); + auto op = action[ "install" ].toList(); + QCOMPARE( op.length(), 2 ); + QCOMPARE( action[ "source" ].toString(), k.toString() ); + QVERIFY( op.contains( QString( "vim" ) ) ); + QVERIFY( op.contains( QString( "emacs" ) ) ); + cDebug() << op; + } + + // Replace with one (different) package + { + QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( + &gs, k, QVariantList { QString( "nano" ) }, QVariantList() ) ); + QVERIFY( gs.contains( topKey ) ); + auto actionList = gs.value( topKey ).toList(); + QCOMPARE( actionList.length(), 1 ); + auto action = actionList[ 0 ].toMap(); + QVERIFY( action.contains( "install" ) ); + auto op = action[ "install" ].toList(); + QCOMPARE( op.length(), 1 ); + QCOMPARE( action[ "source" ].toString(), k.toString() ); + QCOMPARE( op[ 0 ], QString( "nano" ) ); + cDebug() << op; + } + + // Now we have two sources + { + QVERIFY( CalamaresUtils::Packages::setGSPackageAdditions( &gs, otherInstance, QStringList( extraEditor ) ) ); + QVERIFY( gs.contains( topKey ) ); + auto actionList = gs.value( topKey ).toList(); + QCOMPARE( actionList.length(), 2 ); + + for ( const auto& actionVariant : qAsConst( actionList ) ) + { + auto action = actionVariant.toMap(); + QVERIFY( action.contains( "install" ) ); + QVERIFY( action.contains( "source" ) ); + if ( action[ "source" ].toString() == otherInstance.toString() ) + { + auto op = action[ "install" ].toList(); + QCOMPARE( op.length(), 1 ); + QVERIFY( + op.contains( action[ "source" ] == otherInstance.toString() ? extraEditor : QString( "nano" ) ) ); + } + } + } } From 61557cf80539f6cfd50b7867b1511dbe5929bb48 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 12:41:50 +0200 Subject: [PATCH 103/492] [packagechooser] Connect UI to model The model needs to be attached to the widget; because of changes in the order that widget() and setConfigurationMap() are called, the model is created earlier, but needs to be connected later. --- src/modules/packagechooser/Config.cpp | 1 + src/modules/packagechooser/PackageChooserViewStep.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index 0a0358c6b0..a3467b553c 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -169,6 +169,7 @@ fillModel( PackageListModel* model, const QVariantList& items ) model->addPackage( PackageItem( item_map ) ); } } + cDebug() << Logger::SubEntry << "Loaded PackageChooser with" << model->packageCount() << "entries."; } void diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp index a15fd0f55c..67e67495d0 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.cpp +++ b/src/modules/packagechooser/PackageChooserViewStep.cpp @@ -71,6 +71,7 @@ PackageChooserViewStep::widget() connect( m_widget, &PackageChooserPage::selectionChanged, [=]() { emit nextStatusChanged( this->isNextEnabled() ); } ); + hookupModel(); } return m_widget; } From 192d307d39d59d6a96adb084612a50d1564e640d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 12:48:25 +0200 Subject: [PATCH 104/492] [netinstall] Warnings-- for unused variable --- src/modules/netinstall/Tests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index 9f38f6fbf3..df5d5ad609 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -392,7 +392,7 @@ ItemTests::testUrlFallback() QVERIFY( map.count() > 0 ); c.setConfigurationMap( map ); } - catch ( YAML::Exception& e ) + catch ( YAML::Exception& ) { bool badYaml = true; QVERIFY( !badYaml ); From 7521be3c5fca53e8318585114ec24c73aa949fd7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 18:03:24 +0200 Subject: [PATCH 105/492] [libcalamares] Add find() to namedenumtable that takes a default value --- src/libcalamares/utils/NamedEnum.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/libcalamares/utils/NamedEnum.h b/src/libcalamares/utils/NamedEnum.h index 1d839ddc46..1462cc0ff1 100644 --- a/src/libcalamares/utils/NamedEnum.h +++ b/src/libcalamares/utils/NamedEnum.h @@ -174,6 +174,22 @@ struct NamedEnumTable return table.begin()->second; } + /** @brief Find a name @p s in the table. + * + * Searches case-insensitively. + * + * If the name @p s is not found, the value @p d is returned as + * a default. Otherwise the value corresponding to @p s is returned. + * This is a shortcut over find() using a bool to distinguish + * successful and unsuccesful lookups. + */ + enum_t find( const string_t& s, enum_t d ) const + { + bool ok = false; + enum_t e = find( s, ok ); + return ok ? e : d; + } + /** @brief Find a value @p s in the table and return its name. * * If @p s is an enum value in the table, return the corresponding From 6ce1a49f1cf9849d48065e66b3f2898c358df2d8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 21:46:46 +0200 Subject: [PATCH 106/492] [packagechooser] Store *method* configuration in Config object --- src/modules/packagechooser/Config.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index a3467b553c..b0336fccbd 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -92,17 +92,19 @@ void Config::updateGlobalStorage( const QStringList& selected ) const { QString key = QStringLiteral( "packagechooser_%1" ).arg( m_id ); + cDebug() << "Writing to GS" << key; if ( m_method == PackageChooserMethod::Legacy ) { QString value = selected.join( ',' ); Calamares::JobQueue::instance()->globalStorage()->insert( key, value ); - cDebug() << "PackageChooser" << key << "selected" << value; + cDebug() << Logger::SubEntry << "PackageChooser" << key << "selected" << value; } else if ( m_method == PackageChooserMethod::Packages ) { QStringList packageNames = m_model->getInstallPackagesForNames( selected ); + cDebug() << Logger::SubEntry << "Got packages" << packageNames; CalamaresUtils::Packages::setGSPackageAdditions( Calamares::JobQueue::instance()->globalStorage(), m_defaultId, packageNames ); } @@ -175,21 +177,14 @@ fillModel( PackageListModel* model, const QVariantList& items ) void Config::setConfigurationMap( const QVariantMap& configurationMap ) { - QString mode = CalamaresUtils::getString( configurationMap, "mode" ); - bool mode_ok = false; - if ( !mode.isEmpty() ) - { - m_mode = packageChooserModeNames().find( mode, mode_ok ); - } - if ( !mode_ok ) - { - m_mode = PackageChooserMode::Required; - } + m_mode = packageChooserModeNames().find( CalamaresUtils::getString( configurationMap, "mode" ), PackageChooserMode::Required ); + m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ), PackageChooserMethod::Legacy ); m_id = CalamaresUtils::getString( configurationMap, "id" ); if ( m_id.isEmpty() ) { m_id = m_defaultId.id(); + cDebug() << "Using default ID" << m_id << "from" << m_defaultId.toString(); } m_defaultModelIndex = QModelIndex(); From aa3633e43a654ae3115f88b46bf783bd4ec7e17f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 22:04:15 +0200 Subject: [PATCH 107/492] [packagechooser] Delay initialization of default Id When the module is loaded and the viewstep created, it doesn't have a module Id **yet**. That is set after reading more of the configuration file. It **is** set by the time setConfigurationMap() is called, so pass it on to the Config object then. This means that packagechooser modules can skip the *id* config key and use the module Id. --- src/modules/packagechooser/Config.cpp | 31 ++++++++++++------- src/modules/packagechooser/Config.h | 10 +++++- .../packagechooser/PackageChooserViewStep.cpp | 3 +- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index b0336fccbd..531d285ed4 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -51,11 +51,10 @@ PackageChooserMethodNames() return names; } -Config::Config( const Calamares::ModuleSystem::InstanceKey& defaultId, QObject* parent ) +Config::Config( QObject* parent ) : Calamares::ModuleSystem::Config( parent ) , m_model( new PackageListModel( this ) ) , m_mode( PackageChooserMode::Required ) - , m_defaultId( defaultId ) { } @@ -91,7 +90,7 @@ Config::introductionPackage() const void Config::updateGlobalStorage( const QStringList& selected ) const { - QString key = QStringLiteral( "packagechooser_%1" ).arg( m_id ); + const QString& key = m_id; cDebug() << "Writing to GS" << key; if ( m_method == PackageChooserMethod::Legacy ) @@ -177,24 +176,34 @@ fillModel( PackageListModel* model, const QVariantList& items ) void Config::setConfigurationMap( const QVariantMap& configurationMap ) { - m_mode = packageChooserModeNames().find( CalamaresUtils::getString( configurationMap, "mode" ), PackageChooserMode::Required ); - m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ), PackageChooserMethod::Legacy ); + m_mode = packageChooserModeNames().find( CalamaresUtils::getString( configurationMap, "mode" ), + PackageChooserMode::Required ); + m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ), + PackageChooserMethod::Legacy ); - m_id = CalamaresUtils::getString( configurationMap, "id" ); - if ( m_id.isEmpty() ) { - m_id = m_defaultId.id(); - cDebug() << "Using default ID" << m_id << "from" << m_defaultId.toString(); + const QString configId = CalamaresUtils::getString( configurationMap, "id" ); + if ( configId.isEmpty() ) + { + m_id = m_defaultId.toString(); + if ( m_id.isEmpty() ) + { + m_id = QString( "packagechooser" ); + } + cDebug() << "Using default ID" << m_id << "from" << m_defaultId.toString(); + } + else + { + m_id = QStringLiteral( "packagechooser_" ) + configId; + } } - m_defaultModelIndex = QModelIndex(); if ( configurationMap.contains( "items" ) ) { fillModel( m_model, configurationMap.value( "items" ).toList() ); } QString default_item_id = CalamaresUtils::getString( configurationMap, "default" ); - // find default item if ( !default_item_id.isEmpty() ) { for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n ) diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h index d07b4a0107..4cb545cb86 100644 --- a/src/modules/packagechooser/Config.h +++ b/src/modules/packagechooser/Config.h @@ -40,9 +40,17 @@ class Config : public Calamares::ModuleSystem::Config Q_OBJECT public: - Config( const Calamares::ModuleSystem::InstanceKey& defaultId, QObject* parent = nullptr ); + Config( QObject* parent = nullptr ); ~Config() override; + /** @brief Sets the default Id for this Config + * + * The default Id is the (owning) module identifier for the config, + * and it is used when the Id read from the config file is empty. + * The **usual** configuration when using method *packages* is + * to rely on the default Id. + */ + void setDefaultId( const Calamares::ModuleSystem::InstanceKey& defaultId ) { m_defaultId = defaultId; } void setConfigurationMap( const QVariantMap& ) override; PackageChooserMode mode() const { return m_mode; } diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp index 67e67495d0..53912ef36f 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.cpp +++ b/src/modules/packagechooser/PackageChooserViewStep.cpp @@ -37,7 +37,7 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserViewStepFactory, registerPlug PackageChooserViewStep::PackageChooserViewStep( QObject* parent ) : Calamares::ViewStep( parent ) - , m_config( new Config( moduleInstanceKey(), this ) ) + , m_config( new Config( this ) ) , m_widget( nullptr ) , m_stepName( nullptr ) { @@ -146,6 +146,7 @@ PackageChooserViewStep::jobs() const void PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { + m_config->setDefaultId( moduleInstanceKey() ); m_config->setConfigurationMap( configurationMap ); bool labels_ok = false; From f4fe0881b9d068e8c2b6924482e0b1350cfc32f7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 22:29:26 +0200 Subject: [PATCH 108/492] [packagechooser] Be more clear on the resulting GS keys - in legacy mode, *id* can have an effect and leads to "packagechooser_"; if unset, uses the the module instance id instead, still as "packagechooser_". - in packages mode, *id* is not used and only the whole module Id (generally, "packagechooser@") is used, but in packages mode there's no need for other packages to mess with GS settings for this packagechooser. --- src/modules/packagechooser/Config.cpp | 25 +++++++++++-------- .../packagechooser/packagechooser.conf | 6 +++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index 531d285ed4..de5cb0813e 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -90,20 +90,16 @@ Config::introductionPackage() const void Config::updateGlobalStorage( const QStringList& selected ) const { - const QString& key = m_id; - cDebug() << "Writing to GS" << key; - if ( m_method == PackageChooserMethod::Legacy ) { QString value = selected.join( ',' ); - Calamares::JobQueue::instance()->globalStorage()->insert( key, value ); - - cDebug() << Logger::SubEntry << "PackageChooser" << key << "selected" << value; + Calamares::JobQueue::instance()->globalStorage()->insert( m_id, value ); + cDebug() << m_id<< "selected" << value; } else if ( m_method == PackageChooserMethod::Packages ) { QStringList packageNames = m_model->getInstallPackagesForNames( selected ); - cDebug() << Logger::SubEntry << "Got packages" << packageNames; + cDebug() << m_defaultId << "packages to install" << packageNames; CalamaresUtils::Packages::setGSPackageAdditions( Calamares::JobQueue::instance()->globalStorage(), m_defaultId, packageNames ); } @@ -181,20 +177,27 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ), PackageChooserMethod::Legacy ); + if ( m_method == PackageChooserMethod::Legacy ) { const QString configId = CalamaresUtils::getString( configurationMap, "id" ); + const QString base = QStringLiteral( "packagechooser_" ); if ( configId.isEmpty() ) { - m_id = m_defaultId.toString(); - if ( m_id.isEmpty() ) + if ( m_defaultId.id().isEmpty() ) + { + // We got nothing to work with + m_id = base; + } + else { - m_id = QString( "packagechooser" ); + m_id = base + m_defaultId.id(); } cDebug() << "Using default ID" << m_id << "from" << m_defaultId.toString(); } else { - m_id = QStringLiteral( "packagechooser_" ) + configId; + m_id = base + configId; + cDebug() << "Using configured ID" << m_id; } } diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf index 51032929e5..2bde1369ce 100644 --- a/src/modules/packagechooser/packagechooser.conf +++ b/src/modules/packagechooser/packagechooser.conf @@ -18,8 +18,8 @@ mode: required # has been made. The key is *packagechooser_*. Normally, the module's # instance name is used; see the *instances* section of `settings.conf`. # If there is just one packagechooser module, and no special instance is set, -# resulting GS key is probably *packagechooser_packagechooser*. -# You can set "id" to change that, but it is not recommended. +# resulting GS key is probably *packagechooser@packagechooser*. +# You can set *id* to change that, but it is not recommended. # # The GS value is a comma-separated list of the IDs of the selected # packages, or an empty string if none is selected. @@ -33,12 +33,14 @@ mode: required # consumption by the *packages* module (which should appear later # in the `exec` section. These package settings will then be handed # off to whatever package manager is configured there. +# The *id* key is not used. # # There is no need to put this module in the `exec` section. There # are no jobs that this module provides. You should put **other** # modules, either *contextualprocess* or *packages* or some custom # module, in the `exec` section to do the actual work. method: legacy +# The *id* key is used only in "legacy" mode # id: "" From 42888cece62045a20c7cf40bdf389d2be04bff81 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 22:49:26 +0200 Subject: [PATCH 109/492] Changes: document contributions and features --- CHANGES | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGES b/CHANGES index 9856bb7d0f..f3c6807860 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,7 @@ website will have to do for older versions. # 3.2.40 (unreleased) # This release contains contributions from (alphabetically by first name): + - Anubhav Choudhary - Erik Dubois - Joe Kamprad - Lisa Vitolo @@ -23,11 +24,20 @@ This release contains contributions from (alphabetically by first name): libcalamares to systematically mark filesystem (types) as "in use" or not. This, in turn, means that modules can depend on that information for other work (e.g. removing drivers for unused filesystems). #1635 + - The "upload log file" now has a configurable log-file-size. (Thanks Anubhav) ## Modules ## - *displaymanager* example configuration has been shuffled around a bit, for better results when the live image is running XFCE. Also lists more potential display managers. #1205 (Thanks Erik) + - The *netinstall* module can now fall back to alternative URLs when + loading groups data. The first URL to yield a non-empty groups + collection is accepted. No changes are needed in the configuration. #1673 + - *packagechooser* can now integrate with the *packages* module; that + means you can specify package names to install for a given selection, + and the regular package-installation mechanism will take care of it. + Legacy configurations that use *contextualprocess* are still supported. + See the `packagechooser.conf` file for details. #1550 - A long-neglected pull request from Lisa Vitolo for the *partition* module -- allowing to set filesystem labels during manual partitioning -- has been revived and merged. From f024cb737020220bdd08a76e867905e2cd8bb034 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 23:01:28 +0200 Subject: [PATCH 110/492] [packages] Document and add new key to schema FIXES #1676 --- src/modules/packages/packages.conf | 19 ++++++++++++++++++- src/modules/packages/packages.schema.yaml | 1 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/modules/packages/packages.conf b/src/modules/packages/packages.conf index 3c478fe207..49fdbb6d6a 100644 --- a/src/modules/packages/packages.conf +++ b/src/modules/packages/packages.conf @@ -1,13 +1,30 @@ # SPDX-FileCopyrightText: no # SPDX-License-Identifier: CC0-1.0 # +# The configuration for the package manager starts with the +# *backend* key, which picks one of the backends to use. +# In `main.py` there is a base class `PackageManager`. +# Implementations must subclass that and set a (class-level) +# property *backend* to the name of the backend (e.g. "dummy"). +# That property is used to match against the *backend* key here. +# +# You will have to add such a class for your package manager. +# It is fairly simple Python code. The API is described in the +# abstract methods in class `PackageManager`. Mostly, the only +# trick is to figure out the correct commands to use, and in particular, +# whether additional switches are required or not. Some package managers +# have more installer-friendly defaults than others, e.g., DNF requires +# passing --disablerepo=* -C to allow removing packages without Internet +# connectivity, and it also returns an error exit code if the package did +# not exist to begin with. --- # # Which package manager to use, options are: # - apk - Alpine Linux package manager # - apt - APT frontend for DEB and RPM # - dnf - DNF, the new RPM frontend -# - entropy - Sabayon package manager +# - entropy - Sabayon package manager (is being deprecated) +# - luet - Sabayon package manager (next-gen) # - packagekit - PackageKit CLI tool # - pacman - Pacman # - pamac - Manjaro package manager diff --git a/src/modules/packages/packages.schema.yaml b/src/modules/packages/packages.schema.yaml index 10eb9808a7..989bf11ddc 100644 --- a/src/modules/packages/packages.schema.yaml +++ b/src/modules/packages/packages.schema.yaml @@ -13,6 +13,7 @@ properties: - apt - dnf - entropy + - luet - packagekit - pacman - pamac From cd7d109114405c90773ef1e49bc7d705511c0ad1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 23:04:51 +0200 Subject: [PATCH 111/492] [packages] Fix trivial indent problem --- src/modules/packages/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index ac4801fb37..c3cc2ad7d0 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -255,7 +255,8 @@ def update_system(self): # Doesn't need to update the system explicitly pass - class PMLuet(PackageManager): + +class PMLuet(PackageManager): backend = "luet" def install(self, pkgs, from_local=False): @@ -270,7 +271,7 @@ def update_db(self): def update_system(self): check_target_env_call(["luet", "upgrade", "-y"]) - + class PMPackageKit(PackageManager): backend = "packagekit" From fb6e65613ba2c9a0d09994d5930a5cb4d6d5822e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Apr 2021 23:11:06 +0200 Subject: [PATCH 112/492] Changes: document contributors --- CHANGES | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index f3c6807860..b817354c3e 100644 --- a/CHANGES +++ b/CHANGES @@ -10,10 +10,11 @@ website will have to do for older versions. # 3.2.40 (unreleased) # This release contains contributions from (alphabetically by first name): - - Anubhav Choudhary + - Anubhav Choudhary (SoK success!) - Erik Dubois + - Jerrod Frost (new contributor! welcome!) - Joe Kamprad - - Lisa Vitolo + - Lisa Vitolo (blast from the past!) ## Core ## - The CMake modules for consumption by external modules (e.g. the From eee536046b40cad6a14ce6e1aebcf453d1679c97 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 24 Apr 2021 17:40:37 +0200 Subject: [PATCH 113/492] [packagechooser] Sanitize includes - build was broken due to AppStream moving around - unnecessary includes - change name HAVE_XML -> HAVE_APPDATA for meaning --- src/modules/packagechooser/CMakeLists.txt | 2 +- src/modules/packagechooser/Config.cpp | 9 ++++++++- src/modules/packagechooser/PackageChooserViewStep.cpp | 10 ---------- src/modules/packagechooser/Tests.cpp | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt index e6c2c5b1df..f08658037c 100644 --- a/src/modules/packagechooser/CMakeLists.txt +++ b/src/modules/packagechooser/CMakeLists.txt @@ -15,7 +15,7 @@ option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" if ( WITH_APPDATA ) find_package(Qt5 COMPONENTS Xml) if ( Qt5Xml_FOUND ) - add_definitions( -DHAVE_XML ) + add_definitions( -DHAVE_APPDATA ) list( APPEND _extra_libraries Qt5::Xml ) list( APPEND _extra_src ItemAppData.cpp ) endif() diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index de5cb0813e..106ae4538f 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -9,10 +9,17 @@ #include "Config.h" -#ifdef HAVE_XML +#ifdef HAVE_APPDATA #include "ItemAppData.h" #endif +#ifdef HAVE_APPSTREAM +#include "ItemAppStream.h" +#include +#include +#endif + + #include "GlobalStorage.h" #include "JobQueue.h" #include "packages/Globals.h" diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp index 53912ef36f..9057004de0 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.cpp +++ b/src/modules/packagechooser/PackageChooserViewStep.cpp @@ -13,16 +13,6 @@ #include "PackageChooserPage.h" #include "PackageModel.h" -#ifdef HAVE_XML -#include "ItemAppData.h" -#endif - -#ifdef HAVE_APPSTREAM -#include "ItemAppStream.h" -#include -#include -#endif - #include "GlobalStorage.h" #include "JobQueue.h" #include "locale/TranslatableConfiguration.h" diff --git a/src/modules/packagechooser/Tests.cpp b/src/modules/packagechooser/Tests.cpp index c303f04884..1365b14524 100644 --- a/src/modules/packagechooser/Tests.cpp +++ b/src/modules/packagechooser/Tests.cpp @@ -9,7 +9,7 @@ #include "Tests.h" -#ifdef HAVE_XML +#ifdef HAVE_APPDATA #include "ItemAppData.h" #endif #ifdef HAVE_APPSTREAM From e6568667c4e8944d14b446154267da00bdbac496 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 24 Apr 2021 17:40:37 +0200 Subject: [PATCH 114/492] [packagechooser] Sanitize includes - build was broken due to AppStream moving around - unnecessary includes - change name HAVE_XML -> HAVE_APPDATA for meaning --- src/modules/packagechooser/CMakeLists.txt | 2 +- src/modules/packagechooser/Config.cpp | 9 ++++++++- src/modules/packagechooser/PackageChooserViewStep.cpp | 10 ---------- src/modules/packagechooser/Tests.cpp | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt index e6c2c5b1df..f08658037c 100644 --- a/src/modules/packagechooser/CMakeLists.txt +++ b/src/modules/packagechooser/CMakeLists.txt @@ -15,7 +15,7 @@ option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" if ( WITH_APPDATA ) find_package(Qt5 COMPONENTS Xml) if ( Qt5Xml_FOUND ) - add_definitions( -DHAVE_XML ) + add_definitions( -DHAVE_APPDATA ) list( APPEND _extra_libraries Qt5::Xml ) list( APPEND _extra_src ItemAppData.cpp ) endif() diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index de5cb0813e..106ae4538f 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -9,10 +9,17 @@ #include "Config.h" -#ifdef HAVE_XML +#ifdef HAVE_APPDATA #include "ItemAppData.h" #endif +#ifdef HAVE_APPSTREAM +#include "ItemAppStream.h" +#include +#include +#endif + + #include "GlobalStorage.h" #include "JobQueue.h" #include "packages/Globals.h" diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp index 53912ef36f..9057004de0 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.cpp +++ b/src/modules/packagechooser/PackageChooserViewStep.cpp @@ -13,16 +13,6 @@ #include "PackageChooserPage.h" #include "PackageModel.h" -#ifdef HAVE_XML -#include "ItemAppData.h" -#endif - -#ifdef HAVE_APPSTREAM -#include "ItemAppStream.h" -#include -#include -#endif - #include "GlobalStorage.h" #include "JobQueue.h" #include "locale/TranslatableConfiguration.h" diff --git a/src/modules/packagechooser/Tests.cpp b/src/modules/packagechooser/Tests.cpp index c303f04884..1365b14524 100644 --- a/src/modules/packagechooser/Tests.cpp +++ b/src/modules/packagechooser/Tests.cpp @@ -9,7 +9,7 @@ #include "Tests.h" -#ifdef HAVE_XML +#ifdef HAVE_APPDATA #include "ItemAppData.h" #endif #ifdef HAVE_APPSTREAM From 1a3dc7d38629899b79aef86bcc128786547bced4 Mon Sep 17 00:00:00 2001 From: Emmanuel Arias Date: Sat, 1 May 2021 20:58:30 -0300 Subject: [PATCH 115/492] Fix minor Typo on README a `)` is missing. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21c393e294..e7e165a814 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ The dependencies are explained in [CONTRIBUTING.md](CONTRIBUTING.md). Calamares welcomes PRs. New issues are welcome, too. There are both the Calamares **core** repository (this one), -and an *extensions** repository ([Calamares extensions](https://github.com/calamares/calamares-extensions). +and an *extensions** repository ([Calamares extensions])(https://github.com/calamares/calamares-extensions). Contributions to code, modules, documentation, the wiki and the website are all welcome. There is more information in the [CONTRIBUTING.md](CONTRIBUTING.md) file. From 97184dc498ae63ff856671be32b50879da1a1882 Mon Sep 17 00:00:00 2001 From: Emmanuel Arias Date: Sun, 2 May 2021 12:43:11 -0300 Subject: [PATCH 116/492] Fix md link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e7e165a814..464fbc1b34 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ The dependencies are explained in [CONTRIBUTING.md](CONTRIBUTING.md). Calamares welcomes PRs. New issues are welcome, too. There are both the Calamares **core** repository (this one), -and an *extensions** repository ([Calamares extensions])(https://github.com/calamares/calamares-extensions). +and an *extensions** repository ([Calamares extensions](https://github.com/calamares/calamares-extensions)). Contributions to code, modules, documentation, the wiki and the website are all welcome. There is more information in the [CONTRIBUTING.md](CONTRIBUTING.md) file. From 4543feccca2ae5e83216b9acfa066155f330e1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Fri, 7 May 2021 15:44:25 +0200 Subject: [PATCH 117/492] [displaymanager] add ukui --- src/modules/displaymanager/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index edb4d12421..ef34e929f0 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -197,6 +197,7 @@ def update_from_desktop_file(self, root_mount_point): DesktopEnvironment('/usr/bin/icewm-session', 'icewm-session'), DesktopEnvironment('/usr/bin/fvwm3', 'fvwm3'), DesktopEnvironment('/usr/bin/sway', 'sway'), + DesktopEnvironment('/usr/bin/ukui-session', 'ukui'), ] From da2fff12564108e731d6558891d658a93d4f8e29 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 2 May 2021 21:08:58 +0200 Subject: [PATCH 118/492] Changes: credits --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index b817354c3e..f678ecd68f 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,7 @@ website will have to do for older versions. This release contains contributions from (alphabetically by first name): - Anubhav Choudhary (SoK success!) + - Emmanuel Arias (new contributor! welcome!) - Erik Dubois - Jerrod Frost (new contributor! welcome!) - Joe Kamprad From 5d577371e70c5e443241d68ca94cb51509ded8d0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 10 May 2021 21:49:54 +0200 Subject: [PATCH 119/492] [welcome] Name widgets for styling Widgets are easier to style if they have a name, and easier to spot in the widget tree as well. Give the requirements-checker parts meaningful names. SEE #1685 --- src/modules/welcome/checker/CheckerContainer.cpp | 1 + src/modules/welcome/checker/ResultWidget.cpp | 7 +++++-- src/modules/welcome/checker/ResultsListWidget.cpp | 9 ++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/modules/welcome/checker/CheckerContainer.cpp b/src/modules/welcome/checker/CheckerContainer.cpp index eb3416ce50..860857c3c8 100644 --- a/src/modules/welcome/checker/CheckerContainer.cpp +++ b/src/modules/welcome/checker/CheckerContainer.cpp @@ -64,6 +64,7 @@ CheckerContainer::requirementsComplete( bool ok ) m_waitingWidget = nullptr; // Don't delete in destructor m_checkerWidget = new ResultsListWidget( m_model, this ); + m_checkerWidget->setObjectName( "requirementsChecker" ); layout()->addWidget( m_checkerWidget ); m_verdict = ok; diff --git a/src/modules/welcome/checker/ResultWidget.cpp b/src/modules/welcome/checker/ResultWidget.cpp index ef3a7fdc18..6e34a6c36e 100644 --- a/src/modules/welcome/checker/ResultWidget.cpp +++ b/src/modules/welcome/checker/ResultWidget.cpp @@ -29,11 +29,14 @@ ResultWidget::ResultWidget( bool satisfied, bool required, QWidget* parent ) setLayout( mainLayout ); m_iconLabel = new QLabel( this ); - mainLayout->addWidget( m_iconLabel ); m_iconLabel->setFixedSize( CalamaresUtils::defaultIconSize() ); + m_iconLabel->setObjectName( "resultIcon" ); + mainLayout->addWidget( m_iconLabel ); + m_textLabel = new QLabel( this ); - mainLayout->addWidget( m_textLabel ); m_textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); + m_textLabel->setObjectName( "resultText" ); + mainLayout->addWidget( m_textLabel ); if ( satisfied ) { diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp index c04d2a48b9..a7c5caf49c 100644 --- a/src/modules/welcome/checker/ResultsListWidget.cpp +++ b/src/modules/welcome/checker/ResultsListWidget.cpp @@ -52,9 +52,12 @@ createResultWidgets( QLayout* layout, continue; } + const QString checkName = model.data( index, Calamares::RequirementsModel::Name ).toString(); const bool is_satisfied = model.data( index, Calamares::RequirementsModel::Satisfied ).toBool(); const bool is_mandatory = model.data( index, Calamares::RequirementsModel::Mandatory ).toBool(); ResultWidget* ciw = new ResultWidget( is_satisfied, is_mandatory ); + ciw->setObjectName( checkName ); + layout->addWidget( ciw ); ciw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); @@ -105,6 +108,7 @@ ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, auto* entriesLayout = new QVBoxLayout; m_title = new QLabel( this ); + m_title->setObjectName( "resultDialogTitle" ); createResultWidgets( entriesLayout, m_resultWidgets, model, []( const Calamares::RequirementsModel& m, QModelIndex i ) { @@ -112,6 +116,7 @@ ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, } ); QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this ); + buttonBox->setObjectName( "resultDialogButtons" ); mainLayout->addWidget( m_title ); mainLayout->addLayout( entriesLayout ); @@ -168,6 +173,7 @@ ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel& model, m_explanation->setWordWrap( true ); m_explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); m_explanation->setOpenExternalLinks( false ); + m_explanation->setObjectName( "resultsExplanation" ); connect( m_explanation, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked ); entriesLayout->addWidget( m_explanation ); @@ -208,9 +214,10 @@ ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel& model, } imageLabel->setContentsMargins( 4, CalamaresUtils::defaultFontHeight() * 3 / 4, 4, 4 ); - mainLayout->addWidget( imageLabel ); imageLabel->setAlignment( Qt::AlignCenter ); imageLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); + imageLabel->setObjectName( "welcomeLogo" ); + mainLayout->addWidget( imageLabel ); } } m_explanation->setAlignment( Qt::AlignCenter ); From 27f965deb6ea49d81ded02c7bfec705792990a78 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 10 May 2021 21:55:21 +0200 Subject: [PATCH 120/492] [summary] Name widgets for styling --- src/modules/summary/SummaryPage.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp index 3dd797be01..b56793e7ea 100644 --- a/src/modules/summary/SummaryPage.cpp +++ b/src/modules/summary/SummaryPage.cpp @@ -44,6 +44,7 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent ) layout->setContentsMargins( 0, 0, 0, 0 ); QLabel* headerLabel = new QLabel( this ); + headerLabel->setObjectName( "summaryTitle" ); CALAMARES_RETRANSLATE( if ( Calamares::Settings::instance()->isSetupMode() ) headerLabel->setText( tr( "This is an overview of what will happen once you start " "the setup procedure." ) ); @@ -169,6 +170,7 @@ QLabel* SummaryPage::createTitleLabel( const QString& text ) const { QLabel* label = new QLabel( text ); + label->setObjectName( "summaryItemTitle" ); QFont fnt = font(); fnt.setWeight( QFont::Light ); fnt.setPointSize( CalamaresUtils::defaultFontSize() * 2 ); @@ -182,6 +184,7 @@ QLabel* SummaryPage::createBodyLabel( const QString& text ) const { QLabel* label = new QLabel; + label->setObjectName( "summaryItemBody" ); label->setMargin( CalamaresUtils::defaultFontHeight() / 2 ); QPalette pal( palette() ); pal.setColor( WindowBackground, palette().window().color().lighter( 108 ) ); From a888156debbe7a5f0db33c5ac2a457e668fe8283 Mon Sep 17 00:00:00 2001 From: Raul Rodrigo Segura Date: Wed, 12 May 2021 16:20:13 +0200 Subject: [PATCH 121/492] copy resolvconf as link --- src/modules/networkcfg/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py index 608cfd2889..40d1530317 100644 --- a/src/modules/networkcfg/main.py +++ b/src/modules/networkcfg/main.py @@ -59,7 +59,7 @@ def run(): continue try: - shutil.copy(source_network, target_network) + shutil.copy(source_network, target_network, follow_symlinks=False) except FileNotFoundError: libcalamares.utils.debug( "Can't copy network configuration files in " @@ -80,7 +80,7 @@ def run(): ) try: - shutil.copy(source_resolv, target_resolv) + shutil.copy(source_resolv, target_resolv, follow_symlinks=False) except Exception as err: libcalamares.utils.debug( "Can't copy resolv.conf from {}: {}".format(source_resolv, err) From a4ad4404039ba9ea67976f2e3a33bf27cfc22d3f Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 14 May 2021 17:49:45 +0200 Subject: [PATCH 122/492] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_en_GB.ts | 2 +- lang/calamares_fr.ts | 375 ++-- lang/calamares_he.ts | 24 +- lang/calamares_pl.ts | 23 +- lang/calamares_ru_RU.ts | 4279 +++++++++++++++++++++++++++++++++++++++ lang/calamares_sk.ts | 10 +- lang/calamares_sv.ts | 2 +- lang/calamares_zh_CN.ts | 18 +- 8 files changed, 4529 insertions(+), 204 deletions(-) create mode 100644 lang/calamares_ru_RU.ts diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 286894d8ad..524a8435be 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Manage auto-mount settings diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 5b44eb61fd..6f2c1c1f71 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Gérer les paramètres de montage automatique @@ -42,7 +42,7 @@ System Partition - Partition Système + Partition système @@ -99,27 +99,27 @@ Interface: - Interface: + Interface : Crashes Calamares, so that Dr. Konqui can look at it. - + Crashes Calamares, pour que le Dr. Konqui puisse les regarder. Reloads the stylesheet from the branding directory. - + Recharge la feuille de style à partir du répertoire de personnalisation. Uploads the session log to the configured pastebin. - + Télécharge le journal de session dans le pastebin configuré. Send Session Log - + Envoyer le journal de session @@ -129,12 +129,12 @@ Displays the tree of widget names in the log (for stylesheet debugging). - + Affiche l'arborescence des noms de widgets dans le journal (pour le débogage de la feuille de style). Widget Tree - Arbre de Widget + Arbre de widget @@ -338,7 +338,11 @@ %1 Link copied to clipboard - + Journal d'installation publié sur + +%1 + +Lien copié dans le presse-papiers @@ -353,7 +357,7 @@ Link copied to clipboard <br/>The following modules could not be loaded: - Les modules suivants n'ont pas pu être chargés : + <br/>Les modules suivants n'ont pas pu être chargés : @@ -519,7 +523,7 @@ L'installateur se fermera et les changements seront perdus. Select storage de&vice: - Sélectionnez le support de sto&ckage : + Sélectionner le support de sto&ckage : @@ -532,7 +536,7 @@ L'installateur se fermera et les changements seront perdus. After: - Après: + Après : @@ -547,17 +551,17 @@ L'installateur se fermera et les changements seront perdus. <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - <strong>Sélectionnez une partition à réduire, puis faites glisser la barre du bas pour redimensionner</strong> + <strong>Sélectionner une partition à réduire, puis faites glisser la barre du bas pour redimensionner</strong> %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - %1 va être réduit à %2Mio et une nouvelle partition de %3Mio va être créée pour %4. + %1 va être réduit à %2 Mio et une nouvelle partition de %3 Mio va être créée pour %4. Boot loader location: - Emplacement du chargeur de démarrage: + Emplacement du chargeur de démarrage : @@ -764,12 +768,12 @@ L'installateur se fermera et les changements seront perdus. Network Installation. (Disabled: Internal error) - + Installation réseau. (Désactivé : erreur interne) Network Installation. (Disabled: No package list) - + Installation réseau. (Désactivé : pas de liste de paquets) @@ -779,7 +783,7 @@ L'installateur se fermera et les changements seront perdus. Network Installation. (Disabled: Unable to fetch package lists, check your network connection) - Installation par le réseau (Désactivée : impossible de récupérer leslistes de paquets, vérifiez la connexion réseau) + Installation par le réseau (Désactivée : impossible de récupérer les listes de paquets, vérifier la connexion réseau) @@ -884,12 +888,12 @@ L'installateur se fermera et les changements seront perdus. The setup of %1 did not complete successfully. - + La configuration de %1 n'a pas abouti. The installation of %1 did not complete successfully. - + L’installation de %1 n’a pas abouti. @@ -955,7 +959,7 @@ L'installateur se fermera et les changements seront perdus. Fi&le System: - Sy&stème de fichiers: + Sy&stème de fichiers : @@ -965,12 +969,12 @@ L'installateur se fermera et les changements seront perdus. &Mount Point: - Point de &Montage : + Point de &montage : Flags: - Drapeaux: + Drapeaux : @@ -1003,32 +1007,32 @@ L'installateur se fermera et les changements seront perdus. Create new %1MiB partition on %3 (%2) with entries %4. - + Créer une nouvelle partition %1 Mio sur %3 (%2) avec les entrées %4. Create new %1MiB partition on %3 (%2). - + Créer une nouvelle partition %1 Mio sur %3 (%2). Create new %2MiB partition on %4 (%3) with file system %1. - Créer une nouvelle partition de %2Mio sur %4 (%3) avec le système de fichier %1. + Créer une nouvelle partition de %2 Mio sur %4 (%3) avec le système de fichier %1. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Créer une nouvelle partition <strong>%1 Mio</strong> sur <strong>%3</strong> (%2) avec les entrées <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Créer une nouvelle partition <strong>%1 Mio</strong> sur <strong>%3</strong> (%2). Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. - Créer une nouvelle partition de <strong>%2Mio</strong> sur <strong>%4</strong> (%3) avec le système de fichiers <strong>%1</strong>. + Créer une nouvelle partition de <strong>%2 Mio</strong> sur <strong>%4</strong> (%3) avec le système de fichiers <strong>%1</strong>. @@ -1132,7 +1136,7 @@ L'installateur se fermera et les changements seront perdus. Create Volume Group - Créer le Groupe de Volumes + Créer le groupe de volume @@ -1304,12 +1308,12 @@ L'installateur se fermera et les changements seront perdus. &Mount Point: - Point de &Montage : + Point de &montage : Si&ze: - Ta&ille: + Ta&ille : @@ -1319,12 +1323,12 @@ L'installateur se fermera et les changements seront perdus. Fi&le System: - Sys&tème de fichiers: + Sys&tème de fichiers : Flags: - Drapeaux: + Drapeaux : @@ -1347,18 +1351,18 @@ L'installateur se fermera et les changements seront perdus. Passphrase - Phrase de passe + Phrase secrète Confirm passphrase - Confirmez la phrase de passe + Confirmer la phrase secrète Please enter the same passphrase in both boxes. - Merci d'entrer la même phrase de passe dans les deux champs. + Merci d'entrer la même phrase secrète dans les deux champs. @@ -1371,7 +1375,7 @@ L'installateur se fermera et les changements seront perdus. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Installer %1 sur la <strong>nouvelle</strong> partition système %2 avec les fonctionnalités <em>%3</em> @@ -1381,27 +1385,27 @@ L'installateur se fermera et les changements seront perdus. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Configurer la <strong>nouvelle</strong> partition %2 avec le point de montage <strong>%1</strong> et les fonctionnalités <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Configurer la <strong>nouvelle</strong> partition %2 avec le point de montage <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Installer %2 sur la partition système %3 <strong>%1</strong> avec les fonctionnalités <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Configurer la partition %3 <strong>%1</strong> avec le point de montage <strong>%2</strong> et les fonctionnalités <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Configurer la partition %3 <strong>%1</strong> avec le point de montage <strong>%2</strong>%4. @@ -1590,7 +1594,7 @@ L'installateur se fermera et les changements seront perdus. OEM Batch Identifier - Identifiant de Lot OEM + Identifiant de lot OEM @@ -1745,7 +1749,7 @@ L'installateur se fermera et les changements seront perdus. URL: %1 - URL: %1 + URL : %1 @@ -1858,7 +1862,7 @@ L'installateur se fermera et les changements seront perdus. Root partition %1 is LUKS but no passphrase has been set. - La partition racine %1 est LUKS mais aucune passphrase n'a été configurée. + La partition racine %1 est LUKS mais aucune phrase secrète n'a été configurée. @@ -1901,8 +1905,9 @@ L'installateur se fermera et les changements seront perdus. Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. - Sélectionnez votre emplacement préféré sur la carte pour que l'installateur vous suggère les paramètres linguistiques et de fuseau horaire. Vous pouvez affiner les paramètres suggérés ci-dessous. Cherchez sur la carte en la faisant glisser -et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de la souris. + Sélectionner votre emplacement préféré sur la carte pour que l'installateur vous suggère + les paramètres linguistiques et de fuseau horaire. Vous pouvez affiner les paramètres suggérés ci-dessous. Chercher sur la carte en la faisant glisser + et en utilisant les boutons +/- pour zoomer/dézoomer ou utiliser la molette de la souris. @@ -1930,7 +1935,7 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de Browser package - Navigateur Web + Navigateur web @@ -2016,12 +2021,12 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de Ba&tch: - Lo&amp;t: + Lo&amp;t : <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> - <html><head/><body><p>Entrez ici un identifiant de lot. Celui-ci sera stocké sur le système cible.</p></body></html> + <html><head/><body><p>Saisir ici un identifiant de lot. Celui-ci sera stocké sur le système cible.</p></body></html> @@ -2047,7 +2052,7 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de Select your preferred Region, or use the default one based on your current location. - Sélectionnez votre région préférée, ou utilisez celle par défaut basée sur votre localisation actuelle. + Sélectionner votre région préférée, ou utiliser celle par défaut basée sur votre localisation actuelle. @@ -2059,17 +2064,17 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de Select your preferred Zone within your Region. - + Sélectionner votre zone préférée dans votre région. Zones - + Zones You can fine-tune Language and Locale settings below. - + Vous pouvez affiner les paramètres de langue et régionaux ci-dessous. @@ -2147,9 +2152,9 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de The password contains fewer than %n lowercase letters - - - + + Le mot de passe contient moins de %n lettres minuscules + Le mot de passe contient moins de %n lettres minuscules @@ -2180,75 +2185,75 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de The password contains too many characters of the same class consecutively - Le mot de passe contient trop de caractères de la même classe consécutivement + Le mot de passe contient trop de caractères de la même classe consécutive The password contains fewer than %n digits - - - + + Le mot de passe contient moins de %n chiffres + Le mot de passe contient moins de %n chiffres The password contains fewer than %n uppercase letters - - - + + Le mot de passe contient moins de %n lettres majuscules + Le mot de passe contient moins de %n lettres majuscules The password contains fewer than %n non-alphanumeric characters - - - + + Le mot de passe contient moins de %n caractères non alphanumériques + Le mot de passe contient moins de %n caractères non alphanumériques The password is shorter than %n characters - - - + + Le mot de passe est plus court que %n caractères + Le mot de passe est plus court que %n caractères The password is a rotated version of the previous one - + Le mot de passe est une version pivotée du précédent The password contains fewer than %n character classes - - - + + Le mot de passe contient moins de %n classes de caractères + Le mot de passe contient moins de %n classes de caractères The password contains more than %n same characters consecutively - - - + + Le mot de passe contient plus de %n mêmes caractères consécutifs + Le mot de passe contient plus de %n mêmes caractères consécutifs The password contains more than %n characters of the same class consecutively - - - + + Le mot de passe contient plus de %n caractères de la même classe consécutive + Le mot de passe contient plus de %n caractères de la même classe consécutive The password contains monotonic sequence longer than %n characters - - - + + Le mot de passe contient une séquence monotone de plus de %n caractères + Le mot de passe contient une séquence monotone de plus de %n caractères @@ -2357,12 +2362,12 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de Product Name - Nom du Produit + Nom du produit TextLabel - TextLabel + Étiquette de texte @@ -2411,7 +2416,7 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de Keyboard Model: - Modèle Clavier : + Modèle de clavier : @@ -2605,7 +2610,7 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de Storage de&vice: - Périphérique de stockage: + Périphérique de stockage : @@ -2635,22 +2640,22 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de New Volume Group - Nouveau Groupe de Volumes + Nouveau groupe de volume Resize Volume Group - Redimensionner le Groupe de Volumes + Redimensionner le groupe de volume Deactivate Volume Group - Désactiver le Groupe de Volumes + Désactiver le groupe de volume Remove Volume Group - Supprimer le Groupe de Volumes + Supprimer le groupe de volume @@ -2748,12 +2753,12 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Pour configurer une partition système EFI, revenez en arrière et sélectionnez ou créez un système de fichiers FAT32 avec l'indicateur <strong>%3</strong> activé et le point de montage <strong>%2</strong>.<br/><br/>Vous pouvez continuer sans configurer de partition système EFI mais votre système peut ne pas démarrer. An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Une partition a été configurée avec le point de montage <strong>%2</strong> mais son indicateur <strong>%3</strong> n'est pas défini.<br/>Pour définir l'indicateur, revenez en arrière et modifiez la partition.<br/><br/>Vous pouvez continuer sans définir l'indicateur mais votre le système peut ne pas démarrer. @@ -2763,12 +2768,12 @@ et en utilisant les boutons +/- pour zommer/dézoomer ou utilisez la molette de Option to use GPT on BIOS - + Option pour utiliser GPT sur le BIOS A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Une table de partition GPT est la meilleure option pour tous les systèmes. Ce programme d'installation prend également en charge une telle configuration pour les systèmes BIOS.<br/><br/>Pour configurer une table de partition GPT sur le BIOS, (si ce n'est déjà fait) revenez en arrière et définissez la table de partition sur GPT, puis créez une partition non formatée de 8 Mo avec l'indicateur <strong>bios_grub</strong> activé.<br/><br/>Une partition de 8 Mo non formatée est nécessaire pour démarrer %1 sur un système BIOS avec GPT. @@ -2968,7 +2973,7 @@ Sortie Directory not found - + Répertoire non trouvé @@ -3003,7 +3008,8 @@ Sortie <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> - + <p>Cet ordinateur ne satisfait pas à certaines des exigences recommandées pour la configuration de %1.<br/> + L'installation peut continuer, mais certaines fonctionnalités peuvent être désactivées. @@ -3043,7 +3049,7 @@ Sortie Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. - Sélectionnez ou installer %1.<br><font color="red">Attention: </font>ceci va effacer tous les fichiers sur la partition sélectionnée. + Sélectionner ou installer %1.<br><font color="red">Attention : </font>ceci va effacer tous les fichiers sur la partition sélectionnée. @@ -3105,7 +3111,7 @@ Sortie EFI system partition: - Partition système EFI: + Partition système EFI : @@ -3114,13 +3120,15 @@ Sortie <p>This computer does not satisfy the minimum requirements for installing %1.<br/> Installation cannot continue.</p> - + <p>Cet ordinateur ne satisfait pas à la configuration minimale requise pour l'installation de %1.<br/> + L'installation ne peut pas continuer. <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> - + <p>Cet ordinateur ne satisfait pas à certaines des exigences recommandées pour la configuration de %1.<br/> + L'installation peut continuer, mais certaines fonctionnalités peuvent être désactivées.</p> @@ -3252,7 +3260,7 @@ Sortie System requirements - Prérequis système + Configuration requise @@ -3288,7 +3296,7 @@ Sortie Scanning storage devices... - Balayage des périphériques de stockage... + Analyse des périphériques de stockage... @@ -3376,17 +3384,17 @@ Sortie Clear flags on partition <strong>%1</strong>. - Réinitialisez les drapeaux sur la partition <strong>%1</strong>. + Réinitialiser les drapeaux sur la partition <strong>%1</strong>. Clear flags on %1MiB <strong>%2</strong> partition. - Réinitialisez les drapeaux sur la partition <strong>%2</strong> de %1Mio. + Réinitialiser les drapeaux sur la partition <strong>%2</strong> de %1 Mio. Clear flags on new partition. - Réinitialisez les drapeaux sur la nouvelle partition. + Réinitialiser les drapeaux sur la nouvelle partition. @@ -3411,12 +3419,12 @@ Sortie Clearing flags on %1MiB <strong>%2</strong> partition. - Réinitialisez les drapeaux sur la partition <strong>%2</strong> de %1 Mio. + Réinitialiser les drapeaux sur la partition <strong>%2</strong> de %1 Mio. Clearing flags on new partition. - Réinitialisez les drapeaux sur la nouvelle partition. + Réinitialiser les drapeaux sur la nouvelle partition. @@ -3525,18 +3533,18 @@ Sortie Preparing groups. - + Préparation des groupes. Could not create groups in target system - + Impossible de créer des groupes dans le système cible These groups are missing in the target system: %1 - + Ces groupes sont manquants dans le système cible : %1 @@ -3544,7 +3552,7 @@ Sortie Configure <pre>sudo</pre> users. - + Configurer les utilisateurs <pre>sudo</pre>. @@ -3623,28 +3631,28 @@ Sortie KDE user feedback - + Commentaires des utilisateurs de KDE Configuring KDE user feedback. - + Configuration des commentaires des utilisateurs de KDE. Error in KDE user feedback configuration. - + Erreur dans la configuration des commentaires des utilisateurs de KDE. Could not configure KDE user feedback correctly, script error %1. - + Impossible de configurer correctement les commentaires des utilisateurs de KDE, erreur de script %1. Could not configure KDE user feedback correctly, Calamares error %1. - + Impossible de configurer correctement les commentaires des utilisateurs de KDE, erreur Calamares %1. @@ -3691,32 +3699,32 @@ Sortie <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> - + <html><head/><body><p>Cliquer ici <span style=" font-weight:600;">pour n'envoyer aucune information</span> sur votre installation.</p></body></html> <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> - <html><head/><body><span style=" text-decoration: underline; color:#2980b9;">Cliquez ici pour plus d'informations sur les rapports d'utilisateurs</span><a href="placeholder"><p></p></body> + <html><head/><body><span style=" text-decoration: underline; color:#2980b9;">Cliquer ici pour plus d'informations sur les rapports d'utilisateurs</span><a href="placeholder"><p></p></body> Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. - + Le suivi aide %1 à voir à quelle fréquence il est installé, sur quel matériel il est installé et quelles applications sont utilisées. Pour voir ce qui sera envoyé, veuillez cliquer sur l'icône d'aide à côté de chaque zone. By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + En sélectionnant cette option, vous enverrez des informations sur votre installation et votre matériel. Ces informations ne seront envoyées <b>qu'une seule fois</b> après la fin de l'installation. By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + En sélectionnant cette option, vous enverrez périodiquement des informations sur l'installation, le matériel et les applications de votre <b>machine</b> à %1. By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. - + En sélectionnant cette option, vous enverrez régulièrement des informations sur <b>votre</b> installation, le matériel, les applications et les modèles d'utilisation des applications à %1. @@ -3806,17 +3814,17 @@ Sortie Total Size: - Taille Totale : + Taille totale : Used Size: - Taille Utilisée : + Taille utilisée : Total Sectors: - Total des Secteurs : + Total des secteurs : @@ -3920,7 +3928,7 @@ Sortie <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/><strong>%2<br/> pour %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Merci à <a href="https://calamares.io/team/">l'équipe de Calamares</a> et à <a href="https://www.transifex.com/calamares/calamares/">l'équipe de traducteurs de Calamares</a>.<br/><br/>Le développement de <a href="https://calamares.io/">Calamares</a> est sponsorisé par<br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. @@ -3955,12 +3963,21 @@ Sortie development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + pour %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Merci à <a href='https://calamares.io/team/'>l'équipe de Calamares</a> + et à <a href='https://www.transifex.com/calamares/calamares/'>l'équipe de traducteurs de Calamares</a>.<br/><br/> + Le développement de <a href='https://calamares.io/'>Calamares</a> est sponsorisé par<br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software. Back - + Retour @@ -3976,29 +3993,31 @@ Sortie Installation Completed - + Installation terminée %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 a été installé sur votre ordinateur.<br/> + Vous pouvez maintenant redémarrer votre nouveau système ou continuer à utiliser l'environnement en direct. Close Installer - + Fermer l'installateur Restart System - + Redémarrer le système <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Un journal complet de l'installation est disponible sous le nom d'installation.log dans le répertoire de base de l'utilisateur en direct.<br/> + Ce journal est copié dans /var/log/installation.log du système cible.</p> @@ -4007,18 +4026,20 @@ Sortie <h1>Languages</h1> </br> The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>. - + <h1>Langues</h1></br> + Les paramètres régionaux du système affectent la langue et le jeu de caractères de certains éléments de l'interface utilisateur de la ligne de commande. Le paramètre actuel est <strong>%1</strong>. <h1>Locales</h1> </br> The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. - + <h1>Paramètres régionaux</h1></br> + Les paramètres régionaux du système affectent le format des nombres et des dates. Le paramètre actuel est <strong>%1</strong>. Back - + Retour @@ -4026,42 +4047,42 @@ Sortie Keyboard Model - + Modèle de clavier Layouts - + Dispositions Keyboard Layout - + Disposition du clavier Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + Cliquer sur votre modèle de clavier préféré pour sélectionner la disposition et la variante, ou utiliser celui par défaut en fonction du matériel détecté. Models - + Modèles Variants - + Variantes Keyboard Variant - + Variante de clavier Test your keyboard - + Tester votre clavier @@ -4069,7 +4090,7 @@ Sortie Change - + Modifier @@ -4078,7 +4099,8 @@ Sortie <h3>%1</h3> <p>These are example release notes.</p> - + <h3>%1</h3> + <p>Ce sont des exemples de notes de mise à jour.</p> @@ -4106,12 +4128,32 @@ Sortie </ul> <p>The vertical scrollbar is adjustable, current width set to 10.</p> - + <h3>%1</h3> + <p>Voici un exemple de fichier QML, montrant les options dans RichText avec un contenu Flickable.</p> + + <p>QML avec RichText peut utiliser des balises HTML, le contenu Flickable est utile pour les écrans tactiles.</p> + + <p><b>Ceci est un texte en gras</b></p> + <p><i>Ceci est du texte en italique</i></p> + <p><u>Ceci est un texte souligné</u></p> + <p><center>Ce texte sera aligné au centre.</center></p> + <p><s>C'est barré</s></p> + + <p>Exemple de code : + <code>ls -l /home</code></p> + + <p><b>Listes :</b></p> + <ul> + <li>Systèmes CPU Intel</li> + <li>Systèmes CPU AMD</li> + </ul> + + <p>La barre de défilement verticale est réglable, la largeur actuelle est définie sur 10.</p> Back - + Retour @@ -4119,7 +4161,7 @@ Sortie Pick your user name and credentials to login and perform admin tasks - + Choisir votre nom d'utilisateur et vos informations d'identification pour vous connecter et effectuer des tâches d'administration @@ -4139,12 +4181,12 @@ Sortie Login Name - + Identifiant If more than one person will use this computer, you can create multiple accounts after installation. - + Si plusieurs personnes utilisent cet ordinateur, vous pouvez créer plusieurs comptes après l'installation. @@ -4159,7 +4201,7 @@ Sortie This name will be used if you make the computer visible to others on a network. - + Ce nom sera utilisé si vous rendez l'ordinateur visible aux autres sur un réseau. @@ -4179,12 +4221,12 @@ Sortie Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Saisir le même mot de passe deux fois, afin qu'il puisse être vérifié pour les erreurs de frappe. Un bon mot de passe contient un mélange de lettres, de chiffres et de ponctuation, doit comporter au moins huit caractères et doit être changé à intervalles réguliers. Validate passwords quality - + Valider la qualité des mots de passe @@ -4194,12 +4236,12 @@ Sortie Log in automatically without asking for the password - + Connectez-vous automatiquement sans demander le mot de passe Reuse user password as root password - + Réutiliser le mot de passe utilisateur comme mot de passe root @@ -4209,22 +4251,22 @@ Sortie Choose a root password to keep your account safe. - + Choisir un mot de passe root pour protéger votre compte. Root Password - + Mot de passe root Repeat Root Password - + Répéter le mot de passe root Enter the same password twice, so that it can be checked for typing errors. - + Entrer le même mot de passe deux fois, afin qu'il puisse être vérifié pour les erreurs de frappe. @@ -4233,7 +4275,8 @@ Sortie <h3>Welcome to the %1 <quote>%2</quote> installer</h3> <p>This program will ask you some questions and set up %1 on your computer.</p> - + <h3>Bienvenue dans le programme d'installation de %1 <quote>%2</quote></h3> + <p>Ce programme vous posera quelques questions et installera %1 sur votre ordinateur.</p> @@ -4243,7 +4286,7 @@ Sortie Support - + Support @@ -4253,7 +4296,7 @@ Sortie Release notes - + Notes de version diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 2a2d68f76b..68db59150c 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + ניהול הגדרות העיגון האוטומטי @@ -412,17 +412,17 @@ Link copied to clipboard The installation is complete. Close the installer. - תהליך ההתקנה הושלם. נא לסגור את תכנית ההתקנה. + ההתקנה הושלמה. נא לסגור את אשף ההתקנה. Cancel setup without changing the system. - ביטול ההתקנה ללא שינוי המערכת. + ביטול ההתקנה ללא ביצוע שינוי במערכת. Cancel installation without changing the system. - ביטול התקנה ללא ביצוע שינוי במערכת. + ביטול ההתקנה ללא ביצוע שינוי במערכת. @@ -458,14 +458,14 @@ Link copied to clipboard Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - לבטל את תהליך ההתקנה הנוכחי? -תכנית ההתקנה תצא וכל השינויים יאבדו. + האם לבטל את תהליך ההתקנה הנוכחי? +אשף ההתקנה ייסגר וכל השינויים יאבדו. Do you really want to cancel the current install process? The installer will quit and all changes will be lost. - האם אכן ברצונך לבטל את תהליך ההתקנה? + האם לבטל את תהליך ההתקנה הנוכחי? אשף ההתקנה ייסגר וכל השינויים יאבדו. @@ -893,7 +893,7 @@ The installer will quit and all changes will be lost. The installation of %1 did not complete successfully. - + ההתקנה של %1 לא הסתיימה בהצלחה. @@ -2683,7 +2683,7 @@ The installer will quit and all changes will be lost. Are you sure you want to create a new partition table on %1? - ליצור טבלת מחיצות חדשה על %1? + האם ליצור טבלת מחיצות חדשה על %1? @@ -4012,7 +4012,7 @@ Output: Installation Completed - + ההתקנה הושלמה @@ -4023,12 +4023,12 @@ Output: Close Installer - + סגירת אשף ההתקנה Restart System - + הפעלת המערכת מחדש diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts index 21b7cfcba1..51c6add859 100644 --- a/lang/calamares_pl.ts +++ b/lang/calamares_pl.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Zarządzaj ustawieniami auto-montowania @@ -109,22 +109,22 @@ Reloads the stylesheet from the branding directory. - + Ponownie ładuje arkusz stylów z katalogu brandingu. Uploads the session log to the configured pastebin. - + Przesyła dziennik sesji do skonfigurowanego pliku na pastebin. Send Session Log - + Wyślij dziennik sesji Reload Stylesheet - + Przeładowuje Arkusz Stylów @@ -4253,32 +4253,33 @@ i nie uruchomi się <h3>Welcome to the %1 <quote>%2</quote> installer</h3> <p>This program will ask you some questions and set up %1 on your computer.</p> - + <h3>Witaj w instalatorze %1<quote>%2</quote></h3> + <p>Ten program zapyta cię o kilka rzeczy i ustawi %1 na twoim komputerze.</p> About - + O nas Support - + Wsparcie Known issues - + Znane problemy Release notes - + Informacje o wydaniu Donate - + Dotacje diff --git a/lang/calamares_ru_RU.ts b/lang/calamares_ru_RU.ts new file mode 100644 index 0000000000..2758604617 --- /dev/null +++ b/lang/calamares_ru_RU.ts @@ -0,0 +1,4279 @@ + + + + + AutoMountManagementJob + + + Manage auto-mount settings + + + + + BootInfoWidget + + + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. + + + + + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. + + + + + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. + + + + + BootLoaderModel + + + Master Boot Record of %1 + + + + + Boot Partition + + + + + System Partition + + + + + Do not install a boot loader + + + + + %1 (%2) + + + + + Calamares::BlankViewStep + + + Blank Page + + + + + Calamares::DebugWindow + + + Form + + + + + GlobalStorage + + + + + JobQueue + + + + + Modules + + + + + Type: + + + + + + none + + + + + Interface: + + + + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + + Reload Stylesheet + + + + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + + Widget Tree + + + + + Debug information + + + + + Calamares::ExecutionViewStep + + + Set up + + + + + Install + + + + + Calamares::FailJob + + + Job failed (%1) + + + + + Programmed job failure was explicitly requested. + + + + + Calamares::JobThread + + + Done + + + + + Calamares::NamedJob + + + Example job (%1) + + + + + Calamares::ProcessJob + + + Run command '%1' in target system. + + + + + Run command '%1'. + + + + + Running command %1 %2 + + + + + Calamares::PythonJob + + + Running %1 operation. + + + + + Bad working directory path + + + + + Working directory %1 for python job %2 is not readable. + + + + + Bad main script file + + + + + Main script file %1 for python job %2 is not readable. + + + + + Boost.Python error in job "%1". + + + + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + + + Calamares::RequirementsChecker + + + Requirements checking for module <i>%1</i> is complete. + + + + + Waiting for %n module(s). + + + + + + + + + + (%n second(s)) + + + + + + + + + + System-requirements checking is complete. + + + + + Calamares::ViewManager + + + Setup Failed + + + + + Installation Failed + + + + + Would you like to paste the install log to the web? + + + + + Error + + + + + + &Yes + + + + + + &No + + + + + &Close + + + + + Install Log Paste URL + + + + + The upload was unsuccessful. No web-paste was done. + + + + + Install log posted to + +%1 + +Link copied to clipboard + + + + + Calamares Initialization Failed + + + + + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. + + + + + <br/>The following modules could not be loaded: + + + + + Continue with setup? + + + + + Continue with installation? + + + + + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> + + + + + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> + + + + + &Set up now + + + + + &Install now + + + + + Go &back + + + + + &Set up + + + + + &Install + + + + + Setup is complete. Close the setup program. + + + + + The installation is complete. Close the installer. + + + + + Cancel setup without changing the system. + + + + + Cancel installation without changing the system. + + + + + &Next + + + + + &Back + + + + + &Done + + + + + &Cancel + + + + + Cancel setup? + + + + + Cancel installation? + + + + + Do you really want to cancel the current setup process? +The setup program will quit and all changes will be lost. + + + + + Do you really want to cancel the current install process? +The installer will quit and all changes will be lost. + + + + + CalamaresPython::Helper + + + Unknown exception type + + + + + unparseable Python error + + + + + unparseable Python traceback + + + + + Unfetchable Python error. + + + + + CalamaresWindow + + + %1 Setup Program + + + + + %1 Installer + + + + + CheckerContainer + + + Gathering system information... + + + + + ChoicePage + + + Form + + + + + Select storage de&vice: + + + + + + + + Current: + + + + + After: + + + + + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. + + + + + Reuse %1 as home partition for %2. + + + + + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> + + + + + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. + + + + + Boot loader location: + + + + + <strong>Select a partition to install on</strong> + + + + + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. + + + + + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. + + + + + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. + + + + + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> + + + + + This storage device has one of its partitions <strong>mounted</strong>. + + + + + This storage device is a part of an <strong>inactive RAID</strong> device. + + + + + No Swap + + + + + Reuse Swap + + + + + Swap (no Hibernate) + + + + + Swap (with Hibernate) + + + + + Swap to file + + + + + ClearMountsJob + + + Clear mounts for partitioning operations on %1 + + + + + Clearing mounts for partitioning operations on %1. + + + + + Cleared all mounts for %1 + + + + + ClearTempMountsJob + + + Clear all temporary mounts. + + + + + Clearing all temporary mounts. + + + + + Cannot get list of temporary mounts. + + + + + Cleared all temporary mounts. + + + + + CommandList + + + + Could not run command. + + + + + The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. + + + + + The command needs to know the user's name, but no username is defined. + + + + + Config + + + Set keyboard model to %1.<br/> + + + + + Set keyboard layout to %1/%2. + + + + + Set timezone to %1/%2. + + + + + The system language will be set to %1. + + + + + The numbers and dates locale will be set to %1. + + + + + Network Installation. (Disabled: Incorrect configuration) + + + + + Network Installation. (Disabled: Received invalid groups data) + + + + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) + + + + + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. + + + + + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. + + + + + This program will ask you some questions and set up %2 on your computer. + + + + + <h1>Welcome to the Calamares setup program for %1</h1> + + + + + <h1>Welcome to %1 setup</h1> + + + + + <h1>Welcome to the Calamares installer for %1</h1> + + + + + <h1>Welcome to the %1 installer</h1> + + + + + Your username is too long. + + + + + '%1' is not allowed as username. + + + + + Your username must start with a lowercase letter or underscore. + + + + + Only lowercase letters, numbers, underscore and hyphen are allowed. + + + + + Your hostname is too short. + + + + + Your hostname is too long. + + + + + '%1' is not allowed as hostname. + + + + + Only letters, numbers, underscore and hyphen are allowed. + + + + + Your passwords do not match! + + + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + + + + ContextualProcessJob + + + Contextual Processes Job + + + + + CreatePartitionDialog + + + Create a Partition + + + + + Si&ze: + + + + + MiB + + + + + Partition &Type: + + + + + &Primary + + + + + E&xtended + + + + + Fi&le System: + + + + + LVM LV name + + + + + &Mount Point: + + + + + Flags: + + + + + En&crypt + + + + + Logical + + + + + Primary + + + + + GPT + + + + + Mountpoint already in use. Please select another one. + + + + + CreatePartitionJob + + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + + Create new %2MiB partition on %4 (%3) with file system %1. + + + + + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. + + + + + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). + + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. + + + + + + Creating new %1 partition on %2. + + + + + The installer failed to create partition on disk '%1'. + + + + + CreatePartitionTableDialog + + + Create Partition Table + + + + + Creating a new partition table will delete all existing data on the disk. + + + + + What kind of partition table do you want to create? + + + + + Master Boot Record (MBR) + + + + + GUID Partition Table (GPT) + + + + + CreatePartitionTableJob + + + Create new %1 partition table on %2. + + + + + Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). + + + + + Creating new %1 partition table on %2. + + + + + The installer failed to create a partition table on %1. + + + + + CreateUserJob + + + Create user %1 + + + + + Create user <strong>%1</strong>. + + + + + Preserving home directory + + + + + + Creating user %1 + + + + + Configuring user %1 + + + + + Setting file permissions + + + + + CreateVolumeGroupDialog + + + Create Volume Group + + + + + CreateVolumeGroupJob + + + Create new volume group named %1. + + + + + Create new volume group named <strong>%1</strong>. + + + + + Creating new volume group named %1. + + + + + The installer failed to create a volume group named '%1'. + + + + + DeactivateVolumeGroupJob + + + + Deactivate volume group named %1. + + + + + Deactivate volume group named <strong>%1</strong>. + + + + + The installer failed to deactivate a volume group named %1. + + + + + DeletePartitionJob + + + Delete partition %1. + + + + + Delete partition <strong>%1</strong>. + + + + + Deleting partition %1. + + + + + The installer failed to delete partition %1. + + + + + DeviceInfoWidget + + + This device has a <strong>%1</strong> partition table. + + + + + This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem. + + + + + This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page. + + + + + <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment. + + + + + <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions. + + + + + The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. + + + + + DeviceModel + + + %1 - %2 (%3) + device[name] - size[number] (device-node[name]) + + + + + %1 - (%2) + device[name] - (device-node[name]) + + + + + DracutLuksCfgJob + + + Write LUKS configuration for Dracut to %1 + + + + + Skip writing LUKS configuration for Dracut: "/" partition is not encrypted + + + + + Failed to open %1 + + + + + DummyCppJob + + + Dummy C++ Job + + + + + EditExistingPartitionDialog + + + Edit Existing Partition + + + + + Content: + + + + + &Keep + + + + + Format + + + + + Warning: Formatting the partition will erase all existing data. + + + + + &Mount Point: + + + + + Si&ze: + + + + + MiB + + + + + Fi&le System: + + + + + Flags: + + + + + Mountpoint already in use. Please select another one. + + + + + EncryptWidget + + + Form + + + + + En&crypt system + + + + + Passphrase + + + + + Confirm passphrase + + + + + + Please enter the same passphrase in both boxes. + + + + + FillGlobalStorageJob + + + Set partition information + + + + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + + Install %1 on <strong>new</strong> %2 system partition. + + + + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + + + + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + + + + + Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. + + + + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. + + + + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + + + + + Install boot loader on <strong>%1</strong>. + + + + + Setting up mount points. + + + + + FinishedPage + + + Form + + + + + &Restart now + + + + + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. + + + + + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> + + + + + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. + + + + + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> + + + + + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. + + + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + + + + FinishedQmlViewStep + + + Finish + + + + + FinishedViewStep + + + Finish + + + + + FormatPartitionJob + + + Format partition %1 (file system: %2, size: %3 MiB) on %4. + + + + + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. + + + + + Formatting partition %1 with file system %2. + + + + + The installer failed to format partition %1 on disk '%2'. + + + + + GeneralRequirements + + + has at least %1 GiB available drive space + + + + + There is not enough drive space. At least %1 GiB is required. + + + + + has at least %1 GiB working memory + + + + + The system does not have enough working memory. At least %1 GiB is required. + + + + + is plugged in to a power source + + + + + The system is not plugged in to a power source. + + + + + is connected to the Internet + + + + + The system is not connected to the Internet. + + + + + is running the installer as an administrator (root) + + + + + The setup program is not running with administrator rights. + + + + + The installer is not running with administrator rights. + + + + + has a screen large enough to show the whole installer + + + + + The screen is too small to display the setup program. + + + + + The screen is too small to display the installer. + + + + + HostInfoJob + + + Collecting information about your machine. + + + + + IDJob + + + + + + OEM Batch Identifier + + + + + Could not create directories <code>%1</code>. + + + + + Could not open file <code>%1</code>. + + + + + Could not write to file <code>%1</code>. + + + + + InitcpioJob + + + Creating initramfs with mkinitcpio. + + + + + InitramfsJob + + + Creating initramfs. + + + + + InteractiveTerminalPage + + + Konsole not installed + + + + + Please install KDE Konsole and try again! + + + + + Executing script: &nbsp;<code>%1</code> + + + + + InteractiveTerminalViewStep + + + Script + + + + + KeyboardQmlViewStep + + + Keyboard + + + + + KeyboardViewStep + + + Keyboard + + + + + LCLocaleDialog + + + System locale setting + + + + + The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>. + + + + + &Cancel + + + + + &OK + + + + + LicensePage + + + Form + + + + + <h1>License Agreement</h1> + + + + + I accept the terms and conditions above. + + + + + Please review the End User License Agreements (EULAs). + + + + + This setup procedure will install proprietary software that is subject to licensing terms. + + + + + If you do not agree with the terms, the setup procedure cannot continue. + + + + + This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. + + + + + If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. + + + + + LicenseViewStep + + + License + + + + + LicenseWidget + + + URL: %1 + + + + + <strong>%1 driver</strong><br/>by %2 + %1 is an untranslatable product name, example: Creative Audigy driver + + + + + <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> + %1 is usually a vendor name, example: Nvidia graphics driver + + + + + <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 codec</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 package</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1</strong><br/><font color="Grey">by %2</font> + + + + + File: %1 + + + + + Hide license text + + + + + Show the license text + + + + + Open license agreement in browser. + + + + + LocalePage + + + Region: + + + + + Zone: + + + + + + &Change... + + + + + LocaleQmlViewStep + + + Location + + + + + LocaleViewStep + + + Location + + + + + LuksBootKeyFileJob + + + Configuring LUKS key file. + + + + + + No partitions are defined. + + + + + + + Encrypted rootfs setup error + + + + + Root partition %1 is LUKS but no passphrase has been set. + + + + + Could not create LUKS key file for root partition %1. + + + + + Could not configure LUKS key file on partition %1. + + + + + MachineIdJob + + + Generate machine-id. + + + + + Configuration Error + + + + + No root mount point is set for MachineId. + + + + + Map + + + Timezone: %1 + + + + + Please select your preferred location on the map so the installer can suggest the locale + and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging + to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. + + + + + NetInstallViewStep + + + Package selection + + + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + Communication + + + + + Development + + + + + Office + + + + + Multimedia + + + + + Internet + + + + + Theming + + + + + Gaming + + + + + Utilities + + + + + NotesQmlViewStep + + + Notes + + + + + OEMPage + + + Ba&tch: + + + + + <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> + + + + + <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> + + + + + OEMViewStep + + + OEM Configuration + + + + + Set the OEM Batch Identifier to <code>%1</code>. + + + + + Offline + + + Select your preferred Region, or use the default one based on your current location. + + + + + + + Timezone: %1 + + + + + Select your preferred Zone within your Region. + + + + + Zones + + + + + You can fine-tune Language and Locale settings below. + + + + + PWQ + + + Password is too short + + + + + Password is too long + + + + + Password is too weak + + + + + Memory allocation error when setting '%1' + + + + + Memory allocation error + + + + + The password is the same as the old one + + + + + The password is a palindrome + + + + + The password differs with case changes only + + + + + The password is too similar to the old one + + + + + The password contains the user name in some form + + + + + The password contains words from the real name of the user in some form + + + + + The password contains forbidden words in some form + + + + + The password contains too few digits + + + + + The password contains too few uppercase letters + + + + + The password contains fewer than %n lowercase letters + + + + + + + + + + The password contains too few lowercase letters + + + + + The password contains too few non-alphanumeric characters + + + + + The password is too short + + + + + The password does not contain enough character classes + + + + + The password contains too many same characters consecutively + + + + + The password contains too many characters of the same class consecutively + + + + + The password contains fewer than %n digits + + + + + + + + + + The password contains fewer than %n uppercase letters + + + + + + + + + + The password contains fewer than %n non-alphanumeric characters + + + + + + + + + + The password is shorter than %n characters + + + + + + + + + + The password is a rotated version of the previous one + + + + + The password contains fewer than %n character classes + + + + + + + + + + The password contains more than %n same characters consecutively + + + + + + + + + + The password contains more than %n characters of the same class consecutively + + + + + + + + + + The password contains monotonic sequence longer than %n characters + + + + + + + + + + The password contains too long of a monotonic character sequence + + + + + No password supplied + + + + + Cannot obtain random numbers from the RNG device + + + + + Password generation failed - required entropy too low for settings + + + + + The password fails the dictionary check - %1 + + + + + The password fails the dictionary check + + + + + Unknown setting - %1 + + + + + Unknown setting + + + + + Bad integer value of setting - %1 + + + + + Bad integer value + + + + + Setting %1 is not of integer type + + + + + Setting is not of integer type + + + + + Setting %1 is not of string type + + + + + Setting is not of string type + + + + + Opening the configuration file failed + + + + + The configuration file is malformed + + + + + Fatal failure + + + + + Unknown error + + + + + Password is empty + + + + + PackageChooserPage + + + Form + + + + + Product Name + + + + + TextLabel + + + + + Long Product Description + + + + + Package Selection + + + + + Please pick a product from the list. The selected product will be installed. + + + + + PackageChooserViewStep + + + Packages + + + + + PackageModel + + + Name + + + + + Description + + + + + Page_Keyboard + + + Form + + + + + Keyboard Model: + + + + + Type here to test your keyboard + + + + + Page_UserSetup + + + Form + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + login + + + + + What is the name of this computer? + + + + + <small>This name will be used if you make the computer visible to others on a network.</small> + + + + + Computer Name + + + + + Choose a password to keep your account safe. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small> + + + + + + Password + + + + + + Repeat Password + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Require strong passwords. + + + + + Log in automatically without asking for the password. + + + + + Use the same password for the administrator account. + + + + + Choose a password for the administrator account. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors.</small> + + + + + PartitionLabelsView + + + Root + + + + + Home + + + + + Boot + + + + + EFI system + + + + + Swap + + + + + New partition for %1 + + + + + New partition + + + + + %1 %2 + size[number] filesystem[name] + + + + + PartitionModel + + + + Free Space + + + + + + New partition + + + + + Name + + + + + File System + + + + + Mount Point + + + + + Size + + + + + PartitionPage + + + Form + + + + + Storage de&vice: + + + + + &Revert All Changes + + + + + New Partition &Table + + + + + Cre&ate + + + + + &Edit + + + + + &Delete + + + + + New Volume Group + + + + + Resize Volume Group + + + + + Deactivate Volume Group + + + + + Remove Volume Group + + + + + I&nstall boot loader on: + + + + + Are you sure you want to create a new partition table on %1? + + + + + Can not create new partition + + + + + The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. + + + + + PartitionViewStep + + + Gathering system information... + + + + + Partitions + + + + + Install %1 <strong>alongside</strong> another operating system. + + + + + <strong>Erase</strong> disk and install %1. + + + + + <strong>Replace</strong> a partition with %1. + + + + + <strong>Manual</strong> partitioning. + + + + + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). + + + + + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. + + + + + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. + + + + + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). + + + + + Disk <strong>%1</strong> (%2) + + + + + Current: + + + + + After: + + + + + No EFI system partition configured + + + + + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. + + + + + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. + + + + + EFI system partition flag not set + + + + + Option to use GPT on BIOS + + + + + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. + + + + + Boot partition not encrypted + + + + + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. + + + + + has at least one disk device available. + + + + + There are no partitions to install on. + + + + + PlasmaLnfJob + + + Plasma Look-and-Feel Job + + + + + + Could not select KDE Plasma Look-and-Feel package + + + + + PlasmaLnfPage + + + Form + + + + + Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + PlasmaLnfViewStep + + + Look-and-Feel + + + + + PreserveFiles + + + Saving files for later ... + + + + + No files configured to save for later. + + + + + Not all of the configured files could be preserved. + + + + + ProcessResult + + + +There was no output from the command. + + + + + +Output: + + + + + + External command crashed. + + + + + Command <i>%1</i> crashed. + + + + + External command failed to start. + + + + + Command <i>%1</i> failed to start. + + + + + Internal error when starting command. + + + + + Bad parameters for process job call. + + + + + External command failed to finish. + + + + + Command <i>%1</i> failed to finish in %2 seconds. + + + + + External command finished with errors. + + + + + Command <i>%1</i> finished with exit code %2. + + + + + QObject + + + %1 (%2) + + + + + unknown + + + + + extended + + + + + unformatted + + + + + swap + + + + + + Default + + + + + + + + File not found + + + + + Path <pre>%1</pre> must be an absolute path. + + + + + Directory not found + + + + + + Could not create new random file <pre>%1</pre>. + + + + + No product + + + + + No description provided. + + + + + (no mount point) + + + + + Unpartitioned space or unknown partition table + + + + + Recommended + + + <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> + Setup can continue, but some features might be disabled.</p> + + + + + RemoveUserJob + + + Remove live user from target system + + + + + RemoveVolumeGroupJob + + + + Remove Volume Group named %1. + + + + + Remove Volume Group named <strong>%1</strong>. + + + + + The installer failed to remove a volume group named '%1'. + + + + + ReplaceWidget + + + Form + + + + + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. + + + + + The selected item does not appear to be a valid partition. + + + + + %1 cannot be installed on empty space. Please select an existing partition. + + + + + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. + + + + + %1 cannot be installed on this partition. + + + + + Data partition (%1) + + + + + Unknown system partition (%1) + + + + + %1 system partition (%2) + + + + + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. + + + + + <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + Requirements + + + <p>This computer does not satisfy the minimum requirements for installing %1.<br/> + Installation cannot continue.</p> + + + + + <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> + Setup can continue, but some features might be disabled.</p> + + + + + ResizeFSJob + + + Resize Filesystem Job + + + + + Invalid configuration + + + + + The file-system resize job has an invalid configuration and will not run. + + + + + KPMCore not Available + + + + + Calamares cannot start KPMCore for the file-system resize job. + + + + + + + + + Resize Failed + + + + + The filesystem %1 could not be found in this system, and cannot be resized. + + + + + The device %1 could not be found in this system, and cannot be resized. + + + + + + The filesystem %1 cannot be resized. + + + + + + The device %1 cannot be resized. + + + + + The filesystem %1 must be resized, but cannot. + + + + + The device %1 must be resized, but cannot + + + + + ResizePartitionJob + + + Resize partition %1. + + + + + Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. + + + + + Resizing %2MiB partition %1 to %3MiB. + + + + + The installer failed to resize partition %1 on disk '%2'. + + + + + ResizeVolumeGroupDialog + + + Resize Volume Group + + + + + ResizeVolumeGroupJob + + + + Resize volume group named %1 from %2 to %3. + + + + + Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. + + + + + The installer failed to resize a volume group named '%1'. + + + + + ResultsListDialog + + + For best results, please ensure that this computer: + + + + + System requirements + + + + + ResultsListWidget + + + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. + + + + + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. + + + + + This program will ask you some questions and set up %2 on your computer. + + + + + ScanningDialog + + + Scanning storage devices... + + + + + Partitioning + + + + + SetHostNameJob + + + Set hostname %1 + + + + + Set hostname <strong>%1</strong>. + + + + + Setting hostname %1. + + + + + + Internal Error + + + + + + Cannot write hostname to target system + + + + + SetKeyboardLayoutJob + + + Set keyboard model to %1, layout to %2-%3 + + + + + Failed to write keyboard configuration for the virtual console. + + + + + + + Failed to write to %1 + + + + + Failed to write keyboard configuration for X11. + + + + + Failed to write keyboard configuration to existing /etc/default directory. + + + + + SetPartFlagsJob + + + Set flags on partition %1. + + + + + Set flags on %1MiB %2 partition. + + + + + Set flags on new partition. + + + + + Clear flags on partition <strong>%1</strong>. + + + + + Clear flags on %1MiB <strong>%2</strong> partition. + + + + + Clear flags on new partition. + + + + + Flag partition <strong>%1</strong> as <strong>%2</strong>. + + + + + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. + + + + + Flag new partition as <strong>%1</strong>. + + + + + Clearing flags on partition <strong>%1</strong>. + + + + + Clearing flags on %1MiB <strong>%2</strong> partition. + + + + + Clearing flags on new partition. + + + + + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. + + + + + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. + + + + + Setting flags <strong>%1</strong> on new partition. + + + + + The installer failed to set flags on partition %1. + + + + + SetPasswordJob + + + Set password for user %1 + + + + + Setting password for user %1. + + + + + Bad destination system path. + + + + + rootMountPoint is %1 + + + + + Cannot disable root account. + + + + + passwd terminated with error code %1. + + + + + Cannot set password for user %1. + + + + + usermod terminated with error code %1. + + + + + SetTimezoneJob + + + Set timezone to %1/%2 + + + + + Cannot access selected timezone path. + + + + + Bad path: %1 + + + + + Cannot set timezone. + + + + + Link creation failed, target: %1; link name: %2 + + + + + Cannot set timezone, + + + + + Cannot open /etc/timezone for writing + + + + + SetupGroupsJob + + + Preparing groups. + + + + + + Could not create groups in target system + + + + + These groups are missing in the target system: %1 + + + + + SetupSudoJob + + + Configure <pre>sudo</pre> users. + + + + + Cannot chmod sudoers file. + + + + + Cannot create sudoers file for writing. + + + + + ShellProcessJob + + + Shell Processes Job + + + + + SlideCounter + + + %L1 / %L2 + slide counter, %1 of %2 (numeric) + + + + + SummaryPage + + + This is an overview of what will happen once you start the setup procedure. + + + + + This is an overview of what will happen once you start the install procedure. + + + + + SummaryViewStep + + + Summary + + + + + TrackingInstallJob + + + Installation feedback + + + + + Sending installation feedback. + + + + + Internal error in install-tracking. + + + + + HTTP request timed out. + + + + + TrackingKUserFeedbackJob + + + KDE user feedback + + + + + Configuring KDE user feedback. + + + + + + Error in KDE user feedback configuration. + + + + + Could not configure KDE user feedback correctly, script error %1. + + + + + Could not configure KDE user feedback correctly, Calamares error %1. + + + + + TrackingMachineUpdateManagerJob + + + Machine feedback + + + + + Configuring machine feedback. + + + + + + Error in machine feedback configuration. + + + + + Could not configure machine feedback correctly, script error %1. + + + + + Could not configure machine feedback correctly, Calamares error %1. + + + + + TrackingPage + + + Form + + + + + Placeholder + + + + + <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> + + + + + <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> + + + + + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. + + + + + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. + + + + + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. + + + + + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. + + + + + TrackingViewStep + + + Feedback + + + + + UsersPage + + + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> + + + + + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> + + + + + UsersQmlViewStep + + + Users + + + + + UsersViewStep + + + Users + + + + + VariantModel + + + Key + Column header for key/value + + + + + Value + Column header for key/value + + + + + VolumeGroupBaseDialog + + + Create Volume Group + + + + + List of Physical Volumes + + + + + Volume Group Name: + + + + + Volume Group Type: + + + + + Physical Extent Size: + + + + + MiB + + + + + Total Size: + + + + + Used Size: + + + + + Total Sectors: + + + + + Quantity of LVs: + + + + + WelcomePage + + + Form + + + + + + Select application and system language + + + + + &About + + + + + Open donations website + + + + + &Donate + + + + + Open help and support website + + + + + &Support + + + + + Open issues and bug-tracking website + + + + + &Known issues + + + + + Open release notes website + + + + + &Release notes + + + + + <h1>Welcome to the Calamares setup program for %1.</h1> + + + + + <h1>Welcome to %1 setup.</h1> + + + + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + + <h1>Welcome to the %1 installer.</h1> + + + + + %1 support + + + + + About %1 setup + + + + + About %1 installer + + + + + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + WelcomeQmlViewStep + + + Welcome + + + + + WelcomeViewStep + + + Welcome + + + + + about + + + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> + and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares + translators team</a>.<br/><br/> + <a href='https://calamares.io/'>Calamares</a> + development is sponsored by <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software. + + + + + Back + + + + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + + + i18n + + + <h1>Languages</h1> </br> + The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>. + + + + + <h1>Locales</h1> </br> + The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. + + + + + Back + + + + + keyboardq + + + Keyboard Model + + + + + Layouts + + + + + Keyboard Layout + + + + + Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. + + + + + Models + + + + + Variants + + + + + Keyboard Variant + + + + + Test your keyboard + + + + + localeq + + + Change + + + + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + release_notes + + + <h3>%1</h3> + <p>This an example QML file, showing options in RichText with Flickable content.</p> + + <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p> + + <p><b>This is bold text</b></p> + <p><i>This is italic text</i></p> + <p><u>This is underlined text</u></p> + <p><center>This text will be center-aligned.</center></p> + <p><s>This is strikethrough</s></p> + + <p>Code example: + <code>ls -l /home</code></p> + + <p><b>Lists:</b></p> + <ul> + <li>Intel CPU systems</li> + <li>AMD CPU systems</li> + </ul> + + <p>The vertical scrollbar is adjustable, current width set to 10.</p> + + + + + Back + + + + + usersq + + + Pick your user name and credentials to login and perform admin tasks + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + Login Name + + + + + If more than one person will use this computer, you can create multiple accounts after installation. + + + + + What is the name of this computer? + + + + + Computer Name + + + + + This name will be used if you make the computer visible to others on a network. + + + + + Choose a password to keep your account safe. + + + + + Password + + + + + Repeat Password + + + + + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. + + + + + Validate passwords quality + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Log in automatically without asking for the password + + + + + Reuse user password as root password + + + + + Use the same password for the administrator account. + + + + + Choose a root password to keep your account safe. + + + + + Root Password + + + + + Repeat Root Password + + + + + Enter the same password twice, so that it can be checked for typing errors. + + + + + welcomeq + + + <h3>Welcome to the %1 <quote>%2</quote> installer</h3> + <p>This program will ask you some questions and set up %1 on your computer.</p> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + + diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts index c7b5c6809e..2c2fb3fc8c 100644 --- a/lang/calamares_sk.ts +++ b/lang/calamares_sk.ts @@ -312,18 +312,18 @@ &Yes - _Áno + Án&o &No - _Nie + &Nie &Close - _Zavrieť + &Zavrieť @@ -402,7 +402,7 @@ Link copied to clipboard &Install - _Inštalovať + &Inštalovať @@ -437,7 +437,7 @@ Link copied to clipboard &Done - _Dokončiť + &Dokončiť diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index e1045e73bb..1206b29001 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -3847,7 +3847,7 @@ Installationen kan inte fortsätta.</p> &About - Om, &A + &Om diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index a285512e7b..c2a0c2d028 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + 管理自动挂载设置 @@ -120,7 +120,7 @@ Send Session Log - + 发送会话日志 @@ -1403,7 +1403,7 @@ The installer will quit and all changes will be lost. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + 设置%3 分区的挂载点 @@ -3985,29 +3985,31 @@ Output: Installation Completed - + 安装完成 %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 已安装在您的电脑上了。<br/> + 您现在可以重新启动到新系统，或是继续使用 Live 环境。 Close Installer - + 关闭安装程序 Restart System - + 重启系统 <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + 安装过程中的翻译已经复制到了临时用户的家目录下 +于此同时安装日志也已经复制到了目标系统，路径为：/var/log/installation.log From 38293b0f0934ca63121bf5f54fd9871aee521e43 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 14 May 2021 17:49:46 +0200 Subject: [PATCH 123/492] i18n: [python] Automatic merge of Transifex translations --- lang/python/fr/LC_MESSAGES/python.po | 21 +- lang/python/he/LC_MESSAGES/python.po | 2 +- lang/python/it_IT/LC_MESSAGES/python.po | 9 +- lang/python/ko/LC_MESSAGES/python.po | 4 +- lang/python/pt_BR/LC_MESSAGES/python.po | 4 +- lang/python/ru_RU/LC_MESSAGES/python.po | 351 ++++++++++++++++++++++++ 6 files changed, 375 insertions(+), 16 deletions(-) create mode 100644 lang/python/ru_RU/LC_MESSAGES/python.po diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po index 568181c5e2..66b598cf9e 100644 --- a/lang/python/fr/LC_MESSAGES/python.po +++ b/lang/python/fr/LC_MESSAGES/python.po @@ -13,6 +13,7 @@ # Seboss666 , 2019 # Florian B , 2019 # Arnaud Ferraris , 2019 +# roxfr , 2021 # #, fuzzy msgid "" @@ -21,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Arnaud Ferraris , 2019\n" +"Last-Translator: roxfr , 2021\n" "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -112,11 +113,11 @@ msgstr "rsync a échoué avec le code d'erreur {}." #: src/modules/unpackfs/main.py:300 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "" +msgstr "Décompression de l'image {}/{}, fichier {}/{}" #: src/modules/unpackfs/main.py:315 msgid "Starting to unpack {}" -msgstr "" +msgstr "Commencer à décompresser {}" #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 msgid "Failed to unpack image \"{}\"" @@ -146,6 +147,8 @@ msgstr "Mauvaise configuration unsquash" #: src/modules/unpackfs/main.py:455 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" msgstr "" +"Le système de fichiers pour \"{}\" ({}) n'est pas pris en charge par votre " +"noyau actuel" #: src/modules/unpackfs/main.py:459 msgid "The source filesystem \"{}\" does not exist" @@ -214,6 +217,8 @@ msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" +"La liste des gestionnaires d'affichage est vide ou indéfinie à la fois dans " +"globalstorage et displaymanager.conf." #: src/modules/displaymanager/main.py:977 msgid "Display manager configuration was incomplete" @@ -330,11 +335,11 @@ msgstr "Configuration de l'horloge matériel." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "Création d'initramfs avec mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "Échec de l'exécution de mkinitfs sur la cible" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" @@ -362,12 +367,12 @@ msgstr "Écriture du fstab." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." -msgstr "Tâche factice python" +msgstr "Tâche factice de python" #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 #: src/modules/dummypython/main.py:94 msgid "Dummy python step {}" -msgstr "Étape factice python {}" +msgstr "Étape factice de python {}" #: src/modules/localecfg/main.py:30 msgid "Configuring locales." @@ -375,4 +380,4 @@ msgstr "Configuration des locales." #: src/modules/networkcfg/main.py:28 msgid "Saving network configuration." -msgstr "Sauvegarde des configuration réseau." +msgstr "Sauvegarde de la configuration du réseau en cours." diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index 21cdc6a561..414247edb5 100644 --- a/lang/python/he/LC_MESSAGES/python.po +++ b/lang/python/he/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Eli Shleifer , 2017 -# Omer I.S. , 2020 +# Omeritzics Games , 2020 # Yaron Shahrabani , 2020 # #, fuzzy diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po index 1933817ba5..5f516a9495 100644 --- a/lang/python/it_IT/LC_MESSAGES/python.po +++ b/lang/python/it_IT/LC_MESSAGES/python.po @@ -7,6 +7,7 @@ # Pierfrancesco Passerini , 2019 # Pietro F. Fontana, 2020 # Saverio , 2020 +# Giuseppe Pignataro , 2021 # #, fuzzy msgid "" @@ -15,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Saverio , 2020\n" +"Last-Translator: Giuseppe Pignataro , 2021\n" "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -209,6 +210,8 @@ msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" +"L'elenco dei display manager è vuota o non definita sia in globalstorage che" +" in displaymanager.conf." #: src/modules/displaymanager/main.py:977 msgid "Display manager configuration was incomplete" @@ -321,11 +324,11 @@ msgstr "Impostazione del clock hardware." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "Sto creando initramfs con mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "Impossibile eseguire mkinitfs sulla destinazione" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index 528ae5e3b0..b6165a3875 100644 --- a/lang/python/ko/LC_MESSAGES/python.po +++ b/lang/python/ko/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Ji-Hyeon Gim , 2018 -# Bruce Lee , 2020 +# Jung Hee Lee , 2020 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Bruce Lee , 2020\n" +"Last-Translator: Jung Hee Lee , 2020\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po index 6803c6287e..dab21b4fa7 100644 --- a/lang/python/pt_BR/LC_MESSAGES/python.po +++ b/lang/python/pt_BR/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # André Marcelo Alvarenga , 2020 -# Guilherme, 2020 +# Guilherme Marçal Silva, 2020 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Guilherme, 2020\n" +"Last-Translator: Guilherme Marçal Silva, 2020\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/ru_RU/LC_MESSAGES/python.po b/lang/python/ru_RU/LC_MESSAGES/python.po new file mode 100644 index 0000000000..814b007b27 --- /dev/null +++ b/lang/python/ru_RU/LC_MESSAGES/python.po @@ -0,0 +1,351 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" +"PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Language-Team: Russian (Russia) (https://www.transifex.com/calamares/teams/20061/ru_RU/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru_RU\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#: src/modules/grubcfg/main.py:28 +msgid "Configure GRUB." +msgstr "" + +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "" + +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 +#: src/modules/initcpiocfg/main.py:202 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 +#: src/modules/networkcfg/main.py:39 +msgid "Configuration Error" +msgstr "" + +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 +#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 +#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/fstab/main.py:356 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/services-systemd/main.py:26 +msgid "Configure systemd services" +msgstr "" + +#: src/modules/services-systemd/main.py:59 +#: src/modules/services-openrc/main.py:93 +msgid "Cannot modify service" +msgstr "" + +#: src/modules/services-systemd/main.py:60 +msgid "" +"systemctl {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:63 +#: src/modules/services-systemd/main.py:67 +msgid "Cannot enable systemd service {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:65 +msgid "Cannot enable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:69 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "" +"Unknown systemd commands {command!s} and " +"{suffix!s} for unit {name!s}." +msgstr "" + +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "" + +#: src/modules/unpackfs/main.py:35 +msgid "Filling up filesystems." +msgstr "" + +#: src/modules/unpackfs/main.py:255 +msgid "rsync failed with error code {}." +msgstr "" + +#: src/modules/unpackfs/main.py:300 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:315 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 +msgid "Failed to unpack image \"{}\"" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:432 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:438 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 +#: src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:455 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:459 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:465 +msgid "" +"Failed to find unsquashfs, make sure you have the squashfs-tools package " +"installed" +msgstr "" + +#: src/modules/unpackfs/main.py:479 +msgid "The destination \"{}\" in the target system is not a directory" +msgstr "" + +#: src/modules/displaymanager/main.py:514 +msgid "Cannot write KDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:515 +msgid "KDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:576 +msgid "Cannot write LXDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:577 +msgid "LXDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:660 +msgid "Cannot write LightDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:661 +msgid "LightDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:735 +msgid "Cannot configure LightDM" +msgstr "" + +#: src/modules/displaymanager/main.py:736 +msgid "No LightDM greeter installed." +msgstr "" + +#: src/modules/displaymanager/main.py:767 +msgid "Cannot write SLIM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:768 +msgid "SLIM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:894 +msgid "No display managers selected for the displaymanager module." +msgstr "" + +#: src/modules/displaymanager/main.py:895 +msgid "" +"The displaymanagers list is empty or undefined in both globalstorage and " +"displaymanager.conf." +msgstr "" + +#: src/modules/displaymanager/main.py:977 +msgid "Display manager configuration was incomplete" +msgstr "" + +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "" + +#: src/modules/initcpiocfg/main.py:203 +#: src/modules/luksopenswaphookcfg/main.py:91 +#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 +#: src/modules/networkcfg/main.py:40 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "" + +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "" + +#: src/modules/services-openrc/main.py:29 +msgid "Configure OpenRC services" +msgstr "" + +#: src/modules/services-openrc/main.py:57 +msgid "Cannot add service {name!s} to run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:59 +msgid "Cannot remove service {name!s} from run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:61 +msgid "" +"Unknown service-action {arg!s} for service {name!s} in run-" +"level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:94 +msgid "" +"rc-update {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:101 +msgid "Target runlevel does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:102 +msgid "" +"The path for runlevel {level!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/services-openrc/main.py:110 +msgid "Target service does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:111 +msgid "" +"The path for service {name!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "" + +#: src/modules/packages/main.py:50 src/modules/packages/main.py:59 +#: src/modules/packages/main.py:69 +msgid "Install packages." +msgstr "" + +#: src/modules/packages/main.py:57 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:62 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/modules/packages/main.py:65 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "" + +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "" + +#: src/modules/mkinitfs/main.py:27 +msgid "Creating initramfs with mkinitfs." +msgstr "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 +msgid "The exit code was {}" +msgstr "" + +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "" + +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" +msgstr "" + +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "" + +#: src/modules/fstab/main.py:29 +msgid "Writing fstab." +msgstr "" + +#: src/modules/dummypython/main.py:35 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 +#: src/modules/dummypython/main.py:94 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "" + +#: src/modules/networkcfg/main.py:28 +msgid "Saving network configuration." +msgstr "" From ea8f5afc3cea1c7ce713cb3e966322401ee653b1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 15 May 2021 06:24:32 +0200 Subject: [PATCH 124/492] CI: clang-format 7 is no longer supported --- ci/calamaresstyle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/calamaresstyle b/ci/calamaresstyle index 81ec71c39c..9c0964bd2d 100755 --- a/ci/calamaresstyle +++ b/ci/calamaresstyle @@ -22,7 +22,7 @@ export LANG LC_ALL LC_NUMERIC AS=$( which astyle ) -CF_VERSIONS="clang-format-7 clang-format-8 clang-format70 clang-format80 clang-format90 clang-format-9.0.1 clang-format" +CF_VERSIONS="clang-format-8 clang-format80 clang-format90 clang-format-9.0.1 clang-format" for _cf in $CF_VERSIONS do # Not an error if this particular clang-format isn't found From d731e12456815d109dc86583ffb1c0dbf67a4683 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 15 May 2021 07:46:03 +0200 Subject: [PATCH 125/492] [libcalamares] Add an extra job-failure enum value --- src/libcalamares/Job.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/Job.h b/src/libcalamares/Job.h index c7578272d0..58a9bba39a 100644 --- a/src/libcalamares/Job.h +++ b/src/libcalamares/Job.h @@ -35,7 +35,8 @@ class DLLEXPORT JobResult NoError = 0, GenericError = -1, PythonUncaughtException = 1, - InvalidConfiguration = 2 + InvalidConfiguration = 2, + MissingRequirements = 3, }; // Can't copy, but you can keep a temporary From efe41da24d6e191dc8cc5dab5105a412e785dcb9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 19 May 2021 14:21:58 +0200 Subject: [PATCH 126/492] Docs: mention Matrix channel, too --- CONTRIBUTING.md | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d96c91e23f..41dec59fab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,8 +35,8 @@ in Europe, but feel free to idle. **DO NOT** ask-and-leave. Keep that chat window open because it can easily take a few hours for someone to notice a message. -[![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest) - +- [![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest) +- [Join us on Matrix](https://webchat.kde.org/#/room/%23calamares:kde.org) ## General Guidelines diff --git a/README.md b/README.md index 464fbc1b34..0b83861f84 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE) -| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Freenode (IRC): #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest) | [Wiki](https://github.com/calamares/calamares/wiki) | +| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Freenode (IRC): #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest) | [Matrix](https://webchat.kde.org/#/room/%23calamares:kde.org) | [Wiki](https://github.com/calamares/calamares/wiki) | |:--:|:--:|:--:|:--:|:--:| From e4c97cac2b3116e300a1dafbceb26a111444d97b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 19 May 2021 14:24:01 +0200 Subject: [PATCH 127/492] Docs: link to the website user-guide, not the wiki version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b83861f84..6c596c2e97 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ a "ready to use" application: distributions apply a huge amount of customisation and configuration to Calamares, and the target audience for this repository is those distributions, and the people who make those Linux distro's. -Calamares has some [generic user documentation](https://github.com/calamares/calamares/wiki/Use-Guide) +Calamares has some [generic user documentation](https://calamares.io/docs/users-guide/) for end-users, but most of what we have is for distro developers. ## Getting Calamares From b48de5b908821d015357e7c5cfc49aa774621f95 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 19 May 2021 14:28:24 +0200 Subject: [PATCH 128/492] Docs: mention Matrix consistently --- CONTRIBUTING.md | 1 + README.md | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 41dec59fab..fed5058440 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,6 +34,7 @@ Regular Calamares development chit-chat happens on old-school IRC in Europe, but feel free to idle. **DO NOT** ask-and-leave. Keep that chat window open because it can easily take a few hours for someone to notice a message. +The Matrix room is relatively new. - [![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest) - [Join us on Matrix](https://webchat.kde.org/#/room/%23calamares:kde.org) diff --git a/README.md b/README.md index 6c596c2e97..a017bc0c3d 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,7 @@ problems or a new feature to discuss. Regular Calamares development chit-chat happens on old-school IRC (no registration required). Responsiveness is best during the day -in Europe, but feel free to idle. +in Europe, but feel free to idle. The Matrix room is relatively new. -[![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest|) +- [![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest|) +- [Join us on Matrix](https://webchat.kde.org/#/room/%23calamares:kde.org) From caea146840ef409a478f4f10e19b4f20c550b6fe Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 19 May 2021 14:57:33 +0200 Subject: [PATCH 129/492] Docs: styling, badge for matrix --- CONTRIBUTING.md | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fed5058440..a1525dea9a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,7 +37,7 @@ someone to notice a message. The Matrix room is relatively new. - [![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest) -- [Join us on Matrix](https://webchat.kde.org/#/room/%23calamares:kde.org) +- [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares-blue?logo=matrix)](https://webchat.kde.org/#/room/%23calamares:kde.org) ## General Guidelines diff --git a/README.md b/README.md index a017bc0c3d..2247fcf4d1 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ | [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Freenode (IRC): #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest) | [Matrix](https://webchat.kde.org/#/room/%23calamares:kde.org) | [Wiki](https://github.com/calamares/calamares/wiki) | -|:--:|:--:|:--:|:--:|:--:| +|:--:|:--:|:--:|:--:|:--:|:--:| > Calamares is a distribution-independent system installer, with an advanced partitioning @@ -47,7 +47,7 @@ The dependencies are explained in [CONTRIBUTING.md](CONTRIBUTING.md). Calamares welcomes PRs. New issues are welcome, too. There are both the Calamares **core** repository (this one), -and an *extensions** repository ([Calamares extensions](https://github.com/calamares/calamares-extensions)). +and an **extensions** repository ([Calamares extensions](https://github.com/calamares/calamares-extensions)). Contributions to code, modules, documentation, the wiki and the website are all welcome. There is more information in the [CONTRIBUTING.md](CONTRIBUTING.md) file. @@ -62,4 +62,4 @@ Regular Calamares development chit-chat happens on old-school IRC in Europe, but feel free to idle. The Matrix room is relatively new. - [![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest|) -- [Join us on Matrix](https://webchat.kde.org/#/room/%23calamares:kde.org) +- [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares-blue?logo=matrix)](https://webchat.kde.org/#/room/%23calamares:kde.org) From 7830461ac5dc188dce6d4fec29fdd3acbd809bb2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 19 May 2021 15:21:05 +0200 Subject: [PATCH 130/492] Docs: one more round of badging --- CONTRIBUTING.md | 5 +++-- README.md | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a1525dea9a..a8114bef24 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,8 +36,9 @@ that chat window open because it can easily take a few hours for someone to notice a message. The Matrix room is relatively new. -- [![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest) -- [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares-blue?logo=matrix)](https://webchat.kde.org/#/room/%23calamares:kde.org) +* [![Chat on IRC](https://img.shields.io/badge/IRC-Freenode%20%23calamares-green)](https://webchat.freenode.net/?randomnick=1&channels=%23calamares) +* [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares:kde.org-blue)](https://webchat.kde.org/#/room/%23calamares:kde.org) + ## General Guidelines diff --git a/README.md b/README.md index 2247fcf4d1..252e00ea0e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE) -| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Freenode (IRC): #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest) | [Matrix](https://webchat.kde.org/#/room/%23calamares:kde.org) | [Wiki](https://github.com/calamares/calamares/wiki) | +| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [IRC: Freenode #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest) | [Matrix: #calamares:kde.org](https://webchat.kde.org/#/room/%23calamares:kde.org) | [Wiki](https://github.com/calamares/calamares/wiki) | |:--:|:--:|:--:|:--:|:--:|:--:| @@ -61,5 +61,5 @@ Regular Calamares development chit-chat happens on old-school IRC (no registration required). Responsiveness is best during the day in Europe, but feel free to idle. The Matrix room is relatively new. -- [![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest|) -- [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares-blue?logo=matrix)](https://webchat.kde.org/#/room/%23calamares:kde.org) +* [![Chat on IRC](https://img.shields.io/badge/IRC-Freenode%20%23calamares-green)](https://webchat.freenode.net/?randomnick=1&channels=%23calamares) +* [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares:kde.org-blue)](https://webchat.kde.org/#/room/%23calamares:kde.org) From 98ebb6f8d102db980abe9cbeb3954dd0bb9a6683 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 21 May 2021 16:24:56 +0200 Subject: [PATCH 131/492] CI: send push-related CI notifications to Matrix --- .github/workflows/push.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 0889ea2788..2a54f1600e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -78,18 +78,10 @@ jobs: working-directory: ${{ env.BUILDDIR }} run: make install VERBOSE=1 - name: "notify: ok" - uses: rectalogic/notify-irc@v1 if: ${{ success() && github.repository == 'calamares/calamares' }} - with: - server: chat.freenode.net - nickname: cala-ci - channel: "#calamares" - message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}" + run: | + curl -s -XPOST -d '{"msgtype":"m.text", "body":"OK ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}"}' 'https://matrix.org/_matrix/client/r0/rooms/%21${{ secrets.MATRIX_ROOM }}/send/m.room.message?access_token=${{ secrets.MATRIX_TOKEN }}' > /dev/null - name: "notify: fail" - uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} - with: - server: chat.freenode.net - nickname: cala-ci - channel: "#calamares" - message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" + run: | + curl -s -XPOST -d '{"msgtype":"m.text", "body": "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" }' 'https://matrix.org/_matrix/client/r0/rooms/%21${{ secrets.MATRIX_ROOM }}/send/m.room.message?access_token=${{ secrets.MATRIX_TOKEN }}' > /dev/null From e186e54434af6058e0f8d841a8ddca8aa75ba684 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 24 May 2021 22:16:54 +0200 Subject: [PATCH 132/492] [fstab] Don't fail with a KeyError in misconfigured installations Use get() instead of [] to avoid KeyError when the host system confuguration is entirely missing a setting for *mountOptions*. FIXES #1702 --- src/modules/fstab/main.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index b6d7a4b2a3..61f6b0e9f3 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -372,15 +372,23 @@ def run(): root_btrfs = (root_partitions[0] == "btrfs") if root_partitions else False if root_btrfs: partitions.append( dict(fs="swap", mountPoint=None, claimed=True, device="/swap/swapfile", uuid=None) ) - else: + else: partitions.append( dict(fs="swap", mountPoint=None, claimed=True, device="/swapfile", uuid=None) ) else: swap_choice = None libcalamares.job.setprogress(0.1) - mount_options = conf["mountOptions"] + mount_options = conf.get("mountOptions", {}) ssd_extra_mount_options = conf.get("ssdExtraMountOptions", {}) crypttab_options = conf.get("crypttabOptions", "luks") + + # We rely on mount_options having a default; if there wasn't one, + # bail out with a meaningful error. + if not mount_options: + return (_("Configuration Error"), + _("No 
{!s}
configuration is given for 
{!s}
to use.") + .format("mountOptions", "fstab")) + generator = FstabGenerator(partitions, root_mount_point, mount_options, From bb1df38caa75d85855062971116002f9e60cec4d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 24 May 2021 23:05:46 +0200 Subject: [PATCH 133/492] [bootloader] Convert command-failures into readable error messages Avoid leaking errors to the caller, because that gets us a traceback and generic Python Error message, which is less-than-helpful. --- src/modules/bootloader/main.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 03fdb0c5b5..3e384a0183 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -474,6 +474,14 @@ def run(): libcalamares.utils.warning( "EFI system, but nothing mounted on {!s}".format(efi_system_partition) ) return None - prepare_bootloader(fw_type) + try: + prepare_bootloader(fw_type) + except subprocess.CalledProcessError as e: + libcalamares.utils.warning(str(e)) + libcalamares.utils.debug("stdout:" + str(e.stdout)) + libcalamares.utils.debug("stderr:" + str(e.stderr)) + return (_("Bootloader installation error"), + _("The bootloader could not be installed. The installation command 
{!s}
returned error code {!s}.") + .format(e.cmd, e.returncode)) return None From aa4569b55b384a47ed0d4fd24f0f0e795e4d79e8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 24 May 2021 23:07:11 +0200 Subject: [PATCH 134/492] [packages] Convert command-failures into readable error messages If the pakcage manager fails in some way, convert to a readable error message instead of leaking the exception to the caller (which produces a traceback, which is harder to read and less informative) --- src/modules/packages/main.py | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index c3cc2ad7d0..9be079dace 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -579,11 +579,27 @@ def run(): update_db = libcalamares.job.configuration.get("update_db", False) if update_db and libcalamares.globalstorage.value("hasInternet"): - pkgman.update_db() + try: + pkgman.update_db() + except subprocess.CalledProcessError as e: + libcalamares.utils.warning(str(e)) + libcalamares.utils.debug("stdout:" + str(e.stdout)) + libcalamares.utils.debug("stderr:" + str(e.stderr)) + return (_("Package Manager error"), + _("The package manager could not prepare updates. The command 
{!s}
returned error code {!s}.") + .format(e.cmd, e.returncode)) update_system = libcalamares.job.configuration.get("update_system", False) if update_system and libcalamares.globalstorage.value("hasInternet"): - pkgman.update_system() + try: + pkgman.update_system() + except subprocess.CalledProcessError as e: + libcalamares.utils.warning(str(e)) + libcalamares.utils.debug("stdout:" + str(e.stdout)) + libcalamares.utils.debug("stderr:" + str(e.stderr)) + return (_("Package Manager error"), + _("The package manager could not update the system. The command 
{!s}
returned error code {!s}.") + .format(e.cmd, e.returncode)) operations = libcalamares.job.configuration.get("operations", []) if libcalamares.globalstorage.contains("packageOperations"): @@ -603,11 +619,18 @@ def run(): for entry in operations: group_packages = 0 libcalamares.utils.debug(pretty_name()) - run_operations(pkgman, entry) + try: + run_operations(pkgman, entry) + except subprocess.CalledProcessError as e: + libcalamares.utils.warning(str(e)) + libcalamares.utils.debug("stdout:" + str(e.stdout)) + libcalamares.utils.debug("stderr:" + str(e.stderr)) + return (_("Package Manager error"), + _("The package manager could make changes to the installed system. The command 
{!s}
returned error code {!s}.") + .format(e.cmd, e.returncode)) mode_packages = None libcalamares.job.setprogress(1.0) - libcalamares.utils.debug(pretty_name()) return None From ded7991dd6d68e5a5bae58fa10b4747246e8dc0b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 09:55:45 +0200 Subject: [PATCH 135/492] CI: different tactic for notifications --- .github/workflows/push.yml | 8 ++++++ ci/notify.sh | 55 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100755 ci/notify.sh diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2a54f1600e..15418dcfc6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -85,3 +85,11 @@ jobs: if: ${{ failure() && github.repository == 'calamares/calamares' }} run: | curl -s -XPOST -d '{"msgtype":"m.text", "body": "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" }' 'https://matrix.org/_matrix/client/r0/rooms/%21${{ secrets.MATRIX_ROOM }}/send/m.room.message?access_token=${{ secrets.MATRIX_TOKEN }}' > /dev/null + - name: "notify: check" + env: + MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} + MATRIX_ROOM: ${{ secrets.MATRIX_ROOM }} + run: | + "$SRCDIR/ci/notify.sh" OK '${{ github.workflow }}' '${{ github.repository }}' '${{ github.actor }}' '${{ github.event.ref }}' \ + '(test)${{ steps.pre_build.outputs.message }}' \ + '${{ github.event.compare }}' diff --git a/ci/notify.sh b/ci/notify.sh new file mode 100755 index 0000000000..a51d48cd3f --- /dev/null +++ b/ci/notify.sh @@ -0,0 +1,55 @@ +#! /bin/sh +# +# SPDX-FileCopyrightText: 2021 Adriaan de Groot +# SPDX-License-Identifier: BSD-2-Clause +# +### +# +# Sends a notification to wherever the notifications need to be sent. +# +# Called with the following environment (for tokens / secrets): +# MATRIX_ROOM +# MATRIX_TOKEN +# +# Called with the following arguments (in order): +# - "OK" or "FAIL" +# - github.workflow +# - github.repository +# - github.actor +# - github.event.ref +# - commit-message-summary (produced in the workflow) +# - github.event.compare +# + +test -z "$MATRIX_ROOM" && { echo "! No secrets" ; exit 1 ; } +test -z "$MATRIX_TOKEN" && { echo "! No secrets" ; exit 1 ; } + +STATUS="$1" + +WORKFLOW="$2" +REPOSITORY="$3" +ACTOR="$4" +EVENT="$5" +SUMMARY="$6" +COMPARE="$7" + +test "x$STATUS" = "xOK" -o "x$STATUS" = "xFAIL" || { echo "! Invalid status" ; exit 1 ; } + +test -z "$WORKFLOW" && { echo "! No event data" ; exit 1 ; } +test -z "$REPOSITORY" && { echo "! No event data" ; exit 1 ; } +test -z "$ACTOR" && { echo "! No event data" ; exit 1 ; } +test -z "$EVENT" && { echo "! No event data" ; exit 1 ; } +# It's ok for summary or the compare URL to be empty + +url="https://matrix.org/_matrix/client/r0/rooms/%21${MATRIX_ROOM}/send/m.room.message?access_token=${MATRIX_TOKEN}" + +status_line="${STATUS} ${WORKFLOW} in ${REPOSITORY} ${ACTOR} on ${EVENT}" +summary_line="" +compare_line="" + +test -n "$SUMMARY" && summary_line="\n.. ${SUMMARY}" +test -n "$COMPARE" && compare_line="\n.. DIFF ${COMPARE}" + +message_data=$(jq -Rs --arg body "${status_line}${summary_line}${compare_line}" '{"msgtype": "m.text", $body}' < /dev/null) + +curl -s -XPOST -d "$message_data" "$url" > /dev/null From a73ad23b9f1ea9638d1c2eec51d30c89b628615c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 10:40:20 +0200 Subject: [PATCH 136/492] CI: need jq for JSON-formatting of matrix message data --- .github/workflows/push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 15418dcfc6..b73fb5b228 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -36,6 +36,7 @@ jobs: cmake \ extra-cmake-modules \ gettext \ + jq \ kio-dev \ libatasmart-dev \ libboost-python-dev \ From e773fb65a8a659da4687e340186e70fec0c6d413 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 11:21:41 +0200 Subject: [PATCH 137/492] CI: migrate push notification to helper script --- .github/workflows/push.yml | 17 +++++++++-------- ci/notify.sh | 15 ++++++--------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b73fb5b228..b5583c1d39 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -30,13 +30,12 @@ jobs: - name: "prepare env" run: | sudo apt-get update - sudo apt-get -y install git-core + sudo apt-get -y install git-core jq sudo apt-get -y install \ build-essential \ cmake \ extra-cmake-modules \ gettext \ - jq \ kio-dev \ libatasmart-dev \ libboost-python-dev \ @@ -80,17 +79,19 @@ jobs: run: make install VERBOSE=1 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} + env: + MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} + MATRIX_ROOM: ${{ secrets.MATRIX_ROOM }} run: | - curl -s -XPOST -d '{"msgtype":"m.text", "body":"OK ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}"}' 'https://matrix.org/_matrix/client/r0/rooms/%21${{ secrets.MATRIX_ROOM }}/send/m.room.message?access_token=${{ secrets.MATRIX_TOKEN }}' > /dev/null + "$SRCDIR/ci/notify.sh" OK '${{ github.workflow }}' '${{ github.repository }}' '${{ github.actor }}' '${{ github.event.ref }}' \ + '${{ steps.pre_build.outputs.message }}' \ + '' - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - run: | - curl -s -XPOST -d '{"msgtype":"m.text", "body": "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ github.actor }} on ${{ github.event.ref }}\n.. ${{ steps.pre_build.outputs.message }}\n.. DIFF ${{ github.event.compare }}" }' 'https://matrix.org/_matrix/client/r0/rooms/%21${{ secrets.MATRIX_ROOM }}/send/m.room.message?access_token=${{ secrets.MATRIX_TOKEN }}' > /dev/null - - name: "notify: check" env: MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} MATRIX_ROOM: ${{ secrets.MATRIX_ROOM }} run: | - "$SRCDIR/ci/notify.sh" OK '${{ github.workflow }}' '${{ github.repository }}' '${{ github.actor }}' '${{ github.event.ref }}' \ - '(test)${{ steps.pre_build.outputs.message }}' \ + "$SRCDIR/ci/notify.sh" FAIL '${{ github.workflow }}' '${{ github.repository }}' '${{ github.actor }}' '${{ github.event.ref }}' \ + '${{ steps.pre_build.outputs.message }}' \ '${{ github.event.compare }}' diff --git a/ci/notify.sh b/ci/notify.sh index a51d48cd3f..d9a2a4f4b1 100755 --- a/ci/notify.sh +++ b/ci/notify.sh @@ -42,14 +42,11 @@ test -z "$EVENT" && { echo "! No event data" ; exit 1 ; } # It's ok for summary or the compare URL to be empty url="https://matrix.org/_matrix/client/r0/rooms/%21${MATRIX_ROOM}/send/m.room.message?access_token=${MATRIX_TOKEN}" - -status_line="${STATUS} ${WORKFLOW} in ${REPOSITORY} ${ACTOR} on ${EVENT}" -summary_line="" -compare_line="" - -test -n "$SUMMARY" && summary_line="\n.. ${SUMMARY}" -test -n "$COMPARE" && compare_line="\n.. DIFF ${COMPARE}" - -message_data=$(jq -Rs --arg body "${status_line}${summary_line}${compare_line}" '{"msgtype": "m.text", $body}' < /dev/null) +message_data=$( +{ + echo "${STATUS} ${WORKFLOW} in ${REPOSITORY} ${ACTOR} on ${EVENT}" + test -n "$SUMMARY" && echo ".. ${SUMMARY}" + test -n "$COMPARE" && echo ".. DIFF ${COMPARE}" +} | jq -Rs '{"msgtype": "m.text", "body":@text}' ) curl -s -XPOST -d "$message_data" "$url" > /dev/null From d630c2aadf392f6ab6c5ae49cafc6fa74664e9eb Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 10:47:05 +0200 Subject: [PATCH 138/492] [partition] Introduce a check if the GPT-on-BIOS popup should be shown The check is bogus right now, and it still always warns; but if the `shouldWarnForGPTOnBIOS()` function is implemented, this will fix issue 1701. --- .../partition/gui/PartitionViewStep.cpp | 51 ++++++++++++------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 6755b64c6a..b1fa851ede 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -395,6 +395,18 @@ PartitionViewStep::onActivate() } } +static bool +shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) +{ + if ( PartUtils::isEfiSystem() ) + { + return false; + } + + cDebug() << core->bootLoaderInstallPath(); + + return true; +} void PartitionViewStep::onLeave() @@ -462,24 +474,25 @@ PartitionViewStep::onLeave() { cDebug() << "device: BIOS"; - // TODO: this *always* warns, which might be annoying, so it'd be - // best to find a way to detect that bios_grub partition. - - QString message = tr( "Option to use GPT on BIOS" ); - QString description = tr( "A GPT partition table is the best option for all " - "systems. This installer supports such a setup for " - "BIOS systems too." - "

" - "To configure a GPT partition table on BIOS, " - "(if not done so already) go back " - "and set the partition table to GPT, next create a 8 MB " - "unformatted partition with the " - "bios_grub flag enabled.

" - "An unformatted 8 MB partition is necessary " - "to start %1 on a BIOS system with GPT." ) - .arg( branding->shortProductName() ); - - QMessageBox::information( m_manualPartitionPage, message, description ); + + if ( shouldWarnForGPTOnBIOS( m_core ) ) + { + QString message = tr( "Option to use GPT on BIOS" ); + QString description = tr( "A GPT partition table is the best option for all " + "systems. This installer supports such a setup for " + "BIOS systems too." + "

" + "To configure a GPT partition table on BIOS, " + "(if not done so already) go back " + "and set the partition table to GPT, next create a 8 MB " + "unformatted partition with the " + "bios_grub flag enabled.

" + "An unformatted 8 MB partition is necessary " + "to start %1 on a BIOS system with GPT." ) + .arg( branding->shortProductName() ); + + QMessageBox::information( m_manualPartitionPage, message, description ); + } } Partition* root_p = m_core->findPartitionByMountPoint( "/" ); @@ -593,7 +606,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) // because it could take a while. Then when it's done, we can set up the widgets // and remove the spinner. m_future = new QFutureWatcher< void >(); - connect( m_future, &QFutureWatcher< void >::finished, this, [this] { + connect( m_future, &QFutureWatcher< void >::finished, this, [ this ] { continueLoading(); this->m_future->deleteLater(); this->m_future = nullptr; From dabd895755e14b1926600f7743c013e235a1d64b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 12:33:12 +0200 Subject: [PATCH 139/492] [partition] Use type alias consistently --- src/modules/partition/core/BootLoaderModel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/core/BootLoaderModel.h b/src/modules/partition/core/BootLoaderModel.h index 47e6ccb957..9b1a651e47 100644 --- a/src/modules/partition/core/BootLoaderModel.h +++ b/src/modules/partition/core/BootLoaderModel.h @@ -26,6 +26,8 @@ class BootLoaderModel : public QStandardItemModel { Q_OBJECT public: + using DeviceList = QList< Device* >; + enum { BootLoaderPathRole = Qt::UserRole + 1, @@ -39,14 +41,12 @@ class BootLoaderModel : public QStandardItemModel * Init the model with the list of devices. Does *not* take ownership of the * devices. */ - void init( const QList< Device* >& devices ); + void init( const DeviceList& devices ); void update(); QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override; - using DeviceList = QList< Device* >; - private: DeviceList m_devices; mutable QMutex m_lock; From d0276fd25fde2717e81ac02c56454847ad175306 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 13:05:45 +0200 Subject: [PATCH 140/492] [partition] Look up bootloader by name, method The bootloader model knows about both rows and devices, so we can look up both at once. The existing implementation as a non-member was rather sketchy and wasn't used except as support for restoreSelectedBootLoader(). --- .../partition/core/BootLoaderModel.cpp | 46 +++++++++++++------ src/modules/partition/core/BootLoaderModel.h | 15 +++--- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/src/modules/partition/core/BootLoaderModel.cpp b/src/modules/partition/core/BootLoaderModel.cpp index 08b0283b30..fd66c85146 100644 --- a/src/modules/partition/core/BootLoaderModel.cpp +++ b/src/modules/partition/core/BootLoaderModel.cpp @@ -18,6 +18,7 @@ // KPMcore #include +#include #include @@ -148,28 +149,39 @@ BootLoaderModel::data( const QModelIndex& index, int role ) const return QStandardItemModel::data( index, role ); } -namespace Calamares -{ -int -findBootloader( const QAbstractItemModel* model, const QString& path ) +std::pair< int, Device* > +BootLoaderModel::findBootLoader( const QString& path ) const { - for ( int i = 0; i < model->rowCount(); ++i ) + int r = 0; + for ( Device* d : m_devices ) { - const auto index = model->index( i, 0, QModelIndex() ); - if ( !index.isValid() ) + if ( d && d->deviceNode() == path ) { - continue; + return std::make_pair( r, d ); } - QVariant var = model->data( index, BootLoaderModel::BootLoaderPathRole ); - if ( var.isValid() && var.toString() == path ) + r++; + } + + Partition* partition = KPMHelpers::findPartitionByMountPoint( m_devices, path ); + if ( partition ) + { + const QString partition_device_path = partition->deviceNode(); + r = 0; + for ( Device* d : m_devices ) { - return i; + if ( d && d->deviceNode() == partition_device_path ) + { + return std::make_pair( r, d ); + } + r++; } } - - return -1; + return std::make_pair( -1, nullptr ); } + +namespace Calamares +{ void restoreSelectedBootLoader( QComboBox& combo, const QString& path ) { @@ -180,12 +192,16 @@ restoreSelectedBootLoader( QComboBox& combo, const QString& path ) return; } - int r = -1; if ( path.isEmpty() ) { + cDebug() << "No path to restore, choosing default"; combo.setCurrentIndex( 0 ); + return; } - else if ( ( r = findBootloader( model, path ) ) >= 0 ) + + const BootLoaderModel* bmodel = qobject_cast< const BootLoaderModel* >( model ); + int r = bmodel ? bmodel->findBootLoader( path ).first : -1; + if ( r >= 0 ) { combo.setCurrentIndex( r ); } diff --git a/src/modules/partition/core/BootLoaderModel.h b/src/modules/partition/core/BootLoaderModel.h index 9b1a651e47..e640d4d7c7 100644 --- a/src/modules/partition/core/BootLoaderModel.h +++ b/src/modules/partition/core/BootLoaderModel.h @@ -47,6 +47,14 @@ class BootLoaderModel : public QStandardItemModel QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override; + /** @brief Looks up a boot-loader by device-name @p path (e.g. /dev/sda) + * + * Returns a row number (index) in the model and a Device*: if there **is** a + * device for the given @p path, index will be in range of the model and + * Device* non-null. Returns (-1, nullptr) otherwise. + */ + std::pair< int, Device* > findBootLoader( const QString& path ) const; + private: DeviceList m_devices; mutable QMutex m_lock; @@ -57,13 +65,6 @@ class BootLoaderModel : public QStandardItemModel namespace Calamares { -/** @brief Returns the row number of boot-loader @p path (e.g. /dev/sda) - * - * Assuming the @p model is a BootLoaderModel, will return a row number - * in the model. Returns -1 otherwise. - */ -int findBootloader( const QAbstractItemModel* model, const QString& path ); - /** @brief Tries to set @p path as selected item in @p combo * * Matches a boot-loader install path (e.g. /dev/sda) with a model From 43c172f54d596d3169e3ea4439c4a60a0d48921b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 13:23:28 +0200 Subject: [PATCH 141/492] [partition] Tighten up types Don't return the generic Abstract model for bootloader, but the subclass pointer, so that consumers can use the convenience API on the subclass. --- src/modules/partition/core/PartitionCoreModule.cpp | 2 +- src/modules/partition/core/PartitionCoreModule.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 058c10d181..27aceec602 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -340,7 +340,7 @@ PartitionCoreModule::deviceModel() const return m_deviceModel; } -QAbstractItemModel* +BootLoaderModel* PartitionCoreModule::bootLoaderModel() const { return m_bootLoaderModel; diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h index 4923481872..6935693101 100644 --- a/src/modules/partition/core/PartitionCoreModule.h +++ b/src/modules/partition/core/PartitionCoreModule.h @@ -122,7 +122,7 @@ class PartitionCoreModule : public QObject * The single BootLoaderModel instance belongs to the PCM. * @return the BootLoaderModel. */ - QAbstractItemModel* bootLoaderModel() const; + BootLoaderModel* bootLoaderModel() const; void createPartitionTable( Device* device, PartitionTable::TableType type ); From 252a88cb7fd60d2a526fc33f09608f644f9a3c28 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 14:07:58 +0200 Subject: [PATCH 142/492] [partition] Check for suitable bios_grub partition. --- .../partition/gui/PartitionViewStep.cpp | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index b1fa851ede..2e769576e1 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -13,6 +13,7 @@ #include "gui/PartitionViewStep.h" +#include "core/BootLoaderModel.h" #include "core/Config.h" #include "core/DeviceModel.h" #include "core/KPMHelpers.h" @@ -36,6 +37,7 @@ #include "utils/NamedEnum.h" #include "utils/QtCompat.h" #include "utils/Retranslator.h" +#include "utils/Units.h" #include "utils/Variant.h" #include "widgets/WaitingWidget.h" @@ -403,8 +405,33 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) return false; } - cDebug() << core->bootLoaderInstallPath(); - + auto [ r, device ] = core->bootLoaderModel()->findBootLoader( core->bootLoaderInstallPath() ); + if ( device ) + { + auto* table = device->partitionTable(); + cDebug() << "Found device for bootloader" << device->deviceNode(); + if ( table && table->type() == PartitionTable::TableType::gpt ) + { + // So this is a BIOS system, and the bootloader will be installed on a GPT system + for ( const auto& partition : qAsConst( table->children() ) ) + { + using CalamaresUtils::Units::operator""_MiB; + if ( ( partition->activeFlags() & PartitionTable::Flag::BiosGrub ) + && ( partition->fileSystem().type() == FileSystem::Unformatted ) + && ( partition->capacity() >= 8_MiB ) ) + { + cDebug() << Logger::SubEntry << "Partition" << partition->partitionPath() + << "is a suitable bios_grub partition"; + return false; + } + } + } + cDebug() << Logger::SubEntry << "No suitable partition for bios_grub found"; + } + else + { + cDebug() << "Found no device for" << core->bootLoaderInstallPath(); + } return true; } From 01911beccc91273a020fa9f55092fbbf578da871 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 14:16:28 +0200 Subject: [PATCH 143/492] [partition] Expand debugging output The partition path isn't set yet, so is probably 'empty'. Try logging the device, too. --- src/modules/partition/gui/PartitionViewStep.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 2e769576e1..903b03380a 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -420,7 +420,8 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) && ( partition->fileSystem().type() == FileSystem::Unformatted ) && ( partition->capacity() >= 8_MiB ) ) { - cDebug() << Logger::SubEntry << "Partition" << partition->partitionPath() + cDebug() << Logger::SubEntry << "Partition" << partition->devicePath() + << partition->partitionPath() << "is a suitable bios_grub partition"; return false; } From c333b9bb0ad92d145e1dc7ac5129c27698c60276 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 14:38:40 +0200 Subject: [PATCH 144/492] CI: want jq for actions in the nightlies, too --- .github/workflows/nightly-debian.yml | 2 +- .github/workflows/nightly-neon.yml | 2 +- .github/workflows/nightly-opensuse.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml index 3fd558e217..3ce1e71919 100644 --- a/.github/workflows/nightly-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -24,7 +24,7 @@ jobs: - name: "prepare env" run: | apt-get update - apt-get -y install git-core + apt-get -y install git-core jq apt-get -y install \ build-essential \ cmake \ diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml index 92f71c10b2..c40311044b 100644 --- a/.github/workflows/nightly-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -24,7 +24,7 @@ jobs: - name: "prepare env" run: | sudo apt-get update - sudo apt-get -y install git-core + sudo apt-get -y install git-core jq sudo apt-get -y install \ build-essential \ cmake \ diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index c3762fb992..579e308073 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -24,7 +24,7 @@ jobs: - name: "prepare env" run: | zypper --non-interactive up - zypper --non-interactive in git-core + zypper --non-interactive in git-core jq # From deploycala.py zypper --non-interactive in \ "autoconf" \ From 5bf118409ab81997285feb29eb972195edc494a2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 14:39:09 +0200 Subject: [PATCH 145/492] CI: try to use actions-metadata rather than local script --- .github/actions/notify-push/action.yml | 20 ++++++++++++++++++ .github/workflows/push.yml | 29 +++++++++++++------------- 2 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 .github/actions/notify-push/action.yml diff --git a/.github/actions/notify-push/action.yml b/.github/actions/notify-push/action.yml new file mode 100644 index 0000000000..9492fa3258 --- /dev/null +++ b/.github/actions/notify-push/action.yml @@ -0,0 +1,20 @@ +name: 'Notify on Push' +description: 'Notify Matrix room' + +inputs: + room: + description: 'Matrix Room ID' + required: true + token: + description: 'Matrix Token' + required: true + message: + description: 'Message to send' + required: true + +runs: + using: "composite" + steps: + - shell: bash + run: | + curl -s -XPOST -d $( echo "$INPUT_MESSAGE" | jq -Rs '{"msgtype": "m.text", "body":@text}' ) "https://matrix.org/_matrix/client/r0/rooms/%21${INPUT_ROOM}/send/m.room.message?access_token=${INPUT_TOKEN}" > /dev/null diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b5583c1d39..4ab250158b 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -79,19 +79,20 @@ jobs: run: make install VERBOSE=1 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - env: - MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} - MATRIX_ROOM: ${{ secrets.MATRIX_ROOM }} - run: | - "$SRCDIR/ci/notify.sh" OK '${{ github.workflow }}' '${{ github.repository }}' '${{ github.actor }}' '${{ github.event.ref }}' \ - '${{ steps.pre_build.outputs.message }}' \ - '' + uses: ./.github/actions/notify-push + with: + TOKEN: ${{ secrets.MATRIX_TOKEN }} + ROOM: ${{ secrets.MATRIX_ROOM }} + MESSAGE: | + OK ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }} + .. ${{ steps.pre_build.outputs.message }} - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - env: - MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} - MATRIX_ROOM: ${{ secrets.MATRIX_ROOM }} - run: | - "$SRCDIR/ci/notify.sh" FAIL '${{ github.workflow }}' '${{ github.repository }}' '${{ github.actor }}' '${{ github.event.ref }}' \ - '${{ steps.pre_build.outputs.message }}' \ - '${{ github.event.compare }}' + uses: ./.github/actions/notify-push + with: + TOKEN: ${{ secrets.MATRIX_TOKEN }} + ROOM: ${{ secrets.MATRIX_ROOM }} + MESSAGE: | + FAIL ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }} + .. ${{ steps.pre_build.outputs.message }} + .. ${{ github.event.compare }} From d8b8d17e8638d15481f11c9eb5d3a8b7938d454a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 15:01:18 +0200 Subject: [PATCH 146/492] CI: try simpler action --- .github/actions/notify-push/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/notify-push/action.yml b/.github/actions/notify-push/action.yml index 9492fa3258..56cdbf7c60 100644 --- a/.github/actions/notify-push/action.yml +++ b/.github/actions/notify-push/action.yml @@ -16,5 +16,4 @@ runs: using: "composite" steps: - shell: bash - run: | - curl -s -XPOST -d $( echo "$INPUT_MESSAGE" | jq -Rs '{"msgtype": "m.text", "body":@text}' ) "https://matrix.org/_matrix/client/r0/rooms/%21${INPUT_ROOM}/send/m.room.message?access_token=${INPUT_TOKEN}" > /dev/null + run: echo "$INPUT_MESSAGE" From 93221da5ead59f7cda84a081e3c608e2b60546e3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 15:47:44 +0200 Subject: [PATCH 147/492] CI: fix up notifications to Matrix --- .github/actions/notify-push/action.yml | 3 ++- .github/workflows/push.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/actions/notify-push/action.yml b/.github/actions/notify-push/action.yml index 56cdbf7c60..ca4e6c0b25 100644 --- a/.github/actions/notify-push/action.yml +++ b/.github/actions/notify-push/action.yml @@ -16,4 +16,5 @@ runs: using: "composite" steps: - shell: bash - run: echo "$INPUT_MESSAGE" + run: | + curl -s -XPOST -d $( echo "${{ inputs.message }}" | jq -Rs '{"msgtype": "m.text", "body":@text}' ) "https://matrix.org/_matrix/client/r0/rooms/%21${{ inputs.room }}/send/m.room.message?access_token=${{ inputs.token }}" > /dev/null diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4ab250158b..c5f02c6250 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -81,18 +81,18 @@ jobs: if: ${{ success() && github.repository == 'calamares/calamares' }} uses: ./.github/actions/notify-push with: - TOKEN: ${{ secrets.MATRIX_TOKEN }} - ROOM: ${{ secrets.MATRIX_ROOM }} - MESSAGE: | + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} + message: | OK ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }} .. ${{ steps.pre_build.outputs.message }} - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} uses: ./.github/actions/notify-push with: - TOKEN: ${{ secrets.MATRIX_TOKEN }} - ROOM: ${{ secrets.MATRIX_ROOM }} - MESSAGE: | + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} + message: | FAIL ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }} .. ${{ steps.pre_build.outputs.message }} .. ${{ github.event.compare }} From b419f5a3c321d8bc57eb02d4082eb34910d36034 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 16:23:59 +0200 Subject: [PATCH 148/492] CI: fix up quotes in command --- .github/actions/notify-push/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/notify-push/action.yml b/.github/actions/notify-push/action.yml index ca4e6c0b25..80c89ea766 100644 --- a/.github/actions/notify-push/action.yml +++ b/.github/actions/notify-push/action.yml @@ -17,4 +17,4 @@ runs: steps: - shell: bash run: | - curl -s -XPOST -d $( echo "${{ inputs.message }}" | jq -Rs '{"msgtype": "m.text", "body":@text}' ) "https://matrix.org/_matrix/client/r0/rooms/%21${{ inputs.room }}/send/m.room.message?access_token=${{ inputs.token }}" > /dev/null + curl -s -XPOST -d "$( echo "${{ inputs.message }}" | jq -Rsc '{"msgtype": "m.text", "body":@text}' )" "https://matrix.org/_matrix/client/r0/rooms/%21${{ inputs.room }}/send/m.room.message?access_token=${{ inputs.token }}" > /dev/null From e15db9a68ca52cd6b06cb4205836993386c25e04 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 16:25:30 +0200 Subject: [PATCH 149/492] CI: move issues notification to Matrix --- .github/workflows/issues.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index e8d2821aeb..a321d40bac 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -9,18 +9,16 @@ jobs: runs-on: ubuntu-latest steps: - name: "notify: new" - uses: rectalogic/notify-irc@v1 if: github.event.issue.state == 'open' + uses: ./.github/actions/notify-push with: - server: chat.freenode.net - nickname: cala-issues - channel: "#calamares" + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} message: "OPENED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}" - name: "notify: closed" - uses: rectalogic/notify-irc@v1 if: github.event.issue.state != 'open' + uses: ./.github/actions/notify-push with: - server: chat.freenode.net - nickname: cala-issues - channel: "#calamares" + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} message: "CLOSED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}" From 74c8f34b79476296cd2798ae27fe1f6e4f2cb8ab Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 25 May 2021 16:27:12 +0200 Subject: [PATCH 150/492] CI: move nightlies reporting to Matrix --- .github/workflows/nightly-debian.yml | 14 ++++++-------- .github/workflows/nightly-neon.yml | 14 ++++++-------- .github/workflows/nightly-opensuse.yml | 14 ++++++-------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml index 3ce1e71919..53ff930190 100644 --- a/.github/workflows/nightly-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -83,18 +83,16 @@ jobs: working-directory: ${{ env.BUILDDIR }} run: make install VERBOSE=1 - name: "notify: ok" - uses: rectalogic/notify-irc@v1 if: ${{ success() && github.repository == 'calamares/calamares' }} + uses: ./.github/actions/notify-push with: - server: chat.freenode.net - nickname: cala-ci - channel: "#calamares" + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" - uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} + uses: ./.github/actions/notify-push with: - server: chat.freenode.net - nickname: cala-ci - channel: "#calamares" + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml index c40311044b..b5c5b8ced9 100644 --- a/.github/workflows/nightly-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -82,18 +82,16 @@ jobs: if-no-files-found: error retention-days: 3 - name: "notify: ok" - uses: rectalogic/notify-irc@v1 if: ${{ success() && github.repository == 'calamares/calamares' }} + uses: ./.github/actions/notify-push with: - server: chat.freenode.net - nickname: cala-ci - channel: "#calamares" + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" - uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} + uses: ./.github/actions/notify-push with: - server: chat.freenode.net - nickname: cala-ci - channel: "#calamares" + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index 579e308073..59e45500bc 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -81,18 +81,16 @@ jobs: working-directory: ${{ env.BUILDDIR }} run: make install VERBOSE=1 - name: "notify: ok" - uses: rectalogic/notify-irc@v1 if: ${{ success() && github.repository == 'calamares/calamares' }} + uses: ./.github/actions/notify-push with: - server: chat.freenode.net - nickname: cala-ci - channel: "#calamares" + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" - uses: rectalogic/notify-irc@v1 if: ${{ failure() && github.repository == 'calamares/calamares' }} + uses: ./.github/actions/notify-push with: - server: chat.freenode.net - nickname: cala-ci - channel: "#calamares" + token: ${{ secrets.MATRIX_TOKEN }} + room: ${{ secrets.MATRIX_ROOM }} message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" From ffe32091215c63f9ab532fca3d830e830e581c03 Mon Sep 17 00:00:00 2001 From: demmm Date: Tue, 25 May 2021 22:52:10 +0200 Subject: [PATCH 151/492] [localeq], working Offline.qml --- src/modules/localeq/Offline.qml | 34 ++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/modules/localeq/Offline.qml b/src/modules/localeq/Offline.qml index 5a0d4eb3f0..892eb97d37 100644 --- a/src/modules/localeq/Offline.qml +++ b/src/modules/localeq/Offline.qml @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * SPDX-FileCopyrightText: 2020 Anke Boersma + * SPDX-FileCopyrightText: 2020-2021 Anke Boersma * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -21,6 +21,10 @@ Page { width: 800 //parent.width height: 500 + id: control + property string currentRegion + property string currentZone + StackView { id: stack anchors.fill: parent @@ -34,7 +38,7 @@ Page { anchors.horizontalCenter: parent.horizontalCenter color: Kirigami.Theme.textColor horizontalAlignment: Text.AlignCenter - text: qsTr("Select your preferred Region, or use the default one based on your current location.") + text: qsTr("Select your preferred Region, or use the default settings.") } ListView { @@ -62,18 +66,17 @@ Page { opacity: 0.7 } - // model loads, dozens of variations tried for currentIndex all fail model: config.regionModel - currentIndex: config.currentIndex + currentIndex: -1 delegate: ItemDelegate { - + hoverEnabled: true width: parent.width highlighted: ListView.isCurrentItem Label { - text: name + text: model.name Layout.fillHeight: true Layout.fillWidth: true width: parent.width @@ -89,8 +92,9 @@ Page { onClicked: { - list.model.currentIndex = index - // correct to use config.currentTimezoneName when index is updated? + list.currentIndex = index + control.currentRegion = model.name + config.regionalZonesModel.region = control.currentRegion tztext.text = qsTr("Timezone: %1").arg(config.currentTimezoneName) stack.push(zoneView) } @@ -136,9 +140,8 @@ Page { opacity: 0.7 } - // model loads, dozens of variations tried for currentIndex all fail model: config.regionalZonesModel - currentIndex: config.currentIndex + currentIndex : -1 delegate: ItemDelegate { hoverEnabled: true @@ -147,7 +150,7 @@ Page { Label { - text: name + text: model.name Layout.fillHeight: true Layout.fillWidth: true width: parent.width @@ -163,20 +166,21 @@ Page { onClicked: { - list2.model.currentIndex = index + list2.currentIndex = index list2.positionViewAtIndex(index, ListView.Center) - // correct to use config.currentTimezoneName when index is updated? + control.currentZone = model.name + config.setCurrentLocation(control.currentRegion, control.currentZone) tztext.text = qsTr("Timezone: %1").arg(config.currentTimezoneName) } } } - + Button { Layout.fillWidth: true anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: -30 - anchors.left: parent.left + anchors.left: parent.left anchors.leftMargin: parent.width / 15 icon.name: "go-previous" text: qsTr("Zones") From 2c99a8c6f8ea43d3ea3a96db1def5a805bfd0976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 26 May 2021 09:36:02 +0200 Subject: [PATCH 152/492] [displaymanager] add cutefish - more info at https://cutefishos.com/ --- src/modules/displaymanager/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index ef34e929f0..8b63b9e8d8 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -198,6 +198,7 @@ def update_from_desktop_file(self, root_mount_point): DesktopEnvironment('/usr/bin/fvwm3', 'fvwm3'), DesktopEnvironment('/usr/bin/sway', 'sway'), DesktopEnvironment('/usr/bin/ukui-session', 'ukui'), + DesktopEnvironment('/usr/bin/cutefish-session', 'cutefish-xsession'), ] From 72f97ac163bf24b44cb55c2bfbe1a0f00f00a8a2 Mon Sep 17 00:00:00 2001 From: demmm Date: Wed, 26 May 2021 12:38:08 +0200 Subject: [PATCH 153/492] [localeq] Offline.qml visual improvements --- src/modules/localeq/Offline.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/localeq/Offline.qml b/src/modules/localeq/Offline.qml index 892eb97d37..e5e6b31cf8 100644 --- a/src/modules/localeq/Offline.qml +++ b/src/modules/localeq/Offline.qml @@ -49,7 +49,7 @@ Page { } width: parent.width / 2 - height: 250 + height: parent.height / 1.5 anchors.centerIn: parent anchors.verticalCenterOffset: -30 focus: true @@ -77,8 +77,8 @@ Page { Label { text: model.name - Layout.fillHeight: true - Layout.fillWidth: true + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter width: parent.width height: 30 color: highlighted ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor @@ -123,7 +123,7 @@ Page { } width: parent.width / 2 - height: 250 + height: parent.height / 1.5 anchors.centerIn: parent anchors.verticalCenterOffset: -30 focus: true @@ -151,8 +151,8 @@ Page { Label { text: model.name - Layout.fillHeight: true - Layout.fillWidth: true + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter width: parent.width height: 30 color: highlighted ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor From 2107efdd752af4839d6033c4e37798aac3ff5a0f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 26 May 2021 16:11:58 +0200 Subject: [PATCH 154/492] CI: remove Matrix script (it's now a regular action) --- ci/notify.sh | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100755 ci/notify.sh diff --git a/ci/notify.sh b/ci/notify.sh deleted file mode 100755 index d9a2a4f4b1..0000000000 --- a/ci/notify.sh +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/sh -# -# SPDX-FileCopyrightText: 2021 Adriaan de Groot -# SPDX-License-Identifier: BSD-2-Clause -# -### -# -# Sends a notification to wherever the notifications need to be sent. -# -# Called with the following environment (for tokens / secrets): -# MATRIX_ROOM -# MATRIX_TOKEN -# -# Called with the following arguments (in order): -# - "OK" or "FAIL" -# - github.workflow -# - github.repository -# - github.actor -# - github.event.ref -# - commit-message-summary (produced in the workflow) -# - github.event.compare -# - -test -z "$MATRIX_ROOM" && { echo "! No secrets" ; exit 1 ; } -test -z "$MATRIX_TOKEN" && { echo "! No secrets" ; exit 1 ; } - -STATUS="$1" - -WORKFLOW="$2" -REPOSITORY="$3" -ACTOR="$4" -EVENT="$5" -SUMMARY="$6" -COMPARE="$7" - -test "x$STATUS" = "xOK" -o "x$STATUS" = "xFAIL" || { echo "! Invalid status" ; exit 1 ; } - -test -z "$WORKFLOW" && { echo "! No event data" ; exit 1 ; } -test -z "$REPOSITORY" && { echo "! No event data" ; exit 1 ; } -test -z "$ACTOR" && { echo "! No event data" ; exit 1 ; } -test -z "$EVENT" && { echo "! No event data" ; exit 1 ; } -# It's ok for summary or the compare URL to be empty - -url="https://matrix.org/_matrix/client/r0/rooms/%21${MATRIX_ROOM}/send/m.room.message?access_token=${MATRIX_TOKEN}" -message_data=$( -{ - echo "${STATUS} ${WORKFLOW} in ${REPOSITORY} ${ACTOR} on ${EVENT}" - test -n "$SUMMARY" && echo ".. ${SUMMARY}" - test -n "$COMPARE" && echo ".. DIFF ${COMPARE}" -} | jq -Rs '{"msgtype": "m.text", "body":@text}' ) - -curl -s -XPOST -d "$message_data" "$url" > /dev/null From 03b2c8054b3bf1c769efcdaeac88e72a8ac509de Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 26 May 2021 16:12:17 +0200 Subject: [PATCH 155/492] CI: opensuse doesn't have curl installed by default --- .github/workflows/nightly-opensuse.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index 59e45500bc..88c30d1361 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -24,7 +24,7 @@ jobs: - name: "prepare env" run: | zypper --non-interactive up - zypper --non-interactive in git-core jq + zypper --non-interactive in git-core jq curl # From deploycala.py zypper --non-interactive in \ "autoconf" \ From 2d8cf6aabf7b1052f4c674e66b8b62c87a49b484 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 26 May 2021 16:36:28 +0200 Subject: [PATCH 156/492] [partition] Fix build against KPMCore3 --- src/modules/partition/gui/PartitionViewStep.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 903b03380a..738c5d25dc 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -406,6 +406,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) } auto [ r, device ] = core->bootLoaderModel()->findBootLoader( core->bootLoaderInstallPath() ); + Q_UNUSED(r); if ( device ) { auto* table = device->partitionTable(); @@ -416,7 +417,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) for ( const auto& partition : qAsConst( table->children() ) ) { using CalamaresUtils::Units::operator""_MiB; - if ( ( partition->activeFlags() & PartitionTable::Flag::BiosGrub ) + if ( ( partition->activeFlags() & KPM_PARTITION_FLAG( BiosGrub ) ) && ( partition->fileSystem().type() == FileSystem::Unformatted ) && ( partition->capacity() >= 8_MiB ) ) { From 1021db053debdd6b8ab5cd9724d9435a455726f1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 28 May 2021 12:55:52 +0200 Subject: [PATCH 157/492] CI: switch to shared Calamares actions entirely --- .github/actions/notify-push/action.yml | 20 -------------------- .github/workflows/issues.yml | 4 ++-- .github/workflows/nightly-debian.yml | 4 ++-- .github/workflows/nightly-neon.yml | 4 ++-- .github/workflows/nightly-opensuse.yml | 4 ++-- .github/workflows/push.yml | 4 ++-- 6 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 .github/actions/notify-push/action.yml diff --git a/.github/actions/notify-push/action.yml b/.github/actions/notify-push/action.yml deleted file mode 100644 index 80c89ea766..0000000000 --- a/.github/actions/notify-push/action.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: 'Notify on Push' -description: 'Notify Matrix room' - -inputs: - room: - description: 'Matrix Room ID' - required: true - token: - description: 'Matrix Token' - required: true - message: - description: 'Message to send' - required: true - -runs: - using: "composite" - steps: - - shell: bash - run: | - curl -s -XPOST -d "$( echo "${{ inputs.message }}" | jq -Rsc '{"msgtype": "m.text", "body":@text}' )" "https://matrix.org/_matrix/client/r0/rooms/%21${{ inputs.room }}/send/m.room.message?access_token=${{ inputs.token }}" > /dev/null diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index a321d40bac..7d1d5a9f0e 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -10,14 +10,14 @@ jobs: steps: - name: "notify: new" if: github.event.issue.state == 'open' - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: "OPENED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}" - name: "notify: closed" if: github.event.issue.state != 'open' - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml index 53ff930190..7b56c8f760 100644 --- a/.github/workflows/nightly-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -84,14 +84,14 @@ jobs: run: make install VERBOSE=1 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml index b5c5b8ced9..05f23beb88 100644 --- a/.github/workflows/nightly-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -83,14 +83,14 @@ jobs: retention-days: 3 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index 88c30d1361..24987cc7c9 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -82,14 +82,14 @@ jobs: run: make install VERBOSE=1 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c5f02c6250..89fbf91b60 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -79,7 +79,7 @@ jobs: run: make install VERBOSE=1 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} @@ -88,7 +88,7 @@ jobs: .. ${{ steps.pre_build.outputs.message }} - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: ./.github/actions/notify-push + uses: calamares/actions/matrix-notify@v1 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} From fe78ec494ffa48d3e12a293b2357561849281556 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 28 May 2021 17:04:54 +0200 Subject: [PATCH 158/492] CI: use shared prepare and build steps --- .github/workflows/push.yml | 55 +++++--------------------------------- 1 file changed, 6 insertions(+), 49 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 89fbf91b60..23d4b91e2d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -28,55 +28,12 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - run: | - sudo apt-get update - sudo apt-get -y install git-core jq - sudo apt-get -y install \ - build-essential \ - cmake \ - extra-cmake-modules \ - gettext \ - kio-dev \ - libatasmart-dev \ - libboost-python-dev \ - libkf5config-dev \ - libkf5coreaddons-dev \ - libkf5i18n-dev \ - libkf5iconthemes-dev \ - libkf5parts-dev \ - libkf5service-dev \ - libkf5solid-dev \ - libkpmcore-dev \ - libparted-dev \ - libpolkit-qt5-1-dev \ - libqt5svg5-dev \ - libqt5webkit5-dev \ - libyaml-cpp-dev \ - os-prober \ - pkg-config \ - python3-dev \ - qtbase5-dev \ - qtdeclarative5-dev \ - qttools5-dev \ - qttools5-dev-tools + uses: calamares/actions/prepare-neon@v2 - name: "prepare source" uses: actions/checkout@v2 - - name: "prepare build" - id: pre_build - run: | - test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } - mkdir -p $BUILDDIR - test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` - - name: "Calamares: cmake" - working-directory: ${{ env.BUILDDIR }} - run: cmake $CMAKE_ARGS $SRCDIR - - name: "Calamares: make" - working-directory: ${{ env.BUILDDIR }} - run: make -j2 VERBOSE=1 - - name: "Calamares: install" - working-directory: ${{ env.BUILDDIR }} - run: make install VERBOSE=1 + - name: "build" + id: build + uses: calamares/actions/generic-build@v2 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} uses: calamares/actions/matrix-notify@v1 @@ -85,7 +42,7 @@ jobs: room: ${{ secrets.MATRIX_ROOM }} message: | OK ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }} - .. ${{ steps.pre_build.outputs.message }} + .. ${{ steps.build.outputs.git-summary }} - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} uses: calamares/actions/matrix-notify@v1 @@ -94,5 +51,5 @@ jobs: room: ${{ secrets.MATRIX_ROOM }} message: | FAIL ${{ github.workflow }} in ${{ github.repository }} by ${{ github.actor }} on ${{ github.event.ref }} - .. ${{ steps.pre_build.outputs.message }} + .. ${{ steps.build.outputs.git-summary }} .. ${{ github.event.compare }} From 241c1840aa944ef9391e61d193cb6e558d53b922 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 28 May 2021 17:38:30 +0200 Subject: [PATCH 159/492] CI: chase new actions --- .github/workflows/issues.yml | 4 +- .github/workflows/nightly-debian.yml | 70 +++----------------------- .github/workflows/nightly-neon.yml | 61 ++++------------------ .github/workflows/nightly-opensuse.yml | 68 +++---------------------- .github/workflows/push.yml | 4 +- 5 files changed, 29 insertions(+), 178 deletions(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 7d1d5a9f0e..b24d192a1f 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -10,14 +10,14 @@ jobs: steps: - name: "notify: new" if: github.event.issue.state == 'open' - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: "OPENED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}" - name: "notify: closed" if: github.event.issue.state != 'open' - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml index 7b56c8f760..02b5fe3862 100644 --- a/.github/workflows/nightly-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -22,77 +22,23 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - run: | - apt-get update - apt-get -y install git-core jq - apt-get -y install \ - build-essential \ - cmake \ - extra-cmake-modules \ - gettext \ - kio-dev \ - libatasmart-dev \ - libboost-python-dev \ - libkf5config-dev \ - libkf5coreaddons-dev \ - libkf5i18n-dev \ - libkf5iconthemes-dev \ - libkf5parts-dev \ - libkf5service-dev \ - libkf5solid-dev \ - libparted-dev \ - libpolkit-qt5-1-dev \ - libqt5svg5-dev \ - libqt5webkit5-dev \ - libyaml-cpp-dev \ - os-prober \ - pkg-config \ - python3-dev \ - qtbase5-dev \ - qtdeclarative5-dev \ - qttools5-dev \ - qttools5-dev-tools - # Same name as on KDE neon, different version - apt-get -y install libkpmcore-dev - # Additional dependencies - apt-get -y install \ - libappstreamqt-dev \ - libicu-dev \ - libkf5crash-dev \ - libkf5package-dev \ - libkf5plasma-dev \ - libpwquality-dev \ - libqt5webenginewidgets5 \ - qtwebengine5-dev + uses: calamares/actions/prepare-debian@v2 - name: "prepare source" uses: actions/checkout@v2 - - name: "prepare build" - id: pre_build - run: | - test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } - mkdir -p $BUILDDIR - test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` - - name: "Calamares: cmake" - working-directory: ${{ env.BUILDDIR }} - run: cmake $CMAKE_ARGS $SRCDIR - - name: "Calamares: make" - working-directory: ${{ env.BUILDDIR }} - run: make -j2 VERBOSE=1 - - name: "Calamares: install" - working-directory: ${{ env.BUILDDIR }} - run: make install VERBOSE=1 + - name: "build" + id: build + uses: calamares/actions/generic-build@v2 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} - message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} - message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml index 05f23beb88..51a2b3fc67 100644 --- a/.github/workflows/nightly-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -22,59 +22,16 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - run: | - sudo apt-get update - sudo apt-get -y install git-core jq - sudo apt-get -y install \ - build-essential \ - cmake \ - extra-cmake-modules \ - gettext \ - kio-dev \ - libatasmart-dev \ - libboost-python-dev \ - libkf5config-dev \ - libkf5coreaddons-dev \ - libkf5i18n-dev \ - libkf5iconthemes-dev \ - libkf5parts-dev \ - libkf5service-dev \ - libkf5solid-dev \ - libkpmcore-dev \ - libparted-dev \ - libpolkit-qt5-1-dev \ - libqt5svg5-dev \ - libqt5webkit5-dev \ - libyaml-cpp-dev \ - os-prober \ - pkg-config \ - python3-dev \ - qtbase5-dev \ - qtdeclarative5-dev \ - qttools5-dev \ - qttools5-dev-tools + uses: calamares/actions/prepare-neon@v2 - name: "prepare source" uses: actions/checkout@v2 - - name: "prepare build" - id: pre_build - run: | - test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } - mkdir -p $BUILDDIR - test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` - - name: "Calamares: cmake" - working-directory: ${{ env.BUILDDIR }} - run: cmake $CMAKE_ARGS $SRCDIR - - name: "Calamares: make" - working-directory: ${{ env.BUILDDIR }} - run: make -j2 VERBOSE=1 - - name: "Calamares: install" - working-directory: ${{ env.BUILDDIR }} - run: make install VERBOSE=1 DESTDIR=${{ env.BUILDDIR }}/stage + - name: "build" + id: build + uses: calamares/actions/generic-build@v2 - name: "Calamares: archive" working-directory: ${{ env.BUILDDIR }} run: tar czf calamares.tar.gz stage - - name: "upload" + - name: "Calamares: upload" uses: actions/upload-artifact@v2 with: name: calamares-tarball @@ -83,15 +40,15 @@ jobs: retention-days: 3 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} - message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} - message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index 24987cc7c9..ff395d5fb8 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -22,75 +22,23 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - run: | - zypper --non-interactive up - zypper --non-interactive in git-core jq curl - # From deploycala.py - zypper --non-interactive in \ - "autoconf" \ - "automake" \ - "bison" \ - "flex" \ - "git" \ - "libtool" \ - "m4" \ - "make" \ - "cmake" \ - "extra-cmake-modules" \ - "gcc-c++" \ - "libqt5-qtbase-devel" \ - "libqt5-linguist-devel" \ - "libqt5-qtsvg-devel" \ - "libqt5-qtdeclarative-devel" \ - "libqt5-qtwebengine-devel" \ - "yaml-cpp-devel" \ - "libpolkit-qt5-1-devel" \ - "kservice-devel" \ - "kpackage-devel" \ - "kparts-devel" \ - "kcrash-devel" \ - "kpmcore-devel" \ - "plasma5-workspace-devel" \ - "plasma-framework-devel" \ - "libpwquality-devel" \ - "parted-devel" \ - "python3-devel" \ - "boost-devel" \ - "libboost_python-py3-*-devel" - # Additional dependencies - zypper --non-interactive in \ - libicu-devel \ - libAppStreamQt-devel \ - libatasmart-devel + uses: calamares/actions/prepare-opensuse@v2 - name: "prepare source" uses: actions/checkout@v2 - - name: "prepare build" - id: pre_build - run: | - test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } - mkdir -p $BUILDDIR - test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } - echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}` - - name: "Calamares: cmake" - working-directory: ${{ env.BUILDDIR }} - run: cmake $CMAKE_ARGS $SRCDIR - - name: "Calamares: make" - working-directory: ${{ env.BUILDDIR }} - run: make -j2 VERBOSE=1 - - name: "Calamares: install" - working-directory: ${{ env.BUILDDIR }} - run: make install VERBOSE=1 + - name: "build" + id: build + uses: calamares/actions/generic-build@v2 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} - message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} - message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}" + message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 23d4b91e2d..8d67f1865f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -36,7 +36,7 @@ jobs: uses: calamares/actions/generic-build@v2 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} @@ -45,7 +45,7 @@ jobs: .. ${{ steps.build.outputs.git-summary }} - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v1 + uses: calamares/actions/matrix-notify@v2 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} From 516c8bf7b6b43a42eeb9cac7d3627103d671ec2a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 30 May 2021 14:46:13 +0200 Subject: [PATCH 160/492] CI: fix artifact-building The generic-build step runs an install to the host system; for artifact- generation, we need it all centralized in a stage/ directory. Do that separately for the KDE neon builds that produce the artifact. --- .github/workflows/nightly-neon.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml index 51a2b3fc67..2c964bedf9 100644 --- a/.github/workflows/nightly-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -30,7 +30,9 @@ jobs: uses: calamares/actions/generic-build@v2 - name: "Calamares: archive" working-directory: ${{ env.BUILDDIR }} - run: tar czf calamares.tar.gz stage + run: | + make install DESTDIR=${{ env.BUILDDIR }}/stage + tar czf calamares.tar.gz stage - name: "Calamares: upload" uses: actions/upload-artifact@v2 with: From a72d59d23bbcd28dae59e90eb271d415526e5e08 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 31 May 2021 10:38:37 +0200 Subject: [PATCH 161/492] [partition] Don't mention IRC support for weird configs --- src/modules/partition/partition.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index e5de696591..7330f92b34 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -152,8 +152,6 @@ defaultFileSystemType: "ext4" # may arise as a consequence of setting this option to false. # It is strongly recommended that system integrators put in the work to support # LUKS unlocking support in GRUB2 and initramfs/dracut/mkinitcpio/etc. -# Support is offered to system integrators that wish to do so, through the -# Calamares bug tracker, as well as in #calamares on Freenode. # For more information on setting up GRUB2 for Calamares with LUKS, see # https://github.com/calamares/calamares/wiki/Deploy-LUKS # From 1825ae1de4c3c6996ceaf5afb38621b58324c450 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 31 May 2021 10:41:49 +0200 Subject: [PATCH 162/492] Docs: IRC links to Libera.Chat --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a8114bef24..c281631372 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,8 +36,8 @@ that chat window open because it can easily take a few hours for someone to notice a message. The Matrix room is relatively new. -* [![Chat on IRC](https://img.shields.io/badge/IRC-Freenode%20%23calamares-green)](https://webchat.freenode.net/?randomnick=1&channels=%23calamares) * [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares:kde.org-blue)](https://webchat.kde.org/#/room/%23calamares:kde.org) +* [![Chat on IRC](https://img.shields.io/badge/IRC-Libera.Chat%20%23calamares-green)](https://kiwiirc.com/client/irc.libera.chat/#calamares) ## General Guidelines diff --git a/README.md b/README.md index 252e00ea0e..7c674bee49 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE) -| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [IRC: Freenode #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest) | [Matrix: #calamares:kde.org](https://webchat.kde.org/#/room/%23calamares:kde.org) | [Wiki](https://github.com/calamares/calamares/wiki) | +| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [IRC: Libera.Chat #calamares](https://kiwiirc.com/client/irc.libera.chat/#calamares) | [Matrix: #calamares:kde.org](https://webchat.kde.org/#/room/%23calamares:kde.org) | [Wiki](https://github.com/calamares/calamares/wiki) | |:--:|:--:|:--:|:--:|:--:|:--:| @@ -61,5 +61,5 @@ Regular Calamares development chit-chat happens on old-school IRC (no registration required). Responsiveness is best during the day in Europe, but feel free to idle. The Matrix room is relatively new. -* [![Chat on IRC](https://img.shields.io/badge/IRC-Freenode%20%23calamares-green)](https://webchat.freenode.net/?randomnick=1&channels=%23calamares) * [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares:kde.org-blue)](https://webchat.kde.org/#/room/%23calamares:kde.org) +* [![Chat on IRC](https://img.shields.io/badge/IRC-Libera.Chat%20%23calamares-green)](https://kiwiirc.com/client/irc.libera.chat/#calamares) From ddcfd861cc0c40dde9e4327014c73ca5c7aa7657 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 31 May 2021 11:03:24 +0200 Subject: [PATCH 163/492] Changes: note communications --- CHANGES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index f678ecd68f..b67d2d30a6 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,10 @@ This release contains contributions from (alphabetically by first name): - Joe Kamprad - Lisa Vitolo (blast from the past!) +In project news, chat (instant-messaging) communications has largely +moved to Matrix and Libera.Chat. CI notifications -- issues and build +results -- are sent to Matrix only. + ## Core ## - The CMake modules for consumption by external modules (e.g. the calamares-extensions repository, but also any other modules built From 716328cafb95a8f879bf975ee95a3821af206d51 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 31 May 2021 11:26:49 +0200 Subject: [PATCH 164/492] [libcalamares] Un-clog Logging - Map QtMsgType -- used by qDebug() and qWarning() -- to levels used by Calamares in a consistent fashion. - Drop unused log levels (INFO, EXTRA unused in any Calamares code). --- src/libcalamares/utils/Logger.cpp | 17 +++++++++-------- src/libcalamares/utils/Logger.h | 2 -- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp index 262ff59e17..8cce914107 100644 --- a/src/libcalamares/utils/Logger.cpp +++ b/src/libcalamares/utils/Logger.cpp @@ -33,7 +33,7 @@ static unsigned int s_threshold = #ifdef QT_NO_DEBUG Logger::LOG_DISABLE; #else - Logger::LOGEXTRA + 1; // Comparison is < in log() function + Logger::LOGDEBUG; // Comparison is < in log() function #endif static QMutex s_mutex; @@ -105,20 +105,21 @@ CalamaresLogHandler( QtMsgType type, const QMessageLogContext&, const QString& m const char* message = ba.constData(); QMutexLocker locker( &s_mutex ); + switch ( type ) { - case QtDebugMsg: + case QtInfoMsg: log( message, LOGVERBOSE ); break; - - case QtInfoMsg: - log( message, 1 ); + case QtDebugMsg: + log( message, LOGDEBUG ); break; - - case QtCriticalMsg: case QtWarningMsg: + log( message, LOGWARNING ); + break; + case QtCriticalMsg: case QtFatalMsg: - log( message, 0 ); + log( message, LOGERROR ); break; } } diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index b2e8cf0e88..6736ba7408 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -47,8 +47,6 @@ enum LOG_DISABLE = 0, LOGERROR = 1, LOGWARNING = 2, - LOGINFO = 3, - LOGEXTRA = 5, LOGDEBUG = 6, LOGVERBOSE = 8 }; From b68e53513198fbc898467b300bf8e90b61808b31 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 31 May 2021 11:39:13 +0200 Subject: [PATCH 165/492] [libcalamares] Log to file and stdout consistently - The log **file** got every QDebug object, while stdout only got the ones of sufficient logging level. A CDebug object checks the logging level before writing anything -- so those already were consistent, but any qDebug() in the program (not cDebug()!) would reach the writing-function anyway, and so log to the file. Fix this weird inconsistency by checking log-level just once, for both writes. --- src/libcalamares/utils/Logger.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp index 8cce914107..c83fea4ae5 100644 --- a/src/libcalamares/utils/Logger.cpp +++ b/src/libcalamares/utils/Logger.cpp @@ -69,7 +69,7 @@ logLevel() static void log( const char* msg, unsigned int debugLevel, bool withTime = true ) { - if ( true ) + if ( logLevelEnabled( debugLevel ) ) { QMutexLocker lock( &s_mutex ); @@ -81,11 +81,7 @@ log( const char* msg, unsigned int debugLevel, bool withTime = true ) << QString::number( debugLevel ).toUtf8().data() << "]: " << msg << std::endl; logfile.flush(); - } - if ( logLevelEnabled( debugLevel ) ) - { - QMutexLocker lock( &s_mutex ); if ( withTime ) { std::cout << QTime::currentTime().toString().toUtf8().data() << " [" From a57a1fdbd8358d2bff1e2c38abbbe9a5c4387089 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 4 Jun 2021 13:32:22 +0200 Subject: [PATCH 166/492] [partition] Improve logging while collecting devices --- .../partition/core/PartitionCoreModule.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index ddfc6c1cb4..912d465467 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -255,13 +255,22 @@ PartitionCoreModule::doInit() DeviceList devices = PartUtils::getDevices( PartUtils::DeviceType::WritableOnly ); cDebug() << "LIST OF DETECTED DEVICES:"; - cDebug() << "node\tcapacity\tname\tprettyName"; + cDebug() << Logger::SubEntry << "node\tcapacity\tname\tprettyName"; for ( auto device : devices ) { - // Gives ownership of the Device* to the DeviceInfo object - auto deviceInfo = new DeviceInfo( device ); - m_deviceInfos << deviceInfo; - cDebug() << device->deviceNode() << device->capacity() << device->name() << device->prettyName(); + cDebug() << Logger::SubEntry << Logger::Pointer(device); + if ( device ) + { + // Gives ownership of the Device* to the DeviceInfo object + auto deviceInfo = new DeviceInfo( device ); + m_deviceInfos << deviceInfo; + cDebug() << Logger::SubEntry << device->deviceNode() << device->capacity() << device->name() + << device->prettyName(); + } + else + { + cDebug() << Logger::SubEntry << "(skipped null device)"; + } } cDebug() << Logger::SubEntry << devices.count() << "devices detected."; m_deviceModel->init( devices ); From 236bd0eb96e316d9a702acef83e9769268f334e9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 4 Jun 2021 14:46:00 +0200 Subject: [PATCH 167/492] CI: adjust clang-formatting - duplicate the file to .base - drop 10-and-later setting that was commented out - specific setting for lambda-formatting (this seems to be the default) --- .clang-format | 2 +- .clang-format.base | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 .clang-format.base diff --git a/.clang-format b/.clang-format index aa4aa0e2a3..2cd8d678ac 100644 --- a/.clang-format +++ b/.clang-format @@ -8,6 +8,7 @@ AlignEscapedNewlines: DontAlign AllowAllParametersOfDeclarationOnNextLine: "false" AllowShortFunctionsOnASingleLine: Inline AllowShortIfStatementsOnASingleLine: "false" +AllowShortLambdasOnASingleLine: All AllowShortLoopsOnASingleLine: "false" AlwaysBreakAfterReturnType: TopLevelDefinitions AlwaysBreakTemplateDeclarations: Yes @@ -28,7 +29,6 @@ ReflowComments: "false" SortIncludes: "true" SpaceAfterCStyleCast: "false" SpacesBeforeTrailingComments: "2" -# SpaceInEmptyBlock: "true" SpacesInAngles: "true" SpacesInParentheses: "true" SpacesInSquareBrackets: "true" diff --git a/.clang-format.base b/.clang-format.base new file mode 100644 index 0000000000..2cd8d678ac --- /dev/null +++ b/.clang-format.base @@ -0,0 +1,35 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +--- +BasedOnStyle: WebKit + +AlignAfterOpenBracket: Align +AlignEscapedNewlines: DontAlign +AllowAllParametersOfDeclarationOnNextLine: "false" +AllowShortFunctionsOnASingleLine: Inline +AllowShortIfStatementsOnASingleLine: "false" +AllowShortLambdasOnASingleLine: All +AllowShortLoopsOnASingleLine: "false" +AlwaysBreakAfterReturnType: TopLevelDefinitions +AlwaysBreakTemplateDeclarations: Yes +BinPackArguments: "false" +BinPackParameters: "false" +BreakBeforeBraces: Allman +BreakBeforeTernaryOperators: "true" +BreakConstructorInitializers: BeforeComma +ColumnLimit: 120 +Cpp11BracedListStyle: "false" +FixNamespaceComments: "true" +IncludeBlocks: Preserve +IndentWidth: "4" +MaxEmptyLinesToKeep: "2" +NamespaceIndentation: None +PointerAlignment: Left +ReflowComments: "false" +SortIncludes: "true" +SpaceAfterCStyleCast: "false" +SpacesBeforeTrailingComments: "2" +SpacesInAngles: "true" +SpacesInParentheses: "true" +SpacesInSquareBrackets: "true" +Standard: Cpp11 From f3c57723df264a3e6b3ef47d6b9f7b38029776f9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 4 Jun 2021 14:47:26 +0200 Subject: [PATCH 168/492] CI: make clang-format wrangling more flexible Various clang-format versions have different defaults and don't understand the same options, so adjust to having files per-formatting-version to patch things up. --- ci/calamaresstyle | 73 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/ci/calamaresstyle b/ci/calamaresstyle index 9c0964bd2d..3718a85061 100755 --- a/ci/calamaresstyle +++ b/ci/calamaresstyle @@ -5,12 +5,7 @@ # SPDX-License-Identifier: BSD-2-Clause # # Calls astyle with settings matching Calamares coding style -# Requires astyle >= 2.04 and clang-format-7 -8 or -9 -# -# Clang-format-10 is **not** supported, since it changes a default -# that re-introduces a space into empty function bodies; this -# can be turned off with a style setting, but that breaks -# older format versions which don't recognize the setting. +# Requires astyle >= 2.04 and clang-format-8 or later # # You can pass in directory names, in which case the files # in that directory (NOT below it) are processed. @@ -20,9 +15,16 @@ LC_ALL=C LC_NUMERIC=C export LANG LC_ALL LC_NUMERIC +BASEDIR=$(dirname $0) +TOPDIR=$( cd $BASEDIR/.. && pwd -P ) +test -d "$BASEDIR" || { echo "! Could not determine base for $0" ; exit 1 ; } +test -d "$TOPDIR" || { echo "! Cound not determine top-level source dir" ; exit 1 ; } +test -f "$TOPDIR/.clang-format.base" || { echo "! No .clang-format support files in $TOPDIR" ; exit 1 ; } + AS=$( which astyle ) -CF_VERSIONS="clang-format-8 clang-format80 clang-format90 clang-format-9.0.1 clang-format" +# Allow specifying CF_VERSIONS outside already +CF_VERSIONS="$CF_VERSIONS clang-format-8 clang-format80 clang-format90 clang-format-9.0.1 clang-format" for _cf in $CF_VERSIONS do # Not an error if this particular clang-format isn't found @@ -35,19 +37,45 @@ test -n "$CF" || { echo "! No clang-format ($CF_VERSIONS) found in PATH"; exit 1 test -x "$AS" || { echo "! $AS is not executable."; exit 1 ; } test -x "$CF" || { echo "! $CF is not executable."; exit 1 ; } -unmangle_clang_format="" +### CLANG-FORMAT-WRANGLING +# +# Version 7 and earlier doesn't understand all the options we would like +# Version 8 is ok +# Version 9 is ok +# Later versions change some defaults so need extra wrangling. +# .. there are extra files that are appended to the settings, per +# .. clang-format version. + format_version=`"$CF" --version | tr -dc '[^.0-9]' | cut -d . -f 1` -if expr "$format_version" '<' 8 > /dev/null ; then - echo "! Clang-format version 8+ required" - exit 1 -fi -if expr "$format_version" '<' 10 > /dev/null ; then - : -else - unmangle_clang_format=$( dirname $0 )/../.clang-format - echo "SpaceInEmptyBlock: false" >> "$unmangle_clang_format" -fi +case "$format_version" in + [0-7] ) + echo "! Clang-format version 8+ required" + exit 1 + ;; + [89] ) + : + ;; + 10 ) + extra_settings="10" + ;; + 11 ) + extra_settings="10 11" + ;; + * ) + echo "! Clang-format version '$format_version' unknown." + exit 1 + ;; +esac +_fmt="$TOPDIR/.clang-format" +cp "$_fmt.base" "$_fmt" +for f in "$extra_settings" ; do + test -f "$_fmt.$f" && cat "$_fmt.$f" >> "$_fmt" +done + +### FILE PROCESSING +# +# set -e any_dirs=no @@ -59,7 +87,7 @@ done style_some() { if test -n "$*" ; then - $AS --options=$(dirname $0)/astylerc --quiet "$@" + $AS --options=$BASEDIR/astylerc --quiet "$@" $CF -i -style=file "$@" fi } @@ -77,6 +105,7 @@ else style_some "$@" fi -if test -n "$unmangle_clang_format" ; then - sed -i.bak '/^SpaceInEmptyBlock/d' "$unmangle_clang_format" -fi +### CLANG-FORMAT-WRANGLING +# +# Restore the original .clang-format +cp "$_fmt.base" "$_fmt" From 154396f80a8d7fb3321a2f13a1f9ec3e430c2345 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 4 Jun 2021 14:55:11 +0200 Subject: [PATCH 169/492] CI: drop support for clang-format10 and later The only acceptable versions of clang-format are 8 and 9 for now (until another round of big-churn-from-formatting, at which point we'll update the required version). clang-format-9 says: SpacesInSquareBrackets (bool) If true, spaces will be inserted after [ and before ]. Lambdas or unspecified size array declarations will not be affected. clang-format-10 changes part of that to: Lambdas without arguments or unspecified size array declarations will not be affected. This means that 9 will only allow `[name]` for captures, and 10 will only allow `[ name ]` for captures, so they ping-pong all the lambda's in the codebase back and forth. Just don't. --- ci/calamaresstyle | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ci/calamaresstyle b/ci/calamaresstyle index 3718a85061..ffcfe09026 100755 --- a/ci/calamaresstyle +++ b/ci/calamaresstyle @@ -55,14 +55,8 @@ case "$format_version" in [89] ) : ;; - 10 ) - extra_settings="10" - ;; - 11 ) - extra_settings="10 11" - ;; * ) - echo "! Clang-format version '$format_version' unknown." + echo "! Clang-format version '$format_version' unsupported." exit 1 ;; esac From 8f81fd71884e8d27552fc7c06d69206bdd540000 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 11:50:09 +0200 Subject: [PATCH 170/492] CI: bump openSUSE - needs newer dependency installation - try out the slightly-hardened notifications --- .github/workflows/nightly-opensuse.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index ff395d5fb8..b9d13cf0af 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -22,7 +22,7 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - uses: calamares/actions/prepare-opensuse@v2 + uses: calamares/actions/prepare-opensuse@0d294e557d4d2f0fa179eff3ac97b45aaffe53cf - name: "prepare source" uses: actions/checkout@v2 - name: "build" @@ -30,15 +30,16 @@ jobs: uses: calamares/actions/generic-build@v2 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@0d294e557d4d2f0fa179eff3ac97b45aaffe53cf with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} - message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" + message: | + OK" ; ls -la ; echo "${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@0d294e557d4d2f0fa179eff3ac97b45aaffe53cf with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} - message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" + message: "FAIL\" ; ls -la ; echo \" ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" From eb627bc055cf3403e0f7c8d8e8cf459565c5de6d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 13:22:56 +0200 Subject: [PATCH 171/492] [partition] Avoid crash when PARTITION_UNSAFE is on PARTITION_UNSAFE is a debug mode. It is not used in production, because it allows you to pick an install device that would be dangerous (e.g. the current / device). Existing code kept two copies of a list of pointers, and deleted pointers from one of the lists and returned the other -- which now contains dangling pointers. Refactor by applying suitable lambdas to a single copy of the list; this avoids copying the list so there is no danger of dangling pointers. --- src/modules/partition/core/DeviceList.cpp | 33 +++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 395b6b4840..3a0a102b13 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -125,12 +125,27 @@ getDevices( DeviceType which ) DeviceList devices = backend->scanDevices( /* excludeReadOnly */ true ); #endif + /* The list of devices is cleaned up for use: + * - some devices can **never** be used (e.g. floppies, nullptr) + * - some devices can be used if unsafe mode is on, but not in normal operation + * Two lambda's are defined, + * - removeInAllModes() + * - removeInSafeMode() + * To handle the difference. + */ #ifdef DEBUG_PARTITION_UNSAFE cWarning() << "Allowing unsafe partitioning choices." << devices.count() << "candidates."; - DeviceList unsafeDevices = devices; #ifdef DEBUG_PARTITION_LAME - cDebug() << Logger::SubEntry << "it has been lamed, and will fail."; + cDebug() << Logger::SubEntry << "unsafe partitioning has been lamed, and will fail."; #endif + + // Unsafe partitioning + auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it) { return erase(l, it); }; + auto removeInSafeMode = []( DeviceList&, DeviceList::iterator& it) { return ++it; }; +#else + // Safe partitioning + auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it) { return erase(l, it); }; + auto& removeInSafeMode = removeFromAll; #endif cDebug() << "Removing unsuitable devices:" << devices.count() << "candidates."; @@ -142,27 +157,27 @@ getDevices( DeviceType which ) if ( !( *it ) ) { cDebug() << Logger::SubEntry << "Skipping nullptr device"; - it = erase( devices, it ); + it = removeInAllModes( devices, it ); } else if ( isZRam( *it ) ) { cDebug() << Logger::SubEntry << "Removing zram" << it; - it = erase( devices, it ); + it = removeInAllModes( devices, it ); } else if ( isFloppyDrive( ( *it ) ) ) { cDebug() << Logger::SubEntry << "Removing floppy disk" << it; - it = erase( devices, it ); + it = removeInAllModes( devices, it ); } else if ( writableOnly && hasRootPartition( *it ) ) { cDebug() << Logger::SubEntry << "Removing device with root filesystem (/) on it" << it; - it = erase( devices, it ); + it = removeInSafeMode( devices, it ); } else if ( writableOnly && isIso9660( *it ) ) { cDebug() << Logger::SubEntry << "Removing device with iso9660 filesystem (probably a CD) on it" << it; - it = erase( devices, it ); + it = removeInSafeMode( devices, it ); } else { @@ -170,11 +185,7 @@ getDevices( DeviceType which ) } } cDebug() << Logger::SubEntry << "there are" << devices.count() << "devices left."; -#ifdef DEBUG_PARTITION_UNSAFE - return unsafeDevices; -#else return devices; -#endif } } // namespace PartUtils From df634573bf0bad6834eb09c2693efbb9e7f76adc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 14:09:31 +0200 Subject: [PATCH 172/492] [partition] Resize combo box to show whole pop-up The (collapsed) combo box should be wide enough to show the entire pop-up (expanded) box data. FIXES #1700 --- src/modules/partition/gui/ChoicePage.cpp | 26 ++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 093f74b391..245ee0b927 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -134,6 +134,28 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent ) ChoicePage::~ChoicePage() {} +/** @brief Sets the @p model for the given @p box and adjusts UI sizes to match. + * + * The model provides data for drawing the items in the model; the + * drawing itself is done by the delegate, which may end up drawing a + * different width in the popup than in the collapsed combo box. + * + * Make the box wide enough to accomodate the whole expanded delegate; + * this avoids cases where the popup would truncate data being drawn + * because the overall box is sized too narrow. + */ +void setModelToComboBox( QComboBox* box, QAbstractItemModel* model ) +{ + box->setModel( model ); + if ( model->rowCount() > 0 ) + { + QStyleOptionViewItem options; + options.initFrom( box ); + auto delegateSize = box->itemDelegate()->sizeHint(options, model->index(0, 0) ); + box->setMinimumWidth( delegateSize.width() ); + } +} + void ChoicePage::init( PartitionCoreModule* core ) { @@ -145,10 +167,10 @@ ChoicePage::init( PartitionCoreModule* core ) // We need to do this because a PCM revert invalidates the deviceModel. connect( core, &PartitionCoreModule::reverted, this, [=] { - m_drivesCombo->setModel( core->deviceModel() ); + setModelToComboBox( m_drivesCombo, core->deviceModel() ); m_drivesCombo->setCurrentIndex( m_lastSelectedDeviceIndex ); } ); - m_drivesCombo->setModel( core->deviceModel() ); + setModelToComboBox( m_drivesCombo, core->deviceModel() ); connect( m_drivesCombo, static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ), From f67c7f900cc3719b1d8f6956225926faec4dfdbd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 14:14:11 +0200 Subject: [PATCH 173/492] [partition] Make the expanded (pop-up) icon sizes for devices a bit smaller --- src/modules/partition/core/DeviceModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp index bf55417567..46a181b33c 100644 --- a/src/modules/partition/core/DeviceModel.cpp +++ b/src/modules/partition/core/DeviceModel.cpp @@ -99,7 +99,7 @@ DeviceModel::data( const QModelIndex& index, int role ) const return CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionDisk, CalamaresUtils::Original, - QSize( CalamaresUtils::defaultIconSize().width() * 3, CalamaresUtils::defaultIconSize().height() * 3 ) ); + QSize( CalamaresUtils::defaultIconSize().width() * 2, CalamaresUtils::defaultIconSize().height() * 2 ) ); default: return QVariant(); } From 63c6a8bac890b31b1572e9b4a0fc2a5ed50bfbfe Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 14:18:28 +0200 Subject: [PATCH 174/492] [partition] Remove unneeded includes --- src/modules/partition/core/DeviceList.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 3a0a102b13..f7d1d48358 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -10,14 +10,8 @@ #include "DeviceList.h" -#include "PartitionCoreModule.h" -#include "core/DeviceModel.h" -#include "core/KPMHelpers.h" - -#include "GlobalStorage.h" -#include "JobQueue.h" -#include "partition/PartitionIterator.h" #include "utils/Logger.h" +#include "partition/PartitionIterator.h" #include #include @@ -25,7 +19,6 @@ #include #include -#include using CalamaresUtils::Partition::PartitionIterator; From 4f70568c652e73c247889ecf3d5f9c5491cd3099 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 15:05:44 +0200 Subject: [PATCH 175/492] [partition] Remove unneeded includes --- src/modules/partition/gui/PartitionPage.h | 1 - .../partition/gui/PartitionViewStep.cpp | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/src/modules/partition/gui/PartitionPage.h b/src/modules/partition/gui/PartitionPage.h index 81c2cd9835..4628223467 100644 --- a/src/modules/partition/gui/PartitionPage.h +++ b/src/modules/partition/gui/PartitionPage.h @@ -20,7 +20,6 @@ class PartitionCoreModule; class Ui_PartitionPage; class Device; -class DeviceModel; class Partition; /** diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 19544a198e..b4eefb3b09 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -16,45 +16,27 @@ #include "core/BootLoaderModel.h" #include "core/Config.h" #include "core/DeviceModel.h" -#include "core/KPMHelpers.h" -#include "core/OsproberEntry.h" -#include "core/PartUtils.h" -#include "core/PartitionActions.h" #include "core/PartitionCoreModule.h" -#include "core/PartitionModel.h" #include "gui/ChoicePage.h" #include "gui/PartitionBarsView.h" #include "gui/PartitionLabelsView.h" #include "gui/PartitionPage.h" #include "Branding.h" -#include "CalamaresVersion.h" #include "GlobalStorage.h" -#include "Job.h" #include "JobQueue.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" -#include "utils/NamedEnum.h" #include "utils/QtCompat.h" #include "utils/Retranslator.h" -#include "utils/Units.h" #include "utils/Variant.h" #include "widgets/WaitingWidget.h" - -#include #include -#include -#include -#include #include -#include -#include #include -#include #include -#include #include PartitionViewStep::PartitionViewStep( QObject* parent ) From 7019b6d6636b00d2182a9a4d886b186df9f7e44b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 15:37:23 +0200 Subject: [PATCH 176/492] CI: remove in-progress label when closing an issue --- .github/workflows/issues.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index b24d192a1f..b03522103d 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -5,7 +5,7 @@ on: types: [opened, reopened, closed] jobs: - irc: + notify: runs-on: ubuntu-latest steps: - name: "notify: new" @@ -22,3 +22,11 @@ jobs: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: "CLOSED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}" + - name: "remove in-progress label" + if: github.event.issue.state != 'open' + run: | + curl -X DELETE \ + -H 'Accept: application/vnd.github.v3+json' \ + -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \ + https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.id }}/labels/hacking%3A+in-progress + From d75439e7119e7c5b04fb2dba2a00a5dfd26a2fea Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 15:58:29 +0200 Subject: [PATCH 177/492] CI: bump all to @v3 actions from Calamares - prep for the nightlies (only openSUSE affected) - notifications (slightly more secure) - fix unlabeling issues on close --- .github/workflows/issues.yml | 6 +++--- .github/workflows/nightly-debian.yml | 8 ++++---- .github/workflows/nightly-neon.yml | 8 ++++---- .github/workflows/nightly-opensuse.yml | 12 ++++++------ .github/workflows/push.yml | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index b03522103d..155cb6a175 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -10,14 +10,14 @@ jobs: steps: - name: "notify: new" if: github.event.issue.state == 'open' - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: "OPENED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}" - name: "notify: closed" if: github.event.issue.state != 'open' - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} @@ -28,5 +28,5 @@ jobs: curl -X DELETE \ -H 'Accept: application/vnd.github.v3+json' \ -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \ - https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.id }}/labels/hacking%3A+in-progress + https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/hacking%3A+in-progress diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml index 02b5fe3862..d4dfe16216 100644 --- a/.github/workflows/nightly-debian.yml +++ b/.github/workflows/nightly-debian.yml @@ -22,22 +22,22 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - uses: calamares/actions/prepare-debian@v2 + uses: calamares/actions/prepare-debian@v3 - name: "prepare source" uses: actions/checkout@v2 - name: "build" id: build - uses: calamares/actions/generic-build@v2 + uses: calamares/actions/generic-build@v3 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml index 2c964bedf9..64b745e45f 100644 --- a/.github/workflows/nightly-neon.yml +++ b/.github/workflows/nightly-neon.yml @@ -22,12 +22,12 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - uses: calamares/actions/prepare-neon@v2 + uses: calamares/actions/prepare-neon@v3 - name: "prepare source" uses: actions/checkout@v2 - name: "build" id: build - uses: calamares/actions/generic-build@v2 + uses: calamares/actions/generic-build@v3 - name: "Calamares: archive" working-directory: ${{ env.BUILDDIR }} run: | @@ -42,14 +42,14 @@ jobs: retention-days: 3 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml index b9d13cf0af..0eab97bc4e 100644 --- a/.github/workflows/nightly-opensuse.yml +++ b/.github/workflows/nightly-opensuse.yml @@ -22,24 +22,24 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - uses: calamares/actions/prepare-opensuse@0d294e557d4d2f0fa179eff3ac97b45aaffe53cf + uses: calamares/actions/prepare-opensuse@v3 - name: "prepare source" uses: actions/checkout@v2 - name: "build" id: build - uses: calamares/actions/generic-build@v2 + uses: calamares/actions/generic-build@v3 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@0d294e557d4d2f0fa179eff3ac97b45aaffe53cf + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} message: | - OK" ; ls -la ; echo "${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" + OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@0d294e557d4d2f0fa179eff3ac97b45aaffe53cf + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} - message: "FAIL\" ; ls -la ; echo \" ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" + message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 8d67f1865f..cc7bb7223a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -28,15 +28,15 @@ jobs: options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare env" - uses: calamares/actions/prepare-neon@v2 + uses: calamares/actions/prepare-neon@v3 - name: "prepare source" uses: actions/checkout@v2 - name: "build" id: build - uses: calamares/actions/generic-build@v2 + uses: calamares/actions/generic-build@v3 - name: "notify: ok" if: ${{ success() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} @@ -45,7 +45,7 @@ jobs: .. ${{ steps.build.outputs.git-summary }} - name: "notify: fail" if: ${{ failure() && github.repository == 'calamares/calamares' }} - uses: calamares/actions/matrix-notify@v2 + uses: calamares/actions/matrix-notify@v3 with: token: ${{ secrets.MATRIX_TOKEN }} room: ${{ secrets.MATRIX_ROOM }} From 242572f57dacfaee1af537285199298d084167a1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 16:20:03 +0200 Subject: [PATCH 178/492] CI: don't encode label name in URL beforehand; let curl do it --- .github/workflows/issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 155cb6a175..679bb22b80 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -28,5 +28,5 @@ jobs: curl -X DELETE \ -H 'Accept: application/vnd.github.v3+json' \ -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \ - https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/hacking%3A+in-progress + "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/hacking: in-progress" From 8d9c3c428d1806824b0b6e30be685fd3e5b581c2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 16:26:29 +0200 Subject: [PATCH 179/492] Docs: there is no Coverity or Travis status to speak of --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 7c674bee49..54210dcf3b 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,6 @@ [![GitHub release](https://img.shields.io/github/release/calamares/calamares.svg)](https://github.com/calamares/calamares/releases) [![GitHub Build Status](https://img.shields.io/github/workflow/status/calamares/calamares/ci?label=GH%20build)](https://github.com/calamares/calamares/actions?query=workflow%3Aci) -[![Travis Build Status](https://travis-ci.org/calamares/calamares.svg?branch=calamares)](https://travis-ci.org/calamares/calamares) -[![Coverity Scan Build Status](https://scan.coverity.com/projects/5389/badge.svg)](https://scan.coverity.com/projects/5389) [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE) From 185c5d8b5159673b4233868374f4219f815978a5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 16:37:01 +0200 Subject: [PATCH 180/492] Docs: add link and badge for 'current issue' --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 54210dcf3b..5f10957524 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ # Calamares: Distribution-Independent Installer Framework --------- +[![Current issue](https://img.shields.io/badge/issue-in_progress-FE9B48)](https://github.com/calamares/calamares/labels/hacking%3A%20in-progress) [![GitHub release](https://img.shields.io/github/release/calamares/calamares.svg)](https://github.com/calamares/calamares/releases) [![GitHub Build Status](https://img.shields.io/github/workflow/status/calamares/calamares/ci?label=GH%20build)](https://github.com/calamares/calamares/actions?query=workflow%3Aci) [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE) From 983e32c9d91db021089ba5e317f8d6793db00ab3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 16:49:06 +0200 Subject: [PATCH 181/492] CI: fine, encode the whole label name --- .github/workflows/issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 679bb22b80..0a68dd58f5 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -28,5 +28,5 @@ jobs: curl -X DELETE \ -H 'Accept: application/vnd.github.v3+json' \ -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \ - "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/hacking: in-progress" + "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/hacking%3A%20in-progress" From 619a6a3f97d6746220066cc101772bb2db6df9c3 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 8 Jun 2021 17:50:10 +0200 Subject: [PATCH 182/492] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_es.ts | 8 +- lang/calamares_es_MX.ts | 2 +- lang/calamares_es_PE.ts | 4257 +++++++++++++++++++++++++++++++++++++++ lang/calamares_fr.ts | 2 +- lang/calamares_he.ts | 14 +- lang/calamares_ja.ts | 2 +- lang/calamares_nl.ts | 162 +- 7 files changed, 4355 insertions(+), 92 deletions(-) create mode 100644 lang/calamares_es_PE.ts diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts index 8a5d5455c7..41c37f0117 100644 --- a/lang/calamares_es.ts +++ b/lang/calamares_es.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Gestionar la configuración de montaje automático @@ -14,7 +14,7 @@ The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - El <strong>entorno de arranque<strong> de este sistema.<br><br>Los sistemas x86 sólo soportan <strong>BIOS</strong>.<br>Los sistemas modernos habitualmente usan <strong>EFI</strong>, pero también pueden mostrarse como BIOS si se inician en modo de compatibildiad. + El <strong>entorno de arranque<strong> de este sistema.<br><br>Los sistemas x86 sólo tienen soporte para <strong>BIOS</strong>.<br>Los sistemas modernos habitualmente usan <strong>EFI</strong>, pero también pueden mostrarse como BIOS si se inician en modo de compatibildiad. @@ -115,12 +115,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar Uploads the session log to the configured pastebin. - + Sube el log de la sesión hacia el pastebin configurado. Send Session Log - + Envía el Log de la Sesión. diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts index 9690665808..9fef8fcbbb 100644 --- a/lang/calamares_es_MX.ts +++ b/lang/calamares_es_MX.ts @@ -1882,7 +1882,7 @@ El instalador terminará y se perderán todos los cambios. Configuration Error - + Error de configuración diff --git a/lang/calamares_es_PE.ts b/lang/calamares_es_PE.ts new file mode 100644 index 0000000000..aa7bc768c2 --- /dev/null +++ b/lang/calamares_es_PE.ts @@ -0,0 +1,4257 @@ + + + + + AutoMountManagementJob + + + Manage auto-mount settings + + + + + BootInfoWidget + + + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. + + + + + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. + + + + + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. + + + + + BootLoaderModel + + + Master Boot Record of %1 + + + + + Boot Partition + + + + + System Partition + + + + + Do not install a boot loader + + + + + %1 (%2) + + + + + Calamares::BlankViewStep + + + Blank Page + + + + + Calamares::DebugWindow + + + Form + + + + + GlobalStorage + + + + + JobQueue + + + + + Modules + + + + + Type: + + + + + + none + + + + + Interface: + + + + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + + Reload Stylesheet + + + + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + + Widget Tree + + + + + Debug information + + + + + Calamares::ExecutionViewStep + + + Set up + + + + + Install + + + + + Calamares::FailJob + + + Job failed (%1) + + + + + Programmed job failure was explicitly requested. + + + + + Calamares::JobThread + + + Done + + + + + Calamares::NamedJob + + + Example job (%1) + + + + + Calamares::ProcessJob + + + Run command '%1' in target system. + + + + + Run command '%1'. + + + + + Running command %1 %2 + + + + + Calamares::PythonJob + + + Running %1 operation. + + + + + Bad working directory path + + + + + Working directory %1 for python job %2 is not readable. + + + + + Bad main script file + + + + + Main script file %1 for python job %2 is not readable. + + + + + Boost.Python error in job "%1". + + + + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + + + Calamares::RequirementsChecker + + + Requirements checking for module <i>%1</i> is complete. + + + + + Waiting for %n module(s). + + + + + + + + (%n second(s)) + + + + + + + + System-requirements checking is complete. + + + + + Calamares::ViewManager + + + Setup Failed + + + + + Installation Failed + + + + + Would you like to paste the install log to the web? + + + + + Error + + + + + + &Yes + + + + + + &No + + + + + &Close + + + + + Install Log Paste URL + + + + + The upload was unsuccessful. No web-paste was done. + + + + + Install log posted to + +%1 + +Link copied to clipboard + + + + + Calamares Initialization Failed + + + + + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. + + + + + <br/>The following modules could not be loaded: + + + + + Continue with setup? + + + + + Continue with installation? + + + + + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> + + + + + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> + + + + + &Set up now + + + + + &Install now + + + + + Go &back + + + + + &Set up + + + + + &Install + + + + + Setup is complete. Close the setup program. + + + + + The installation is complete. Close the installer. + + + + + Cancel setup without changing the system. + + + + + Cancel installation without changing the system. + + + + + &Next + + + + + &Back + + + + + &Done + + + + + &Cancel + + + + + Cancel setup? + + + + + Cancel installation? + + + + + Do you really want to cancel the current setup process? +The setup program will quit and all changes will be lost. + + + + + Do you really want to cancel the current install process? +The installer will quit and all changes will be lost. + + + + + CalamaresPython::Helper + + + Unknown exception type + + + + + unparseable Python error + + + + + unparseable Python traceback + + + + + Unfetchable Python error. + + + + + CalamaresWindow + + + %1 Setup Program + + + + + %1 Installer + + + + + CheckerContainer + + + Gathering system information... + + + + + ChoicePage + + + Form + + + + + Select storage de&vice: + + + + + + + + Current: + + + + + After: + + + + + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. + + + + + Reuse %1 as home partition for %2. + + + + + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> + + + + + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. + + + + + Boot loader location: + + + + + <strong>Select a partition to install on</strong> + + + + + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. + + + + + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. + + + + + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. + + + + + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> + + + + + This storage device has one of its partitions <strong>mounted</strong>. + + + + + This storage device is a part of an <strong>inactive RAID</strong> device. + + + + + No Swap + + + + + Reuse Swap + + + + + Swap (no Hibernate) + + + + + Swap (with Hibernate) + + + + + Swap to file + + + + + ClearMountsJob + + + Clear mounts for partitioning operations on %1 + + + + + Clearing mounts for partitioning operations on %1. + + + + + Cleared all mounts for %1 + + + + + ClearTempMountsJob + + + Clear all temporary mounts. + + + + + Clearing all temporary mounts. + + + + + Cannot get list of temporary mounts. + + + + + Cleared all temporary mounts. + + + + + CommandList + + + + Could not run command. + + + + + The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. + + + + + The command needs to know the user's name, but no username is defined. + + + + + Config + + + Set keyboard model to %1.<br/> + + + + + Set keyboard layout to %1/%2. + + + + + Set timezone to %1/%2. + + + + + The system language will be set to %1. + + + + + The numbers and dates locale will be set to %1. + + + + + Network Installation. (Disabled: Incorrect configuration) + + + + + Network Installation. (Disabled: Received invalid groups data) + + + + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) + + + + + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. + + + + + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. + + + + + This program will ask you some questions and set up %2 on your computer. + + + + + <h1>Welcome to the Calamares setup program for %1</h1> + + + + + <h1>Welcome to %1 setup</h1> + + + + + <h1>Welcome to the Calamares installer for %1</h1> + + + + + <h1>Welcome to the %1 installer</h1> + + + + + Your username is too long. + + + + + '%1' is not allowed as username. + + + + + Your username must start with a lowercase letter or underscore. + + + + + Only lowercase letters, numbers, underscore and hyphen are allowed. + + + + + Your hostname is too short. + + + + + Your hostname is too long. + + + + + '%1' is not allowed as hostname. + + + + + Only letters, numbers, underscore and hyphen are allowed. + + + + + Your passwords do not match! + + + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + + + + ContextualProcessJob + + + Contextual Processes Job + + + + + CreatePartitionDialog + + + Create a Partition + + + + + Si&ze: + + + + + MiB + + + + + Partition &Type: + + + + + &Primary + + + + + E&xtended + + + + + Fi&le System: + + + + + LVM LV name + + + + + &Mount Point: + + + + + Flags: + + + + + En&crypt + + + + + Logical + + + + + Primary + + + + + GPT + + + + + Mountpoint already in use. Please select another one. + + + + + CreatePartitionJob + + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + + Create new %2MiB partition on %4 (%3) with file system %1. + + + + + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. + + + + + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). + + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. + + + + + + Creating new %1 partition on %2. + + + + + The installer failed to create partition on disk '%1'. + + + + + CreatePartitionTableDialog + + + Create Partition Table + + + + + Creating a new partition table will delete all existing data on the disk. + + + + + What kind of partition table do you want to create? + + + + + Master Boot Record (MBR) + + + + + GUID Partition Table (GPT) + + + + + CreatePartitionTableJob + + + Create new %1 partition table on %2. + + + + + Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). + + + + + Creating new %1 partition table on %2. + + + + + The installer failed to create a partition table on %1. + + + + + CreateUserJob + + + Create user %1 + + + + + Create user <strong>%1</strong>. + + + + + Preserving home directory + + + + + + Creating user %1 + + + + + Configuring user %1 + + + + + Setting file permissions + + + + + CreateVolumeGroupDialog + + + Create Volume Group + + + + + CreateVolumeGroupJob + + + Create new volume group named %1. + + + + + Create new volume group named <strong>%1</strong>. + + + + + Creating new volume group named %1. + + + + + The installer failed to create a volume group named '%1'. + + + + + DeactivateVolumeGroupJob + + + + Deactivate volume group named %1. + + + + + Deactivate volume group named <strong>%1</strong>. + + + + + The installer failed to deactivate a volume group named %1. + + + + + DeletePartitionJob + + + Delete partition %1. + + + + + Delete partition <strong>%1</strong>. + + + + + Deleting partition %1. + + + + + The installer failed to delete partition %1. + + + + + DeviceInfoWidget + + + This device has a <strong>%1</strong> partition table. + + + + + This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem. + + + + + This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page. + + + + + <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment. + + + + + <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions. + + + + + The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. + + + + + DeviceModel + + + %1 - %2 (%3) + device[name] - size[number] (device-node[name]) + + + + + %1 - (%2) + device[name] - (device-node[name]) + + + + + DracutLuksCfgJob + + + Write LUKS configuration for Dracut to %1 + + + + + Skip writing LUKS configuration for Dracut: "/" partition is not encrypted + + + + + Failed to open %1 + + + + + DummyCppJob + + + Dummy C++ Job + + + + + EditExistingPartitionDialog + + + Edit Existing Partition + + + + + Content: + + + + + &Keep + + + + + Format + + + + + Warning: Formatting the partition will erase all existing data. + + + + + &Mount Point: + + + + + Si&ze: + + + + + MiB + + + + + Fi&le System: + + + + + Flags: + + + + + Mountpoint already in use. Please select another one. + + + + + EncryptWidget + + + Form + + + + + En&crypt system + + + + + Passphrase + + + + + Confirm passphrase + + + + + + Please enter the same passphrase in both boxes. + + + + + FillGlobalStorageJob + + + Set partition information + + + + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + + Install %1 on <strong>new</strong> %2 system partition. + + + + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + + + + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + + + + + Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. + + + + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. + + + + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + + + + + Install boot loader on <strong>%1</strong>. + + + + + Setting up mount points. + + + + + FinishedPage + + + Form + + + + + &Restart now + + + + + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. + + + + + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> + + + + + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. + + + + + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> + + + + + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. + + + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + + + + FinishedQmlViewStep + + + Finish + + + + + FinishedViewStep + + + Finish + + + + + FormatPartitionJob + + + Format partition %1 (file system: %2, size: %3 MiB) on %4. + + + + + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. + + + + + Formatting partition %1 with file system %2. + + + + + The installer failed to format partition %1 on disk '%2'. + + + + + GeneralRequirements + + + has at least %1 GiB available drive space + + + + + There is not enough drive space. At least %1 GiB is required. + + + + + has at least %1 GiB working memory + + + + + The system does not have enough working memory. At least %1 GiB is required. + + + + + is plugged in to a power source + + + + + The system is not plugged in to a power source. + + + + + is connected to the Internet + + + + + The system is not connected to the Internet. + + + + + is running the installer as an administrator (root) + + + + + The setup program is not running with administrator rights. + + + + + The installer is not running with administrator rights. + + + + + has a screen large enough to show the whole installer + + + + + The screen is too small to display the setup program. + + + + + The screen is too small to display the installer. + + + + + HostInfoJob + + + Collecting information about your machine. + + + + + IDJob + + + + + + OEM Batch Identifier + + + + + Could not create directories <code>%1</code>. + + + + + Could not open file <code>%1</code>. + + + + + Could not write to file <code>%1</code>. + + + + + InitcpioJob + + + Creating initramfs with mkinitcpio. + + + + + InitramfsJob + + + Creating initramfs. + + + + + InteractiveTerminalPage + + + Konsole not installed + + + + + Please install KDE Konsole and try again! + + + + + Executing script: &nbsp;<code>%1</code> + + + + + InteractiveTerminalViewStep + + + Script + + + + + KeyboardQmlViewStep + + + Keyboard + + + + + KeyboardViewStep + + + Keyboard + + + + + LCLocaleDialog + + + System locale setting + + + + + The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>. + + + + + &Cancel + + + + + &OK + + + + + LicensePage + + + Form + + + + + <h1>License Agreement</h1> + + + + + I accept the terms and conditions above. + + + + + Please review the End User License Agreements (EULAs). + + + + + This setup procedure will install proprietary software that is subject to licensing terms. + + + + + If you do not agree with the terms, the setup procedure cannot continue. + + + + + This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. + + + + + If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. + + + + + LicenseViewStep + + + License + + + + + LicenseWidget + + + URL: %1 + + + + + <strong>%1 driver</strong><br/>by %2 + %1 is an untranslatable product name, example: Creative Audigy driver + + + + + <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> + %1 is usually a vendor name, example: Nvidia graphics driver + + + + + <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 codec</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 package</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1</strong><br/><font color="Grey">by %2</font> + + + + + File: %1 + + + + + Hide license text + + + + + Show the license text + + + + + Open license agreement in browser. + + + + + LocalePage + + + Region: + + + + + Zone: + + + + + + &Change... + + + + + LocaleQmlViewStep + + + Location + + + + + LocaleViewStep + + + Location + + + + + LuksBootKeyFileJob + + + Configuring LUKS key file. + + + + + + No partitions are defined. + + + + + + + Encrypted rootfs setup error + + + + + Root partition %1 is LUKS but no passphrase has been set. + + + + + Could not create LUKS key file for root partition %1. + + + + + Could not configure LUKS key file on partition %1. + + + + + MachineIdJob + + + Generate machine-id. + + + + + Configuration Error + + + + + No root mount point is set for MachineId. + + + + + Map + + + Timezone: %1 + + + + + Please select your preferred location on the map so the installer can suggest the locale + and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging + to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. + + + + + NetInstallViewStep + + + Package selection + + + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + Communication + + + + + Development + + + + + Office + + + + + Multimedia + + + + + Internet + + + + + Theming + + + + + Gaming + + + + + Utilities + + + + + NotesQmlViewStep + + + Notes + + + + + OEMPage + + + Ba&tch: + + + + + <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> + + + + + <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> + + + + + OEMViewStep + + + OEM Configuration + + + + + Set the OEM Batch Identifier to <code>%1</code>. + + + + + Offline + + + Select your preferred Region, or use the default one based on your current location. + + + + + + + Timezone: %1 + + + + + Select your preferred Zone within your Region. + + + + + Zones + + + + + You can fine-tune Language and Locale settings below. + + + + + PWQ + + + Password is too short + + + + + Password is too long + + + + + Password is too weak + + + + + Memory allocation error when setting '%1' + + + + + Memory allocation error + + + + + The password is the same as the old one + + + + + The password is a palindrome + + + + + The password differs with case changes only + + + + + The password is too similar to the old one + + + + + The password contains the user name in some form + + + + + The password contains words from the real name of the user in some form + + + + + The password contains forbidden words in some form + + + + + The password contains too few digits + + + + + The password contains too few uppercase letters + + + + + The password contains fewer than %n lowercase letters + + + + + + + + The password contains too few lowercase letters + + + + + The password contains too few non-alphanumeric characters + + + + + The password is too short + + + + + The password does not contain enough character classes + + + + + The password contains too many same characters consecutively + + + + + The password contains too many characters of the same class consecutively + + + + + The password contains fewer than %n digits + + + + + + + + The password contains fewer than %n uppercase letters + + + + + + + + The password contains fewer than %n non-alphanumeric characters + + + + + + + + The password is shorter than %n characters + + + + + + + + The password is a rotated version of the previous one + + + + + The password contains fewer than %n character classes + + + + + + + + The password contains more than %n same characters consecutively + + + + + + + + The password contains more than %n characters of the same class consecutively + + + + + + + + The password contains monotonic sequence longer than %n characters + + + + + + + + The password contains too long of a monotonic character sequence + + + + + No password supplied + + + + + Cannot obtain random numbers from the RNG device + + + + + Password generation failed - required entropy too low for settings + + + + + The password fails the dictionary check - %1 + + + + + The password fails the dictionary check + + + + + Unknown setting - %1 + + + + + Unknown setting + + + + + Bad integer value of setting - %1 + + + + + Bad integer value + + + + + Setting %1 is not of integer type + + + + + Setting is not of integer type + + + + + Setting %1 is not of string type + + + + + Setting is not of string type + + + + + Opening the configuration file failed + + + + + The configuration file is malformed + + + + + Fatal failure + + + + + Unknown error + + + + + Password is empty + + + + + PackageChooserPage + + + Form + + + + + Product Name + + + + + TextLabel + + + + + Long Product Description + + + + + Package Selection + + + + + Please pick a product from the list. The selected product will be installed. + + + + + PackageChooserViewStep + + + Packages + + + + + PackageModel + + + Name + + + + + Description + + + + + Page_Keyboard + + + Form + + + + + Keyboard Model: + + + + + Type here to test your keyboard + + + + + Page_UserSetup + + + Form + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + login + + + + + What is the name of this computer? + + + + + <small>This name will be used if you make the computer visible to others on a network.</small> + + + + + Computer Name + + + + + Choose a password to keep your account safe. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small> + + + + + + Password + + + + + + Repeat Password + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Require strong passwords. + + + + + Log in automatically without asking for the password. + + + + + Use the same password for the administrator account. + + + + + Choose a password for the administrator account. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors.</small> + + + + + PartitionLabelsView + + + Root + + + + + Home + + + + + Boot + + + + + EFI system + + + + + Swap + + + + + New partition for %1 + + + + + New partition + + + + + %1 %2 + size[number] filesystem[name] + + + + + PartitionModel + + + + Free Space + + + + + + New partition + + + + + Name + + + + + File System + + + + + Mount Point + + + + + Size + + + + + PartitionPage + + + Form + + + + + Storage de&vice: + + + + + &Revert All Changes + + + + + New Partition &Table + + + + + Cre&ate + + + + + &Edit + + + + + &Delete + + + + + New Volume Group + + + + + Resize Volume Group + + + + + Deactivate Volume Group + + + + + Remove Volume Group + + + + + I&nstall boot loader on: + + + + + Are you sure you want to create a new partition table on %1? + + + + + Can not create new partition + + + + + The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. + + + + + PartitionViewStep + + + Gathering system information... + + + + + Partitions + + + + + Install %1 <strong>alongside</strong> another operating system. + + + + + <strong>Erase</strong> disk and install %1. + + + + + <strong>Replace</strong> a partition with %1. + + + + + <strong>Manual</strong> partitioning. + + + + + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). + + + + + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. + + + + + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. + + + + + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). + + + + + Disk <strong>%1</strong> (%2) + + + + + Current: + + + + + After: + + + + + No EFI system partition configured + + + + + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. + + + + + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. + + + + + EFI system partition flag not set + + + + + Option to use GPT on BIOS + + + + + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. + + + + + Boot partition not encrypted + + + + + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. + + + + + has at least one disk device available. + + + + + There are no partitions to install on. + + + + + PlasmaLnfJob + + + Plasma Look-and-Feel Job + + + + + + Could not select KDE Plasma Look-and-Feel package + + + + + PlasmaLnfPage + + + Form + + + + + Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + PlasmaLnfViewStep + + + Look-and-Feel + + + + + PreserveFiles + + + Saving files for later ... + + + + + No files configured to save for later. + + + + + Not all of the configured files could be preserved. + + + + + ProcessResult + + + +There was no output from the command. + + + + + +Output: + + + + + + External command crashed. + + + + + Command <i>%1</i> crashed. + + + + + External command failed to start. + + + + + Command <i>%1</i> failed to start. + + + + + Internal error when starting command. + + + + + Bad parameters for process job call. + + + + + External command failed to finish. + + + + + Command <i>%1</i> failed to finish in %2 seconds. + + + + + External command finished with errors. + + + + + Command <i>%1</i> finished with exit code %2. + + + + + QObject + + + %1 (%2) + + + + + unknown + + + + + extended + + + + + unformatted + + + + + swap + + + + + + Default + + + + + + + + File not found + + + + + Path <pre>%1</pre> must be an absolute path. + + + + + Directory not found + + + + + + Could not create new random file <pre>%1</pre>. + + + + + No product + + + + + No description provided. + + + + + (no mount point) + + + + + Unpartitioned space or unknown partition table + + + + + Recommended + + + <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> + Setup can continue, but some features might be disabled.</p> + + + + + RemoveUserJob + + + Remove live user from target system + + + + + RemoveVolumeGroupJob + + + + Remove Volume Group named %1. + + + + + Remove Volume Group named <strong>%1</strong>. + + + + + The installer failed to remove a volume group named '%1'. + + + + + ReplaceWidget + + + Form + + + + + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. + + + + + The selected item does not appear to be a valid partition. + + + + + %1 cannot be installed on empty space. Please select an existing partition. + + + + + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. + + + + + %1 cannot be installed on this partition. + + + + + Data partition (%1) + + + + + Unknown system partition (%1) + + + + + %1 system partition (%2) + + + + + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. + + + + + <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + Requirements + + + <p>This computer does not satisfy the minimum requirements for installing %1.<br/> + Installation cannot continue.</p> + + + + + <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> + Setup can continue, but some features might be disabled.</p> + + + + + ResizeFSJob + + + Resize Filesystem Job + + + + + Invalid configuration + + + + + The file-system resize job has an invalid configuration and will not run. + + + + + KPMCore not Available + + + + + Calamares cannot start KPMCore for the file-system resize job. + + + + + + + + + Resize Failed + + + + + The filesystem %1 could not be found in this system, and cannot be resized. + + + + + The device %1 could not be found in this system, and cannot be resized. + + + + + + The filesystem %1 cannot be resized. + + + + + + The device %1 cannot be resized. + + + + + The filesystem %1 must be resized, but cannot. + + + + + The device %1 must be resized, but cannot + + + + + ResizePartitionJob + + + Resize partition %1. + + + + + Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. + + + + + Resizing %2MiB partition %1 to %3MiB. + + + + + The installer failed to resize partition %1 on disk '%2'. + + + + + ResizeVolumeGroupDialog + + + Resize Volume Group + + + + + ResizeVolumeGroupJob + + + + Resize volume group named %1 from %2 to %3. + + + + + Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. + + + + + The installer failed to resize a volume group named '%1'. + + + + + ResultsListDialog + + + For best results, please ensure that this computer: + + + + + System requirements + + + + + ResultsListWidget + + + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. + + + + + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. + + + + + This program will ask you some questions and set up %2 on your computer. + + + + + ScanningDialog + + + Scanning storage devices... + + + + + Partitioning + + + + + SetHostNameJob + + + Set hostname %1 + + + + + Set hostname <strong>%1</strong>. + + + + + Setting hostname %1. + + + + + + Internal Error + + + + + + Cannot write hostname to target system + + + + + SetKeyboardLayoutJob + + + Set keyboard model to %1, layout to %2-%3 + + + + + Failed to write keyboard configuration for the virtual console. + + + + + + + Failed to write to %1 + + + + + Failed to write keyboard configuration for X11. + + + + + Failed to write keyboard configuration to existing /etc/default directory. + + + + + SetPartFlagsJob + + + Set flags on partition %1. + + + + + Set flags on %1MiB %2 partition. + + + + + Set flags on new partition. + + + + + Clear flags on partition <strong>%1</strong>. + + + + + Clear flags on %1MiB <strong>%2</strong> partition. + + + + + Clear flags on new partition. + + + + + Flag partition <strong>%1</strong> as <strong>%2</strong>. + + + + + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. + + + + + Flag new partition as <strong>%1</strong>. + + + + + Clearing flags on partition <strong>%1</strong>. + + + + + Clearing flags on %1MiB <strong>%2</strong> partition. + + + + + Clearing flags on new partition. + + + + + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. + + + + + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. + + + + + Setting flags <strong>%1</strong> on new partition. + + + + + The installer failed to set flags on partition %1. + + + + + SetPasswordJob + + + Set password for user %1 + + + + + Setting password for user %1. + + + + + Bad destination system path. + + + + + rootMountPoint is %1 + + + + + Cannot disable root account. + + + + + passwd terminated with error code %1. + + + + + Cannot set password for user %1. + + + + + usermod terminated with error code %1. + + + + + SetTimezoneJob + + + Set timezone to %1/%2 + + + + + Cannot access selected timezone path. + + + + + Bad path: %1 + + + + + Cannot set timezone. + + + + + Link creation failed, target: %1; link name: %2 + + + + + Cannot set timezone, + + + + + Cannot open /etc/timezone for writing + + + + + SetupGroupsJob + + + Preparing groups. + + + + + + Could not create groups in target system + + + + + These groups are missing in the target system: %1 + + + + + SetupSudoJob + + + Configure <pre>sudo</pre> users. + + + + + Cannot chmod sudoers file. + + + + + Cannot create sudoers file for writing. + + + + + ShellProcessJob + + + Shell Processes Job + + + + + SlideCounter + + + %L1 / %L2 + slide counter, %1 of %2 (numeric) + + + + + SummaryPage + + + This is an overview of what will happen once you start the setup procedure. + + + + + This is an overview of what will happen once you start the install procedure. + + + + + SummaryViewStep + + + Summary + + + + + TrackingInstallJob + + + Installation feedback + + + + + Sending installation feedback. + + + + + Internal error in install-tracking. + + + + + HTTP request timed out. + + + + + TrackingKUserFeedbackJob + + + KDE user feedback + + + + + Configuring KDE user feedback. + + + + + + Error in KDE user feedback configuration. + + + + + Could not configure KDE user feedback correctly, script error %1. + + + + + Could not configure KDE user feedback correctly, Calamares error %1. + + + + + TrackingMachineUpdateManagerJob + + + Machine feedback + + + + + Configuring machine feedback. + + + + + + Error in machine feedback configuration. + + + + + Could not configure machine feedback correctly, script error %1. + + + + + Could not configure machine feedback correctly, Calamares error %1. + + + + + TrackingPage + + + Form + + + + + Placeholder + + + + + <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> + + + + + <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> + + + + + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. + + + + + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. + + + + + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. + + + + + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. + + + + + TrackingViewStep + + + Feedback + + + + + UsersPage + + + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> + + + + + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> + + + + + UsersQmlViewStep + + + Users + + + + + UsersViewStep + + + Users + + + + + VariantModel + + + Key + Column header for key/value + + + + + Value + Column header for key/value + + + + + VolumeGroupBaseDialog + + + Create Volume Group + + + + + List of Physical Volumes + + + + + Volume Group Name: + + + + + Volume Group Type: + + + + + Physical Extent Size: + + + + + MiB + + + + + Total Size: + + + + + Used Size: + + + + + Total Sectors: + + + + + Quantity of LVs: + + + + + WelcomePage + + + Form + + + + + + Select application and system language + + + + + &About + + + + + Open donations website + + + + + &Donate + + + + + Open help and support website + + + + + &Support + + + + + Open issues and bug-tracking website + + + + + &Known issues + + + + + Open release notes website + + + + + &Release notes + + + + + <h1>Welcome to the Calamares setup program for %1.</h1> + + + + + <h1>Welcome to %1 setup.</h1> + + + + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + + <h1>Welcome to the %1 installer.</h1> + + + + + %1 support + + + + + About %1 setup + + + + + About %1 installer + + + + + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + WelcomeQmlViewStep + + + Welcome + + + + + WelcomeViewStep + + + Welcome + + + + + about + + + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> + and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares + translators team</a>.<br/><br/> + <a href='https://calamares.io/'>Calamares</a> + development is sponsored by <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software. + + + + + Back + + + + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + + + i18n + + + <h1>Languages</h1> </br> + The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>. + + + + + <h1>Locales</h1> </br> + The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. + + + + + Back + + + + + keyboardq + + + Keyboard Model + + + + + Layouts + + + + + Keyboard Layout + + + + + Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. + + + + + Models + + + + + Variants + + + + + Keyboard Variant + + + + + Test your keyboard + + + + + localeq + + + Change + + + + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + release_notes + + + <h3>%1</h3> + <p>This an example QML file, showing options in RichText with Flickable content.</p> + + <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p> + + <p><b>This is bold text</b></p> + <p><i>This is italic text</i></p> + <p><u>This is underlined text</u></p> + <p><center>This text will be center-aligned.</center></p> + <p><s>This is strikethrough</s></p> + + <p>Code example: + <code>ls -l /home</code></p> + + <p><b>Lists:</b></p> + <ul> + <li>Intel CPU systems</li> + <li>AMD CPU systems</li> + </ul> + + <p>The vertical scrollbar is adjustable, current width set to 10.</p> + + + + + Back + + + + + usersq + + + Pick your user name and credentials to login and perform admin tasks + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + Login Name + + + + + If more than one person will use this computer, you can create multiple accounts after installation. + + + + + What is the name of this computer? + + + + + Computer Name + + + + + This name will be used if you make the computer visible to others on a network. + + + + + Choose a password to keep your account safe. + + + + + Password + + + + + Repeat Password + + + + + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. + + + + + Validate passwords quality + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Log in automatically without asking for the password + + + + + Reuse user password as root password + + + + + Use the same password for the administrator account. + + + + + Choose a root password to keep your account safe. + + + + + Root Password + + + + + Repeat Root Password + + + + + Enter the same password twice, so that it can be checked for typing errors. + + + + + welcomeq + + + <h3>Welcome to the %1 <quote>%2</quote> installer</h3> + <p>This program will ask you some questions and set up %1 on your computer.</p> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + + diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts index 6f2c1c1f71..b28c80fdd1 100644 --- a/lang/calamares_fr.ts +++ b/lang/calamares_fr.ts @@ -104,7 +104,7 @@ Crashes Calamares, so that Dr. Konqui can look at it. - Crashes Calamares, pour que le Dr. Konqui puisse les regarder. + Accidents de Calamares, pour que le Dr. Konqui puisse les regarder. diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 68db59150c..881e05a5c8 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -119,7 +119,7 @@ Send Session Log - + שליחת קובץ היומן של ההפעלה @@ -758,7 +758,7 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: Incorrect configuration) - התקנת רשת. (מושבתת: תצורה שגויה) + התקנה מהרשת. (מושבתת: תצורה שגויה) @@ -768,7 +768,7 @@ The installer will quit and all changes will be lost. Network Installation. (Disabled: Internal error) - + התקנה מהרשת. (מושבתת: שגיאה פנימית) @@ -888,12 +888,12 @@ The installer will quit and all changes will be lost. The setup of %1 did not complete successfully. - + התקנת %1 לא הושלמה בהצלחה. The installation of %1 did not complete successfully. - ההתקנה של %1 לא הסתיימה בהצלחה. + התקנת %1 לא הושלמה בהצלחה. @@ -1012,7 +1012,7 @@ The installer will quit and all changes will be lost. Create new %1MiB partition on %3 (%2). - + יצירת מחיצה חדשה בגודל %1MiB על גבי %3 ‏(%2). @@ -1027,7 +1027,7 @@ The installer will quit and all changes will be lost. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + יצירת מחיצה חדשה בגודל <strong>%1MiB</strong> על גבי <strong>%3</strong> ‏(%2). diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index a0fb111d9d..db8e8421b9 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -574,7 +574,7 @@ The installer will quit and all changes will be lost. The EFI system partition at %1 will be used for starting %2. - %1 上のEFIシステムパーテイションは %2 のスタートに使用されます。 + %1 の EFI システム パーティションは、%2 の起動に使用されます。 diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts index 53c2848ecc..31cf85468b 100644 --- a/lang/calamares_nl.ts +++ b/lang/calamares_nl.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Beheer auto-mount instellingen @@ -104,22 +104,22 @@ Crashes Calamares, so that Dr. Konqui can look at it. - + Laat Calamares crashen, zodat Dr. Konqui er naar kan kijken. Reloads the stylesheet from the branding directory. - + Laadt het stylesheet van de fabrikantsmap opnieuw. Uploads the session log to the configured pastebin. - + Uploads de sessielogboeken naar de geconfigureerde pastebin. Send Session Log - + Verstuur Sessielogboeken @@ -129,7 +129,7 @@ Displays the tree of widget names in the log (for stylesheet debugging). - + Weergeeft de boom van widgetnamen in het logboek (voor stylesheet debuggen). @@ -338,7 +338,11 @@ %1 Link copied to clipboard - + Installatielogboek geposte naar: + +%1 + +Link gekopieerd naar klembord @@ -626,17 +630,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + Dit opslagmedium bevat al een besturingssysteem, maar de partitietabel <strong>%1</strong> is anders dan het benodigde <strong>%2</strong>.<br/> This storage device has one of its partitions <strong>mounted</strong>. - + Dit opslagmedium heeft een van de partities <strong>gemount</strong>. This storage device is a part of an <strong>inactive RAID</strong> device. - + Dit opslagmedium maakt deel uit van een <strong>inactieve RAID</strong> apparaat. @@ -764,12 +768,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Network Installation. (Disabled: Internal error) - + Netwerkinstallatie. (Uitgeschakeld: Interne Fout) Network Installation. (Disabled: No package list) - + Netwerkinstallatie. (Uitgeschakeld: Ontbrekende pakketlijst) @@ -884,12 +888,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. The setup of %1 did not complete successfully. - + De voorbereiding van %1 is niet met succes voltooid. The installation of %1 did not complete successfully. - + De installatie van %1 is niet met succes voltooid. @@ -1003,12 +1007,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Create new %1MiB partition on %3 (%2) with entries %4. - + Maak nieuwe %1MiB partitie aan op %3 (%2) met onderdelen %4. Create new %1MiB partition on %3 (%2). - + Maak nieuwe %1MiB partitie aan op %3 (%2). @@ -1018,12 +1022,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Maak een nieuwe <strong>%1MiB</strong> partitie aan op <strong>%3</strong> (%2) met onderdelen <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Maak een nieuwe <strong>%1MiB</strong> partitie aan op <strong>%3</strong> (%2). @@ -1108,13 +1112,13 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Preserving home directory - + Gebruikersmap wordt behouden Creating user %1 - + Gebruiker %1 aanmaken @@ -1371,7 +1375,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Installeer %1 op <strong>nieuwe</strong> %2 systeempartitie met features <em>%3</em> @@ -1381,27 +1385,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + <strong>Nieuwe</strong> %2 partitie voorbereiden met aankoppelpunt <strong>%1</strong> en features <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Maak <strong>nieuwe</strong> %2 partitie met aankoppelpunt <strong>%1</strong>%3. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Installeer %2 op %3 systeempartitie <strong>%1</strong> met features <em>%4</em> Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Stel %3 partitie <strong>%1</strong> in met aankoppelpunt <strong>%2</strong> met features <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Stel %3 partitie <strong>%1</strong> in met aankoppelpunt <strong>%2</strong>%4. @@ -2146,9 +2150,9 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. The password contains fewer than %n lowercase letters - - - + + Het wachtwoord bevat minder dan %n kleine letters + Het wachtwoord bevat minder dan %n kleine letters @@ -2184,70 +2188,70 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan. The password contains fewer than %n digits - - - + + Het wachtwoord bevat minder dan %n getallen + Het wachtwoord bevat minder dan %n getallen The password contains fewer than %n uppercase letters - - - + + Het wachtwoord bevat minder dan %n hoofdletters + Het wachtwoord bevat minder dan %n hoofdletters The password contains fewer than %n non-alphanumeric characters - - - + + Het wachtwoord bevat minder dan %n niet-alfanumerieke symbolen. + Het wachtwoord bevat minder dan %n niet-alfanumerieke symbolen. The password is shorter than %n characters - - - + + Het wachtwoord is korter dan %n karakters + Het wachtwoord is korter dan %n karakters The password is a rotated version of the previous one - + Het wachtwoord is een omgedraaide versie van de oude The password contains fewer than %n character classes - - - + + Het wachtwoord bevat minder dan %n karaktergroepen + Het wachtwoord bevat minder dan %n karaktergroepen The password contains more than %n same characters consecutively - - - + + Het wachtwoord bevat meer dan %n dezelfde karakters na elkaar + Het wachtwoord bevat meer dan %n dezelfde karakters na elkaar The password contains more than %n characters of the same class consecutively - - - + + Het wachtwoord bevat meer dan %n dezelfde karakters van dezelfde groep na elkaar + Het wachtwoord bevat meer dan %n dezelfde karakters van dezelfde groep na elkaar The password contains monotonic sequence longer than %n characters - - - + + Het wachtwoord bevat een monotone sequentie van meer dan %n karakters + Het wachtwoord bevat een monotone sequentie van meer dan %n karakters @@ -2966,7 +2970,7 @@ Uitvoer: Directory not found - + Map niet gevonden @@ -3530,12 +3534,12 @@ De installatie kan niet doorgaan. Could not create groups in target system - + Kan groepen niet creëren in doelsysteem. These groups are missing in the target system: %1 - + Deze groepen bestaan niet in het doelsysteem: %1 @@ -3543,7 +3547,7 @@ De installatie kan niet doorgaan. Configure <pre>sudo</pre> users. - + Configureer <pre>sudo</pre> (administratie) gebruikers. @@ -3954,7 +3958,7 @@ De installatie kan niet doorgaan. development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/><strong>%2<br/>voor %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> Met dank aan <a href="https://calamares.io/team/">het Calamares team</a> en <a href="https://www.transifex.com/calamares/calamares/">het Calamares vertaalteam</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> ontwikkeling gesponsord door <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. @@ -3975,29 +3979,31 @@ De installatie kan niet doorgaan. Installation Completed - + Installatie Voltooid %1 has been installed on your computer.<br/> You may now restart into your new system, or continue using the Live environment. - + %1 is geïnstalleerd op je computer.<br/> +Je mag nu opnieuw opstarten in je systeem, of de Live-omgeving blijven gebruiken. Close Installer - + Sluit Installatieprogramma Restart System - + Herstart Systeem <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> This log is copied to /var/log/installation.log of the target system.</p> - + <p>Een logboek van de installatie is beschikbaar als installation.log in de gebruikersmap van de Live gebruiker<br/> +Dit logboek is ook gekopieerd naar /var/log/installation.log van het doelsysteem.</p> @@ -4042,7 +4048,7 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + Kies je voorkeurstoetsenbordmodel om lay-out en variant te selecteren, of gebruik het standaardmodel op de gedetecteerde hardware. @@ -4057,7 +4063,7 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Keyboard Variant - + Toetsenbord Variant @@ -4140,7 +4146,7 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Pick your user name and credentials to login and perform admin tasks - + Kies je gebruikersnaam en wachtwoord om in te loggen en administratieve taken uit te voeren @@ -4160,12 +4166,12 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Login Name - + Inlognaam If more than one person will use this computer, you can create multiple accounts after installation. - + Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie. @@ -4180,7 +4186,7 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige This name will be used if you make the computer visible to others on a network. - + Deze naam zal worden gebruikt als u de computer zichtbaar maakt voor anderen op een netwerk. @@ -4200,12 +4206,12 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten. Een goed wachtwoord bevat een combinatie van letters, cijfers en leestekens, is ten minste acht tekens lang, en zou regelmatig moeten worden gewijzigd. Validate passwords quality - + Controleer wachtwoorden op gelijkheid @@ -4215,12 +4221,12 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Log in automatically without asking for the password - + Automatisch aanmelden zonder wachtwoord te vragen Reuse user password as root password - + Hergebruik gebruikerswachtwoord als root (administratie) wachtwoord. @@ -4230,22 +4236,22 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige Choose a root password to keep your account safe. - + Kies een root (administratie) wachtwoord om je account veilig te houden. Root Password - + Root (Administratie) Wachtwoord Repeat Root Password - + Herhaal Root Wachtwoord Enter the same password twice, so that it can be checked for typing errors. - + Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten. From d71e0a009c8dbc51b186b50b5377ba34addbf7d7 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 8 Jun 2021 17:50:10 +0200 Subject: [PATCH 183/492] i18n: [python] Automatic merge of Transifex translations --- lang/python/es_MX/LC_MESSAGES/python.po | 99 ++++--- lang/python/es_PE/LC_MESSAGES/python.po | 347 ++++++++++++++++++++++++ lang/python/he/LC_MESSAGES/python.po | 2 +- lang/python/pl/LC_MESSAGES/python.po | 46 +++- 4 files changed, 435 insertions(+), 59 deletions(-) create mode 100644 lang/python/es_PE/LC_MESSAGES/python.po diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po index 37171cb0ec..6942a78595 100644 --- a/lang/python/es_MX/LC_MESSAGES/python.po +++ b/lang/python/es_MX/LC_MESSAGES/python.po @@ -6,6 +6,7 @@ # Translators: # guillermo pacheco , 2018 # Logan 8192 , 2018 +# Erland Huaman , 2021 # #, fuzzy msgid "" @@ -14,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Logan 8192 , 2018\n" +"Last-Translator: Erland Huaman , 2021\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +25,11 @@ msgstr "" #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." -msgstr "" +msgstr "Configura GRUB." #: src/modules/mount/main.py:30 msgid "Mounting partitions." -msgstr "" +msgstr "Montando particiones." #: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 #: src/modules/initcpiocfg/main.py:202 @@ -40,51 +41,56 @@ msgstr "" #: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 #: src/modules/networkcfg/main.py:39 msgid "Configuration Error" -msgstr "" +msgstr "Error de configuración" #: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 #: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." -msgstr "" +msgstr "No hay particiones definidas para que 
{!s}
use." #: src/modules/services-systemd/main.py:26 msgid "Configure systemd services" -msgstr "" +msgstr "Configura los servicios de systemd" #: src/modules/services-systemd/main.py:59 #: src/modules/services-openrc/main.py:93 msgid "Cannot modify service" -msgstr "" +msgstr "No se puede modificar el servicio." #: src/modules/services-systemd/main.py:60 msgid "" "systemctl {arg!s} call in chroot returned error code {num!s}." msgstr "" +"La llamada de: systemctl {arg!s} en chroot retorna código de " +"error {num!s}." #: src/modules/services-systemd/main.py:63 #: src/modules/services-systemd/main.py:67 msgid "Cannot enable systemd service {name!s}." -msgstr "" +msgstr "No se puede habilitar el servicio {name!s} de systemd." #: src/modules/services-systemd/main.py:65 msgid "Cannot enable systemd target {name!s}." -msgstr "" +msgstr "No se puede habilitar el objetivo {name!s} de systemd." #: src/modules/services-systemd/main.py:69 msgid "Cannot disable systemd target {name!s}." msgstr "" +"No se puede deshabilitar el objetivo {name!s} de systemd." #: src/modules/services-systemd/main.py:71 msgid "Cannot mask systemd unit {name!s}." -msgstr "" +msgstr "No se puede enmascarar la unidad {name!s} de systemd." #: src/modules/services-systemd/main.py:73 msgid "" "Unknown systemd commands {command!s} and " "{suffix!s} for unit {name!s}." msgstr "" +"systemd no reconoce los comandos {command!s} y " +"{suffix!s}para la unidad {name!s}." #: src/modules/umount/main.py:31 msgid "Unmount file systems." @@ -92,62 +98,67 @@ msgstr "Desmontar sistemas de archivo." #: src/modules/unpackfs/main.py:35 msgid "Filling up filesystems." -msgstr "" +msgstr "Llenando sistema de archivos." #: src/modules/unpackfs/main.py:255 msgid "rsync failed with error code {}." -msgstr "" +msgstr "rsync falló con código de error {}." #: src/modules/unpackfs/main.py:300 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "" +msgstr "Desempaquetando imagen {}/{}, archivo {}/{}" #: src/modules/unpackfs/main.py:315 msgid "Starting to unpack {}" -msgstr "" +msgstr "Iniciando a desempaquetar {}" #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 msgid "Failed to unpack image \"{}\"" -msgstr "" +msgstr "Se falló en la desempaquetización de la imagen \"{}\"" #: src/modules/unpackfs/main.py:431 msgid "No mount point for root partition" -msgstr "" +msgstr "No existe punto de montaje para la partición raíz" #: src/modules/unpackfs/main.py:432 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" msgstr "" +"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada" #: src/modules/unpackfs/main.py:437 msgid "Bad mount point for root partition" -msgstr "" +msgstr "Mal punto de montaje para la partición raíz" #: src/modules/unpackfs/main.py:438 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" -msgstr "" +msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada" #: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 #: src/modules/unpackfs/main.py:478 msgid "Bad unsquash configuration" -msgstr "" +msgstr "Mala configuración del paquete unsquash" #: src/modules/unpackfs/main.py:455 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" msgstr "" +"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" " +"({})" #: src/modules/unpackfs/main.py:459 msgid "The source filesystem \"{}\" does not exist" -msgstr "" +msgstr "El sistema de archivos fuente \"{}\" no existe" #: src/modules/unpackfs/main.py:465 msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed" msgstr "" +"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools " +"instalado" #: src/modules/unpackfs/main.py:479 msgid "The destination \"{}\" in the target system is not a directory" -msgstr "" +msgstr "El destino \"{}\" en el sistema objetivo no es un directorio" #: src/modules/displaymanager/main.py:514 msgid "Cannot write KDM configuration file" @@ -179,7 +190,7 @@ msgstr "No se puede configurar LightDM" #: src/modules/displaymanager/main.py:736 msgid "No LightDM greeter installed." -msgstr "" +msgstr "LightDM greeter no está instalado." #: src/modules/displaymanager/main.py:767 msgid "Cannot write SLIM configuration file" @@ -191,21 +202,23 @@ msgstr "" #: src/modules/displaymanager/main.py:894 msgid "No display managers selected for the displaymanager module." -msgstr "" +msgstr "No se seleccionaron gestores para el módulo de gestor de pantalla." #: src/modules/displaymanager/main.py:895 msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" +"La lista de gestores de pantalla está vacía o indefinida tanto en el " +"globalstorage como en el displaymanager.conf." #: src/modules/displaymanager/main.py:977 msgid "Display manager configuration was incomplete" -msgstr "" +msgstr "La configuración del gestor de pantalla estaba incompleta" #: src/modules/initcpiocfg/main.py:28 msgid "Configuring mkinitcpio." -msgstr "" +msgstr "Configurando mkinitcpio" #: src/modules/initcpiocfg/main.py:203 #: src/modules/luksopenswaphookcfg/main.py:91 @@ -217,15 +230,15 @@ msgstr "" #: src/modules/luksopenswaphookcfg/main.py:26 msgid "Configuring encrypted swap." -msgstr "" +msgstr "Configurando la swap encriptada." #: src/modules/rawfs/main.py:26 msgid "Installing data." -msgstr "" +msgstr "Instalando data." #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" -msgstr "" +msgstr "Configura los servicios de OpenRC" #: src/modules/services-openrc/main.py:57 msgid "Cannot add service {name!s} to run-level {level!s}." @@ -248,7 +261,7 @@ msgstr "" #: src/modules/services-openrc/main.py:101 msgid "Target runlevel does not exist" -msgstr "" +msgstr "El nivel de ejecución del objetivo no existe" #: src/modules/services-openrc/main.py:102 msgid "" @@ -258,7 +271,7 @@ msgstr "" #: src/modules/services-openrc/main.py:110 msgid "Target service does not exist" -msgstr "" +msgstr "El servicio objetivo no existe" #: src/modules/services-openrc/main.py:111 msgid "" @@ -268,7 +281,7 @@ msgstr "" #: src/modules/plymouthcfg/main.py:27 msgid "Configure Plymouth theme" -msgstr "" +msgstr "Configurando el tema de Plymouth" #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -296,43 +309,43 @@ msgstr[1] "Removiendo %(num)dpaquetes." #: src/modules/bootloader/main.py:43 msgid "Install bootloader." -msgstr "" +msgstr "Instalar el cargador de arranque." #: src/modules/hwclock/main.py:26 msgid "Setting hardware clock." -msgstr "" +msgstr "Configurando el reloj del hardware." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "Creando initramfs con mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "Se falló al intentar correr mkinitfs en el objetivo" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" -msgstr "" +msgstr "El código de salida fue {}" #: src/modules/dracut/main.py:27 msgid "Creating initramfs with dracut." -msgstr "" +msgstr "Creando initramfs con dracut" #: src/modules/dracut/main.py:49 msgid "Failed to run dracut on the target" -msgstr "" +msgstr "Se falló al intentar correr dracut en el objetivo" #: src/modules/initramfscfg/main.py:32 msgid "Configuring initramfs." -msgstr "" +msgstr "Configurando initramfs." #: src/modules/openrcdmcryptcfg/main.py:26 msgid "Configuring OpenRC dmcrypt service." -msgstr "" +msgstr "Configurando el servicio OpenRc dmcrypt." #: src/modules/fstab/main.py:29 msgid "Writing fstab." -msgstr "" +msgstr "Escribiento fstab." #: src/modules/dummypython/main.py:35 msgid "Dummy python job." @@ -345,8 +358,8 @@ msgstr "Paso python ficticio {}" #: src/modules/localecfg/main.py:30 msgid "Configuring locales." -msgstr "" +msgstr "Configurando locales." #: src/modules/networkcfg/main.py:28 msgid "Saving network configuration." -msgstr "" +msgstr "Guardando configuración de red." diff --git a/lang/python/es_PE/LC_MESSAGES/python.po b/lang/python/es_PE/LC_MESSAGES/python.po new file mode 100644 index 0000000000..20096e12cd --- /dev/null +++ b/lang/python/es_PE/LC_MESSAGES/python.po @@ -0,0 +1,347 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-03-19 14:27+0100\n" +"PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Language-Team: Spanish (Peru) (https://www.transifex.com/calamares/teams/20061/es_PE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_PE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/grubcfg/main.py:28 +msgid "Configure GRUB." +msgstr "" + +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "" + +#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 +#: src/modules/initcpiocfg/main.py:202 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 +#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 +#: src/modules/networkcfg/main.py:39 +msgid "Configuration Error" +msgstr "" + +#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199 +#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165 +#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/fstab/main.py:356 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/services-systemd/main.py:26 +msgid "Configure systemd services" +msgstr "" + +#: src/modules/services-systemd/main.py:59 +#: src/modules/services-openrc/main.py:93 +msgid "Cannot modify service" +msgstr "" + +#: src/modules/services-systemd/main.py:60 +msgid "" +"systemctl {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:63 +#: src/modules/services-systemd/main.py:67 +msgid "Cannot enable systemd service {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:65 +msgid "Cannot enable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:69 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "" +"Unknown systemd commands {command!s} and " +"{suffix!s} for unit {name!s}." +msgstr "" + +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "" + +#: src/modules/unpackfs/main.py:35 +msgid "Filling up filesystems." +msgstr "" + +#: src/modules/unpackfs/main.py:255 +msgid "rsync failed with error code {}." +msgstr "" + +#: src/modules/unpackfs/main.py:300 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:315 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 +msgid "Failed to unpack image \"{}\"" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:432 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:438 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458 +#: src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:455 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:459 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:465 +msgid "" +"Failed to find unsquashfs, make sure you have the squashfs-tools package " +"installed" +msgstr "" + +#: src/modules/unpackfs/main.py:479 +msgid "The destination \"{}\" in the target system is not a directory" +msgstr "" + +#: src/modules/displaymanager/main.py:514 +msgid "Cannot write KDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:515 +msgid "KDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:576 +msgid "Cannot write LXDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:577 +msgid "LXDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:660 +msgid "Cannot write LightDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:661 +msgid "LightDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:735 +msgid "Cannot configure LightDM" +msgstr "" + +#: src/modules/displaymanager/main.py:736 +msgid "No LightDM greeter installed." +msgstr "" + +#: src/modules/displaymanager/main.py:767 +msgid "Cannot write SLIM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:768 +msgid "SLIM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:894 +msgid "No display managers selected for the displaymanager module." +msgstr "" + +#: src/modules/displaymanager/main.py:895 +msgid "" +"The displaymanagers list is empty or undefined in both globalstorage and " +"displaymanager.conf." +msgstr "" + +#: src/modules/displaymanager/main.py:977 +msgid "Display manager configuration was incomplete" +msgstr "" + +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "" + +#: src/modules/initcpiocfg/main.py:203 +#: src/modules/luksopenswaphookcfg/main.py:91 +#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136 +#: src/modules/networkcfg/main.py:40 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "" + +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "" + +#: src/modules/services-openrc/main.py:29 +msgid "Configure OpenRC services" +msgstr "" + +#: src/modules/services-openrc/main.py:57 +msgid "Cannot add service {name!s} to run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:59 +msgid "Cannot remove service {name!s} from run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:61 +msgid "" +"Unknown service-action {arg!s} for service {name!s} in run-" +"level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:94 +msgid "" +"rc-update {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:101 +msgid "Target runlevel does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:102 +msgid "" +"The path for runlevel {level!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/services-openrc/main.py:110 +msgid "Target service does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:111 +msgid "" +"The path for service {name!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "" + +#: src/modules/packages/main.py:50 src/modules/packages/main.py:59 +#: src/modules/packages/main.py:69 +msgid "Install packages." +msgstr "" + +#: src/modules/packages/main.py:57 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:62 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:65 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "" + +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "" + +#: src/modules/mkinitfs/main.py:27 +msgid "Creating initramfs with mkinitfs." +msgstr "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 +msgid "The exit code was {}" +msgstr "" + +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "" + +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" +msgstr "" + +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "" + +#: src/modules/fstab/main.py:29 +msgid "Writing fstab." +msgstr "" + +#: src/modules/dummypython/main.py:35 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 +#: src/modules/dummypython/main.py:94 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "" + +#: src/modules/networkcfg/main.py:28 +msgid "Saving network configuration." +msgstr "" diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po index 414247edb5..21cdc6a561 100644 --- a/lang/python/he/LC_MESSAGES/python.po +++ b/lang/python/he/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Eli Shleifer , 2017 -# Omeritzics Games , 2020 +# Omer I.S. , 2020 # Yaron Shahrabani , 2020 # #, fuzzy diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po index 1b899113fd..fac070882e 100644 --- a/lang/python/pl/LC_MESSAGES/python.po +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -7,6 +7,7 @@ # Marcin Mikołajczak , 2017 # KagiSame, 2018 # Piotr Strębski , 2020 +# Jacob B. , 2021 # #, fuzzy msgid "" @@ -15,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Piotr Strębski , 2020\n" +"Last-Translator: Jacob B. , 2021\n" "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,7 +49,7 @@ msgstr "Błąd konfiguracji" #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73 #: src/modules/fstab/main.py:356 msgid "No partitions are defined for 
{!s}
to use." -msgstr "" +msgstr "Nie ma zdefiniowanych partycji dla 
{!s}
do użytku." #: src/modules/services-systemd/main.py:26 msgid "Configure systemd services" @@ -63,29 +64,32 @@ msgstr "Nie można zmodyfikować usług" msgid "" "systemctl {arg!s} call in chroot returned error code {num!s}." msgstr "" +"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}." #: src/modules/services-systemd/main.py:63 #: src/modules/services-systemd/main.py:67 msgid "Cannot enable systemd service {name!s}." -msgstr "" +msgstr "Nie można włączyć usługi systemd {name!s}." #: src/modules/services-systemd/main.py:65 msgid "Cannot enable systemd target {name!s}." -msgstr "" +msgstr "Nie można włączyć celu w systemd {name!s}." #: src/modules/services-systemd/main.py:69 msgid "Cannot disable systemd target {name!s}." -msgstr "" +msgstr "Nie można wyłączyć celu w systemd {name!s}." #: src/modules/services-systemd/main.py:71 msgid "Cannot mask systemd unit {name!s}." -msgstr "" +msgstr "Nie można zamaskować jednostki systemd {name!s}." #: src/modules/services-systemd/main.py:73 msgid "" "Unknown systemd commands {command!s} and " "{suffix!s} for unit {name!s}." msgstr "" +"Nieznana komenda systemd {command!s} oraz " +"{suffix!s} dla jednostki {name!s}." #: src/modules/umount/main.py:31 msgid "Unmount file systems." @@ -101,11 +105,11 @@ msgstr "rsync zakończyło działanie kodem błędu {}." #: src/modules/unpackfs/main.py:300 msgid "Unpacking image {}/{}, file {}/{}" -msgstr "" +msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}" #: src/modules/unpackfs/main.py:315 msgid "Starting to unpack {}" -msgstr "" +msgstr "Rozpoczynanie odpakowywania {}" #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464 msgid "Failed to unpack image \"{}\"" @@ -139,6 +143,8 @@ msgstr "Błędna konfiguracja unsquash" #: src/modules/unpackfs/main.py:455 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" msgstr "" +"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego " +"systemu" #: src/modules/unpackfs/main.py:459 msgid "The source filesystem \"{}\" does not exist" @@ -205,6 +211,8 @@ msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" +"Lista displaymanagers jest pusta lub niezdefiniowana w globalstorage oraz " +"displaymanager.conf." #: src/modules/displaymanager/main.py:977 msgid "Display manager configuration was incomplete" @@ -221,6 +229,7 @@ msgstr "Konfigurowanie mkinitcpio." #: src/modules/networkcfg/main.py:40 msgid "No root mount point is given for 
{!s}
to use." msgstr "" +"Nie znaleziono głównego punktu montowania dla 
{!s}
do użycia." #: src/modules/luksopenswaphookcfg/main.py:26 msgid "Configuring encrypted swap." @@ -237,31 +246,38 @@ msgstr "Konfiguracja usług OpenRC" #: src/modules/services-openrc/main.py:57 msgid "Cannot add service {name!s} to run-level {level!s}." msgstr "" +"Nie udało się dodać usługi {name!s} do poziomu-uruchamiania {level!s}." #: src/modules/services-openrc/main.py:59 msgid "Cannot remove service {name!s} from run-level {level!s}." msgstr "" +"Nie udało się usunąć usługi {name!s} do poziomu-uruchamiania {level!s}." #: src/modules/services-openrc/main.py:61 msgid "" "Unknown service-action {arg!s} for service {name!s} in run-" "level {level!s}." msgstr "" +"Nieznana akcja-usługi {arg!s} dla usługi {name!s} w poziomie-" +"uruchamiania {level!s}." #: src/modules/services-openrc/main.py:94 msgid "" "rc-update {arg!s} call in chroot returned error code {num!s}." msgstr "" +"rc-update {arg!s} wezwanie w chroot zwróciło kod błędu {num!s}." #: src/modules/services-openrc/main.py:101 msgid "Target runlevel does not exist" -msgstr "" +msgstr "Docelowy poziom odtwarzania nie istnieje" #: src/modules/services-openrc/main.py:102 msgid "" "The path for runlevel {level!s} is {path!s}, which does not " "exist." msgstr "" +"Ścieżka do poziomu odtwarzania {level!s} to {path!s}, nie " +"istnieje." #: src/modules/services-openrc/main.py:110 msgid "Target service does not exist" @@ -271,7 +287,7 @@ msgstr "Docelowa usługa nie istnieje" msgid "" "The path for service {name!s} is {path!s}, which does not " "exist." -msgstr "" +msgstr "Ścieżka do usługi {name!s} to {path!s}, nie istnieje." #: src/modules/plymouthcfg/main.py:27 msgid "Configure Plymouth theme" @@ -315,15 +331,15 @@ msgstr "Ustawianie zegara systemowego." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "Tworzenie initramfs z mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "Nie udało się włączyć mkinitfs." #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" -msgstr "" +msgstr "Kod wyjściowy to {}" #: src/modules/dracut/main.py:27 msgid "Creating initramfs with dracut." @@ -331,7 +347,7 @@ msgstr "Tworzenie initramfs z dracut." #: src/modules/dracut/main.py:49 msgid "Failed to run dracut on the target" -msgstr "" +msgstr "Nie udało się włączyć dracut." #: src/modules/initramfscfg/main.py:32 msgid "Configuring initramfs." @@ -339,7 +355,7 @@ msgstr "Konfigurowanie initramfs." #: src/modules/openrcdmcryptcfg/main.py:26 msgid "Configuring OpenRC dmcrypt service." -msgstr "" +msgstr "Konfigurowanie usługi OpenRC dmcrypt." #: src/modules/fstab/main.py:29 msgid "Writing fstab." From dba346be7a798acdb94be89150b19e5e9fd78bce Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 8 Jun 2021 19:51:25 +0200 Subject: [PATCH 184/492] [partition] Fix build in non-debug settings --- src/modules/partition/core/DeviceList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index f7d1d48358..d58b22868b 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -138,7 +138,7 @@ getDevices( DeviceType which ) #else // Safe partitioning auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it) { return erase(l, it); }; - auto& removeInSafeMode = removeFromAll; + auto& removeInSafeMode = removeInAllModes; #endif cDebug() << "Removing unsuitable devices:" << devices.count() << "candidates."; From fa1c848faf77d317ffb72d38c425a6f1d5df8803 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 15 Jun 2021 11:29:49 +0200 Subject: [PATCH 185/492] Docs: do not use freenode --- CONTRIBUTING.md | 10 ++++++---- README.md | 13 +++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c281631372..0be408ba01 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,12 +29,14 @@ rules of decent behavior in both communities are pretty much the same). GitHub Issues are **one** place for discussing Calamares if there are concrete problems or a new feature to discuss. -Regular Calamares development chit-chat happens on old-school IRC -(no registration required). Responsiveness is best during the day -in Europe, but feel free to idle. **DO NOT** ask-and-leave. Keep +Regular Calamares development chit-chat happens in a [Matrix](https://matrix.org/) +room, `#calamares:kde.org`. The conversation is bridged with IRC +on [Libera.Chat](https://libera.chat/). +Responsiveness is best during the day +in Europe, but feel free to idle. If you use IRC, **DO NOT** ask-and-leave. Keep that chat window open because it can easily take a few hours for someone to notice a message. -The Matrix room is relatively new. +Matrix is persistent, and we'll see your message eventually. * [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares:kde.org-blue)](https://webchat.kde.org/#/room/%23calamares:kde.org) * [![Chat on IRC](https://img.shields.io/badge/IRC-Libera.Chat%20%23calamares-green)](https://kiwiirc.com/client/irc.libera.chat/#calamares) diff --git a/README.md b/README.md index 5f10957524..8fa2dfda78 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE) -| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [IRC: Libera.Chat #calamares](https://kiwiirc.com/client/irc.libera.chat/#calamares) | [Matrix: #calamares:kde.org](https://webchat.kde.org/#/room/%23calamares:kde.org) | [Wiki](https://github.com/calamares/calamares/wiki) | +| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Matrix: #calamares:kde.org](https://webchat.kde.org/#/room/%23calamares:kde.org) | [IRC: Libera.Chat #calamares](https://kiwiirc.com/client/irc.libera.chat/#calamares) | [Wiki](https://github.com/calamares/calamares/wiki) | |:--:|:--:|:--:|:--:|:--:|:--:| @@ -56,9 +56,14 @@ There is more information in the [CONTRIBUTING.md](CONTRIBUTING.md) file. GitHub Issues are **one** place for discussing Calamares if there are concrete problems or a new feature to discuss. -Regular Calamares development chit-chat happens on old-school IRC -(no registration required). Responsiveness is best during the day -in Europe, but feel free to idle. The Matrix room is relatively new. +Regular Calamares development chit-chat happens in a [Matrix](https://matrix.org/) +room, `#calamares:kde.org`. The conversation is bridged with IRC +on [Libera.Chat](https://libera.chat/). +Responsiveness is best during the day +in Europe, but feel free to idle. If you use IRC, **DO NOT** ask-and-leave. Keep +that chat window open because it can easily take a few hours for +someone to notice a message. +Matrix is persistent, and we'll see your message eventually. * [![Join us on Matrix](https://img.shields.io/badge/Matrix-%23calamares:kde.org-blue)](https://webchat.kde.org/#/room/%23calamares:kde.org) * [![Chat on IRC](https://img.shields.io/badge/IRC-Libera.Chat%20%23calamares-green)](https://kiwiirc.com/client/irc.libera.chat/#calamares) From f0a25bd397615e5155838ce9fdde64bc23badcf7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 15 Jun 2021 11:41:17 +0200 Subject: [PATCH 186/492] [libcalamares] Avoid warnings from deprecated country codes. The Qt documentation does not mention @since for these values, so we're going to let CI catch them. --- src/libcalamares/locale/CountryData_p.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/locale/CountryData_p.cpp b/src/libcalamares/locale/CountryData_p.cpp index f439de27c4..455027ef8c 100644 --- a/src/libcalamares/locale/CountryData_p.cpp +++ b/src/libcalamares/locale/CountryData_p.cpp @@ -31,6 +31,7 @@ * Edited anyway: * 20191211 India (IN) changed to AnyLanguage, since Hindi doesn't make sense. #1284 * 20210207 Belarus (BY) changed to Russian, as the more-common-language. #1634 + * 20210615 Tokelau and Tuvalu country enum values changed to avoid deprecation warning. * */ @@ -224,13 +225,13 @@ static const CountryData country_data_table[] = { { QLocale::Language::French, QLocale::Country::Togo, 'T', 'G' }, { QLocale::Language::Thai, QLocale::Country::Thailand, 'T', 'H' }, { QLocale::Language::Tajik, QLocale::Country::Tajikistan, 'T', 'J' }, -{ QLocale::Language::TokelauLanguage, QLocale::Country::Tokelau, 'T', 'K' }, +{ QLocale::Language::TokelauLanguage, QLocale::Country::TokelauCountry, 'T', 'K' }, { QLocale::Language::Portuguese, QLocale::Country::EastTimor, 'T', 'L' }, { QLocale::Language::Turkmen, QLocale::Country::Turkmenistan, 'T', 'M' }, { QLocale::Language::Arabic, QLocale::Country::Tunisia, 'T', 'N' }, { QLocale::Language::Tongan, QLocale::Country::Tonga, 'T', 'O' }, { QLocale::Language::Turkish, QLocale::Country::Turkey, 'T', 'R' }, -{ QLocale::Language::TuvaluLanguage, QLocale::Country::Tuvalu, 'T', 'V' }, +{ QLocale::Language::TuvaluLanguage, QLocale::Country::TuvaluCountry, 'T', 'V' }, { QLocale::Language::Chinese, QLocale::Country::Taiwan, 'T', 'W' }, { QLocale::Language::Swahili, QLocale::Country::Tanzania, 'T', 'Z' }, { QLocale::Language::Ukrainian, QLocale::Country::Ukraine, 'U', 'A' }, From 6ee0da41c89419204421c2e8e3239173e24ec5ed Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 15 Jun 2021 11:45:29 +0200 Subject: [PATCH 187/492] [libcalamares] Avoid deprecation warning in network attributes --- src/libcalamares/network/Manager.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp index d089551bbd..79db1a587e 100644 --- a/src/libcalamares/network/Manager.cpp +++ b/src/libcalamares/network/Manager.cpp @@ -27,10 +27,16 @@ namespace Network void RequestOptions::applyToRequest( QNetworkRequest* request ) const { +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + constexpr const auto RedirectPolicyAttribute = QNetworkRequest::FollowRedirectsAttribute; +#else + constexpr const auto RedirectPolicyAttribute = QNetworkRequest::RedirectPolicyAttribute; +#endif + if ( m_flags & Flag::FollowRedirect ) { // Follows all redirects except unsafe ones (https to http). - request->setAttribute( QNetworkRequest::FollowRedirectsAttribute, true ); + request->setAttribute( RedirectPolicyAttribute, true ); } if ( m_flags & Flag::FakeUserAgent ) From 846936357b6ff4ea298ae5443354bc7a2e2f985f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 15 Jun 2021 20:43:44 +0200 Subject: [PATCH 188/492] [mount] If no btrfs layout at all, use something reasonable This is related to https://invent.kde.org/neon/neon/calamares-settings/-/merge_requests/1 which adds .. the default things from the example configuration to the configuration file KDE neon ships. The default layout doesn't add any subvolumes at all, which seems to be non-functional. If nothing is configured, complain and use /@ as the lone subvolume. --- src/modules/mount/main.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 07166dd75e..5e5233935e 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -74,7 +74,14 @@ def mount_partition(root_mount_point, partition, partitions): # Special handling for btrfs subvolumes. Create the subvolumes listed in mount.conf if fstype == "btrfs" and partition["mountPoint"] == '/': # Root has been mounted to btrfs volume -> create subvolumes from configuration - btrfs_subvolumes = libcalamares.job.configuration.get("btrfsSubvolumes") or [] + btrfs_subvolumes = libcalamares.job.configuration.get("btrfsSubvolumes", None) + # Warn if there's no configuration at all, and empty configurations are + # replaced by a simple root-only layout. + if btrfs_subvolumes is None: + libcalamares.utils.warning("No configuration for btrfsSubvolumes") + if not btrfs_subvolumes: + btrfs_subvolumes = [ dict(mountPoint="/", subvolume="/@") ] + subvolume_mountpoints = [d['mountPoint'] for d in btrfs_subvolumes] # Check if listed mountpoints besides / are already present and don't create subvolume for those for p in partitions: From 7b297a0e16d36430f1370bf9ddc407cef1a0978c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 15 Jun 2021 20:48:22 +0200 Subject: [PATCH 189/492] [mount] Rename test file, re-jig tests for mount --- src/modules/mount/{test.yaml => tests/1.global} | 0 src/modules/mount/tests/1.job | 6 ++++++ src/modules/mount/tests/2.global | 8 ++++++++ src/modules/mount/tests/2.job | 5 +++++ 4 files changed, 19 insertions(+) rename src/modules/mount/{test.yaml => tests/1.global} (100%) create mode 100644 src/modules/mount/tests/1.job create mode 100644 src/modules/mount/tests/2.global create mode 100644 src/modules/mount/tests/2.job diff --git a/src/modules/mount/test.yaml b/src/modules/mount/tests/1.global similarity index 100% rename from src/modules/mount/test.yaml rename to src/modules/mount/tests/1.global diff --git a/src/modules/mount/tests/1.job b/src/modules/mount/tests/1.job new file mode 100644 index 0000000000..94b3a14928 --- /dev/null +++ b/src/modules/mount/tests/1.job @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +bogus: true + +# No configuration needed because the partitions are +# all filesystems that require no special handling. diff --git a/src/modules/mount/tests/2.global b/src/modules/mount/tests/2.global new file mode 100644 index 0000000000..20aba89ec0 --- /dev/null +++ b/src/modules/mount/tests/2.global @@ -0,0 +1,8 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +partitions: + - device: "/dev/sdb1" + mountPoint: "/" + fs: "btrfs" + +# Expect a complaint and a default btrfs layout diff --git a/src/modules/mount/tests/2.job b/src/modules/mount/tests/2.job new file mode 100644 index 0000000000..40d8c6171c --- /dev/null +++ b/src/modules/mount/tests/2.job @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 + +# Expect a complaint and a default btrfs layout because the +# partitions use btrfs From 69cad09a005388fa6c38c25a6ad2ef1f2e722b2c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 15 Jun 2021 21:23:57 +0200 Subject: [PATCH 190/492] [calamares] Tighten debug-output from module-loader test executable --- src/calamares/testmain.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp index e038b5a2fc..4cde803002 100644 --- a/src/calamares/testmain.cpp +++ b/src/calamares/testmain.cpp @@ -321,7 +321,7 @@ load_module( const ModuleConfig& moduleConfig ) QString configFile( moduleConfig.configFile().isEmpty() ? moduleDirectory + '/' + name + ".conf" : moduleConfig.configFile() ); - cDebug() << "Module" << moduleName << "job-configuration:" << configFile; + cDebug() << Logger::SubEntry << "Module" << moduleName << "job-configuration:" << configFile; Calamares::Module* module = Calamares::moduleFromDescriptor( Calamares::ModuleSystem::Descriptor::fromDescriptorData( descriptor ), name, configFile, moduleDirectory ); @@ -406,7 +406,7 @@ main( int argc, char* argv[] ) return 1; } - cDebug() << " .. got" << m->name() << m->typeString() << m->interfaceString(); + cDebug() << Logger::SubEntry << " .. got" << m->name() << m->typeString() << m->interfaceString(); if ( m->type() == Calamares::Module::Type::View ) { // If we forgot the --ui, any ViewModule will core dump as it @@ -455,7 +455,6 @@ main( int argc, char* argv[] ) cDebug() << "Module metadata" << TR( "name", m->name() ) << TR( "type", m->typeString() ) << TR( "interface", m->interfaceString() ); - cDebug() << "Job outputs:"; Calamares::JobList jobList = m->jobs(); unsigned int failure_count = 0; unsigned int count = 1; From 629fc83f210367b858c0f93a5ca220fadaab1973 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 15 Jun 2021 21:50:59 +0200 Subject: [PATCH 191/492] [libcalamares] Add a pre-script for PythonJobs This allows injecting arbitrary Python code before the script of a module is even run. For testing purposes, that gives us a chance to modify existing (internal) modules before the script (e.g. to test subprocess calls). --- src/libcalamares/PythonJob.cpp | 14 ++++++++++++++ src/libcalamares/PythonJob.h | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp index 98f284ecc3..1a4683c29c 100644 --- a/src/libcalamares/PythonJob.cpp +++ b/src/libcalamares/PythonJob.cpp @@ -19,6 +19,8 @@ #include +static const char* s_preScript = nullptr; + namespace bp = boost::python; BOOST_PYTHON_FUNCTION_OVERLOADS( mount_overloads, CalamaresPython::mount, 2, 4 ); @@ -242,6 +244,11 @@ PythonJob::exec() calamaresNamespace[ "globalstorage" ] = CalamaresPython::GlobalStoragePythonWrapper( JobQueue::instance()->globalStorage() ); + if ( s_preScript ) + { + bp::exec( s_preScript, scriptNamespace, scriptNamespace ); + } + cDebug() << "Job file" << scriptFI.absoluteFilePath(); bp::object execResult = bp::exec_file( scriptFI.absoluteFilePath().toLocal8Bit().data(), scriptNamespace, scriptNamespace ); @@ -319,4 +326,11 @@ PythonJob::emitProgress( qreal progressValue ) emit progress( progressValue ); } +void +PythonJob::setInjectedPreScript( const char* preScript ) +{ + s_preScript = preScript; + cDebug() << "Python pre-script set to" << Logger::Pointer( preScript ); +} + } // namespace Calamares diff --git a/src/libcalamares/PythonJob.h b/src/libcalamares/PythonJob.h index 04a0645eae..af77d741d0 100644 --- a/src/libcalamares/PythonJob.h +++ b/src/libcalamares/PythonJob.h @@ -41,6 +41,19 @@ class PythonJob : public Job QString prettyStatusMessage() const override; JobResult exec() override; + /** @brief Sets the pre-run Python code for all PythonJobs + * + * A PythonJob runs the code from the scriptFile parameter to + * the constructor; the pre-run code is **also** run, before + * even the scriptFile code. Use this in testing mode + * to modify Python internals. + * + * No ownership of @p script is taken: pass in a pointer to + * a character literal or something that lives longer than the + * job. Pass in @c nullptr to switch off pre-run code. + */ + static void setInjectedPreScript( const char* script ); + private: struct Private; From cc0e39db562af8b3a324505bea5767f820cda767 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 15 Jun 2021 23:21:32 +0200 Subject: [PATCH 192/492] [calamares] Inject a pre-script when testing Python modules Co-opt the subprocess module and replace call and check_call functions with something that logs the call and does nothing. --- src/calamares/testmain.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp index 4cde803002..6dae0af68f 100644 --- a/src/calamares/testmain.cpp +++ b/src/calamares/testmain.cpp @@ -18,6 +18,7 @@ #include "GlobalStorage.h" #include "Job.h" #include "JobQueue.h" +#include "PythonJob.h" #include "Settings.h" #include "ViewManager.h" #include "modulesystem/Module.h" @@ -365,6 +366,27 @@ createApplication( int& argc, char* argv[] ) return new QCoreApplication( argc, argv ); } +static const char pythonPreScript[] = R"( +# This is Python code executed by Python modules *before* the +# script file (e.g. main.py) is executed. Beware " before ) +# because it's a C++ raw-string. +_calamares_subprocess = __import__("subprocess", globals(), locals(), [], 0) +import sys +import libcalamares +class fake_subprocess(object): + @staticmethod + def call(*args, **kwargs): + libcalamares.utils.debug("subprocess.call(%r,%r) X run normally" % (args, kwargs)) + return 0 + @staticmethod + def check_call(*args, **kwargs): + libcalamares.utils.debug("subprocess.check_call(%r,%r) X subverted to call" % (args, kwargs)) + return 0 +sys.modules["subprocess"] = fake_subprocess +libcalamares.utils.debug('pre-script for testing purposes injected') + +)"; + int main( int argc, char* argv[] ) { @@ -397,6 +419,7 @@ main( int argc, char* argv[] ) #ifdef WITH_QML CalamaresUtils::initQmlModulesDir(); // don't care if failed #endif + Calamares::PythonJob::setInjectedPreScript(pythonPreScript); cDebug() << "Calamares module-loader testing" << module.moduleName(); Calamares::Module* m = load_module( module ); From 546253d750aa8f93be7aca016d87635f9cd299dd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 11:00:15 +0200 Subject: [PATCH 193/492] [partition] Apply coding style --- src/modules/partition/core/PartitionActions.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index 0dab5747fc..728eda7678 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -16,13 +16,12 @@ #include "core/PartitionCoreModule.h" #include "core/PartitionInfo.h" -#include "utils/CalamaresUtilsSystem.h" -#include "utils/NamedEnum.h" -#include "utils/Units.h" - #include "GlobalStorage.h" #include "JobQueue.h" +#include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" +#include "utils/NamedEnum.h" +#include "utils/Units.h" #include #include @@ -110,8 +109,8 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO } FileSystem::Type type; - PartUtils::findFS(o.defaultFsType, &type); - core->initLayout( type == FileSystem::Unknown ? FileSystem::Ext4 : type); + PartUtils::findFS( o.defaultFsType, &type ); + core->initLayout( type == FileSystem::Unknown ? FileSystem::Ext4 : type ); core->createPartitionTable( dev, partType ); From f9659989b18efb0e4e8eed268f5d6b85ac2ebb08 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 11:06:02 +0200 Subject: [PATCH 194/492] [partition] rename findFS Rename findFS -> canonicalFilesystemName because that's what it actually does. While here, apply coding style to the files that are affected. --- src/modules/partition/core/PartUtils.cpp | 2 +- src/modules/partition/core/PartUtils.h | 6 ++++-- src/modules/partition/core/PartitionActions.cpp | 6 ++++-- src/modules/partition/core/PartitionLayout.cpp | 2 +- src/modules/partition/gui/CreatePartitionDialog.cpp | 2 +- .../partition/gui/EditExistingPartitionDialog.cpp | 2 +- src/modules/partition/gui/PartitionViewStep.cpp | 9 ++++----- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 368d04af24..8d048b297a 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -472,7 +472,7 @@ isEfiBootable( const Partition* candidate ) } QString -findFS( QString fsName, FileSystem::Type* fsType ) +canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType ) { QStringList fsLanguage { QLatin1String( "C" ) }; // Required language list to turn off localization if ( fsName.isEmpty() ) diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h index aec345882c..89d2c5e1a3 100644 --- a/src/modules/partition/core/PartUtils.h +++ b/src/modules/partition/core/PartUtils.h @@ -91,11 +91,13 @@ bool isEfiBootable( const Partition* candidate ); /** @brief translate @p fsName into a recognized name and type * * Makes several attempts to translate the string into a - * name that KPMCore will recognize. + * name that KPMCore will recognize. Returns the canonical + * filesystem name (e.g. asking for "EXT4" will return "ext4"). + * * The corresponding filesystem type is stored in @p fsType, and * its value is FileSystem::Unknown if @p fsName is not recognized. */ -QString findFS( QString fsName, FileSystem::Type* fsType ); +QString canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType ); } // namespace PartUtils diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index 728eda7678..422c1d38f1 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -108,8 +108,10 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO partType = isEfi ? PartitionTable::gpt : PartitionTable::msdos; } - FileSystem::Type type; - PartUtils::findFS( o.defaultFsType, &type ); + // Looking up the defaultFsType (which should name a filesystem type) + // will log an error and set the type to Unknown if there's something wrong. + FileSystem::Type type = FileSystem::Unknown; + PartUtils::canonicalFilesystemName( o.defaultFsType, &type ); core->initLayout( type == FileSystem::Unknown ? FileSystem::Ext4 : type ); core->createPartitionTable( dev, partType ); diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index 23eaeda620..c828fce69c 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -75,7 +75,7 @@ PartitionLayout::PartitionEntry::PartitionEntry( const QString& label, , partMinSize( minSize ) , partMaxSize( maxSize ) { - PartUtils::findFS( fs, &partFileSystem ); + PartUtils::canonicalFilesystemName( fs, &partFileSystem ); } diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index c765bf1f77..4236022be7 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -96,7 +96,7 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, // File system; the config value is translated (best-effort) to a type FileSystem::Type defaultFSType; - QString untranslatedFSName = PartUtils::findFS( + QString untranslatedFSName = PartUtils::canonicalFilesystemName( Calamares::JobQueue::instance()->globalStorage()->value( "defaultFileSystemType" ).toString(), &defaultFSType ); if ( defaultFSType == FileSystem::Type::Unknown ) { diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp index e2d7ac5ba5..411d6d0dc7 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp @@ -97,7 +97,7 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, m_ui->fileSystemComboBox->addItems( fsNames ); FileSystem::Type defaultFSType; - QString untranslatedFSName = PartUtils::findFS( + QString untranslatedFSName = PartUtils::canonicalFilesystemName( Calamares::JobQueue::instance()->globalStorage()->value( "defaultFileSystemType" ).toString(), &defaultFSType ); if ( defaultFSType == FileSystem::Type::Unknown ) { diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index b4eefb3b09..52bf1fc3b6 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -388,7 +388,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) } auto [ r, device ] = core->bootLoaderModel()->findBootLoader( core->bootLoaderInstallPath() ); - Q_UNUSED(r); + Q_UNUSED( r ); if ( device ) { auto* table = device->partitionTable(); @@ -403,8 +403,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) && ( partition->fileSystem().type() == FileSystem::Unformatted ) && ( partition->capacity() >= 8_MiB ) ) { - cDebug() << Logger::SubEntry << "Partition" << partition->devicePath() - << partition->partitionPath() + cDebug() << Logger::SubEntry << "Partition" << partition->devicePath() << partition->partitionPath() << "is a suitable bios_grub partition"; return false; } @@ -591,7 +590,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { cWarning() << "Partition-module setting *defaultFileSystemType* is missing, will use ext4"; } - QString fsRealName = PartUtils::findFS( fsName, &fsType ); + QString fsRealName = PartUtils::canonicalFilesystemName( fsName, &fsType ); if ( fsRealName == fsName ) { cDebug() << o << "Partition-module setting *defaultFileSystemType*" << fsRealName; @@ -619,7 +618,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) // because it could take a while. Then when it's done, we can set up the widgets // and remove the spinner. m_future = new QFutureWatcher< void >(); - connect( m_future, &QFutureWatcher< void >::finished, this, [ this ] { + connect( m_future, &QFutureWatcher< void >::finished, this, [this] { continueLoading(); this->m_future->deleteLater(); this->m_future = nullptr; From 9fa5ab04e56a4253da7ef39e29e38ec2cc7d0cc7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 11:23:27 +0200 Subject: [PATCH 195/492] [partition] Apply coding style to core/ --- src/modules/partition/core/Config.cpp | 23 +++++++++++-------- src/modules/partition/core/Config.h | 4 ++-- src/modules/partition/core/DeviceList.cpp | 8 +++---- src/modules/partition/core/PartUtils.cpp | 13 ++++++++--- src/modules/partition/core/PartUtils.h | 2 +- .../partition/core/PartitionCoreModule.cpp | 3 +-- 6 files changed, 32 insertions(+), 21 deletions(-) diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp index a603cedd0f..47951321e8 100644 --- a/src/modules/partition/core/Config.cpp +++ b/src/modules/partition/core/Config.cpp @@ -208,9 +208,10 @@ Config::setSwapChoice( Config::SwapChoice c ) } void -Config::setEraseFsTypeChoice(const QString& choice) +Config::setEraseFsTypeChoice( const QString& choice ) { - if(choice != m_eraseFsTypeChoice){ + if ( choice != m_eraseFsTypeChoice ) + { m_eraseFsTypeChoice = choice; } } @@ -249,14 +250,18 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) gs->insert( "allowManualPartitioning", CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ) ); - if ( configurationMap.contains( "availableFileSystemTypes" ) ) { - if(configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::List ){ + if ( configurationMap.contains( "availableFileSystemTypes" ) ) + { + if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::List ) + { m_eraseFsTypes.clear(); - m_eraseFsTypes.append(configurationMap.value( "availableFileSystemTypes" ).toStringList()); - m_eraseFsTypeChoice = m_eraseFsTypes[0]; - } else if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::String ){ - m_eraseFsTypes.append(configurationMap.value( "availableFileSystemTypes" ).toString()); - m_eraseFsTypeChoice = m_eraseFsTypes[0]; + m_eraseFsTypes.append( configurationMap.value( "availableFileSystemTypes" ).toStringList() ); + m_eraseFsTypeChoice = m_eraseFsTypes[ 0 ]; + } + else if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::String ) + { + m_eraseFsTypes.append( configurationMap.value( "availableFileSystemTypes" ).toString() ); + m_eraseFsTypeChoice = m_eraseFsTypes[ 0 ]; } } diff --git a/src/modules/partition/core/Config.h b/src/modules/partition/core/Config.h index 5cdd14c9d7..a4f5e68f61 100644 --- a/src/modules/partition/core/Config.h +++ b/src/modules/partition/core/Config.h @@ -96,9 +96,9 @@ class Config : public QObject */ SwapChoice swapChoice() const { return m_swapChoice; } - EraseFsTypesSet eraseFsTypes() const {return m_eraseFsTypes; } + EraseFsTypesSet eraseFsTypes() const { return m_eraseFsTypes; } - QString eraseFsType() const {return m_eraseFsTypeChoice; } + QString eraseFsType() const { return m_eraseFsTypeChoice; } ///@brief Is manual partitioning allowed (not explicitly disnabled in the config file)? diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index d58b22868b..6b770a9821 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -10,8 +10,8 @@ #include "DeviceList.h" -#include "utils/Logger.h" #include "partition/PartitionIterator.h" +#include "utils/Logger.h" #include #include @@ -133,11 +133,11 @@ getDevices( DeviceType which ) #endif // Unsafe partitioning - auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it) { return erase(l, it); }; - auto removeInSafeMode = []( DeviceList&, DeviceList::iterator& it) { return ++it; }; + auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it ) { return erase( l, it ); }; + auto removeInSafeMode = []( DeviceList&, DeviceList::iterator& it ) { return ++it; }; #else // Safe partitioning - auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it) { return erase(l, it); }; + auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it ) { return erase( l, it ); }; auto& removeInSafeMode = removeInAllModes; #endif diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 8d048b297a..8bff2c95f3 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -177,7 +177,8 @@ canBeResized( Partition* candidate, const Logger::Once& o ) if ( availableStorageB > advisedStorageB ) { - cDebug() << o << "Partition" << convenienceName( candidate ) << "authorized for resize + autopartition install."; + cDebug() << o << "Partition" << convenienceName( candidate ) + << "authorized for resize + autopartition install."; return true; } else @@ -412,8 +413,14 @@ runOsprober( DeviceModel* dm ) FstabEntryList fstabEntries = lookForFstabEntries( path ); QString homePath = findPartitionPathForMountPoint( fstabEntries, "/home" ); - osproberEntries.append( - { prettyName, path, file, QString(), canBeResized( dm, path, o ), lineColumns, fstabEntries, homePath } ); + osproberEntries.append( { prettyName, + path, + file, + QString(), + canBeResized( dm, path, o ), + lineColumns, + fstabEntries, + homePath } ); osproberCleanLines.append( line ); } } diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h index 89d2c5e1a3..5e84e379ba 100644 --- a/src/modules/partition/core/PartUtils.h +++ b/src/modules/partition/core/PartUtils.h @@ -26,7 +26,7 @@ class DeviceModel; class Partition; namespace Logger { - class Once; +class Once; } namespace PartUtils diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index c8b17b1cb5..363d9daefc 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -258,7 +258,7 @@ PartitionCoreModule::doInit() cDebug() << Logger::SubEntry << "node\tcapacity\tname\tprettyName"; for ( auto device : devices ) { - cDebug() << Logger::SubEntry << Logger::Pointer(device); + cDebug() << Logger::SubEntry << Logger::Pointer( device ); if ( device ) { // Gives ownership of the Device* to the DeviceInfo object @@ -390,7 +390,6 @@ PartitionCoreModule::createPartitionTable( Device* device, PartitionTable::Table OperationHelper helper( partitionModelForDevice( device ), this ); deviceInfo->makeJob< CreatePartitionTableJob >( type ); - } } From 4fa61249a83a4c0bb5a246bc016ad54cde3b66a2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 11:29:36 +0200 Subject: [PATCH 196/492] [partition] Make the fs type used for erase, a config property --- src/modules/partition/core/Config.cpp | 2 ++ src/modules/partition/core/Config.h | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp index 47951321e8..cfe9458cc8 100644 --- a/src/modules/partition/core/Config.cpp +++ b/src/modules/partition/core/Config.cpp @@ -212,7 +212,9 @@ Config::setEraseFsTypeChoice( const QString& choice ) { if ( choice != m_eraseFsTypeChoice ) { + // FIXME: shouldn't this be a canonical fs name? m_eraseFsTypeChoice = choice; + Q_EMIT eraseModeFilesystemChanged( choice ); } } diff --git a/src/modules/partition/core/Config.h b/src/modules/partition/core/Config.h index a4f5e68f61..8b420a8d0c 100644 --- a/src/modules/partition/core/Config.h +++ b/src/modules/partition/core/Config.h @@ -24,6 +24,9 @@ class Config : public QObject ///@brief The swap choice (None, Small, Hibernate, ...) which only makes sense when Erase is chosen Q_PROPERTY( SwapChoice swapChoice READ swapChoice WRITE setSwapChoice NOTIFY swapChoiceChanged ) + ///@brief Name of the FS that will be used when erasing type disk (e.g. "default filesystem") + Q_PROPERTY( QString eraseModeFilesystem READ eraseFsType WRITE setEraseFsTypeChoice NOTIFY eraseModeFilesystemChanged ) + Q_PROPERTY( bool allowManualPartitioning READ allowManualPartitioning CONSTANT FINAL ) public: @@ -109,11 +112,12 @@ public Q_SLOTS: void setInstallChoice( InstallChoice ); void setSwapChoice( int ); ///< Translates a button ID or so to SwapChoice void setSwapChoice( SwapChoice ); - void setEraseFsTypeChoice( const QString& ); + void setEraseFsTypeChoice( const QString& filesystemName ); ///< See property eraseModeFilesystem Q_SIGNALS: void installChoiceChanged( InstallChoice ); void swapChoiceChanged( SwapChoice ); + void eraseModeFilesystemChanged( const QString& ); private: SwapChoiceSet m_swapChoices; From d8a862ec82d0fb96e6c9ca10ef6eb3f87385a9cc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 11:31:53 +0200 Subject: [PATCH 197/492] [partition] Use Q_EMIT --- src/modules/partition/core/Config.cpp | 4 ++-- src/modules/partition/core/DeviceModel.cpp | 2 +- src/modules/partition/core/PartitionCoreModule.cpp | 6 +++--- src/modules/partition/core/PartitionModel.cpp | 2 +- src/modules/partition/core/PartitionModel.h | 2 +- src/modules/partition/gui/ChoicePage.cpp | 14 +++++++------- src/modules/partition/gui/EncryptWidget.cpp | 2 +- .../partition/gui/PartitionSplitterWidget.cpp | 4 ++-- src/modules/partition/gui/PartitionViewStep.cpp | 2 +- src/modules/partition/gui/ReplaceWidget.cpp | 2 +- src/modules/partition/gui/ScanningDialog.cpp | 2 +- src/modules/partition/jobs/PartitionJob.cpp | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp index cfe9458cc8..78296018a5 100644 --- a/src/modules/partition/core/Config.cpp +++ b/src/modules/partition/core/Config.cpp @@ -180,7 +180,7 @@ Config::setInstallChoice( InstallChoice c ) if ( c != m_installChoice ) { m_installChoice = c; - emit installChoiceChanged( c ); + Q_EMIT installChoiceChanged( c ); ::updateGlobalStorage( c, m_swapChoice ); } } @@ -202,7 +202,7 @@ Config::setSwapChoice( Config::SwapChoice c ) if ( c != m_swapChoice ) { m_swapChoice = c; - emit swapChoiceChanged( c ); + Q_EMIT swapChoiceChanged( c ); ::updateGlobalStorage( m_installChoice, c ); } } diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp index 46a181b33c..33aae20c04 100644 --- a/src/modules/partition/core/DeviceModel.cpp +++ b/src/modules/partition/core/DeviceModel.cpp @@ -132,7 +132,7 @@ DeviceModel::swapDevice( Device* oldDevice, Device* newDevice ) m_devices[ indexOfOldDevice ] = newDevice; - emit dataChanged( index( indexOfOldDevice ), index( indexOfOldDevice ) ); + Q_EMIT dataChanged( index( indexOfOldDevice ), index( indexOfOldDevice ) ); } void diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 363d9daefc..e2c91fbee7 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -687,7 +687,7 @@ void PartitionCoreModule::refreshPartition( Device* device, Partition* ) { // Keep it simple for now: reset the model. This can be improved to cause - // the model to emit dataChanged() for the affected row instead, avoiding + // the model to Q_EMIT dataChanged() for the affected row instead, avoiding // the loss of the current selection. auto model = partitionModelForDevice( device ); Q_ASSERT( model ); @@ -966,7 +966,7 @@ PartitionCoreModule::revert() m_deviceInfos.clear(); doInit(); updateIsDirty(); - emit reverted(); + Q_EMIT reverted(); } @@ -1040,7 +1040,7 @@ PartitionCoreModule::revertDevice( Device* dev, bool individualRevert ) { refreshAfterModelChange(); } - emit deviceReverted( newDev ); + Q_EMIT deviceReverted( newDev ); } diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp index b4ea57adb5..e310eee5e1 100644 --- a/src/modules/partition/core/PartitionModel.cpp +++ b/src/modules/partition/core/PartitionModel.cpp @@ -327,5 +327,5 @@ PartitionModel::partitionForIndex( const QModelIndex& index ) const void PartitionModel::update() { - emit dataChanged( index( 0, 0 ), index( rowCount() - 1, columnCount() - 1 ) ); + Q_EMIT dataChanged( index( 0, 0 ), index( rowCount() - 1, columnCount() - 1 ) ); } diff --git a/src/modules/partition/core/PartitionModel.h b/src/modules/partition/core/PartitionModel.h index 433fa06203..ba5e258a31 100644 --- a/src/modules/partition/core/PartitionModel.h +++ b/src/modules/partition/core/PartitionModel.h @@ -41,7 +41,7 @@ class PartitionModel : public QAbstractItemModel /** * This helper class must be instantiated on the stack *before* making * changes to the device represented by this model. It will cause the model - * to emit modelAboutToBeReset() when instantiated and modelReset() when + * to Q_EMIT modelAboutToBeReset() when instantiated and modelReset() when * destructed. */ class ResetHelper diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 5ae62a87e4..e6c7ea91f7 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -300,7 +300,7 @@ ChoicePage::setupChoices() m_config->setInstallChoice( id ); updateNextEnabled(); - emit actionChosen(); + Q_EMIT actionChosen(); } else // An action was unpicked, either on its own or because of another selection. { @@ -310,7 +310,7 @@ ChoicePage::setupChoices() m_config->setInstallChoice( InstallChoice::NoChoice ); updateNextEnabled(); - emit actionChosen(); + Q_EMIT actionChosen(); } } } ); @@ -433,8 +433,8 @@ ChoicePage::continueApplyDeviceChoice() checkInstallChoiceRadioButton( m_config->installChoice() ); } - emit actionChosen(); - emit deviceChosen(); + Q_EMIT actionChosen(); + Q_EMIT deviceChosen(); } @@ -489,14 +489,14 @@ ChoicePage::applyActionChoice( InstallChoice choice ) } ), [=] { PartitionActions::doAutopartition( m_core, selectedDevice(), options ); - emit deviceChosen(); + Q_EMIT deviceChosen(); }, this ); } else { PartitionActions::doAutopartition( m_core, selectedDevice(), options ); - emit deviceChosen(); + Q_EMIT deviceChosen(); } } break; @@ -1599,7 +1599,7 @@ ChoicePage::updateNextEnabled() if ( enabled != m_nextEnabled ) { m_nextEnabled = enabled; - emit nextStatusChanged( enabled ); + Q_EMIT nextStatusChanged( enabled ); } } diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp index 7f648491a7..ee50e7d664 100644 --- a/src/modules/partition/gui/EncryptWidget.cpp +++ b/src/modules/partition/gui/EncryptWidget.cpp @@ -136,7 +136,7 @@ EncryptWidget::updateState() if ( newState != m_state ) { m_state = newState; - emit stateChanged( m_state ); + Q_EMIT stateChanged( m_state ); } } diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp index 93c77bb694..0cafe7814f 100644 --- a/src/modules/partition/gui/PartitionSplitterWidget.cpp +++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp @@ -225,7 +225,7 @@ PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize, } } - emit partitionResized( m_itemToResize.itemPath, m_itemToResize.size, m_itemToResizeNext.size ); + Q_EMIT partitionResized( m_itemToResize.itemPath, m_itemToResize.size, m_itemToResizeNext.size ); cDebug() << "Items updated. Status:"; foreach ( const PartitionSplitterItem& item, m_items ) @@ -374,7 +374,7 @@ PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event ) repaint(); - emit partitionResized( itemPath, m_itemToResize.size, m_itemToResizeNext.size ); + Q_EMIT partitionResized( itemPath, m_itemToResize.size, m_itemToResizeNext.size ); } else { diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index 52bf1fc3b6..cc06ba967d 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -327,7 +327,7 @@ PartitionViewStep::isNextEnabled() const void PartitionViewStep::nextPossiblyChanged( bool ) { - emit nextStatusChanged( isNextEnabled() ); + Q_EMIT nextStatusChanged( isNextEnabled() ); } bool diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp index 078eb4de7e..94f5276463 100644 --- a/src/modules/partition/gui/ReplaceWidget.cpp +++ b/src/modules/partition/gui/ReplaceWidget.cpp @@ -311,7 +311,7 @@ ReplaceWidget::setNextEnabled( bool enabled ) } m_nextEnabled = enabled; - emit nextStatusChanged( enabled ); + Q_EMIT nextStatusChanged( enabled ); } diff --git a/src/modules/partition/gui/ScanningDialog.cpp b/src/modules/partition/gui/ScanningDialog.cpp index cd22bb8616..4dffa922b5 100644 --- a/src/modules/partition/gui/ScanningDialog.cpp +++ b/src/modules/partition/gui/ScanningDialog.cpp @@ -68,5 +68,5 @@ void ScanningDialog::setVisible( bool visible ) { QDialog::setVisible( visible ); - emit visibilityChanged(); + Q_EMIT visibilityChanged(); } diff --git a/src/modules/partition/jobs/PartitionJob.cpp b/src/modules/partition/jobs/PartitionJob.cpp index 3bdb05ebdc..ca9b00944c 100644 --- a/src/modules/partition/jobs/PartitionJob.cpp +++ b/src/modules/partition/jobs/PartitionJob.cpp @@ -25,5 +25,5 @@ PartitionJob::iprogress( int percent ) { percent = 100; } - emit progress( qreal( percent / 100.0 ) ); + Q_EMIT progress( qreal( percent / 100.0 ) ); } From cd804470b57556f49e2484b9d54d49c33bca61dc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 11:51:33 +0200 Subject: [PATCH 198/492] [partition] Canonicalize the FS choice for erase --- src/modules/partition/core/Config.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp index 78296018a5..b09f1424d1 100644 --- a/src/modules/partition/core/Config.cpp +++ b/src/modules/partition/core/Config.cpp @@ -9,6 +9,8 @@ #include "Config.h" +#include "PartUtils.h" + #include "GlobalStorage.h" #include "JobQueue.h" #include "utils/Logger.h" @@ -210,11 +212,11 @@ Config::setSwapChoice( Config::SwapChoice c ) void Config::setEraseFsTypeChoice( const QString& choice ) { - if ( choice != m_eraseFsTypeChoice ) + QString canonicalChoice = PartUtils::canonicalFilesystemName( choice, nullptr ); + if ( canonicalChoice != m_eraseFsTypeChoice ) { - // FIXME: shouldn't this be a canonical fs name? - m_eraseFsTypeChoice = choice; - Q_EMIT eraseModeFilesystemChanged( choice ); + m_eraseFsTypeChoice = canonicalChoice; + Q_EMIT eraseModeFilesystemChanged( canonicalChoice ); } } From 26cabbb3e410e6dff1ab3c361df0013699be35ac Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 12:18:04 +0200 Subject: [PATCH 199/492] [partition] refactor config-reading from availableFileSystemTypes --- src/modules/partition/core/Config.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp index b09f1424d1..69dbe17d3a 100644 --- a/src/modules/partition/core/Config.cpp +++ b/src/modules/partition/core/Config.cpp @@ -256,16 +256,22 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) if ( configurationMap.contains( "availableFileSystemTypes" ) ) { + QStringList fsTypes; + if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::List ) { - m_eraseFsTypes.clear(); - m_eraseFsTypes.append( configurationMap.value( "availableFileSystemTypes" ).toStringList() ); - m_eraseFsTypeChoice = m_eraseFsTypes[ 0 ]; + fsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" ); } else if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::String ) { - m_eraseFsTypes.append( configurationMap.value( "availableFileSystemTypes" ).toString() ); - m_eraseFsTypeChoice = m_eraseFsTypes[ 0 ]; + fsTypes = QStringList { CalamaresUtils::getString( configurationMap, "availableFileSystemTypes" ) }; + } + + m_eraseFsTypes = fsTypes; + if ( !fsTypes.empty() ) + { + m_eraseFsTypeChoice = m_eraseFsTypes.first(); + Q_EMIT eraseModeFilesystemChanged( m_eraseFsTypeChoice ); } } From 2a0d4e5a2356837633395d7a692b46e9e2df717d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 12:35:15 +0200 Subject: [PATCH 200/492] [partition] Initialize pointers in declaration --- src/modules/partition/gui/ChoicePage.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h index f43578ba5e..30de05cb9d 100644 --- a/src/modules/partition/gui/ChoicePage.h +++ b/src/modules/partition/gui/ChoicePage.h @@ -138,8 +138,8 @@ private slots: Calamares::PrettyRadioButton* m_eraseButton; Calamares::PrettyRadioButton* m_replaceButton; Calamares::PrettyRadioButton* m_somethingElseButton; - QComboBox* m_eraseSwapChoiceComboBox; // UI, see also m_eraseSwapChoice - QComboBox* m_eraseFsTypesChoiceComboBox; // UI, see also m_eraseSwapChoice + QComboBox* m_eraseSwapChoiceComboBox = nullptr; // UI, see also Config's swap choice + QComboBox* m_eraseFsTypesChoiceComboBox = nullptr; // UI, see also Config's erase-mode FS DeviceInfoWidget* m_deviceInfoWidget; From ef436ac4d73edf6c9346894ebfad7fe1ae29e135 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 13:49:08 +0200 Subject: [PATCH 201/492] [libcalamares] add a convenience optional-setter for use with pointers --- src/libcalamares/utils/RAII.h | 17 ++++++++++++ src/libcalamares/utils/Tests.cpp | 45 ++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/src/libcalamares/utils/RAII.h b/src/libcalamares/utils/RAII.h index 1cbead4a2f..f3adb90f65 100644 --- a/src/libcalamares/utils/RAII.h +++ b/src/libcalamares/utils/RAII.h @@ -14,6 +14,7 @@ #include #include +#include #include /** @brief Convenience to zero out and deleteLater of any QObject-derived-class @@ -58,4 +59,20 @@ struct cBoolSetter /// @brief Blocks signals on a QObject until destruction using cSignalBlocker = QSignalBlocker; +/** @brief Writes a value on destruction to a pointed-to location. + * + * If the pointer is non-null, write the last-given-value if there + * is one to the pointed-to object. + */ +template < typename T > +struct cPointerSetter +{ + std::optional< T > m_value; + T* m_pointer; + + cPointerSetter( T* p ) : m_pointer(p) {} + ~cPointerSetter() { if ( m_pointer && m_value.has_value() ) { *m_pointer = m_value.value(); } } + + const T& operator=(const T& v) { m_value = v; return v; } +}; #endif diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index cdb37f20d8..7a6d526239 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -56,6 +56,7 @@ private Q_SLOTS: /** @brief Tests the RAII bits. */ void testBoolSetter(); + void testPointerSetter(); /** @brief Tests the Traits bits. */ void testTraits(); @@ -360,6 +361,50 @@ LibCalamaresTests::testBoolSetter() QVERIFY( b ); } +void +LibCalamaresTests::testPointerSetter() +{ + int special = 17; + + QCOMPARE( special, 17 ); + { + cPointerSetter p( &special ); + } + QCOMPARE( special, 17 ); + { + cPointerSetter p( &special ); + p = 18; + } + QCOMPARE( special, 18 ); + { + cPointerSetter p( &special ); + p = 20; + p = 3; + } + QCOMPARE( special, 3 ); + { + cPointerSetter p( nullptr ); + } + QCOMPARE( special, 3 ); + { + // "don't do this" .. order of destructors is important + cPointerSetter p( &special ); + cPointerSetter q( &special ); + p = 17; + } + QCOMPARE( special, 17 ); + { + // "don't do this" .. order of destructors is important + cPointerSetter p( &special ); + cPointerSetter q( &special ); + p = 34; + q = 2; + // q destroyed first, then p + } + QCOMPARE( special, 34 ); +} + + /* Demonstration of Traits support for has-a-method or not. * * We have two classes, c1 and c2; one has a method do_the_thing() and the From 7ce2a876448ea33b371ec379a3259a9f7f6d16da Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 13:49:31 +0200 Subject: [PATCH 202/492] [partition] Fix build - fsName was a QString (a copy) so it could be modified; - the modification isn't really necessary. - While here, pick up new PointerSetter convenience class. --- src/modules/partition/core/PartUtils.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 8bff2c95f3..2f269d37f7 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -22,6 +22,7 @@ #include "partition/PartitionQuery.h" #include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" +#include "utils/RAII.h" #include #include @@ -481,19 +482,17 @@ isEfiBootable( const Partition* candidate ) QString canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType ) { - QStringList fsLanguage { QLatin1String( "C" ) }; // Required language list to turn off localization + cPointerSetter type( fsType ); if ( fsName.isEmpty() ) { - fsName = QStringLiteral( "ext4" ); + type = FileSystem::Ext4; + return QStringLiteral( "ext4" ); } - FileSystem::Type tmpType = FileSystem::typeForName( fsName, fsLanguage ); - if ( tmpType != FileSystem::Unknown ) + QStringList fsLanguage { QLatin1String( "C" ) }; // Required language list to turn off localization + + if ( ( type = FileSystem::typeForName( fsName, fsLanguage ) ) != FileSystem::Unknown ) { - if ( fsType ) - { - *fsType = tmpType; - } return fsName; } @@ -513,7 +512,6 @@ canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType ) } cWarning() << "Filesystem" << fsName << "not found, using ext4"; - fsName = QStringLiteral( "ext4" ); // fsType can be used to check whether fsName was a valid filesystem. if ( fsType ) { @@ -533,7 +531,8 @@ canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType ) } } #endif - return fsName; + type = FileSystem::Unknown; + return QStringLiteral( "ext4" ); } } // namespace PartUtils From fb7e6101ffd47e89618effd715d078bec5157c9e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 13:53:47 +0200 Subject: [PATCH 203/492] [partition] Hook erase-fs-type changes to the config-object --- src/modules/partition/gui/ChoicePage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index e6c7ea91f7..0c86fd718a 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -272,7 +272,8 @@ ChoicePage::setupChoices() { m_eraseFsTypesChoiceComboBox = new QComboBox; m_eraseFsTypesChoiceComboBox->addItems(m_config->eraseFsTypes()); - connect(m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, [this](const auto& currentString){m_config->setEraseFsTypeChoice(currentString); onActionChanged();}); + connect( m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, m_config, &Config::setEraseFsTypeChoice ); + connect( m_config, &Config::eraseModeFilesystemChanged, this, &ChoicePage::onActionChanged ); m_eraseButton->addOptionsComboBox( m_eraseFsTypesChoiceComboBox ); } From bf7eed934235eb0d67a9024d4384437a6525b993 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 15:50:13 +0200 Subject: [PATCH 204/492] [partition] Tidy debug output when creating table --- src/modules/partition/jobs/CreatePartitionTableJob.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 0913a1cfc4..76c0ab9ee6 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -75,13 +75,13 @@ CreatePartitionTableJob::exec() QString message = tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() ); PartitionTable* table = m_device->partitionTable(); - cDebug() << "Creating new partition table of type" << table->typeName() << ", uncommitted yet:"; if ( Logger::logLevelEnabled( Logger::LOGDEBUG ) ) { + cDebug() << "Creating new partition table of type" << table->typeName() << ", uncommitted partitions:"; for ( auto it = PartitionIterator::begin( table ); it != PartitionIterator::end( table ); ++it ) { - cDebug() << it; + cDebug() << Logger::SubEntry << it; } QProcess lsblk; @@ -89,14 +89,14 @@ CreatePartitionTableJob::exec() lsblk.setProcessChannelMode( QProcess::MergedChannels ); lsblk.start(); lsblk.waitForFinished(); - cDebug() << "lsblk:\n" << lsblk.readAllStandardOutput(); + cDebug() << Logger::SubEntry << "lsblk output:\n" << Logger::NoQuote << lsblk.readAllStandardOutput(); QProcess mount; mount.setProgram( "mount" ); // Debug output only, not mounting something mount.setProcessChannelMode( QProcess::MergedChannels ); mount.start(); mount.waitForFinished(); - cDebug() << "mount:\n" << mount.readAllStandardOutput(); + cDebug() << Logger::SubEntry << "mount output:\n" << Logger::NoQuote << mount.readAllStandardOutput(); } CreatePartitionTableOperation op( *m_device, table ); From 17cc0470da1f8e64c411b4b82f78aa66b582b695 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 15:54:51 +0200 Subject: [PATCH 205/492] [partition] Log names of partition flags, not just a number --- src/modules/partition/jobs/SetPartitionFlagsJob.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp index 7b61012414..de77d86f87 100644 --- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp +++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp @@ -144,8 +144,9 @@ SetPartFlagsJob::prettyStatusMessage() const Calamares::JobResult SetPartFlagsJob::exec() { - cDebug() << "Setting flags on" << m_device->deviceNode() << "partition" << partition()->deviceNode() << "to" - << m_flags; + QStringList flagsList = PartitionTable::flagNames( m_flags ); + cDebug() << "Setting flags on" << m_device->deviceNode() << "partition" << partition()->deviceNode() + << Logger::DebugList( flagsList ); Report report( nullptr ); SetPartFlagsOperation op( *m_device, *partition(), m_flags ); From 66f96e339ca9e00498e1fed79af4e0403abeec4d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 16:01:04 +0200 Subject: [PATCH 206/492] [libcalamares] Introduce cVerbose() convenience macro (like cDebug()) --- src/libcalamares/utils/Logger.h | 1 + src/modules/partition/jobs/AutoMountManagementJob.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index fb49248e1e..8ef0edaf94 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -327,6 +327,7 @@ operator<<( CDebug&& s, const Once& o ) } // namespace Logger +#define cVerbose() Logger::CDebug( Logger::LOGVERBOSE, Q_FUNC_INFO ) #define cDebug() Logger::CDebug( Logger::LOGDEBUG, Q_FUNC_INFO ) #define cWarning() Logger::CDebug( Logger::LOGWARNING, Q_FUNC_INFO ) #define cError() Logger::CDebug( Logger::LOGERROR, Q_FUNC_INFO ) diff --git a/src/modules/partition/jobs/AutoMountManagementJob.cpp b/src/modules/partition/jobs/AutoMountManagementJob.cpp index 9472eae9c3..e276447db3 100644 --- a/src/modules/partition/jobs/AutoMountManagementJob.cpp +++ b/src/modules/partition/jobs/AutoMountManagementJob.cpp @@ -25,8 +25,8 @@ AutoMountManagementJob::prettyName() const Calamares::JobResult AutoMountManagementJob::exec() { - Logger::CDebug( Logger::LOGVERBOSE ) << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored ) - << ( m_stored ? "restore" : m_disable ? "disable" : "enable" ); + cVerbose() << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored ) + << ( m_stored ? "restore" : m_disable ? "disable" : "enable" ); if ( m_stored ) { CalamaresUtils::Partition::automountRestore( m_stored ); From 432154e50ac8d51598a2d6507b097f18468892e0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 16:10:13 +0200 Subject: [PATCH 207/492] [libcalamares] Improve Once-logging Sending a Once to a logger that isn't enabled should not "consume" that Once; it's still available for a subsequent logger that **is** enabled (useful if you're using more than one log-level in a function). --- src/libcalamares/utils/Logger.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index 8ef0edaf94..871cc6fb3a 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -60,6 +60,8 @@ class DLLEXPORT CDebug : public QDebug friend CDebug& operator<<( CDebug&&, const FuncSuppressor& ); friend CDebug& operator<<( CDebug&&, const Once& ); + inline unsigned int level() const { return m_debugLevel; } + private: QString m_msg; unsigned int m_debugLevel; @@ -315,6 +317,12 @@ class Once inline CDebug& operator<<( CDebug&& s, const Once& o ) { + if ( !logLevelEnabled( s.level() ) ) + { + // This won't print, so it's not using the "onceness" + return s; + } + if ( o.m ) { o.m = false; From 7deb6c0e9efdd7241fb0ec77d5fd38d52aadf5f8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 16:18:06 +0200 Subject: [PATCH 208/492] [partition] Improve logging in clearmounts job --- .../partition/jobs/ClearTempMountsJob.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/modules/partition/jobs/ClearTempMountsJob.cpp b/src/modules/partition/jobs/ClearTempMountsJob.cpp index 2f90278fe9..ffbc35044d 100644 --- a/src/modules/partition/jobs/ClearTempMountsJob.cpp +++ b/src/modules/partition/jobs/ClearTempMountsJob.cpp @@ -43,6 +43,7 @@ ClearTempMountsJob::prettyStatusMessage() const Calamares::JobResult ClearTempMountsJob::exec() { + Logger::Once o; // Fetch a list of current mounts to Calamares temporary directories. QList< QPair< QString, QString > > lst; QFile mtab( "/etc/mtab" ); @@ -51,23 +52,27 @@ ClearTempMountsJob::exec() return Calamares::JobResult::error( tr( "Cannot get list of temporary mounts." ) ); } - cDebug() << "Opened mtab. Lines:"; + cVerbose() << o << "Opened mtab. Lines:"; QTextStream in( &mtab ); QString lineIn = in.readLine(); while ( !lineIn.isNull() ) { QStringList line = lineIn.split( ' ', SplitSkipEmptyParts ); - cDebug() << line.join( ' ' ); + cVerbose() << o << line.join( ' ' ); QString device = line.at( 0 ); QString mountPoint = line.at( 1 ); if ( mountPoint.startsWith( "/tmp/calamares-" ) ) { - cDebug() << "INSERTING pair (device, mountPoint)" << device << mountPoint; lst.append( qMakePair( device, mountPoint ) ); } lineIn = in.readLine(); } + if ( lst.empty() ) + { + return Calamares::JobResult::ok(); + } + std::sort( lst.begin(), lst.end(), []( const QPair< QString, QString >& a, const QPair< QString, QString >& b ) -> bool { return a.first > b.first; @@ -76,10 +81,10 @@ ClearTempMountsJob::exec() QStringList goodNews; QProcess process; - foreach ( auto line, lst ) + for ( const auto& line : qAsConst( lst ) ) { QString partPath = line.second; - cDebug() << "Will try to umount path" << partPath; + cDebug() << o << "Will try to umount path" << partPath; process.start( "umount", { "-lv", partPath } ); process.waitForFinished(); if ( process.exitCode() == 0 ) @@ -92,7 +97,7 @@ ClearTempMountsJob::exec() ok.setMessage( tr( "Cleared all temporary mounts." ) ); ok.setDetails( goodNews.join( "\n" ) ); - cDebug() << "ClearTempMountsJob finished. Here's what was done:\n" << goodNews.join( "\n" ); + cDebug() << o << "ClearTempMountsJob finished. Here's what was done:\n" << Logger::DebugList( goodNews ); return ok; } From 6936915dd641e4f6cf4f8a3bd13134f0da8262ae Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 17:41:22 +0200 Subject: [PATCH 209/492] [partition] Fix logging (type of debug stream changed) --- src/modules/partition/jobs/CreatePartitionTableJob.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 76c0ab9ee6..118ec88233 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -60,14 +60,6 @@ CreatePartitionTableJob::prettyStatusMessage() const } -static inline QDebug& -operator<<( QDebug&& s, PartitionIterator& it ) -{ - s << ( ( *it ) ? ( *it )->deviceNode() : QString( "" ) ); - return s; -} - - Calamares::JobResult CreatePartitionTableJob::exec() { @@ -81,7 +73,7 @@ CreatePartitionTableJob::exec() cDebug() << "Creating new partition table of type" << table->typeName() << ", uncommitted partitions:"; for ( auto it = PartitionIterator::begin( table ); it != PartitionIterator::end( table ); ++it ) { - cDebug() << Logger::SubEntry << it; + cDebug() << Logger::SubEntry << ( ( *it ) ? ( *it )->deviceNode() : QString( "" ) ); } QProcess lsblk; From 60f8a7c5fb276cac4b9c802f5d3fcedb54e56668 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 18 Jun 2021 22:20:11 +0200 Subject: [PATCH 210/492] [partition] Don't offer /boot if EFI wants something else - Don't leave /boot in the list always; EFI might be configured for /boot/efi on this system - While here, apply coding style. --- src/modules/partition/gui/PartitionDialogHelpers.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/gui/PartitionDialogHelpers.cpp b/src/modules/partition/gui/PartitionDialogHelpers.cpp index c5c35279d4..0d25c3c8d2 100644 --- a/src/modules/partition/gui/PartitionDialogHelpers.cpp +++ b/src/modules/partition/gui/PartitionDialogHelpers.cpp @@ -23,11 +23,15 @@ QStringList standardMountPoints() { - QStringList mountPoints { "/", "/boot", "/home", "/opt", "/srv", "/usr", "/var" }; + QStringList mountPoints { "/", "/home", "/opt", "/srv", "/usr", "/var" }; if ( PartUtils::isEfiSystem() ) { mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); } + else + { + mountPoints << QStringLiteral( "/boot" ); + } mountPoints.removeDuplicates(); mountPoints.sort(); return mountPoints; @@ -68,11 +72,13 @@ setSelectedMountPoint( QComboBox& combo, const QString& selected ) else { for ( int i = 0; i < combo.count(); ++i ) + { if ( selected == combo.itemText( i ) ) { combo.setCurrentIndex( i ); return; } + } combo.addItem( selected ); combo.setCurrentIndex( combo.count() - 1 ); } @@ -85,10 +91,12 @@ flagsFromList( const QListWidget& list ) PartitionTable::Flags flags; for ( int i = 0; i < list.count(); i++ ) + { if ( list.item( i )->checkState() == Qt::Checked ) { flags |= static_cast< PartitionTable::Flag >( list.item( i )->data( Qt::UserRole ).toInt() ); } + } return flags; } From 54e66ff1c0577bf36ee2b1336c73b3dbf4de1a31 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 21 Jun 2021 10:09:44 +0200 Subject: [PATCH 211/492] [calamares] Python pre-script only if Python is enabled If Python support isn't enabled, you can include the PythonJob header, but the symbols aren't in libcalamares so fails at link time. FIXES #1729 --- src/calamares/testmain.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp index 6dae0af68f..250b047eb7 100644 --- a/src/calamares/testmain.cpp +++ b/src/calamares/testmain.cpp @@ -18,18 +18,25 @@ #include "GlobalStorage.h" #include "Job.h" #include "JobQueue.h" -#include "PythonJob.h" #include "Settings.h" #include "ViewManager.h" #include "modulesystem/Module.h" #include "modulesystem/ModuleManager.h" #include "modulesystem/ViewModule.h" #include "utils/Logger.h" +#include "utils/Yaml.h" +#include "viewpages/ExecutionViewStep.h" + +// Optional features of Calamares +// - Python support +// - QML support +#ifdef WITH_PYTHON +#include "PythonJob.h" +#endif #ifdef WITH_QML #include "utils/Qml.h" #endif -#include "utils/Yaml.h" -#include "viewpages/ExecutionViewStep.h" + #include #include @@ -366,10 +373,15 @@ createApplication( int& argc, char* argv[] ) return new QCoreApplication( argc, argv ); } +#ifdef WITH_PYTHON static const char pythonPreScript[] = R"( # This is Python code executed by Python modules *before* the # script file (e.g. main.py) is executed. Beware " before ) # because it's a C++ raw-string. +# +# Calls to suprocess methods that execute something are +# suppressed and logged -- scripts should really be using libcalamares +# methods instead. _calamares_subprocess = __import__("subprocess", globals(), locals(), [], 0) import sys import libcalamares @@ -386,6 +398,7 @@ sys.modules["subprocess"] = fake_subprocess libcalamares.utils.debug('pre-script for testing purposes injected') )"; +#endif int main( int argc, char* argv[] ) @@ -416,10 +429,12 @@ main( int argc, char* argv[] ) gs->insert( "localeConf", vm ); } +#ifdef WITH_PYTHON + Calamares::PythonJob::setInjectedPreScript(pythonPreScript); +#endif #ifdef WITH_QML CalamaresUtils::initQmlModulesDir(); // don't care if failed #endif - Calamares::PythonJob::setInjectedPreScript(pythonPreScript); cDebug() << "Calamares module-loader testing" << module.moduleName(); Calamares::Module* m = load_module( module ); From acb731d8237ce638decaa32514215b2c05048d0a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 21 Jun 2021 22:21:06 +0200 Subject: [PATCH 212/492] [libcalamaresui] Provide the logFile path This is intended for consumption by QML; the ViewManager object acts as a proxy for a handful of global Settings values already, so throw in global Logger values as well. A QML module that would like to read the log file (e.g. for tailing it as part of a slide-show) can get the path via this property. --- src/libcalamaresui/ViewManager.cpp | 6 ++++++ src/libcalamaresui/ViewManager.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index c55b5dd67d..f6edbfc2a0 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -613,4 +613,10 @@ ViewManager::isSetupMode() const return s ? s->isSetupMode() : false; } +QString +ViewManager::logFilePath() const +{ + return Logger::logFile(); +} + } // namespace Calamares diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h index 9a77cbb5a9..5a449a1536 100644 --- a/src/libcalamaresui/ViewManager.h +++ b/src/libcalamaresui/ViewManager.h @@ -54,6 +54,7 @@ class UIDLLEXPORT ViewManager : public QAbstractListModel Q_PROPERTY( bool isDebugMode READ isDebugMode CONSTANT FINAL ) Q_PROPERTY( bool isChrootMode READ isChrootMode CONSTANT FINAL ) Q_PROPERTY( bool isSetupMode READ isSetupMode CONSTANT FINAL ) + Q_PROPERTY( QString logFilePath READ logFilePath CONSTANT FINAL ) public: /** @@ -208,6 +209,8 @@ public Q_SLOTS: bool isChrootMode() const; /// @brief Proxy to Settings::isSetupMode() default @c false bool isSetupMode() const; + /// @brief Proxy to Logger::logFile(), default empty + QString logFilePath() const; signals: void currentStepChanged(); From f06766085ab0d52e00e8f75bdfda288880501201 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 21 Jun 2021 23:20:32 +0200 Subject: [PATCH 213/492] [partition] Rename function, to track down consumers --- src/modules/partition/gui/CreatePartitionDialog.cpp | 2 +- src/modules/partition/gui/CreatePartitionDialog.h | 2 +- src/modules/partition/gui/PartitionPage.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index c765bf1f77..e7aab89cd6 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -188,7 +188,7 @@ CreatePartitionDialog::initGptPartitionTypeUi() } Partition* -CreatePartitionDialog::createPartition() +CreatePartitionDialog::getNewlyCreatedPartition() { if ( m_role.roles() == PartitionRole::None ) { diff --git a/src/modules/partition/gui/CreatePartitionDialog.h b/src/modules/partition/gui/CreatePartitionDialog.h index bee70f61b5..45e3f7cf41 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.h +++ b/src/modules/partition/gui/CreatePartitionDialog.h @@ -57,7 +57,7 @@ class CreatePartitionDialog : public QDialog * Must be called when user wants to edit a to-be-created partition. */ void initFromPartitionToCreate( Partition* partition ); - Partition* createPartition(); + Partition* getNewlyCreatedPartition(); PartitionTable::Flags newFlags() const; diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index f5a3b0f433..d9ff65f88c 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -395,7 +395,7 @@ PartitionPage::onCreateClicked() dlg.initFromFreeSpace( partition ); if ( dlg.exec() == QDialog::Accepted ) { - Partition* newPart = dlg.createPartition(); + Partition* newPart = dlg.getNewlyCreatedPartition(); m_core->createPartition( model->device(), newPart, dlg.newFlags() ); } } @@ -496,7 +496,7 @@ PartitionPage::updatePartitionToCreate( Device* device, Partition* partition ) dlg->initFromPartitionToCreate( partition ); if ( dlg->exec() == QDialog::Accepted ) { - Partition* newPartition = dlg->createPartition(); + Partition* newPartition = dlg->getNewlyCreatedPartition(); m_core->deletePartition( device, partition ); m_core->createPartition( device, newPartition, dlg->newFlags() ); } From dbfd8bea030b9513a8f088723de5f0c9f1c37e01 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 21 Jun 2021 23:22:40 +0200 Subject: [PATCH 214/492] [partition] Newly-created (fresh) partitions don't have flags yet When a partition is set as "freshly created", the dialog was passing in newFlags() as the **already-active** flags on the partition; then the caller was setting those same flags as "set these in the future", so that afterwards, no flags would actually be set (because they're already active -- see the first sentence). Now, fresh partitions have no flags. --- src/modules/partition/gui/CreatePartitionDialog.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index e7aab89cd6..37547ef8c6 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -204,17 +204,21 @@ CreatePartitionDialog::getNewlyCreatedPartition() : FileSystem::typeForName( m_ui->fsComboBox->currentText() ); const QString fsLabel = m_ui->filesystemLabelEdit->text(); + // The newly-created partitions have no flags set (no **active** flags), + // because they're new. The desired flags can be retrieved from + // newFlags() and the consumer (see PartitionPage::onCreateClicked) + // does so, to set up the partition for create-and-then-set-flags. Partition* partition = nullptr; QString luksPassphrase = m_ui->encryptWidget->passphrase(); if ( m_ui->encryptWidget->state() == EncryptWidget::Encryption::Confirmed && !luksPassphrase.isEmpty() ) { partition = KPMHelpers::createNewEncryptedPartition( - m_parent, *m_device, m_role, fsType, fsLabel, first, last, luksPassphrase, newFlags() ); + m_parent, *m_device, m_role, fsType, fsLabel, first, last, luksPassphrase, PartitionTable::Flags() ); } else { partition - = KPMHelpers::createNewPartition( m_parent, *m_device, m_role, fsType, fsLabel, first, last, newFlags() ); + = KPMHelpers::createNewPartition( m_parent, *m_device, m_role, fsType, fsLabel, first, last, PartitionTable::Flags() ); } if ( m_device->type() == Device::Type::LVM_Device ) From e2bf717ea0c9f820c7cb6d08ebc409bec70e9295 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Jun 2021 00:06:17 +0200 Subject: [PATCH 215/492] [partition] Rewrite new-partition API The existing API required calling the one constructor with specific pointers (nullptr for a partition-from-free-space) followed by calling one of the initFrom*() functions. This is fragile design. Use tag-classes to distinguish create-from-free-space and edit-another-freshly-created-partition cases, refactor to merge the initFrom*() methods into the constructors and factor out the shared UI creation. Callers can now use the tag-class to distinguish. While here, adjust both callers to use QPointer, avoiding some very specific dialog-on-the-stack crash possibilities. --- .../partition/gui/CreatePartitionDialog.cpp | 76 +++++++++---------- .../partition/gui/CreatePartitionDialog.h | 43 +++++++---- src/modules/partition/gui/PartitionPage.cpp | 14 ++-- 3 files changed, 72 insertions(+), 61 deletions(-) diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index 37547ef8c6..c097244635 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -52,7 +52,6 @@ static QSet< FileSystem::Type > s_unmountableFS( { FileSystem::Unformatted, CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* parentPartition, - Partition* partition, const QStringList& usedMountPoints, QWidget* parentWidget ) : QDialog( parentWidget ) @@ -81,9 +80,6 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, m_ui->lvNameLineEdit->setValidator( validator ); } - standardMountPoints( *( m_ui->mountPointComboBox ), - partition ? PartitionInfo::mountPoint( partition ) : QString() ); - if ( device->partitionTable()->type() == PartitionTable::msdos || device->partitionTable()->type() == PartitionTable::msdos_sectorbased ) { @@ -132,13 +128,48 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, // Select a default m_ui->fsComboBox->setCurrentIndex( defaultFsIndex ); updateMountPointUi(); + checkMountPointSelection(); +} +CreatePartitionDialog::CreatePartitionDialog( Device* device, + const FreeSpace& freeSpacePartition, + const QStringList& usedMountPoints, + QWidget* parentWidget ) + : CreatePartitionDialog(device, freeSpacePartition.p->parent(), usedMountPoints, parentWidget ) +{ + standardMountPoints( *( m_ui->mountPointComboBox ), QString() ); setFlagList( *( m_ui->m_listFlags ), static_cast< PartitionTable::Flags >( ~PartitionTable::Flags::Int( 0 ) ), - partition ? PartitionInfo::flags( partition ) : PartitionTable::Flags() ); + PartitionTable::Flags() ); + initPartResizerWidget( freeSpacePartition.p ); +} - // Checks the initial selection. - checkMountPointSelection(); +CreatePartitionDialog::CreatePartitionDialog( Device* device, + const FreshPartition& existingNewPartition, + const QStringList& usedMountPoints, + QWidget* parentWidget ) + : CreatePartitionDialog(device, existingNewPartition.p->parent(), usedMountPoints, parentWidget ) +{ + standardMountPoints( *( m_ui->mountPointComboBox ), + PartitionInfo::mountPoint( existingNewPartition.p ) ); + setFlagList( *( m_ui->m_listFlags ), + static_cast< PartitionTable::Flags >( ~PartitionTable::Flags::Int( 0 ) ), + PartitionInfo::flags( existingNewPartition.p ) ); + + const bool isExtended = existingNewPartition.p->roles().has( PartitionRole::Extended ); + if ( isExtended ) + { + cDebug() << "Editing extended partitions is not supported."; + return; + } + + initPartResizerWidget( existingNewPartition.p ); + + FileSystem::Type fsType = existingNewPartition.p->fileSystem().type(); + m_ui->fsComboBox->setCurrentText( FileSystem::nameForType( fsType ) ); + + setSelectedMountPoint( m_ui->mountPointComboBox, PartitionInfo::mountPoint( existingNewPartition.p ) ); + updateMountPointUi(); } CreatePartitionDialog::~CreatePartitionDialog() {} @@ -288,34 +319,3 @@ CreatePartitionDialog::initPartResizerWidget( Partition* partition ) m_partitionSizeController->setPartResizerWidget( m_ui->partResizerWidget ); m_partitionSizeController->setSpinBox( m_ui->sizeSpinBox ); } - -void -CreatePartitionDialog::initFromFreeSpace( Partition* freeSpacePartition ) -{ - initPartResizerWidget( freeSpacePartition ); -} - -void -CreatePartitionDialog::initFromPartitionToCreate( Partition* partition ) -{ - Q_ASSERT( partition ); - - bool isExtended = partition->roles().has( PartitionRole::Extended ); - Q_ASSERT( !isExtended ); - if ( isExtended ) - { - cDebug() << "Editing extended partitions is not supported for now"; - return; - } - - initPartResizerWidget( partition ); - - // File System - FileSystem::Type fsType = partition->fileSystem().type(); - m_ui->fsComboBox->setCurrentText( FileSystem::nameForType( fsType ) ); - - // Mount point - setSelectedMountPoint( m_ui->mountPointComboBox, PartitionInfo::mountPoint( partition ) ); - - updateMountPointUi(); -} diff --git a/src/modules/partition/gui/CreatePartitionDialog.h b/src/modules/partition/gui/CreatePartitionDialog.h index 45e3f7cf41..e18840564e 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.h +++ b/src/modules/partition/gui/CreatePartitionDialog.h @@ -33,30 +33,41 @@ class Ui_CreatePartitionDialog; class CreatePartitionDialog : public QDialog { Q_OBJECT + +private: + /** @brief Delegated constructor + * + * This does all the shared UI setup. + */ + CreatePartitionDialog( Device* device, + PartitionNode* parentPartition, + const QStringList& usedMountPoints, + QWidget* parentWidget ); + public: - /** - * @brief Dialog for editing a new partition. + struct FreeSpace { Partition* p; }; + struct FreshPartition { Partition* p; }; + + /** @brief Dialog for editing a new partition based on free space. * - * For the (unlikely) case that a newly created partition is being re-edited, - * pass a pointer to that @p partition, otherwise pass nullptr. + * Creating from free space makes a wholly new partition with + * no flags set at all. */ CreatePartitionDialog( Device* device, - PartitionNode* parentPartition, - Partition* partition, + const FreeSpace& freeSpacePartition, const QStringList& usedMountPoints, QWidget* parentWidget = nullptr ); - ~CreatePartitionDialog() override; - - /** - * Must be called when user wants to create a partition in - * freeSpacePartition. + /** @brief Dialog for editing a newly-created partition. + * + * A partition previously newly created (e.g. via this dialog + * and the constructor above) can be re-edited. */ - void initFromFreeSpace( Partition* freeSpacePartition ); + CreatePartitionDialog( Device* device, + const FreshPartition& existingNewPartition, + const QStringList& usedMountPoints, + QWidget* parentWidget = nullptr ); + ~CreatePartitionDialog() override; - /** - * Must be called when user wants to edit a to-be-created partition. - */ - void initFromPartitionToCreate( Partition* partition ); Partition* getNewlyCreatedPartition(); PartitionTable::Flags newFlags() const; diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index d9ff65f88c..06aa7b1a85 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -391,13 +391,14 @@ PartitionPage::onCreateClicked() return; } - CreatePartitionDialog dlg( model->device(), partition->parent(), nullptr, getCurrentUsedMountpoints(), this ); - dlg.initFromFreeSpace( partition ); - if ( dlg.exec() == QDialog::Accepted ) + QPointer< CreatePartitionDialog > dlg = new + CreatePartitionDialog ( model->device(), CreatePartitionDialog::FreeSpace{ partition }, getCurrentUsedMountpoints(), this ); + if ( dlg->exec() == QDialog::Accepted ) { - Partition* newPart = dlg.getNewlyCreatedPartition(); - m_core->createPartition( model->device(), newPart, dlg.newFlags() ); + Partition* newPart = dlg->getNewlyCreatedPartition(); + m_core->createPartition( model->device(), newPart, dlg->newFlags() ); } + delete dlg; } void @@ -492,8 +493,7 @@ PartitionPage::updatePartitionToCreate( Device* device, Partition* partition ) mountPoints.removeOne( PartitionInfo::mountPoint( partition ) ); QPointer< CreatePartitionDialog > dlg - = new CreatePartitionDialog( device, partition->parent(), partition, mountPoints, this ); - dlg->initFromPartitionToCreate( partition ); + = new CreatePartitionDialog( device, CreatePartitionDialog::FreshPartition{ partition }, mountPoints, this ); if ( dlg->exec() == QDialog::Accepted ) { Partition* newPartition = dlg->getNewlyCreatedPartition(); From 131352ca03884dc8c0ace700b5dc41534e35affc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Jun 2021 00:21:01 +0200 Subject: [PATCH 216/492] [partition] Apply coding style --- src/modules/partition/core/DeviceList.cpp | 8 ++++---- src/modules/partition/core/PartUtils.cpp | 13 ++++++++++--- src/modules/partition/core/PartUtils.h | 2 +- .../partition/core/PartitionCoreModule.cpp | 2 +- src/modules/partition/gui/ChoicePage.cpp | 11 +++++++---- .../partition/gui/CreatePartitionDialog.cpp | 11 +++++------ .../partition/gui/CreatePartitionDialog.h | 16 +++++++++++----- src/modules/partition/gui/PartitionPage.cpp | 6 +++--- src/modules/partition/gui/PartitionViewStep.cpp | 7 +++---- 9 files changed, 45 insertions(+), 31 deletions(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index d58b22868b..6b770a9821 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -10,8 +10,8 @@ #include "DeviceList.h" -#include "utils/Logger.h" #include "partition/PartitionIterator.h" +#include "utils/Logger.h" #include #include @@ -133,11 +133,11 @@ getDevices( DeviceType which ) #endif // Unsafe partitioning - auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it) { return erase(l, it); }; - auto removeInSafeMode = []( DeviceList&, DeviceList::iterator& it) { return ++it; }; + auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it ) { return erase( l, it ); }; + auto removeInSafeMode = []( DeviceList&, DeviceList::iterator& it ) { return ++it; }; #else // Safe partitioning - auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it) { return erase(l, it); }; + auto removeInAllModes = []( DeviceList& l, DeviceList::iterator& it ) { return erase( l, it ); }; auto& removeInSafeMode = removeInAllModes; #endif diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 368d04af24..47654a2be9 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -177,7 +177,8 @@ canBeResized( Partition* candidate, const Logger::Once& o ) if ( availableStorageB > advisedStorageB ) { - cDebug() << o << "Partition" << convenienceName( candidate ) << "authorized for resize + autopartition install."; + cDebug() << o << "Partition" << convenienceName( candidate ) + << "authorized for resize + autopartition install."; return true; } else @@ -412,8 +413,14 @@ runOsprober( DeviceModel* dm ) FstabEntryList fstabEntries = lookForFstabEntries( path ); QString homePath = findPartitionPathForMountPoint( fstabEntries, "/home" ); - osproberEntries.append( - { prettyName, path, file, QString(), canBeResized( dm, path, o ), lineColumns, fstabEntries, homePath } ); + osproberEntries.append( { prettyName, + path, + file, + QString(), + canBeResized( dm, path, o ), + lineColumns, + fstabEntries, + homePath } ); osproberCleanLines.append( line ); } } diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h index aec345882c..404dd5a77d 100644 --- a/src/modules/partition/core/PartUtils.h +++ b/src/modules/partition/core/PartUtils.h @@ -26,7 +26,7 @@ class DeviceModel; class Partition; namespace Logger { - class Once; +class Once; } namespace PartUtils diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 912d465467..363d9daefc 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -258,7 +258,7 @@ PartitionCoreModule::doInit() cDebug() << Logger::SubEntry << "node\tcapacity\tname\tprettyName"; for ( auto device : devices ) { - cDebug() << Logger::SubEntry << Logger::Pointer(device); + cDebug() << Logger::SubEntry << Logger::Pointer( device ); if ( device ) { // Gives ownership of the Device* to the DeviceInfo object diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 245ee0b927..d2f5c99e79 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -144,14 +144,15 @@ ChoicePage::~ChoicePage() {} * this avoids cases where the popup would truncate data being drawn * because the overall box is sized too narrow. */ -void setModelToComboBox( QComboBox* box, QAbstractItemModel* model ) +void +setModelToComboBox( QComboBox* box, QAbstractItemModel* model ) { box->setModel( model ); if ( model->rowCount() > 0 ) { QStyleOptionViewItem options; options.initFrom( box ); - auto delegateSize = box->itemDelegate()->sizeHint(options, model->index(0, 0) ); + auto delegateSize = box->itemDelegate()->sizeHint( options, model->index( 0, 0 ) ); box->setMinimumWidth( delegateSize.width() ); } } @@ -1005,7 +1006,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) SelectionFilter filter = []( const QModelIndex& index ) { return PartUtils::canBeResized( - static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), Logger::Once() ); + static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), + Logger::Once() ); }; m_beforePartitionBarsView->setSelectionFilter( filter ); m_beforePartitionLabelsView->setSelectionFilter( filter ); @@ -1094,7 +1096,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice ) { SelectionFilter filter = []( const QModelIndex& index ) { return PartUtils::canBeReplaced( - static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), Logger::Once() ); + static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ), + Logger::Once() ); }; m_beforePartitionBarsView->setSelectionFilter( filter ); m_beforePartitionLabelsView->setSelectionFilter( filter ); diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index c097244635..5ebe153364 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -135,7 +135,7 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, const FreeSpace& freeSpacePartition, const QStringList& usedMountPoints, QWidget* parentWidget ) - : CreatePartitionDialog(device, freeSpacePartition.p->parent(), usedMountPoints, parentWidget ) + : CreatePartitionDialog( device, freeSpacePartition.p->parent(), usedMountPoints, parentWidget ) { standardMountPoints( *( m_ui->mountPointComboBox ), QString() ); setFlagList( *( m_ui->m_listFlags ), @@ -148,10 +148,9 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, const FreshPartition& existingNewPartition, const QStringList& usedMountPoints, QWidget* parentWidget ) - : CreatePartitionDialog(device, existingNewPartition.p->parent(), usedMountPoints, parentWidget ) + : CreatePartitionDialog( device, existingNewPartition.p->parent(), usedMountPoints, parentWidget ) { - standardMountPoints( *( m_ui->mountPointComboBox ), - PartitionInfo::mountPoint( existingNewPartition.p ) ); + standardMountPoints( *( m_ui->mountPointComboBox ), PartitionInfo::mountPoint( existingNewPartition.p ) ); setFlagList( *( m_ui->m_listFlags ), static_cast< PartitionTable::Flags >( ~PartitionTable::Flags::Int( 0 ) ), PartitionInfo::flags( existingNewPartition.p ) ); @@ -248,8 +247,8 @@ CreatePartitionDialog::getNewlyCreatedPartition() } else { - partition - = KPMHelpers::createNewPartition( m_parent, *m_device, m_role, fsType, fsLabel, first, last, PartitionTable::Flags() ); + partition = KPMHelpers::createNewPartition( + m_parent, *m_device, m_role, fsType, fsLabel, first, last, PartitionTable::Flags() ); } if ( m_device->type() == Device::Type::LVM_Device ) diff --git a/src/modules/partition/gui/CreatePartitionDialog.h b/src/modules/partition/gui/CreatePartitionDialog.h index e18840564e..38c65aaf6e 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.h +++ b/src/modules/partition/gui/CreatePartitionDialog.h @@ -40,13 +40,19 @@ class CreatePartitionDialog : public QDialog * This does all the shared UI setup. */ CreatePartitionDialog( Device* device, - PartitionNode* parentPartition, - const QStringList& usedMountPoints, - QWidget* parentWidget ); + PartitionNode* parentPartition, + const QStringList& usedMountPoints, + QWidget* parentWidget ); public: - struct FreeSpace { Partition* p; }; - struct FreshPartition { Partition* p; }; + struct FreeSpace + { + Partition* p; + }; + struct FreshPartition + { + Partition* p; + }; /** @brief Dialog for editing a new partition based on free space. * diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index 06aa7b1a85..8444b9ddb3 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -391,8 +391,8 @@ PartitionPage::onCreateClicked() return; } - QPointer< CreatePartitionDialog > dlg = new - CreatePartitionDialog ( model->device(), CreatePartitionDialog::FreeSpace{ partition }, getCurrentUsedMountpoints(), this ); + QPointer< CreatePartitionDialog > dlg = new CreatePartitionDialog( + model->device(), CreatePartitionDialog::FreeSpace { partition }, getCurrentUsedMountpoints(), this ); if ( dlg->exec() == QDialog::Accepted ) { Partition* newPart = dlg->getNewlyCreatedPartition(); @@ -493,7 +493,7 @@ PartitionPage::updatePartitionToCreate( Device* device, Partition* partition ) mountPoints.removeOne( PartitionInfo::mountPoint( partition ) ); QPointer< CreatePartitionDialog > dlg - = new CreatePartitionDialog( device, CreatePartitionDialog::FreshPartition{ partition }, mountPoints, this ); + = new CreatePartitionDialog( device, CreatePartitionDialog::FreshPartition { partition }, mountPoints, this ); if ( dlg->exec() == QDialog::Accepted ) { Partition* newPartition = dlg->getNewlyCreatedPartition(); diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index b4eefb3b09..bbb865f309 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -388,7 +388,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) } auto [ r, device ] = core->bootLoaderModel()->findBootLoader( core->bootLoaderInstallPath() ); - Q_UNUSED(r); + Q_UNUSED( r ); if ( device ) { auto* table = device->partitionTable(); @@ -403,8 +403,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core ) && ( partition->fileSystem().type() == FileSystem::Unformatted ) && ( partition->capacity() >= 8_MiB ) ) { - cDebug() << Logger::SubEntry << "Partition" << partition->devicePath() - << partition->partitionPath() + cDebug() << Logger::SubEntry << "Partition" << partition->devicePath() << partition->partitionPath() << "is a suitable bios_grub partition"; return false; } @@ -619,7 +618,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) // because it could take a while. Then when it's done, we can set up the widgets // and remove the spinner. m_future = new QFutureWatcher< void >(); - connect( m_future, &QFutureWatcher< void >::finished, this, [ this ] { + connect( m_future, &QFutureWatcher< void >::finished, this, [this] { continueLoading(); this->m_future->deleteLater(); this->m_future = nullptr; From 2b37c41b08fdf852c902a0b98c5162a02c50e7ad Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 22 Jun 2021 00:31:58 +0200 Subject: [PATCH 217/492] i18n: [python] Automatic merge of Transifex translations --- lang/python/ko/LC_MESSAGES/python.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po index b6165a3875..ed244e03d9 100644 --- a/lang/python/ko/LC_MESSAGES/python.po +++ b/lang/python/ko/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Ji-Hyeon Gim , 2018 -# Jung Hee Lee , 2020 +# JungHee Lee , 2020 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Jung Hee Lee , 2020\n" +"Last-Translator: JungHee Lee , 2020\n" "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From e1bf7ae96fdadb9906ae180617aecd73a8a8f071 Mon Sep 17 00:00:00 2001 From: "Omer I.S" <66558205+omeritzics@users.noreply.github.com> Date: Thu, 24 Jun 2021 14:13:30 +0300 Subject: [PATCH 218/492] Add Hebrew and Arabic --- src/modules/keyboard/non-ascii-layouts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/keyboard/non-ascii-layouts b/src/modules/keyboard/non-ascii-layouts index fe3f285a29..ef2e42787d 100644 --- a/src/modules/keyboard/non-ascii-layouts +++ b/src/modules/keyboard/non-ascii-layouts @@ -7,3 +7,5 @@ ru us - ruwin_alt_sh-UTF-8 ua us - ua-utf gr us - gr +he us - he +ar us - ar From 3dce393dcc7a9fd3f05d91c7705111d107ee2ac3 Mon Sep 17 00:00:00 2001 From: Jia Chao Date: Fri, 25 Jun 2021 17:42:36 +0800 Subject: [PATCH 219/492] bootloader: add-support_for_aarch64 --- src/modules/bootloader/main.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 3e384a0183..7d6a050458 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -24,6 +24,8 @@ import shutil import subprocess +import platform + import libcalamares from libcalamares.utils import check_target_env_call @@ -299,14 +301,21 @@ def install_grub(efi_directory, fw_type): efi_bootloader_id = efi_label() efi_bitness = efi_word_size() + cpu_type = platform.machine() + if efi_bitness == "32": efi_target = "i386-efi" efi_grub_file = "grubia32.efi" efi_boot_file = "bootia32.efi" elif efi_bitness == "64": - efi_target = "x86_64-efi" - efi_grub_file = "grubx64.efi" - efi_boot_file = "bootx64.efi" + if cpu_type == "aarch64": + efi_target = "arm64-efi" + efi_grub_file = "grubaa64.efi" + efi_boot_file = "bootaa64.efi" + else: + efi_target = "x86_64-efi" + efi_grub_file = "grubx64.efi" + efi_boot_file = "bootx64.efi" check_target_env_call([libcalamares.job.configuration["grubInstall"], "--target=" + efi_target, From e5aa90d3a88345e40efdd2645f7580c5f44094da Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 25 Jun 2021 23:57:59 +0200 Subject: [PATCH 220/492] Changes: credit for patch --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 4e38c24eb6..5422168a2e 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,7 @@ This release contains contributions from (alphabetically by first name): - Jerrod Frost (new contributor! welcome!) - Joe Kamprad - Lisa Vitolo (blast from the past!) + - Omer I.S. In project news, chat (instant-messaging) communications has largely moved to Matrix and Libera.Chat. CI notifications -- issues and build @@ -36,6 +37,8 @@ results -- are sent to Matrix only. - *displaymanager* example configuration has been shuffled around a bit, for better results when the live image is running XFCE. Also lists more potential display managers. #1205 (Thanks Erik) + - *keyboard* now switches on an alternate `en_US` keyboard layout when + Arabic or Hebrew is selected as primary layout. (Thanks Omer) - The *netinstall* module can now fall back to alternative URLs when loading groups data. The first URL to yield a non-empty groups collection is accepted. No changes are needed in the configuration. #1673 From 989d08c70aae9496788842143b1550379c281b64 Mon Sep 17 00:00:00 2001 From: demmm Date: Sat, 26 Jun 2021 18:14:19 +0200 Subject: [PATCH 221/492] [usersq] add inline messages, adjust layout warning messages implemented for user & host names move root password option box inline with password section adjust background color according to text.length hardcode color instead of kirigami colors usersq is now usable, sets user, hostname & password correctly on install warning messages & color changes not fully done yet --- src/modules/usersq/usersq.qml | 123 +++++++++++++++------------------- 1 file changed, 53 insertions(+), 70 deletions(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index 0886bba1ba..2e70adff01 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * - * SPDX-FileCopyrightText: 2020 Anke Boersma + * SPDX-FileCopyrightText: 2020 - 2021 Anke Boersma + * SPDX-FileCopyrightText: 2021 Adriaan de Groot * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -25,8 +26,7 @@ Kirigami.ScrollablePage { Kirigami.Theme.backgroundColor: "#EFF0F1" Kirigami.Theme.textColor: "#1F1F1F" - header: Kirigami.Heading { - + header: Kirigami.Heading { Layout.fillWidth: true height: 50 horizontalAlignment: Qt.AlignHCenter @@ -37,23 +37,19 @@ Kirigami.ScrollablePage { } ColumnLayout { - id: _formLayout spacing: Kirigami.Units.smallSpacing Column { - Layout.fillWidth: true spacing: Kirigami.Units.smallSpacing Label { - width: parent.width text: qsTr("What is your name?") } TextField { - id: _userNameField width: parent.width enabled: config.isEditable("fullName") @@ -62,46 +58,39 @@ Kirigami.ScrollablePage { onTextChanged: config.setFullName(text); background: Rectangle { - color: "#FBFBFB" // Kirigami.Theme.backgroundColor radius: 2 opacity: 0.9 //border.color: _userNameField.text === "" ? Kirigami.Theme.backgroundColor : ( config.fullNameReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - border.color: _userNameField.text === "" ? "#FBFBFB" : ( config.fullNameChanged ? "#FBFBFB" : Kirigami.Theme.negativeTextColor) + color: _userNameField.text.length ? "#FBFBFB" : ( config.fullNameChanged ? "#f0fff0" : "#ffdae0") } } } Column { - Layout.fillWidth: true spacing: Kirigami.Units.smallSpacing Label { - width: parent.width text: qsTr("What name do you want to use to log in?") } TextField { - id: _userLoginField width: parent.width enabled: config.isEditable("loginName") placeholderText: qsTr("Login Name") text: config.loginName - onTextChanged: config.setLoginName(text) + onTextChanged: config.loginNameStatusChanged ? ( config.setLoginName(text),userMessage.visible = false ) : ( userMessage.visible = true,console.log("Invalid") ) background: Rectangle { - - color: "#FBFBFB" // Kirigami.Theme.backgroundColor opacity: 0.9 //border.color: _userLoginField.text === "" ? Kirigami.Theme.backgroundColor : ( config.userNameReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - border.color: _userLoginField.text === "" ? "#FBFBFB" : ( config.loginNameStatusChanged ? "#FBFBFB" : Kirigami.Theme.negativeTextColor) + color: _userLoginField.text.length ? "#FBFBFB" : ( config.loginNameStatusChanged ? "#f0fff0" : "#ffdae0") } } Label { - width: parent.width text: qsTr("If more than one person will use this computer, you can create multiple accounts after installation.") font.weight: Font.Thin @@ -110,36 +99,38 @@ Kirigami.ScrollablePage { } } - Column { + Kirigami.InlineMessage { + id: userMessage + Layout.fillWidth: true + visible: false + type: Kirigami.MessageType.Error + text: qsTr("Your username must start with a lowercase letter or underscore.") + } + Column { Layout.fillWidth: true spacing: Kirigami.Units.smallSpacing Label { - width: parent.width text: qsTr("What is the name of this computer?") } TextField { - id: _hostName width: parent.width placeholderText: qsTr("Computer Name") text: config.hostName - onTextChanged: config.setHostName(text) + onTextChanged: config.hostNameStatusChanged ? ( config.setHostName(text),hostMessage.visible = false ) : hostMessage.visible = true background: Rectangle { - - color: "#FBFBFB" // Kirigami.Theme.backgroundColor opacity: 0.9 //border.color: _hostName.text === "" ? Kirigami.Theme.backgroundColor : ( config.hostNameStatusChanged ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - border.color: _hostName.text === "" ? "#FBFBFB" : ( config.hostNameStatusChanged ? "#FBFBFB" : Kirigami.Theme.negativeTextColor) + color: _hostName.text.length ? "#FBFBFB" : ( config.hostNameStatusChanged ? "#f0fff0" : "#ffdae0") } } Label { - width: parent.width text: qsTr("This name will be used if you make the computer visible to others on a network.") font.weight: Font.Thin @@ -148,13 +139,19 @@ Kirigami.ScrollablePage { } } - Column { + Kirigami.InlineMessage { + id: hostMessage + Layout.fillWidth: true + visible: false + type: Kirigami.MessageType.Error + text: qsTr("Only letter, numbers, underscore and hyphen are allowed.") + } + Column { Layout.fillWidth: true spacing: Kirigami.Units.smallSpacing Label { - width: parent.width text: qsTr("Choose a password to keep your account safe.") } @@ -164,7 +161,6 @@ Kirigami.ScrollablePage { spacing: 20 TextField { - id: _passwordField width: parent.width / 2 - 10 placeholderText: qsTr("Password") @@ -176,16 +172,13 @@ Kirigami.ScrollablePage { inputMethodHints: Qt.ImhNoAutoUppercase background: Rectangle { - - color: "#FBFBFB" // Kirigami.Theme.backgroundColor opacity: 0.9 //border.color: _passwordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.passwordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - border.color: _passwordField.text === "" ? "#FBFBFB" : ( config.userPasswordStatusChanged ? "#FBFBFB" : Kirigami.Theme.negativeTextColor) + color: _passwordField.text.length ? "#FBFBFB" : ( config.userPasswordStatusChanged ? "#f0fff0" : "#ffdae0") } } TextField { - id: _verificationPasswordField width: parent.width / 2 - 10 placeholderText: qsTr("Repeat Password") @@ -197,17 +190,14 @@ Kirigami.ScrollablePage { inputMethodHints: Qt.ImhNoAutoUppercase background: Rectangle { - - color: "#FBFBFB" //Kirigami.Theme.backgroundColor opacity: 0.9 //border.color: _verificationpasswordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.passwordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - border.color: _verificationPasswordField.text === "" ? "#FBFBFB" : ( config.userPasswordSecondaryChanged ? "#FBFBFB" : Kirigami.Theme.negativeTextColor) + color: _verificationPasswordField.text.length ? "#FBFBFB" : ( config.userPasswordSecondaryChanged ? "#f0fff0" : "#ffdae0") } } } Label { - width: parent.width text: qsTr("Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.") font.weight: Font.Thin @@ -217,29 +207,6 @@ Kirigami.ScrollablePage { } } - CheckBox { - - visible: config.permitWeakPasswords - text: qsTr("Validate passwords quality") - checked: config.requireStrongPasswords - onCheckedChanged: config.setRequireStrongPasswords(checked) - } - - Label { - visible: config.permitWeakPasswords - width: parent.width - text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password.") - font.weight: Font.Thin - font.pointSize: 8 - color: "#6D6D6D" - } - - CheckBox { - text: qsTr("Log in automatically without asking for the password") - checked: config.doAutoLogin - onCheckedChanged: config.setAutoLogin(checked) - } - CheckBox { id: root visible: config.writeRootPassword @@ -258,13 +225,11 @@ Kirigami.ScrollablePage { } Column { - visible: ! root.checked Layout.fillWidth: true spacing: Kirigami.Units.smallSpacing Label { - width: parent.width text: qsTr("Choose a root password to keep your account safe.") } @@ -274,7 +239,6 @@ Kirigami.ScrollablePage { spacing: 20 TextField { - id: _rootPasswordField width: parent.width / 2 -10 placeholderText: qsTr("Root Password") @@ -286,16 +250,13 @@ Kirigami.ScrollablePage { inputMethodHints: Qt.ImhNoAutoUppercase background: Rectangle { - - color: "#FBFBFB" // Kirigami.Theme.backgroundColor opacity: 0.9 //border.color: _rootPasswordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.rootPasswordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - border.color: _rootPasswordField.text === "" ? "#FBFBFB" : ( config.rootPasswordReady ? "#FBFBFB" : Kirigami.Theme.negativeTextColor) + color: _rootPasswordField.text.length ? "#FBFBFB" : ( config.rootPasswordReady ? "#f0fff0" : "#ffdae0") } } TextField { - id: _verificationRootPasswordField width: parent.width / 2 -10 placeholderText: qsTr("Repeat Root Password") @@ -307,17 +268,14 @@ Kirigami.ScrollablePage { inputMethodHints: Qt.ImhNoAutoUppercase background: Rectangle { - - color: "#FBFBFB" // Kirigami.Theme.backgroundColor opacity: 0.9 //border.color: _verificationRootPasswordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.rootPasswordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - border.color: _verificationRootPasswordField.text === "" ? "#FBFBFB" : ( config.rootPasswordReady ? "#FBFBFB" : Kirigami.Theme.negativeTextColor) + color: _verificationRootPasswordField.text.length ? "#FBFBFB" : ( config.rootPasswordReady ? "#f0fff0" : "#ffdae0") } } } Label { - visible: ! root.checked width: parent.width text: qsTr("Enter the same password twice, so that it can be checked for typing errors.") @@ -326,5 +284,30 @@ Kirigami.ScrollablePage { color: "#6D6D6D" } } + + CheckBox { + Layout.alignment: Qt.AlignCenter + text: qsTr("Log in automatically without asking for the password") + checked: config.doAutoLogin + onCheckedChanged: config.setAutoLogin(checked) + } + + CheckBox { + visible: config.permitWeakPasswords + Layout.alignment: Qt.AlignCenter + text: qsTr("Validate passwords quality") + checked: config.requireStrongPasswords + onCheckedChanged: config.setRequireStrongPasswords(checked) + } + + Label { + visible: config.permitWeakPasswords + width: parent.width + Layout.alignment: Qt.AlignCenter + text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password.") + font.weight: Font.Thin + font.pointSize: 8 + color: "#6D6D6D" + } } } From 1554646a386fa94886aa9d7711609543202d7328 Mon Sep 17 00:00:00 2001 From: demmm Date: Sat, 26 Jun 2021 18:29:22 +0200 Subject: [PATCH 222/492] Changes: add QML modules changes --- CHANGES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index 5422168a2e..e7063fde45 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,7 @@ website will have to do for older versions. # 3.2.40 (unreleased) # This release contains contributions from (alphabetically by first name): + - Anke Boersma - Anubhav Choudhary (SoK success!) - Emmanuel Arias (new contributor! welcome!) - Erik Dubois @@ -39,6 +40,8 @@ results -- are sent to Matrix only. more potential display managers. #1205 (Thanks Erik) - *keyboard* now switches on an alternate `en_US` keyboard layout when Arabic or Hebrew is selected as primary layout. (Thanks Omer) + - *localeq* now has a fully functional offline option (alongside the default + interactive map option, which requires internet). - The *netinstall* module can now fall back to alternative URLs when loading groups data. The first URL to yield a non-empty groups collection is accepted. No changes are needed in the configuration. #1673 @@ -53,6 +56,8 @@ results -- are sent to Matrix only. - The *partition* manager has had a long-standing bug with partition-flags and manual partitioning resolved. This may help resolve some installation issues on UEFI systems. #1724 + - *usersq* is further implemented and can now be used for a successful install. + Not all warning messages available in the regular users module are implemented. # 3.2.39.3 (2021-04-14) # From 2f7d251000c0d0b4649a23150fc405c33872b9ae Mon Sep 17 00:00:00 2001 From: demmm Date: Sun, 27 Jun 2021 12:05:44 +0200 Subject: [PATCH 223/492] [usersq] empty length is starting color --- src/modules/usersq/usersq.qml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index 2e70adff01..2199ac6767 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -61,7 +61,7 @@ Kirigami.ScrollablePage { radius: 2 opacity: 0.9 //border.color: _userNameField.text === "" ? Kirigami.Theme.backgroundColor : ( config.fullNameReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _userNameField.text.length ? "#FBFBFB" : ( config.fullNameChanged ? "#f0fff0" : "#ffdae0") + color: _userNameField.text.length ? ( config.fullNameChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" } } } @@ -81,12 +81,13 @@ Kirigami.ScrollablePage { enabled: config.isEditable("loginName") placeholderText: qsTr("Login Name") text: config.loginName - onTextChanged: config.loginNameStatusChanged ? ( config.setLoginName(text),userMessage.visible = false ) : ( userMessage.visible = true,console.log("Invalid") ) + //onTextChanged: config.setLoginName(text) + onTextChanged: config.loginNameStatusChanged ? ( config.setLoginName(text),userMessage.visible = false ) : ( userMessage.visible = true ) background: Rectangle { opacity: 0.9 //border.color: _userLoginField.text === "" ? Kirigami.Theme.backgroundColor : ( config.userNameReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _userLoginField.text.length ? "#FBFBFB" : ( config.loginNameStatusChanged ? "#f0fff0" : "#ffdae0") + color: _userLoginField.text.length ? ( config.loginNameStatusChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" } } @@ -121,12 +122,12 @@ Kirigami.ScrollablePage { width: parent.width placeholderText: qsTr("Computer Name") text: config.hostName - onTextChanged: config.hostNameStatusChanged ? ( config.setHostName(text),hostMessage.visible = false ) : hostMessage.visible = true + onTextChanged: config.hostNameStatusChanged ? (config.setHostName(text),hostMessage.visible = false) : hostMessage.visible = true background: Rectangle { opacity: 0.9 //border.color: _hostName.text === "" ? Kirigami.Theme.backgroundColor : ( config.hostNameStatusChanged ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _hostName.text.length ? "#FBFBFB" : ( config.hostNameStatusChanged ? "#f0fff0" : "#ffdae0") + color: _hostName.text.length ? ( config.hostNameStatusChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" } } @@ -174,7 +175,7 @@ Kirigami.ScrollablePage { background: Rectangle { opacity: 0.9 //border.color: _passwordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.passwordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _passwordField.text.length ? "#FBFBFB" : ( config.userPasswordStatusChanged ? "#f0fff0" : "#ffdae0") + color: _passwordField.text.length ? ( config.userPasswordStatusChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" } } @@ -192,7 +193,7 @@ Kirigami.ScrollablePage { background: Rectangle { opacity: 0.9 //border.color: _verificationpasswordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.passwordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _verificationPasswordField.text.length ? "#FBFBFB" : ( config.userPasswordSecondaryChanged ? "#f0fff0" : "#ffdae0") + color: _verificationPasswordField.text.length ? ( config.userPasswordSecondaryChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" } } } @@ -252,7 +253,7 @@ Kirigami.ScrollablePage { background: Rectangle { opacity: 0.9 //border.color: _rootPasswordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.rootPasswordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _rootPasswordField.text.length ? "#FBFBFB" : ( config.rootPasswordReady ? "#f0fff0" : "#ffdae0") + color: _rootPasswordField.text.length ? ( config.rootPasswordReady ? "#f0fff0" : "#ffdae0") : "#FBFBFB" } } @@ -270,7 +271,7 @@ Kirigami.ScrollablePage { background: Rectangle { opacity: 0.9 //border.color: _verificationRootPasswordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.rootPasswordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _verificationRootPasswordField.text.length ? "#FBFBFB" : ( config.rootPasswordReady ? "#f0fff0" : "#ffdae0") + color: _verificationRootPasswordField.text.length ? ( config.rootPasswordReady ? "#f0fff0" : "#ffdae0") : "#FBFBFB" } } } From a86ffd105a6c4db7bbda0a88fe7f112e8ae75610 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 28 Jun 2021 17:05:58 +0200 Subject: [PATCH 224/492] [bootloader] factor out GRUB EFI determinations --- src/modules/bootloader/main.py | 48 ++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 7d6a050458..7192df75cb 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -24,8 +24,6 @@ import shutil import subprocess -import platform - import libcalamares from libcalamares.utils import check_target_env_call @@ -283,6 +281,33 @@ def install_systemd_boot(efi_directory): create_loader(loader_path, distribution_translated) +def get_grub_efi_parameters(): + """ + Returns a 3-tuple of suitable parameters for GRUB EFI installation, + depending on the host machine architecture. The return is + - target name + - grub.efi name + - boot.efi name + all three are strings. May return None if there is no suitable + set for the current machine. May return unsuitable values if the + host architecture is unknown (e.g. defaults to x86_64). + """ + import platform + efi_bitness = efi_word_size() + cpu_type = platform.machine() + + if efi_bitness == "32": + # Assume all 32-bitters are legacy x86 + return ("i386-efi", "grubia32.efi", "bootia32.efi") + elif efi_bitness == "64" and cpu_type == "aarch64": + return ("arm64-efi", "grubaa64.efi", "bootaa64.efi") + elif efi_bitness == "64": + # If it's not ARM, must by AMD64 + return ("x86_64-efi", "grubx64.efi", "bootx64.efi") + libcalamares.utils.warning("Could not find GRUB parameters for bits {b} and cpu {c}".format(b=repr(efi_bitness), c=repr(cpu_type))) + return None + + def install_grub(efi_directory, fw_type): """ Installs grub as bootloader, either in pc or efi mode. @@ -299,23 +324,8 @@ def install_grub(efi_directory, fw_type): os.makedirs(install_efi_directory) efi_bootloader_id = efi_label() - efi_bitness = efi_word_size() - - cpu_type = platform.machine() - - if efi_bitness == "32": - efi_target = "i386-efi" - efi_grub_file = "grubia32.efi" - efi_boot_file = "bootia32.efi" - elif efi_bitness == "64": - if cpu_type == "aarch64": - efi_target = "arm64-efi" - efi_grub_file = "grubaa64.efi" - efi_boot_file = "bootaa64.efi" - else: - efi_target = "x86_64-efi" - efi_grub_file = "grubx64.efi" - efi_boot_file = "bootx64.efi" + + efi_target, efi_grub_file, efi_boot_file = get_grub_efi_parameters() check_target_env_call([libcalamares.job.configuration["grubInstall"], "--target=" + efi_target, From 5d54a08581ad1f42722c96d997f646ae653108e3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 28 Jun 2021 17:17:19 +0200 Subject: [PATCH 225/492] [calamares] Allow disabling the Python pre-script The test-application injects a script into Python code to render harmless functions in the subprocess module (eg to avoid Python code from running the package manager for real). There are cases, though, where that injection should be skipped (eg because the whole point of test- loading some Python is to check commands that are run). Add a -P option to the test-application to do that. --- src/calamares/testmain.cpp | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp index 250b047eb7..2ce75d919f 100644 --- a/src/calamares/testmain.cpp +++ b/src/calamares/testmain.cpp @@ -62,6 +62,7 @@ struct ModuleConfig QString m_language; QString m_branding; bool m_ui; + bool m_pythonInjection; }; static ModuleConfig @@ -86,7 +87,6 @@ handle_args( QCoreApplication& a ) QStringLiteral( "Enable UI" ) ); QCommandLineOption slideshowOption( QStringList() << QStringLiteral( "s" ) << QStringLiteral( "slideshow" ), QStringLiteral( "Run slideshow module" ) ); - QCommandLineParser parser; parser.setApplicationDescription( "Calamares module tester" ); parser.addHelpOption(); @@ -99,6 +99,12 @@ handle_args( QCoreApplication& a ) parser.addOption( brandOption ); parser.addOption( uiOption ); parser.addOption( slideshowOption ); +#ifdef WITH_PYTHON + QCommandLineOption pythonOption( QStringList() << QStringLiteral( "P" ) << QStringLiteral( "no-injected-python" ), + QStringLiteral( "Do not disable potentially-harmful Python commands" ) ); + parser.addOption( pythonOption ); +#endif + parser.addPositionalArgument( "module", "Path or name of module to run." ); parser.addPositionalArgument( "job.yaml", "Path of job settings document to use.", "[job.yaml]" ); @@ -123,12 +129,21 @@ handle_args( QCoreApplication& a ) jobSettings = args.at( 1 ); } + bool pythonInjection = true; +#ifdef WITH_PYTHON + if ( parser.isSet( pythonOption ) ) + { + pythonInjection = false; + } +#endif return ModuleConfig { parser.isSet( slideshowOption ) ? QStringLiteral( "-" ) : args.first(), jobSettings, parser.value( globalOption ), parser.value( langOption ), parser.value( brandOption ), - parser.isSet( slideshowOption ) || parser.isSet( uiOption ) }; + parser.isSet( slideshowOption ) || parser.isSet( uiOption ), + pythonInjection + }; } } @@ -430,7 +445,10 @@ main( int argc, char* argv[] ) } #ifdef WITH_PYTHON - Calamares::PythonJob::setInjectedPreScript(pythonPreScript); + if ( module.m_pythonInjection ) + { + Calamares::PythonJob::setInjectedPreScript(pythonPreScript); + } #endif #ifdef WITH_QML CalamaresUtils::initQmlModulesDir(); // don't care if failed From 015f644acf42f4e6b08978d549dfb70f505a58ac Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 28 Jun 2021 21:56:49 +0200 Subject: [PATCH 226/492] [calamares] More attributes in injected Python script Fake a little more of the subprocess module. --- src/calamares/testmain.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp index 2ce75d919f..aa74922367 100644 --- a/src/calamares/testmain.cpp +++ b/src/calamares/testmain.cpp @@ -409,6 +409,8 @@ class fake_subprocess(object): def check_call(*args, **kwargs): libcalamares.utils.debug("subprocess.check_call(%r,%r) X subverted to call" % (args, kwargs)) return 0 +for attr in ("CalledProcessError",): + setattr(fake_subprocess,attr,getattr(_calamares_subprocess,attr)) sys.modules["subprocess"] = fake_subprocess libcalamares.utils.debug('pre-script for testing purposes injected') From e5f93d3563468d3b7a5e4b979c58c1fdbceea479 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 28 Jun 2021 21:59:13 +0200 Subject: [PATCH 227/492] Changes: credits for recent PRs --- CHANGES | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index e7063fde45..829be924f6 100644 --- a/CHANGES +++ b/CHANGES @@ -15,9 +15,10 @@ This release contains contributions from (alphabetically by first name): - Emmanuel Arias (new contributor! welcome!) - Erik Dubois - Jerrod Frost (new contributor! welcome!) + - Jia Chao (new contributor! welcome!) - Joe Kamprad - Lisa Vitolo (blast from the past!) - - Omer I.S. + - Omer I.S. (new contributor! welcome!) In project news, chat (instant-messaging) communications has largely moved to Matrix and Libera.Chat. CI notifications -- issues and build @@ -35,6 +36,7 @@ results -- are sent to Matrix only. - The "upload log file" now has a configurable log-file-size. (Thanks Anubhav) ## Modules ## + - *bootloader* can now install an aarch64 (ARM) compatible EFI GRUB. (Thanks Jia) - *displaymanager* example configuration has been shuffled around a bit, for better results when the live image is running XFCE. Also lists more potential display managers. #1205 (Thanks Erik) From cba5b9e4fb00e8c8fec7e60a7d24180bb4251a79 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 21 Jun 2021 22:56:23 +0200 Subject: [PATCH 228/492] [partition]: restore defaultFileSystemType in config Add the old key back, document the new key, expand schema. --- src/modules/partition/partition.conf | 8 ++++++++ src/modules/partition/partition.schema.yaml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index c9a72655b9..a900bdf483 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -137,6 +137,14 @@ initialSwapChoice: none # If nothing is specified, Calamares defaults to "ext4". # # Names are case-sensitive and defined by KPMCore. +defaultFileSystemType: "ext4" + +# Selectable filesystem type, used when "erase" is done. +# +# When erasing the disk, the *defaultFileSystemType* is used (see +# above), but it is also possible to give users a choice: +# list suitable filesystems here. A drop-down is provided +# to pick which is the filesystems will be used. availableFileSystemTypes: ["ext4", "btrfs", "f2fs"] # Show/hide LUKS related functionality in automated partitioning modes. diff --git a/src/modules/partition/partition.schema.yaml b/src/modules/partition/partition.schema.yaml index 16cc08319e..6c65e8ae73 100644 --- a/src/modules/partition/partition.schema.yaml +++ b/src/modules/partition/partition.schema.yaml @@ -18,6 +18,8 @@ properties: alwaysShowPartitionLabels: { type: boolean, default: true } defaultFileSystemType: { type: string } + availableFileSystemTypes: { type: array, items: { type: string } } + enableLuksAutomatedPartitioning: { type: boolean, default: false } allowManualPartitioning: { type: boolean, default: true } partitionLayout: { type: array } # TODO: specify items From c3bc305bb6ccefd7604e39d491a625d090150ec7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 11:22:47 +0200 Subject: [PATCH 229/492] [partition] Shuffle Config and ViewStep to top Modules nearly always have a Config and either a Job or ViewStep as their "top level" components. Everything else is implementation- detail. The *partition* module was unusual in that those two "top level" components were tucked away in subdirectories. Shuffle them to the top: this makes it more clear that these two files are there to coordinate the module. --- src/modules/partition/CMakeLists.txt | 5 +++-- src/modules/partition/{core => }/Config.cpp | 2 +- src/modules/partition/{core => }/Config.h | 0 .../partition/{gui => }/PartitionViewStep.cpp | 4 ++-- .../partition/{gui => }/PartitionViewStep.h | 0 src/modules/partition/core/PartitionActions.h | 2 +- src/modules/partition/gui/ChoicePage.cpp | 17 +++++++++-------- src/modules/partition/gui/ChoicePage.h | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) rename src/modules/partition/{core => }/Config.cpp (99%) rename src/modules/partition/{core => }/Config.h (100%) rename src/modules/partition/{gui => }/PartitionViewStep.cpp (99%) rename src/modules/partition/{gui => }/PartitionViewStep.h (100%) diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index bffb2128cd..26d4ffae78 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -49,9 +49,11 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES + Config.cpp + PartitionViewStep.cpp + core/BootLoaderModel.cpp core/ColorUtils.cpp - core/Config.cpp core/DeviceList.cpp core/DeviceModel.cpp core/KPMHelpers.cpp @@ -75,7 +77,6 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND gui/PartitionLabelsView.cpp gui/PartitionSizeController.cpp gui/PartitionSplitterWidget.cpp - gui/PartitionViewStep.cpp gui/ResizeVolumeGroupDialog.cpp gui/ScanningDialog.cpp gui/ReplaceWidget.cpp diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/Config.cpp similarity index 99% rename from src/modules/partition/core/Config.cpp rename to src/modules/partition/Config.cpp index 69dbe17d3a..c24fdea206 100644 --- a/src/modules/partition/core/Config.cpp +++ b/src/modules/partition/Config.cpp @@ -9,7 +9,7 @@ #include "Config.h" -#include "PartUtils.h" +#include "core/PartUtils.h" #include "GlobalStorage.h" #include "JobQueue.h" diff --git a/src/modules/partition/core/Config.h b/src/modules/partition/Config.h similarity index 100% rename from src/modules/partition/core/Config.h rename to src/modules/partition/Config.h diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp similarity index 99% rename from src/modules/partition/gui/PartitionViewStep.cpp rename to src/modules/partition/PartitionViewStep.cpp index cc06ba967d..c757069724 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -11,10 +11,10 @@ * */ -#include "gui/PartitionViewStep.h" +#include "PartitionViewStep.h" +#include "Config.h" #include "core/BootLoaderModel.h" -#include "core/Config.h" #include "core/DeviceModel.h" #include "core/PartitionCoreModule.h" #include "gui/ChoicePage.h" diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/PartitionViewStep.h similarity index 100% rename from src/modules/partition/gui/PartitionViewStep.h rename to src/modules/partition/PartitionViewStep.h diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h index 3a345dc4ed..4a60f47358 100644 --- a/src/modules/partition/core/PartitionActions.h +++ b/src/modules/partition/core/PartitionActions.h @@ -10,7 +10,7 @@ #ifndef PARTITIONACTIONS_H #define PARTITIONACTIONS_H -#include "core/Config.h" +#include "Config.h" #include #include diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 0c86fd718a..6bbb852be7 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -11,15 +11,9 @@ #include "ChoicePage.h" -#include "BootInfoWidget.h" -#include "DeviceInfoWidget.h" -#include "PartitionBarsView.h" -#include "PartitionLabelsView.h" -#include "PartitionSplitterWidget.h" -#include "ReplaceWidget.h" -#include "ScanningDialog.h" +#include "Config.h" + #include "core/BootLoaderModel.h" -#include "core/Config.h" #include "core/DeviceModel.h" #include "core/KPMHelpers.h" #include "core/OsproberEntry.h" @@ -28,6 +22,13 @@ #include "core/PartitionCoreModule.h" #include "core/PartitionInfo.h" #include "core/PartitionModel.h" +#include "gui/BootInfoWidget.h" +#include "gui/DeviceInfoWidget.h" +#include "gui/PartitionBarsView.h" +#include "gui/PartitionLabelsView.h" +#include "gui/PartitionSplitterWidget.h" +#include "gui/ReplaceWidget.h" +#include "gui/ScanningDialog.h" #include "Branding.h" #include "GlobalStorage.h" diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h index 30de05cb9d..5e0a24d438 100644 --- a/src/modules/partition/gui/ChoicePage.h +++ b/src/modules/partition/gui/ChoicePage.h @@ -15,7 +15,7 @@ #include "ui_ChoicePage.h" -#include "core/Config.h" +#include "Config.h" #include "core/OsproberEntry.h" #include From 5f7cfefed7407e9fbf61b9b0b82e044e9c532f05 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 11:43:20 +0200 Subject: [PATCH 230/492] [partition] Migrate EFI settings-setting to Config object --- src/modules/partition/Config.cpp | 24 +++++++++++++++++++++ src/modules/partition/PartitionViewStep.cpp | 19 ---------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp index c24fdea206..1e0a1ce84a 100644 --- a/src/modules/partition/Config.cpp +++ b/src/modules/partition/Config.cpp @@ -228,6 +228,28 @@ Config::allowManualPartitioning() const return gs->value( "allowManualPartitioning" ).toBool(); } +static void +fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configurationMap ) +{ + // Set up firmwareType global storage entry. This is used, e.g. by the bootloader module. + QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) ); + gs->insert( "firmwareType", firmwareType ); + + gs->insert( "efiSystemPartition", CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) ); + + // Read and parse key efiSystemPartitionSize + if ( configurationMap.contains( "efiSystemPartitionSize" ) ) + { + gs->insert( "efiSystemPartitionSize", CalamaresUtils::getString( configurationMap, "efiSystemPartitionSize" ) ); + } + + // Read and parse key efiSystemPartitionName + if ( configurationMap.contains( "efiSystemPartitionName" ) ) + { + gs->insert( "efiSystemPartitionName", CalamaresUtils::getString( configurationMap, "efiSystemPartitionName" ) ); + } +} + void Config::setConfigurationMap( const QVariantMap& configurationMap ) @@ -288,6 +310,8 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) m_requiredPartitionTableType.append( configurationMap.value( "requiredPartitionTableType" ).toString() ); } gs->insert( "requiredPartitionTableType", m_requiredPartitionTableType ); + + fillGSConfigurationEFI(gs, configurationMap); } void diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index c757069724..cea1df0235 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -548,25 +548,6 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) // Copy the efiSystemPartition setting to the global storage. It is needed not only in // the EraseDiskPage, but also in the bootloader configuration modules (grub, bootloader). Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - QString efiSP = CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ); - gs->insert( "efiSystemPartition", efiSP ); - - // Set up firmwareType global storage entry. This is used, e.g. by the bootloader module. - QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) ); - cDebug() << o << "Setting firmwareType to" << firmwareType; - gs->insert( "firmwareType", firmwareType ); - - // Read and parse key efiSystemPartitionSize - if ( configurationMap.contains( "efiSystemPartitionSize" ) ) - { - gs->insert( "efiSystemPartitionSize", CalamaresUtils::getString( configurationMap, "efiSystemPartitionSize" ) ); - } - - // Read and parse key efiSystemPartitionName - if ( configurationMap.contains( "efiSystemPartitionName" ) ) - { - gs->insert( "efiSystemPartitionName", CalamaresUtils::getString( configurationMap, "efiSystemPartitionName" ) ); - } // Read and parse key swapPartitionName if ( configurationMap.contains( "swapPartitionName" ) ) From 46f2d72b4c081da88747c73475ed25079421d3d9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 11:48:53 +0200 Subject: [PATCH 231/492] [partition] requiredPartitionTableType: improve docs --- src/modules/partition/partition.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index a900bdf483..23f1f12b6b 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -113,12 +113,11 @@ initialSwapChoice: none # Restrict the installation on disks that match the type of partition # tables that are specified. # -# Suggested values: msdos, gpt -# If nothing is specified, Calamares defaults to both "msdos" and "mbr". +# Possible values: msdos, gpt. Names are case-sensitive and defined by KPMCore. +# +# If nothing is specified, Calamares defaults to both "msdos" and "gpt". # -# Names are case-sensitive and defined by KPMCore. # requiredPartitionTableType: gpt -# or, # requiredPartitionTableType: # - msdos # - gpt From 88be947f6c0f5cc3aacef4908e6ef8121fdcc78e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 12:13:37 +0200 Subject: [PATCH 232/492] [libcalamares] Expand tests for Variant access - document that getStringList() also handles strings as 1-element lists --- src/libcalamares/utils/Tests.cpp | 33 +++++++++++++++++++++++--------- src/libcalamares/utils/Variant.h | 12 ++++++++---- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 7a6d526239..a689505e9b 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -46,26 +46,27 @@ private Q_SLOTS: void testCommands(); - /** @brief Test that all the UMask objects work correctly. */ + /** @section Test that all the UMask objects work correctly. */ void testUmask(); - /** @brief Tests the entropy functions. */ + /** @section Tests the entropy functions. */ void testEntropy(); void testPrintableEntropy(); void testOddSizedPrintable(); - /** @brief Tests the RAII bits. */ + /** @section Tests the RAII bits. */ void testBoolSetter(); void testPointerSetter(); - /** @brief Tests the Traits bits. */ + /** @section Tests the Traits bits. */ void testTraits(); + /** @section Testing the variants-methods */ void testVariantStringListCode(); void testVariantStringListYAMLDashed(); void testVariantStringListYAMLBracketed(); - /** @brief Test smart string truncation. */ + /** @section Test smart string truncation. */ void testStringTruncation(); void testStringTruncationShorter(); void testStringTruncationDegenerate(); @@ -476,17 +477,31 @@ LibCalamaresTests::testVariantStringListCode() QCOMPARE( getStringList( m, key ), QStringList {} ); m.insert( key, 17 ); QCOMPARE( getStringList( m, key ), QStringList {} ); - m.insert( key, QString( "more strings" ) ); - QCOMPARE( getStringList( m, key ), - QStringList { "more strings" } ); // A single string **can** be considered a stringlist! m.insert( key, QVariant {} ); QCOMPARE( getStringList( m, key ), QStringList {} ); } { - // Things that are stringlists + // Things that are **like** stringlists + QVariantMap m; + m.insert( key, QString( "astring" ) ); + QCOMPARE( getStringList( m, key ).count(), 1 ); + QCOMPARE( getStringList( m, key ), + QStringList { "astring" } ); // A single string **can** be considered a stringlist! + m.insert( key, QString( "more strings" ) ); + QCOMPARE( getStringList( m, key ).count(), 1 ); + QCOMPARE( getStringList( m, key ), + QStringList { "more strings" } ); + m.insert( key, QString() ); + QCOMPARE( getStringList( m, key ).count(), 1 ); + QCOMPARE( getStringList( m, key ), QStringList { QString() } ); + } + + { + // Things that are definitely stringlists QVariantMap m; m.insert( key, QStringList { "aap", "noot" } ); + QCOMPARE( getStringList( m, key ).count(), 2 ); QVERIFY( getStringList( m, key ).contains( "aap" ) ); QVERIFY( !getStringList( m, key ).contains( "mies" ) ); } diff --git a/src/libcalamares/utils/Variant.h b/src/libcalamares/utils/Variant.h index e1261f8773..ab9e73f90a 100644 --- a/src/libcalamares/utils/Variant.h +++ b/src/libcalamares/utils/Variant.h @@ -25,13 +25,17 @@ namespace CalamaresUtils */ DLLEXPORT bool getBool( const QVariantMap& map, const QString& key, bool d = false ); -/** - * Get a string value from a mapping with a given key; returns @p d if no value. +/** @brief Get a string value from a mapping with a given key; returns @p d if no value. + * + * The value must be an actual string; numbers are not automatically converted to strings, + * nor are lists flattened or converted. */ DLLEXPORT QString getString( const QVariantMap& map, const QString& key, const QString& d = QString() ); -/** - * Get a string list from a mapping with a given key; returns @p d if no value. +/** @brief Get a string list from a mapping with a given key; returns @p d if no value. + * + * This is slightly more lenient that getString(), and a single-string value will + * be returned as a 1-item list. */ DLLEXPORT QStringList getStringList( const QVariantMap& map, const QString& key, const QStringList& d = QStringList() ); From ebecfb9f8b368bd913dba3d6fe1b4ddc1efaa285 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 12:21:14 +0200 Subject: [PATCH 233/492] [partition] Simplify config-reading (now the variant-docs are better) --- src/modules/partition/Config.cpp | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp index 1e0a1ce84a..7de7dbbe3f 100644 --- a/src/modules/partition/Config.cpp +++ b/src/modules/partition/Config.cpp @@ -278,16 +278,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) if ( configurationMap.contains( "availableFileSystemTypes" ) ) { - QStringList fsTypes; - - if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::List ) - { - fsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" ); - } - else if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::String ) - { - fsTypes = QStringList { CalamaresUtils::getString( configurationMap, "availableFileSystemTypes" ) }; - } + QStringList fsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" ); m_eraseFsTypes = fsTypes; if ( !fsTypes.empty() ) @@ -297,18 +288,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } } - if ( configurationMap.contains( "requiredPartitionTableType" ) - && configurationMap.value( "requiredPartitionTableType" ).type() == QVariant::List ) - { - m_requiredPartitionTableType.clear(); - m_requiredPartitionTableType.append( configurationMap.value( "requiredPartitionTableType" ).toStringList() ); - } - else if ( configurationMap.contains( "requiredPartitionTableType" ) - && configurationMap.value( "requiredPartitionTableType" ).type() == QVariant::String ) - { - m_requiredPartitionTableType.clear(); - m_requiredPartitionTableType.append( configurationMap.value( "requiredPartitionTableType" ).toString() ); - } + m_requiredPartitionTableType = CalamaresUtils::getStringList( configurationMap, "requiredPartitionTableType" ); gs->insert( "requiredPartitionTableType", m_requiredPartitionTableType ); fillGSConfigurationEFI(gs, configurationMap); From 5e3a0eda7315be86a97729cace504a2fe6862103 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 13:01:21 +0200 Subject: [PATCH 234/492] [partition] Reduce confused naming --- src/modules/packagechooser/Config.h | 2 +- src/modules/partition/Config.cpp | 2 +- src/modules/partition/Config.h | 11 ++++++++++- src/modules/partition/PartitionViewStep.cpp | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h index 4cb545cb86..5959e3ea4f 100644 --- a/src/modules/packagechooser/Config.h +++ b/src/modules/packagechooser/Config.h @@ -72,7 +72,7 @@ class Config : public Calamares::ModuleSystem::Config */ void updateGlobalStorage( const QStringList& selected ) const; /// As updateGlobalStorage() with an empty selection list - void updateGlobalStorage() const { updateGlobalStorage( QStringList() ); } + void fillGSSecondaryConfiguration() const { updateGlobalStorage( QStringList() ); } private: PackageListModel* m_model = nullptr; diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp index 7de7dbbe3f..a47bf90f8a 100644 --- a/src/modules/partition/Config.cpp +++ b/src/modules/partition/Config.cpp @@ -295,7 +295,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } void -Config::updateGlobalStorage() const +Config::fillGSSecondaryConfiguration() const { // If there's no setting (e.g. from the welcome page) for required storage // then use ours, if it was set. diff --git a/src/modules/partition/Config.h b/src/modules/partition/Config.h index 8b420a8d0c..826cc73b57 100644 --- a/src/modules/partition/Config.h +++ b/src/modules/partition/Config.h @@ -60,7 +60,16 @@ class Config : public QObject using EraseFsTypesSet = QStringList; void setConfigurationMap( const QVariantMap& ); - void updateGlobalStorage() const; + /** @brief Set GS values where other modules configuration has priority + * + * Some "required" values are duplicated between modules; if some + * othe module hasn't already set the GS value, take a value from + * the partitioning configuration. + * + * Applicable GS keys: + * - requiredStorageGiB + */ + void fillGSSecondaryConfiguration() const; /** @brief What kind of installation (partitioning) is requested **initially**? * diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index cea1df0235..47315e6a03 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -368,7 +368,7 @@ PartitionViewStep::isAtEnd() const void PartitionViewStep::onActivate() { - m_config->updateGlobalStorage(); + m_config->fillGSSecondaryConfiguration(); // if we're coming back to PVS from the next VS if ( m_widget->currentWidget() == m_choicePage && m_config->installChoice() == Config::InstallChoice::Alongside ) From f4944408955918527cce1d39f9622aa0373cf5fa Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 13:21:46 +0200 Subject: [PATCH 235/492] [partition] Don't run bool allowManualPartitioning through GS It's a bit over-wrought to store a bool in a QVariant in GS for consumption **only** by ChoicePage, so drop that GS key and store it locally. --- src/modules/partition/Config.cpp | 13 ++----------- src/modules/partition/Config.h | 7 ++++--- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp index a47bf90f8a..deb75d2a46 100644 --- a/src/modules/partition/Config.cpp +++ b/src/modules/partition/Config.cpp @@ -220,14 +220,6 @@ Config::setEraseFsTypeChoice( const QString& choice ) } } - -bool -Config::allowManualPartitioning() const -{ - Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - return gs->value( "allowManualPartitioning" ).toBool(); -} - static void fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configurationMap ) { @@ -272,9 +264,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } setSwapChoice( m_initialSwapChoice ); - Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - gs->insert( "allowManualPartitioning", - CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ) ); + m_allowManualPartitioning = CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ); if ( configurationMap.contains( "availableFileSystemTypes" ) ) { @@ -288,6 +278,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) } } + Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); m_requiredPartitionTableType = CalamaresUtils::getStringList( configurationMap, "requiredPartitionTableType" ); gs->insert( "requiredPartitionTableType", m_requiredPartitionTableType ); diff --git a/src/modules/partition/Config.h b/src/modules/partition/Config.h index 826cc73b57..309bb4a49e 100644 --- a/src/modules/partition/Config.h +++ b/src/modules/partition/Config.h @@ -112,9 +112,8 @@ class Config : public QObject QString eraseFsType() const { return m_eraseFsTypeChoice; } - - ///@brief Is manual partitioning allowed (not explicitly disnabled in the config file)? - bool allowManualPartitioning() const; + ///@brief Is manual partitioning allowed (not explicitly disabled in the config file)? + bool allowManualPartitioning() const { return m_allowManualPartitioning; } public Q_SLOTS: void setInstallChoice( int ); ///< Translates a button ID or so to InstallChoice @@ -138,6 +137,8 @@ public Q_SLOTS: InstallChoice m_installChoice = NoChoice; qreal m_requiredStorageGiB = 0.0; // May duplicate setting in the welcome module QStringList m_requiredPartitionTableType; + + bool m_allowManualPartitioning = true; }; /** @brief Given a set of swap choices, return a sensible value from it. From 67fafa04ac9452e95766165b373b068222839de9 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 14:47:09 +0200 Subject: [PATCH 236/492] [partition] Move fs-type handling into Config - the defaultFileSystemType interacts with availableFileSystemTypes so set them together. --- src/modules/partition/Config.cpp | 68 +++++++++++++++++---- src/modules/partition/Config.h | 20 +++++- src/modules/partition/PartitionViewStep.cpp | 28 +-------- 3 files changed, 76 insertions(+), 40 deletions(-) diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp index deb75d2a46..7a931b9bed 100644 --- a/src/modules/partition/Config.cpp +++ b/src/modules/partition/Config.cpp @@ -242,6 +242,61 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu } } +void +Config::fillConfigurationFSTypes(const QVariantMap& configurationMap) +{ + Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); + + + // The defaultFileSystemType setting needs a bit more processing, + // as we want to cover various cases (such as different cases) + QString fsName = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" ); + QString fsRealName; + FileSystem::Type fsType = FileSystem::Type::Unknown; + if ( fsName.isEmpty() ) + { + cWarning() << "Partition-module setting *defaultFileSystemType* is missing, will use ext4"; + fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral("ext4"), &fsType ); + } + else + { + fsRealName = PartUtils::canonicalFilesystemName( fsName, &fsType ); + if ( fsType == FileSystem::Type::Unknown ) + { + cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName << ") using ext4 instead"; + fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral("ext4"), &fsType ); + } + else if ( fsRealName != fsName ) + { + cWarning() << "Partition-module setting *defaultFileSystemType* changed to" << fsRealName; + } + } + Q_ASSERT( fsType != FileSystem::Type::Unknown ); + m_defaultFsType = fsType; + gs->insert( "defaultFileSystemType", fsRealName ); + + // TODO: canonicalize the names? How is translation supposed to work? + m_eraseFsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" ); + if ( !m_eraseFsTypes.contains( fsRealName ) ) + { + if ( !m_eraseFsTypes.isEmpty() ) + { + // Explicitly set, and doesn't include the default + cWarning() << "Partition-module *availableFileSystemTypes* does not contain the default" << fsRealName; + m_eraseFsTypes.prepend( fsRealName ); + } + else + { + // Not explicitly set, so it's empty; don't complain + m_eraseFsTypes = QStringList { fsRealName }; + } + } + + Q_ASSERT( !m_eraseFsTypes.isEmpty() ); + m_eraseFsTypeChoice = m_eraseFsTypes.first(); + Q_EMIT eraseModeFilesystemChanged( m_eraseFsTypeChoice ); +} + void Config::setConfigurationMap( const QVariantMap& configurationMap ) @@ -266,23 +321,12 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) m_allowManualPartitioning = CalamaresUtils::getBool( configurationMap, "allowManualPartitioning", true ); - if ( configurationMap.contains( "availableFileSystemTypes" ) ) - { - QStringList fsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" ); - - m_eraseFsTypes = fsTypes; - if ( !fsTypes.empty() ) - { - m_eraseFsTypeChoice = m_eraseFsTypes.first(); - Q_EMIT eraseModeFilesystemChanged( m_eraseFsTypeChoice ); - } - } - Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); m_requiredPartitionTableType = CalamaresUtils::getStringList( configurationMap, "requiredPartitionTableType" ); gs->insert( "requiredPartitionTableType", m_requiredPartitionTableType ); fillGSConfigurationEFI(gs, configurationMap); + fillConfigurationFSTypes( configurationMap ); } void diff --git a/src/modules/partition/Config.h b/src/modules/partition/Config.h index 309bb4a49e..3365403fab 100644 --- a/src/modules/partition/Config.h +++ b/src/modules/partition/Config.h @@ -12,6 +12,8 @@ #include "utils/NamedEnum.h" +#include + #include #include @@ -108,10 +110,22 @@ class Config : public QObject */ SwapChoice swapChoice() const { return m_swapChoice; } + /** @brief Get the list of configured FS types to use with *erase* mode + * + * This list is not empty. + */ EraseFsTypesSet eraseFsTypes() const { return m_eraseFsTypes; } + /** @brief Currently-selected FS type for *erase* mode + */ QString eraseFsType() const { return m_eraseFsTypeChoice; } + /** @brief Configured default FS type (for other modes than erase) + * + * This is not "Unknown" or "Unformatted" + */ + FileSystem::Type defaultFsType() const { return m_defaultFsType; } + ///@brief Is manual partitioning allowed (not explicitly disabled in the config file)? bool allowManualPartitioning() const { return m_allowManualPartitioning; } @@ -128,9 +142,13 @@ public Q_SLOTS: void eraseModeFilesystemChanged( const QString& ); private: - SwapChoiceSet m_swapChoices; + /** @brief Handle FS-type configuration, for erase and default */ + void fillConfigurationFSTypes( const QVariantMap& configurationMap ); EraseFsTypesSet m_eraseFsTypes; QString m_eraseFsTypeChoice; + FileSystem::Type m_defaultFsType; + + SwapChoiceSet m_swapChoices; SwapChoice m_initialSwapChoice = NoSwap; SwapChoice m_swapChoice = NoSwap; InstallChoice m_initialInstallChoice = NoChoice; diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index 47315e6a03..fc6b3e50c9 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -541,8 +541,6 @@ PartitionViewStep::onLeave() void PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) { - Logger::Once o; - m_config->setConfigurationMap( configurationMap ); // Copy the efiSystemPartition setting to the global storage. It is needed not only in @@ -563,30 +561,6 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) gs->insert( "enableLuksAutomatedPartitioning", CalamaresUtils::getBool( configurationMap, "enableLuksAutomatedPartitioning", true ) ); - // The defaultFileSystemType setting needs a bit more processing, - // as we want to cover various cases (such as different cases) - QString fsName = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" ); - FileSystem::Type fsType; - if ( fsName.isEmpty() ) - { - cWarning() << "Partition-module setting *defaultFileSystemType* is missing, will use ext4"; - } - QString fsRealName = PartUtils::canonicalFilesystemName( fsName, &fsType ); - if ( fsRealName == fsName ) - { - cDebug() << o << "Partition-module setting *defaultFileSystemType*" << fsRealName; - } - else if ( fsType != FileSystem::Unknown ) - { - cWarning() << "Partition-module setting *defaultFileSystemType* changed" << fsRealName; - } - else - { - cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName << ") using" << fsRealName - << "instead."; - } - gs->insert( "defaultFileSystemType", fsRealName ); - QString partitionTableName = CalamaresUtils::getString( configurationMap, "defaultPartitionTableType" ); if ( partitionTableName.isEmpty() ) { @@ -608,7 +582,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) QFuture< void > future = QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule ); m_future->setFuture( future ); - m_core->initLayout( fsType == FileSystem::Unknown ? FileSystem::Ext4 : fsType, + m_core->initLayout( m_config->defaultFsType(), configurationMap.value( "partitionLayout" ).toList() ); } From c3528e4e40aac264d0eb081b87d220c905f3af92 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 14:52:16 +0200 Subject: [PATCH 237/492] [partition] Document that the default FS is used, also when erasing --- src/modules/partition/Config.cpp | 3 ++- src/modules/partition/partition.conf | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp index 7a931b9bed..82c0ad846f 100644 --- a/src/modules/partition/Config.cpp +++ b/src/modules/partition/Config.cpp @@ -293,7 +293,8 @@ Config::fillConfigurationFSTypes(const QVariantMap& configurationMap) } Q_ASSERT( !m_eraseFsTypes.isEmpty() ); - m_eraseFsTypeChoice = m_eraseFsTypes.first(); + Q_ASSERT( m_eraseFsTypes.contains( fsRealName ) ); + m_eraseFsTypeChoice = fsRealName; Q_EMIT eraseModeFilesystemChanged( m_eraseFsTypeChoice ); } diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index 23f1f12b6b..61e9553757 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -144,6 +144,9 @@ defaultFileSystemType: "ext4" # above), but it is also possible to give users a choice: # list suitable filesystems here. A drop-down is provided # to pick which is the filesystems will be used. +# +# The value *defaultFileSystemType* is added to this list (with a warning) +# if not present; the default pick is the *defaultFileSystemType*. availableFileSystemTypes: ["ext4", "btrfs", "f2fs"] # Show/hide LUKS related functionality in automated partitioning modes. From 70df0b0bc8ea2764ab0073ccf49c43a7903338b1 Mon Sep 17 00:00:00 2001 From: demmm Date: Tue, 29 Jun 2021 17:41:07 +0200 Subject: [PATCH 238/492] [localeq] prevent MouseArea from stealing all map interaction bug introduced with Qt 5.15 KDE patches makes near impossible to set location adding - 5 seems to fix, otherwise the coordinates label will have to be removed --- src/modules/localeq/Map.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/localeq/Map.qml b/src/modules/localeq/Map.qml index 845f16ea36..5972b5c153 100644 --- a/src/modules/localeq/Map.qml +++ b/src/modules/localeq/Map.qml @@ -168,7 +168,7 @@ Column { hoverEnabled: true property var coordinate: map.toCoordinate(Qt.point(mouseX, mouseY)) Label { - x: parent.mouseX - width + x: parent.mouseX - width -5 y: parent.mouseY - height - 5 text: "%1, %2".arg( parent.coordinate.latitude).arg(parent.coordinate.longitude) From 453d533d2c852fa412d097612c0feb249551e002 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 Jun 2021 23:47:33 +0200 Subject: [PATCH 239/492] [partition] Use default FS for layout items with type Unknown --- .../partition/core/PartitionLayout.cpp | 74 ++++++++++++++++++- src/modules/partition/core/PartitionLayout.h | 20 ++++- 2 files changed, 89 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index c828fce69c..a8ed206d87 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -95,7 +95,7 @@ PartitionLayout::addEntry( const PartitionEntry& entry ) void PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& config ) { - bool ok; + bool ok = true; // bogus argument to getSubMap() m_partLayout.clear(); @@ -130,10 +130,71 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi if ( !m_partLayout.count() ) { - addEntry( { defaultFsType, QString( "/" ), QString( "100%" ) } ); + // Unknown will be translated to defaultFsType at apply-time + addEntry( { FileSystem::Type::Unknown, QString( "/" ), QString( "100%" ) } ); } + + setDefaultFsType( defaultFsType ); +} + +void +PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType) +{ + using T = FileSystem::Type; + switch ( defaultFsType ) + { + case T::Unknown: + case T::Unformatted: + case T::Extended: + case T::LinuxSwap: + case T::Luks: + case T::Ocfs2: + case T::Lvm2_PV: + case T::Udf: + case T::Iso9660: + case T::Luks2: + case T::LinuxRaidMember: + case T::BitLocker: + // bad bad + cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead."; + defaultFsType = T::Ext4; + break; + case T::Ext2: + case T::Ext3: + case T::Ext4: + case T::Fat32: + case T::Ntfs: + case T::Reiser4: + case T::ReiserFS: + case T::Xfs: + case T::Jfs: + case T::Btrfs: + case T::Exfat: + case T::F2fs: + // ok + break; + case T::Fat12: + case T::Fat16: + case T::Hfs: + case T::HfsPlus: + case T::Ufs: + case T::Hpfs: + case T::Zfs: + case T::Nilfs2: + case T::Apfs: + case T::Minix: + // weird + cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong."; + break; + default: + cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares." << "Using ext4 instead."; + defaultFsType = T::Ext4; + } + + m_defaultFsType = defaultFsType; } + QList< Partition* > PartitionLayout::createPartitions( Device* dev, qint64 firstSector, @@ -142,6 +203,9 @@ PartitionLayout::createPartitions( Device* dev, PartitionNode* parent, const PartitionRole& role ) { + // Make sure the default FS is sensible; warn and use ext4 if not + setDefaultFsType( m_defaultFsType ); + QList< Partition* > partList; // Map each partition entry to its requested size (0 when calculated later) QMap< const PartitionLayout::PartitionEntry*, qint64 > partSectorsMap; @@ -210,6 +274,8 @@ PartitionLayout::createPartitions( Device* dev, } } + auto correctFS = [d=m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; }; + // Create the partitions. currentSector = firstSector; availableSectors = totalSectors; @@ -229,7 +295,7 @@ PartitionLayout::createPartitions( Device* dev, part = KPMHelpers::createNewPartition( parent, *dev, role, - entry.partFileSystem, + correctFS( entry.partFileSystem ), entry.partLabel, currentSector, currentSector + sectors - 1, @@ -240,7 +306,7 @@ PartitionLayout::createPartitions( Device* dev, part = KPMHelpers::createNewEncryptedPartition( parent, *dev, role, - entry.partFileSystem, + correctFS( entry.partFileSystem ), entry.partLabel, currentSector, currentSector + sectors - 1, diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h index 6e0c73f8f1..c4c26d9f1a 100644 --- a/src/modules/partition/core/PartitionLayout.h +++ b/src/modules/partition/core/PartitionLayout.h @@ -87,11 +87,28 @@ class PartitionLayout * * @p config is a list of partition entries (in QVariant form, * read from YAML). If no entries are given, then a single - * partition is created with the given @p defaultFsType + * partition is created with type Unkown. + * + * Any partitions with FS type Unknown will get the default filesystem + * that is set at **apply** time (e.g. when createPartitions() is + * called as well. + * + * @see setDefaultFsType() */ void init( FileSystem::Type defaultFsType, const QVariantList& config ); + /** @brief add an entry as if it had been listed in the config + * + * The same comments about filesystem type apply. + */ bool addEntry( const PartitionEntry& entry ); + /** @brief set the default filesystem type + * + * Any partitions in the layout with type Unknown will get + * the default type when createPartitions() is called. + */ + void setDefaultFsType( FileSystem::Type defaultFsType ); + /** * @brief Apply the current partition layout to the selected drive space. * @return A list of Partition objects. @@ -105,6 +122,7 @@ class PartitionLayout private: QList< PartitionEntry > m_partLayout; + FileSystem::Type m_defaultFsType = FileSystem::Type::Unknown; }; #endif /* PARTITIONLAYOUT_H */ From 00b6694073ce66b0a157eeb3696cd34e647ece64 Mon Sep 17 00:00:00 2001 From: demmm Date: Wed, 30 Jun 2021 18:29:32 +0200 Subject: [PATCH 240/492] [usersq] use validator for login & hostname pallette for colors inline warning messages now work, password fields checks included left to implement are password validation inline messages --- src/modules/usersq/usersq.qml | 90 ++++++++++++++++------------------- 1 file changed, 41 insertions(+), 49 deletions(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index 2199ac6767..fbd748f11f 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -11,7 +11,7 @@ import io.calamares.core 1.0 import io.calamares.ui 1.0 -import QtQuick 2.10 +import QtQuick 2.15 import QtQuick.Controls 2.10 import QtQuick.Layouts 1.3 import org.kde.kirigami 2.7 as Kirigami @@ -56,13 +56,8 @@ Kirigami.ScrollablePage { placeholderText: qsTr("Your Full Name") text: config.fullName onTextChanged: config.setFullName(text); - - background: Rectangle { - radius: 2 - opacity: 0.9 - //border.color: _userNameField.text === "" ? Kirigami.Theme.backgroundColor : ( config.fullNameReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _userNameField.text.length ? ( config.fullNameChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" - } + palette.base: _userNameField.text.length ? "#f0fff0" : "#FBFBFB" + palette.highlight : _userNameField.text.length ? "#dcffdc" : "#FBFBFB" } } @@ -81,14 +76,11 @@ Kirigami.ScrollablePage { enabled: config.isEditable("loginName") placeholderText: qsTr("Login Name") text: config.loginName - //onTextChanged: config.setLoginName(text) - onTextChanged: config.loginNameStatusChanged ? ( config.setLoginName(text),userMessage.visible = false ) : ( userMessage.visible = true ) + validator: RegularExpressionValidator { regularExpression: /[a-z_][a-z0-9_-]*[$]?$/ } + onTextChanged: acceptableInput ? ( config.setLoginName(text),userMessage.visible = false ) : ( userMessage.visible = true,console.log("Invalid") ) - background: Rectangle { - opacity: 0.9 - //border.color: _userLoginField.text === "" ? Kirigami.Theme.backgroundColor : ( config.userNameReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _userLoginField.text.length ? ( config.loginNameStatusChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" - } + palette.base: _userLoginField.text.length ? "#f0fff0" : "#FBFBFB" + palette.highlight : _userLoginField.text.length ? "#dcffdc" : "#FBFBFB" } Label { @@ -105,7 +97,7 @@ Kirigami.ScrollablePage { Layout.fillWidth: true visible: false type: Kirigami.MessageType.Error - text: qsTr("Your username must start with a lowercase letter or underscore.") + text: qsTr("Your username must start with a lowercase letter or underscore, minimal of two characters.") } Column { @@ -122,13 +114,11 @@ Kirigami.ScrollablePage { width: parent.width placeholderText: qsTr("Computer Name") text: config.hostName - onTextChanged: config.hostNameStatusChanged ? (config.setHostName(text),hostMessage.visible = false) : hostMessage.visible = true + validator: RegularExpressionValidator { regularExpression: /[a-zA-Z0-9][-a-zA-Z0-9_]+/ } + onTextChanged: acceptableInput ? (config.setHostName(text),hostMessage.visible = false) : hostMessage.visible = true - background: Rectangle { - opacity: 0.9 - //border.color: _hostName.text === "" ? Kirigami.Theme.backgroundColor : ( config.hostNameStatusChanged ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _hostName.text.length ? ( config.hostNameStatusChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" - } + palette.base: _hostName.text.length ? ( acceptableInput ? "#f0fff0" : "#ffdae0") : "#FBFBFB" + palette.highlight : _hostName.text.length ? "#dcffdc" : "#FBFBFB" } Label { @@ -145,7 +135,7 @@ Kirigami.ScrollablePage { Layout.fillWidth: true visible: false type: Kirigami.MessageType.Error - text: qsTr("Only letter, numbers, underscore and hyphen are allowed.") + text: qsTr("Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.") } Column { @@ -167,16 +157,12 @@ Kirigami.ScrollablePage { placeholderText: qsTr("Password") text: config.userPassword onTextChanged: config.setUserPassword(text) + palette.base: _passwordField.text.length ? "#f0fff0" : "#FBFBFB" + palette.highlight : _passwordField.text.length ? "#dcffdc" : "#FBFBFB" echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - - background: Rectangle { - opacity: 0.9 - //border.color: _passwordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.passwordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _passwordField.text.length ? ( config.userPasswordStatusChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" - } } TextField { @@ -184,17 +170,14 @@ Kirigami.ScrollablePage { width: parent.width / 2 - 10 placeholderText: qsTr("Repeat Password") text: config.userPasswordSecondary - onTextChanged: config.setUserPasswordSecondary(text) + onTextChanged: _passwordField.text === _verificationPasswordField.text ? (config.setUserPasswordSecondary(text),passMessage.visible = false) : passMessage.visible = true + + palette.base: _verificationPasswordField.text.length ? ( _passwordField.text === _verificationPasswordField.text ? "#f0fff0" : "#ffdae0") : "#FBFBFB" + palette.highlight : _verificationPasswordField.text.length ? "#dcffdc" : "#FBFBFB" echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - - background: Rectangle { - opacity: 0.9 - //border.color: _verificationpasswordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.passwordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _verificationPasswordField.text.length ? ( config.userPasswordSecondaryChanged ? "#f0fff0" : "#ffdae0") : "#FBFBFB" - } } } @@ -208,6 +191,14 @@ Kirigami.ScrollablePage { } } + Kirigami.InlineMessage { + id: passMessage + Layout.fillWidth: true + visible: false + type: Kirigami.MessageType.Error + text: qsTr("Your passwords do not match!") + } + CheckBox { id: root visible: config.writeRootPassword @@ -245,16 +236,12 @@ Kirigami.ScrollablePage { placeholderText: qsTr("Root Password") text: config.rootPassword onTextChanged: config.setRootPassword(text) + palette.base: _rootPasswordField.text.length ? "#f0fff0" : "#FBFBFB" + palette.highlight : _rootPasswordField.text.length ? "#dcffdc" : "#FBFBFB" echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - - background: Rectangle { - opacity: 0.9 - //border.color: _rootPasswordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.rootPasswordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _rootPasswordField.text.length ? ( config.rootPasswordReady ? "#f0fff0" : "#ffdae0") : "#FBFBFB" - } } TextField { @@ -262,17 +249,14 @@ Kirigami.ScrollablePage { width: parent.width / 2 -10 placeholderText: qsTr("Repeat Root Password") text: config.rootPasswordSecondary - onTextChanged: config.setRootPasswordSecondary(text) + //onTextChanged: config.setRootPasswordSecondary(text) + onTextChanged: _rootPasswordField.text === _verificationRootPasswordField.text ? (config.setRootPasswordSecondary(text),rootPassMessage.visible = false) : rootPassMessage.visible = true + palette.base: _verificationRootPasswordField.text.length ? ( _rootPasswordField.text === _verificationRootPasswordField.text ? "#f0fff0" : "#ffdae0") : "#FBFBFB" + palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : "#FBFBFB" echoMode: TextInput.Password passwordMaskDelay: 300 inputMethodHints: Qt.ImhNoAutoUppercase - - background: Rectangle { - opacity: 0.9 - //border.color: _verificationRootPasswordField.text === "" ? Kirigami.Theme.backgroundColor : ( config.rootPasswordReady ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeTextColor) - color: _verificationRootPasswordField.text.length ? ( config.rootPasswordReady ? "#f0fff0" : "#ffdae0") : "#FBFBFB" - } } } @@ -286,6 +270,14 @@ Kirigami.ScrollablePage { } } + Kirigami.InlineMessage { + id: rootPassMessage + Layout.fillWidth: true + visible: false + type: Kirigami.MessageType.Error + text: qsTr("Your passwords do not match!") + } + CheckBox { Layout.alignment: Qt.AlignCenter text: qsTr("Log in automatically without asking for the password") From ce699d8e3d4d88079ca205fac1ab3a261ca8fde7 Mon Sep 17 00:00:00 2001 From: demmm Date: Wed, 30 Jun 2021 22:29:32 +0200 Subject: [PATCH 241/492] [usersq] add warnings for forbidden names root & localhost set as forbidden in loginname & hostname --- src/modules/usersq/usersq.qml | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index fbd748f11f..064ffcc342 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -77,9 +77,9 @@ Kirigami.ScrollablePage { placeholderText: qsTr("Login Name") text: config.loginName validator: RegularExpressionValidator { regularExpression: /[a-z_][a-z0-9_-]*[$]?$/ } - onTextChanged: acceptableInput ? ( config.setLoginName(text),userMessage.visible = false ) : ( userMessage.visible = true,console.log("Invalid") ) + onTextChanged: acceptableInput ? ( _userLoginField.text === "root" ? forbiddenMessage.visible=true : ( config.setLoginName(text),userMessage.visible = false,forbiddenMessage.visible=false ) ) : ( userMessage.visible = true,console.log("Invalid") ) - palette.base: _userLoginField.text.length ? "#f0fff0" : "#FBFBFB" + palette.base: _userLoginField.text.length ? ( acceptableInput ? ( _userLoginField.text === "root" ? "#ffdae0" : "#f0fff0" ) : "#ffdae0") : "#FBFBFB" palette.highlight : _userLoginField.text.length ? "#dcffdc" : "#FBFBFB" } @@ -97,7 +97,15 @@ Kirigami.ScrollablePage { Layout.fillWidth: true visible: false type: Kirigami.MessageType.Error - text: qsTr("Your username must start with a lowercase letter or underscore, minimal of two characters.") + text: qsTr("Only lowercase letters, numbers, underscore and hyphen are allowed.") + } + + Kirigami.InlineMessage { + id: forbiddenMessage + Layout.fillWidth: true + visible: false + type: Kirigami.MessageType.Error + text: qsTr("root is not allowed as username.") } Column { @@ -115,9 +123,9 @@ Kirigami.ScrollablePage { placeholderText: qsTr("Computer Name") text: config.hostName validator: RegularExpressionValidator { regularExpression: /[a-zA-Z0-9][-a-zA-Z0-9_]+/ } - onTextChanged: acceptableInput ? (config.setHostName(text),hostMessage.visible = false) : hostMessage.visible = true + onTextChanged: acceptableInput ? ( _hostName.text === "localhost" ? forbiddenHost.visible=true : (config.setHostName(text),hostMessage.visible = false,forbiddenHost.visible = false) ) : hostMessage.visible = true - palette.base: _hostName.text.length ? ( acceptableInput ? "#f0fff0" : "#ffdae0") : "#FBFBFB" + palette.base: _hostName.text.length ? ( acceptableInput ? ( _hostName.text === "localhost" ? "#ffdae0" : "#f0fff0" ) : "#ffdae0") : "#FBFBFB" palette.highlight : _hostName.text.length ? "#dcffdc" : "#FBFBFB" } @@ -138,6 +146,14 @@ Kirigami.ScrollablePage { text: qsTr("Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.") } + Kirigami.InlineMessage { + id: forbiddenHost + Layout.fillWidth: true + visible: false + type: Kirigami.MessageType.Error + text: qsTr("localhost is not allowed as hostname.") + } + Column { Layout.fillWidth: true spacing: Kirigami.Units.smallSpacing @@ -251,6 +267,7 @@ Kirigami.ScrollablePage { text: config.rootPasswordSecondary //onTextChanged: config.setRootPasswordSecondary(text) onTextChanged: _rootPasswordField.text === _verificationRootPasswordField.text ? (config.setRootPasswordSecondary(text),rootPassMessage.visible = false) : rootPassMessage.visible = true + palette.base: _verificationRootPasswordField.text.length ? ( _rootPasswordField.text === _verificationRootPasswordField.text ? "#f0fff0" : "#ffdae0") : "#FBFBFB" palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : "#FBFBFB" From a156d2e63ff54215da74c2558c8b58d8adb14b7e Mon Sep 17 00:00:00 2001 From: demmm Date: Sat, 3 Jul 2021 00:10:31 +0200 Subject: [PATCH 242/492] [usersq] working password validity check kirigami inlinemessages adjusted for password fields coding style, break lines in variables add closing button for root password inline message, needed bc of re-use root password option does not remove all messages --- src/modules/usersq/usersq.qml | 89 ++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 13 deletions(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index 064ffcc342..0654c46196 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -55,7 +55,8 @@ Kirigami.ScrollablePage { enabled: config.isEditable("fullName") placeholderText: qsTr("Your Full Name") text: config.fullName - onTextChanged: config.setFullName(text); + onTextChanged: config.setFullName(text) + palette.base: _userNameField.text.length ? "#f0fff0" : "#FBFBFB" palette.highlight : _userNameField.text.length ? "#dcffdc" : "#FBFBFB" } @@ -77,9 +78,18 @@ Kirigami.ScrollablePage { placeholderText: qsTr("Login Name") text: config.loginName validator: RegularExpressionValidator { regularExpression: /[a-z_][a-z0-9_-]*[$]?$/ } - onTextChanged: acceptableInput ? ( _userLoginField.text === "root" ? forbiddenMessage.visible=true : ( config.setLoginName(text),userMessage.visible = false,forbiddenMessage.visible=false ) ) : ( userMessage.visible = true,console.log("Invalid") ) - palette.base: _userLoginField.text.length ? ( acceptableInput ? ( _userLoginField.text === "root" ? "#ffdae0" : "#f0fff0" ) : "#ffdae0") : "#FBFBFB" + onTextChanged: acceptableInput + ? ( _userLoginField.text === "root" + ? forbiddenMessage.visible=true + : ( config.setLoginName(text), + userMessage.visible = false,forbiddenMessage.visible=false ) ) + : ( userMessage.visible = true,console.log("Invalid") ) + + palette.base: _userLoginField.text.length + ? ( acceptableInput + ? ( _userLoginField.text === "root" + ? "#ffdae0" : "#f0fff0" ) : "#ffdae0" ) : "#FBFBFB" palette.highlight : _userLoginField.text.length ? "#dcffdc" : "#FBFBFB" } @@ -123,9 +133,19 @@ Kirigami.ScrollablePage { placeholderText: qsTr("Computer Name") text: config.hostName validator: RegularExpressionValidator { regularExpression: /[a-zA-Z0-9][-a-zA-Z0-9_]+/ } - onTextChanged: acceptableInput ? ( _hostName.text === "localhost" ? forbiddenHost.visible=true : (config.setHostName(text),hostMessage.visible = false,forbiddenHost.visible = false) ) : hostMessage.visible = true - palette.base: _hostName.text.length ? ( acceptableInput ? ( _hostName.text === "localhost" ? "#ffdae0" : "#f0fff0" ) : "#ffdae0") : "#FBFBFB" + onTextChanged: acceptableInput + ? ( _hostName.text === "localhost" + ? forbiddenHost.visible=true + : ( config.setHostName(text), + hostMessage.visible = false,forbiddenHost.visible = false ) ) + : hostMessage.visible = true + + palette.base: _hostName.text.length + ? ( acceptableInput + ? ( _hostName.text === "localhost" ? "#ffdae0" : "#f0fff0" ) + : "#ffdae0") + : "#FBFBFB" palette.highlight : _hostName.text.length ? "#dcffdc" : "#FBFBFB" } @@ -173,6 +193,7 @@ Kirigami.ScrollablePage { placeholderText: qsTr("Password") text: config.userPassword onTextChanged: config.setUserPassword(text) + palette.base: _passwordField.text.length ? "#f0fff0" : "#FBFBFB" palette.highlight : _passwordField.text.length ? "#dcffdc" : "#FBFBFB" @@ -186,9 +207,18 @@ Kirigami.ScrollablePage { width: parent.width / 2 - 10 placeholderText: qsTr("Repeat Password") text: config.userPasswordSecondary - onTextChanged: _passwordField.text === _verificationPasswordField.text ? (config.setUserPasswordSecondary(text),passMessage.visible = false) : passMessage.visible = true - palette.base: _verificationPasswordField.text.length ? ( _passwordField.text === _verificationPasswordField.text ? "#f0fff0" : "#ffdae0") : "#FBFBFB" + onTextChanged: _passwordField.text === _verificationPasswordField.text + ? ( config.setUserPasswordSecondary(text), + passMessage.visible = false, + validityMessage.visible = true ) + : ( passMessage.visible = true, + validityMessage.visible = false ) + + palette.base: _verificationPasswordField.text.length + ? ( _passwordField.text === _verificationPasswordField.text + ? "#f0fff0" : "#ffdae0" ) + : "#FBFBFB" palette.highlight : _verificationPasswordField.text.length ? "#dcffdc" : "#FBFBFB" echoMode: TextInput.Password @@ -212,7 +242,18 @@ Kirigami.ScrollablePage { Layout.fillWidth: true visible: false type: Kirigami.MessageType.Error - text: qsTr("Your passwords do not match!") + text: config.userPasswordMessage + } + + Kirigami.InlineMessage { + id: validityMessage + Layout.fillWidth: true + visible: false + type: config.userPasswordValidity + ? ( config.requireStrongPasswords + ? Kirigami.MessageType.Error : Kirigami.MessageType.Warning ) + : Kirigami.MessageType.Positive + text: config.userPasswordMessage } CheckBox { @@ -251,7 +292,9 @@ Kirigami.ScrollablePage { width: parent.width / 2 -10 placeholderText: qsTr("Root Password") text: config.rootPassword + onTextChanged: config.setRootPassword(text) + palette.base: _rootPasswordField.text.length ? "#f0fff0" : "#FBFBFB" palette.highlight : _rootPasswordField.text.length ? "#dcffdc" : "#FBFBFB" @@ -265,10 +308,17 @@ Kirigami.ScrollablePage { width: parent.width / 2 -10 placeholderText: qsTr("Repeat Root Password") text: config.rootPasswordSecondary - //onTextChanged: config.setRootPasswordSecondary(text) - onTextChanged: _rootPasswordField.text === _verificationRootPasswordField.text ? (config.setRootPasswordSecondary(text),rootPassMessage.visible = false) : rootPassMessage.visible = true - palette.base: _verificationRootPasswordField.text.length ? ( _rootPasswordField.text === _verificationRootPasswordField.text ? "#f0fff0" : "#ffdae0") : "#FBFBFB" + onTextChanged: _rootPasswordField.text === _verificationRootPasswordField.text + ? ( config.setRootPasswordSecondary(text), + rootPassMessage.visible = false, + rootValidityMessage.visible = true ) + : ( rootPassMessage.visible = true, + rootValidityMessage.visible = false ) + + palette.base: _verificationRootPasswordField.text.length + ? ( _rootPasswordField.text === _verificationRootPasswordField.text + ? "#f0fff0" : "#ffdae0") : "#FBFBFB" palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : "#FBFBFB" echoMode: TextInput.Password @@ -292,7 +342,19 @@ Kirigami.ScrollablePage { Layout.fillWidth: true visible: false type: Kirigami.MessageType.Error - text: qsTr("Your passwords do not match!") + text: config.rootPasswordMessage + } + + Kirigami.InlineMessage { + id: rootValidityMessage + Layout.fillWidth: true + showCloseButton: true + visible: false + type: config.rootPasswordValidity + ? ( config.requireStrongPasswords + ? Kirigami.MessageType.Error : Kirigami.MessageType.Warning ) + : Kirigami.MessageType.Positive + text: config.rootPasswordMessage } CheckBox { @@ -307,7 +369,8 @@ Kirigami.ScrollablePage { Layout.alignment: Qt.AlignCenter text: qsTr("Validate passwords quality") checked: config.requireStrongPasswords - onCheckedChanged: config.setRequireStrongPasswords(checked) + onCheckedChanged: config.setRequireStrongPasswords(checked), + rootPassMessage.visible = false } Label { From fce798dadf74bfb4d2e7c2e6270bbdfe47b1140a Mon Sep 17 00:00:00 2001 From: demmm Date: Sat, 3 Jul 2021 14:21:07 +0200 Subject: [PATCH 243/492] [users] add an OK message to password message fields empty text box on all good status in usersq is confusing --- src/modules/users/Config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 6560d06ac3..b19d29e6af 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -545,7 +545,7 @@ Config::passwordStatus( const QString& pw1, const QString& pw2 ) const } } - return qMakePair( PasswordValidity::Valid, QString() ); + return qMakePair( PasswordValidity::Valid, tr( "OK!" ) ); } From 8b561a29f51cdaf1e9f048449d2b79ffb3e14a86 Mon Sep 17 00:00:00 2001 From: demmm Date: Sat, 3 Jul 2021 14:23:01 +0200 Subject: [PATCH 244/492] [usersq] add close button to all password message fields --- src/modules/usersq/usersq.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index 0654c46196..2eb4be1e16 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -240,6 +240,7 @@ Kirigami.ScrollablePage { Kirigami.InlineMessage { id: passMessage Layout.fillWidth: true + showCloseButton: true visible: false type: Kirigami.MessageType.Error text: config.userPasswordMessage @@ -248,6 +249,7 @@ Kirigami.ScrollablePage { Kirigami.InlineMessage { id: validityMessage Layout.fillWidth: true + showCloseButton: true visible: false type: config.userPasswordValidity ? ( config.requireStrongPasswords @@ -340,6 +342,7 @@ Kirigami.ScrollablePage { Kirigami.InlineMessage { id: rootPassMessage Layout.fillWidth: true + showCloseButton: true visible: false type: Kirigami.MessageType.Error text: config.rootPasswordMessage From 6a7a486b8cf43462ad717378a2e61a184e048732 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 5 Jul 2021 12:28:17 +0200 Subject: [PATCH 245/492] [partition] Document interactions between defaultFS and layout --- src/modules/partition/partition.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index 61e9553757..3213e0d338 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -215,7 +215,12 @@ availableFileSystemTypes: ["ext4", "btrfs", "f2fs"] # - uuid: partition uuid (optional parameter; gpt only; requires KPMCore >= 4.2.0) # - type: partition type (optional parameter; gpt only; requires KPMCore >= 4.2.0) # - attributes: partition attributes (optional parameter; gpt only; requires KPMCore >= 4.2.0) -# - filesystem: filesystem type (optional parameter; fs not created if "unformatted" or unset) +# - filesystem: filesystem type (optional parameter) +# - if not set at all, treat as "unformatted" +# - if "unformatted", no filesystem will be created +# - if "unknown" (or an unknown FS name, like "elephant") then the +# default filesystem type, or the user's choice, will be applied instead +# of "unknown" (e.g. the user might pick ext4, or xfs). # - mountPoint: partition mount point (optional parameter; not mounted if unset) # - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB) # or From 7ea67688526ac61e373dcf66fba5b7f3a9fbef29 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 5 Jul 2021 12:39:56 +0200 Subject: [PATCH 246/492] [partition] Pick slightly more sensible defaults for FS selection --- src/modules/partition/partition.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index 3213e0d338..899eb6269d 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -147,7 +147,10 @@ defaultFileSystemType: "ext4" # # The value *defaultFileSystemType* is added to this list (with a warning) # if not present; the default pick is the *defaultFileSystemType*. -availableFileSystemTypes: ["ext4", "btrfs", "f2fs"] +# +# If not specified at all, uses *defaultFileSystemType* without a +# warning (this matches traditional no-choice-available behavior best). +# availableFileSystemTypes: ["ext4","f2fs"] # Show/hide LUKS related functionality in automated partitioning modes. # Disable this if you choose not to deploy early unlocking support in GRUB2 From 1a542d3afee65a70e99647ea4bade196440208b1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 5 Jul 2021 13:11:00 +0200 Subject: [PATCH 247/492] [partition] Write out type rather than aliasing to T --- src/modules/partition/PartitionViewStep.cpp | 9 ++- .../partition/core/PartitionLayout.cpp | 74 +++++++++---------- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index fc6b3e50c9..3f57050aab 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -432,14 +432,15 @@ PartitionViewStep::onLeave() { if ( PartUtils::isEfiSystem() ) { - QString espMountPoint + const QString espMountPoint = Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); + const QString espFlagName = PartitionTable::flagName( #ifdef WITH_KPMCORE4API - auto espFlag = PartitionTable::Flag::Boot; + PartitionTable::Flag::Boot #else - auto espFlag = PartitionTable::FlagEsp; + PartitionTable::FlagEsp #endif - QString espFlagName = PartitionTable::flagName( espFlag ); + ); Partition* esp = m_core->findPartitionByMountPoint( espMountPoint ); QString message; diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index a8ed206d87..61e7d2fdc5 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -140,55 +140,55 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi void PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType) { - using T = FileSystem::Type; + using FileSystem = FileSystem::Type; switch ( defaultFsType ) { - case T::Unknown: - case T::Unformatted: - case T::Extended: - case T::LinuxSwap: - case T::Luks: - case T::Ocfs2: - case T::Lvm2_PV: - case T::Udf: - case T::Iso9660: - case T::Luks2: - case T::LinuxRaidMember: - case T::BitLocker: + case FileSystem::Unknown: + case FileSystem::Unformatted: + case FileSystem::Extended: + case FileSystem::LinuxSwap: + case FileSystem::Luks: + case FileSystem::Ocfs2: + case FileSystem::Lvm2_PV: + case FileSystem::Udf: + case FileSystem::Iso9660: + case FileSystem::Luks2: + case FileSystem::LinuxRaidMember: + case FileSystem::BitLocker: // bad bad cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead."; - defaultFsType = T::Ext4; + defaultFsType = FileSystem::Ext4; break; - case T::Ext2: - case T::Ext3: - case T::Ext4: - case T::Fat32: - case T::Ntfs: - case T::Reiser4: - case T::ReiserFS: - case T::Xfs: - case T::Jfs: - case T::Btrfs: - case T::Exfat: - case T::F2fs: + case FileSystem::Ext2: + case FileSystem::Ext3: + case FileSystem::Ext4: + case FileSystem::Fat32: + case FileSystem::Ntfs: + case FileSystem::Reiser4: + case FileSystem::ReiserFS: + case FileSystem::Xfs: + case FileSystem::Jfs: + case FileSystem::Btrfs: + case FileSystem::Exfat: + case FileSystem::F2fs: // ok break; - case T::Fat12: - case T::Fat16: - case T::Hfs: - case T::HfsPlus: - case T::Ufs: - case T::Hpfs: - case T::Zfs: - case T::Nilfs2: - case T::Apfs: - case T::Minix: + case FileSystem::Fat12: + case FileSystem::Fat16: + case FileSystem::Hfs: + case FileSystem::HfsPlus: + case FileSystem::Ufs: + case FileSystem::Hpfs: + case FileSystem::Zfs: + case FileSystem::Nilfs2: + case FileSystem::Apfs: + case FileSystem::Minix: // weird cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong."; break; default: cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares." << "Using ext4 instead."; - defaultFsType = T::Ext4; + defaultFsType = FileSystem::Ext4; } m_defaultFsType = defaultFsType; From b5c56fd579f0ed5577f516b2a2a11b5781b96fb0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 5 Jul 2021 13:33:09 +0200 Subject: [PATCH 248/492] [partition] Clarify comments on boot-flags --- src/modules/partition/core/PartUtils.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 2f269d37f7..22e84a09c9 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -451,13 +451,12 @@ isEfiBootable( const Partition* candidate ) { const auto flags = PartitionInfo::flags( candidate ); - // TODO: with KPMCore 4, this comment is wrong: the flags - // are remapped, and the ESP flag is the same as Boot. #if defined( WITH_KPMCORE4API ) + // In KPMCore4, the flags are remapped, and the ESP flag is the same as Boot. static_assert( KPM_PARTITION_FLAG_ESP == KPM_PARTITION_FLAG( Boot ), "KPMCore API enum changed" ); return flags.testFlag( KPM_PARTITION_FLAG_ESP ); #else - /* If bit 17 is set, old-style Esp flag, it's OK */ + // In KPMCore3, bit 17 is the old-style Esp flag, and it's OK if ( flags.testFlag( KPM_PARTITION_FLAG_ESP ) ) { return true; From a4fadcd9be71fec09b5de17f5d12ec46dd25cd5e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Jul 2021 12:54:25 +0200 Subject: [PATCH 249/492] [partition] Introduce check for EFI partition type-and-size Re-use the existing message about partition type and size, since I don't want to introduce another message with all the specifics; give a works-always message instead. The check itself is also straightforward, avoiding all of the nuances and technically-this-might-work cases: FAT32, 300MiB+. FIXES #607 --- src/modules/partition/PartitionViewStep.cpp | 2 +- src/modules/partition/core/PartUtils.cpp | 28 +++++++++++++++++++++ src/modules/partition/core/PartUtils.h | 6 +++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index 3f57050aab..015aab2ce4 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -445,7 +445,7 @@ PartitionViewStep::onLeave() QString message; QString description; - if ( !esp ) + if ( !esp || ( esp && !PartUtils::isEfiFilesystemSuitable( esp ) ) ) { message = tr( "No EFI system partition configured" ); description = tr( "An EFI system partition is necessary to start %1." diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 22e84a09c9..5b8572189b 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -446,6 +446,34 @@ isEfiSystem() return QDir( "/sys/firmware/efi/efivars" ).exists(); } +bool +isEfiFilesystemSuitable(const Partition* candidate) +{ + auto type = candidate->fileSystem().type(); + auto size = candidate->capacity(); // bytes + + using CalamaresUtils::Units::operator""_MiB; + + switch( type ) + { + case FileSystem::Type::Fat32: + if ( size >= 300_MiB ) + { + return true; + } + cWarning() << "FAT32 filesystem is too small (" << size << "bytes)"; + return false; + case FileSystem::Type::Fat12: + case FileSystem::Type::Fat16: + cWarning() << "FAT12 and FAT16 are probably not supported by EFI"; + return false; + default: + cWarning() << "EFI boot partition must be FAT32"; + return false; + } +} + + bool isEfiBootable( const Partition* candidate ) { diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h index 5e84e379ba..6bf2239212 100644 --- a/src/modules/partition/core/PartUtils.h +++ b/src/modules/partition/core/PartUtils.h @@ -82,6 +82,12 @@ OsproberEntryList runOsprober( DeviceModel* dm ); */ bool isEfiSystem(); +/** + * @brief Is the @p partition suitable as an EFI boot partition? + * Checks for filesystem type (FAT32) and size (300MiB at least). + */ +bool isEfiFilesystemSuitable( const Partition* candidate ); + /** * @brief Is the given @p partition bootable in EFI? Depending on * the partition table layout, this may mean different flags. From 96c2c624707c6d84a9074d2eb7620cc5e504bc99 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Jul 2021 12:59:01 +0200 Subject: [PATCH 250/492] [partition] Fix build on older KPMCore --- src/modules/partition/core/PartUtils.cpp | 2 ++ src/modules/partition/core/PartitionLayout.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 5b8572189b..4beac0db8a 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -463,7 +463,9 @@ isEfiFilesystemSuitable(const Partition* candidate) } cWarning() << "FAT32 filesystem is too small (" << size << "bytes)"; return false; +#ifdef WITH_KPMCORE4API case FileSystem::Type::Fat12: +#endif case FileSystem::Type::Fat16: cWarning() << "FAT12 and FAT16 are probably not supported by EFI"; return false; diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index 61e7d2fdc5..233f5117a3 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -152,9 +152,11 @@ PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType) case FileSystem::Lvm2_PV: case FileSystem::Udf: case FileSystem::Iso9660: +#ifdef WITH_KPMCORE4API case FileSystem::Luks2: case FileSystem::LinuxRaidMember: case FileSystem::BitLocker: +#endif // bad bad cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead."; defaultFsType = FileSystem::Ext4; @@ -173,7 +175,6 @@ PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType) case FileSystem::F2fs: // ok break; - case FileSystem::Fat12: case FileSystem::Fat16: case FileSystem::Hfs: case FileSystem::HfsPlus: @@ -181,8 +182,11 @@ PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType) case FileSystem::Hpfs: case FileSystem::Zfs: case FileSystem::Nilfs2: +#ifdef WITH_KPMCORE4API + case FileSystem::Fat12: case FileSystem::Apfs: case FileSystem::Minix: +#endif // weird cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong."; break; From 3531896892da84a60723fb98ca1d58805505d290 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Jul 2021 15:31:00 +0200 Subject: [PATCH 251/492] [mount] Factor out the default btrfs configuration --- src/modules/mount/main.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 5e5233935e..8f019f1a31 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -29,6 +29,24 @@ def pretty_name(): return _("Mounting partitions.") + +def get_btrfs_subvolumes(): + """ + Gets the job-configuration for btrfs subvolumes, or if there is + none given, returns a default configuration that matches + the setup (/ and /home) from before configurability was introduced. + """ + btrfs_subvolumes = libcalamares.job.configuration.get("btrfsSubvolumes", None) + # Warn if there's no configuration at all, and empty configurations are + # replaced by a simple root-only layout. + if btrfs_subvolumes is None: + libcalamares.utils.warning("No configuration for btrfsSubvolumes") + if not btrfs_subvolumes: + btrfs_subvolumes = [ dict(mountPoint="/", subvolume="/@") ] + + return btrfs_subvolumes + + def mount_partition(root_mount_point, partition, partitions): """ Do a single mount of @p partition inside @p root_mount_point. @@ -74,13 +92,7 @@ def mount_partition(root_mount_point, partition, partitions): # Special handling for btrfs subvolumes. Create the subvolumes listed in mount.conf if fstype == "btrfs" and partition["mountPoint"] == '/': # Root has been mounted to btrfs volume -> create subvolumes from configuration - btrfs_subvolumes = libcalamares.job.configuration.get("btrfsSubvolumes", None) - # Warn if there's no configuration at all, and empty configurations are - # replaced by a simple root-only layout. - if btrfs_subvolumes is None: - libcalamares.utils.warning("No configuration for btrfsSubvolumes") - if not btrfs_subvolumes: - btrfs_subvolumes = [ dict(mountPoint="/", subvolume="/@") ] + btrfs_subvolumes = get_btrfs_subvolumes() subvolume_mountpoints = [d['mountPoint'] for d in btrfs_subvolumes] # Check if listed mountpoints besides / are already present and don't create subvolume for those From 6b2088c94e72d739862606060d48ba122bcb54c4 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Jul 2021 15:34:13 +0200 Subject: [PATCH 252/492] [mount] Restore @home subvolume In 942221c764a8622c9b23d29b1db291404af0f63b the fixed-setup (with /@ and /@home) was replaced by the configurable btrfs layout, but the default went away. Restore the two-subvolume layout if nothing is configured. --- src/modules/mount/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 8f019f1a31..50eba72cbe 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -42,7 +42,7 @@ def get_btrfs_subvolumes(): if btrfs_subvolumes is None: libcalamares.utils.warning("No configuration for btrfsSubvolumes") if not btrfs_subvolumes: - btrfs_subvolumes = [ dict(mountPoint="/", subvolume="/@") ] + btrfs_subvolumes = [ dict(mountPoint="/", subvolume="/@"), dict(mountPoint="/home", subvolume="/@home") ] return btrfs_subvolumes From cc357140e569d7ea9293d1ceb6a73a51dd491518 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Jul 2021 16:43:56 +0200 Subject: [PATCH 253/492] [mount] Factor out the subvolume-filtering for partitions --- src/modules/mount/main.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 50eba72cbe..1a97718b0a 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -30,11 +30,16 @@ def pretty_name(): return _("Mounting partitions.") -def get_btrfs_subvolumes(): +def get_btrfs_subvolumes(partitions): """ Gets the job-configuration for btrfs subvolumes, or if there is none given, returns a default configuration that matches the setup (/ and /home) from before configurability was introduced. + + @param partitions + The partitions (from the partitioning module) that will exist on disk. + This is used to filter out subvolumes that don't need to be created + because they get a dedicated partition instead. """ btrfs_subvolumes = libcalamares.job.configuration.get("btrfsSubvolumes", None) # Warn if there's no configuration at all, and empty configurations are @@ -44,6 +49,10 @@ def get_btrfs_subvolumes(): if not btrfs_subvolumes: btrfs_subvolumes = [ dict(mountPoint="/", subvolume="/@"), dict(mountPoint="/home", subvolume="/@home") ] + # Filter out the subvolumes which have a dedicated partition + non_root_partition_mounts = [ m for m in [ p.get("mountPoint", None) for p in partitions ] if m is not None and m != '/' ] + btrfs_subvolumes = filter(lambda s : s["mountPoint"] in non_root_partition_mounts, btrfs_subvolumes) + return btrfs_subvolumes @@ -92,15 +101,8 @@ def mount_partition(root_mount_point, partition, partitions): # Special handling for btrfs subvolumes. Create the subvolumes listed in mount.conf if fstype == "btrfs" and partition["mountPoint"] == '/': # Root has been mounted to btrfs volume -> create subvolumes from configuration - btrfs_subvolumes = get_btrfs_subvolumes() - - subvolume_mountpoints = [d['mountPoint'] for d in btrfs_subvolumes] - # Check if listed mountpoints besides / are already present and don't create subvolume for those - for p in partitions: - if "mountPoint" not in p or not p["mountPoint"]: - continue - if p["mountPoint"] in subvolume_mountpoints and p["mountPoint"] != '/': - btrfs_subvolumes = [d for d in btrfs_subvolumes if d['mountPoint'] != p["mountPoint"]] + btrfs_subvolumes = get_btrfs_subvolumes(partitions) + # Check if we need a subvolume for swap file swap_choice = global_storage.value( "partitionChoices" ) if swap_choice: From e800b2da2d35c6720973fc0437c6160340baf577 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 6 Jul 2021 16:48:46 +0200 Subject: [PATCH 254/492] [mount] Factor out swap-subvolume setting --- src/modules/mount/main.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 1a97718b0a..f5faad7d1f 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -53,6 +53,11 @@ def get_btrfs_subvolumes(partitions): non_root_partition_mounts = [ m for m in [ p.get("mountPoint", None) for p in partitions ] if m is not None and m != '/' ] btrfs_subvolumes = filter(lambda s : s["mountPoint"] in non_root_partition_mounts, btrfs_subvolumes) + # If we have a swap **file**, give it a separate subvolume. + swap_choice = libcalamares.globalstorage.value( "partitionChoices" ) + if swap_choice and swap_choice.get( "swap", None ) == "file": + btrfs_subvolumes.append({'mountPoint': '/swap', 'subvolume': '/@swap'}) + return btrfs_subvolumes @@ -62,7 +67,6 @@ def mount_partition(root_mount_point, partition, partitions): """ # Create mount point with `+` rather than `os.path.join()` because # `partition["mountPoint"]` starts with a '/'. - global_storage = libcalamares.globalstorage raw_mount_point = partition["mountPoint"] if not raw_mount_point: return @@ -103,12 +107,6 @@ def mount_partition(root_mount_point, partition, partitions): # Root has been mounted to btrfs volume -> create subvolumes from configuration btrfs_subvolumes = get_btrfs_subvolumes(partitions) - # Check if we need a subvolume for swap file - swap_choice = global_storage.value( "partitionChoices" ) - if swap_choice: - swap_choice = swap_choice.get( "swap", None ) - if swap_choice and swap_choice == "file": - btrfs_subvolumes.append({'mountPoint': '/swap', 'subvolume': '/@swap'}) # Store created list in global storage so it can be used in the fstab module libcalamares.globalstorage.insert("btrfsSubvolumes", btrfs_subvolumes) # Create the subvolumes that are in the completed list From 6388b41e6c69f3fdca172bb6dce1ad770801923b Mon Sep 17 00:00:00 2001 From: demmm Date: Tue, 6 Jul 2021 18:59:58 +0200 Subject: [PATCH 255/492] [partition] adding prettyStatus will be used in summaryq, reading from widgets not an option section probably better suited for Config.cpp/h, since quite a bit of duplicated code from createSummaryWidget --- src/modules/partition/PartitionViewStep.cpp | 90 +++++++++++++++++++++ src/modules/partition/PartitionViewStep.h | 1 + 2 files changed, 91 insertions(+) diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index 015aab2ce4..8881d45693 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -109,6 +109,96 @@ PartitionViewStep::prettyName() const return tr( "Partitions" ); } +QString +PartitionViewStep::prettyStatus() const +{ + //return tr( "Create new GPT partition table on /dev/sdb" ); //includes %1" ); .arg ( m_pkgc ); + QString jobsLabel, modeText, diskInfoLabel; + + Config::InstallChoice choice = m_config->installChoice(); + const auto* branding = Calamares::Branding::instance(); + + QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo(); + + cDebug() << "Summary for Partition" << list.length() << choice; + if ( list.length() > 1 ) // There are changes on more than one disk + { +// NOTE: all of this should only happen when Manual partitioning is active. +// Any other choice should result in a list.length() == 1. + switch ( choice ) + { + case Config::Alongside: + modeText = tr( "Install %1 alongside another operating system." ) + .arg( branding->shortVersionedName() ); + break; + case Config::Erase: + modeText + = tr( "Erase disk and install %1." ).arg( branding->shortVersionedName() ); + break; + case Config::Replace: + modeText + = tr( "Replace a partition with %1." ).arg( branding->shortVersionedName() ); + break; + case Config::NoChoice: + case Config::Manual: + modeText = tr( "Manual partitioning." ); + } + } + + for ( const auto& info : list ) + { + if ( list.length() == 1 ) // this is the only disk preview + { + switch ( choice ) + { + case Config::Alongside: + diskInfoLabel = tr( "Install %1 alongside another operating system on disk " + "%2 (%3)." ) + .arg( branding->shortVersionedName() ) + .arg( info.deviceNode ) + .arg( info.deviceName ); + break; + case Config::Erase: + diskInfoLabel = tr( "Erase disk %2 (%3) and install %1." ) + .arg( branding->shortVersionedName() ) + .arg( info.deviceNode ) + .arg( info.deviceName ); + break; + case Config::Replace: + diskInfoLabel = tr( "Replace a partition on disk %2 (%3) with %1." ) + .arg( branding->shortVersionedName() ) + .arg( info.deviceNode ) + .arg( info.deviceName ); + break; + case Config::NoChoice: + case Config::Manual: + diskInfoLabel = tr( "Manual partitioning on disk %1 (%2)." ) + .arg( info.deviceNode ) + .arg( info.deviceName ); + } + } + else // multiple disk previews! + { + diskInfoLabel = tr( "Disk %1 (%2)" ).arg( info.deviceNode ).arg( info.deviceName ) ; + } + } + + QStringList jobsLines; + foreach ( const Calamares::job_ptr& job, jobs() ) + { + if ( !job->prettyDescription().isEmpty() ) + { + jobsLines.append( job->prettyDescription() ); + } + } + if ( !jobsLines.isEmpty() ) + { + jobsLabel = jobsLines.join( "
" ); + } + + return diskInfoLabel + "
" + jobsLabel; +} + QWidget* PartitionViewStep::widget() diff --git a/src/modules/partition/PartitionViewStep.h b/src/modules/partition/PartitionViewStep.h index 9f3da9f3da..ecba73f45e 100644 --- a/src/modules/partition/PartitionViewStep.h +++ b/src/modules/partition/PartitionViewStep.h @@ -43,6 +43,7 @@ class PLUGINDLLEXPORT PartitionViewStep : public Calamares::ViewStep ~PartitionViewStep() override; QString prettyName() const override; + QString prettyStatus() const override; QWidget* createSummaryWidget() const override; QWidget* widget() override; From 6bb7df918dec074ea5193ba0453e8296325a3714 Mon Sep 17 00:00:00 2001 From: demmm Date: Tue, 6 Jul 2021 19:09:20 +0200 Subject: [PATCH 256/492] [summaryq] adding summaryq initial work done by Nitrux/Camilo Higuita in 2020, reflected in license headers C++ adjusted to make it build & work as noted in the inline comments https://github.com/KaOSx/calamares/commit/e80618ef1c90e955d5215ea7803943ce178ec9bb there are quite a few errors in the C++, but it builds, runs and shows the correct output --- src/modules/summaryq/CMakeLists.txt | 22 ++++ src/modules/summaryq/Config.cpp | 114 ++++++++++++++++++ src/modules/summaryq/Config.h | 75 ++++++++++++ src/modules/summaryq/SummaryQmlViewStep.cpp | 75 ++++++++++++ src/modules/summaryq/SummaryQmlViewStep.h | 55 +++++++++ src/modules/summaryq/img/keyboard.svg | 22 ++++ src/modules/summaryq/img/keyboard.svg.license | 2 + src/modules/summaryq/img/lokalize.svg | 39 ++++++ src/modules/summaryq/img/lokalize.svg.license | 2 + src/modules/summaryq/summaryq.qml | 112 +++++++++++++++++ src/modules/summaryq/summaryq.qrc | 7 ++ 11 files changed, 525 insertions(+) create mode 100644 src/modules/summaryq/CMakeLists.txt create mode 100644 src/modules/summaryq/Config.cpp create mode 100644 src/modules/summaryq/Config.h create mode 100644 src/modules/summaryq/SummaryQmlViewStep.cpp create mode 100644 src/modules/summaryq/SummaryQmlViewStep.h create mode 100644 src/modules/summaryq/img/keyboard.svg create mode 100644 src/modules/summaryq/img/keyboard.svg.license create mode 100644 src/modules/summaryq/img/lokalize.svg create mode 100644 src/modules/summaryq/img/lokalize.svg.license create mode 100644 src/modules/summaryq/summaryq.qml create mode 100644 src/modules/summaryq/summaryq.qrc diff --git a/src/modules/summaryq/CMakeLists.txt b/src/modules/summaryq/CMakeLists.txt new file mode 100644 index 0000000000..0df854140f --- /dev/null +++ b/src/modules/summaryq/CMakeLists.txt @@ -0,0 +1,22 @@ +if( NOT WITH_QML ) + calamares_skip_module( "summaryq (QML is not supported in this build)" ) + return() +endif() + +set( _summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary ) +include_directories( ${_finished} ) + +include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) +calamares_add_plugin( summaryq + TYPE viewmodule + EXPORT_MACRO PLUGINDLLEXPORT_PRO + SOURCES + SummaryQmlViewStep.cpp + Config.cpp + UI + RESOURCES + summaryq.qrc + LINK_PRIVATE_LIBRARIES + calamaresui + SHARED_LIB +) diff --git a/src/modules/summaryq/Config.cpp b/src/modules/summaryq/Config.cpp new file mode 100644 index 0000000000..64e43a0ba6 --- /dev/null +++ b/src/modules/summaryq/Config.cpp @@ -0,0 +1,114 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2020, Camilo Higuita + * SPDX-FileCopyrightText: 2021 Anke Boersma + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "Config.h" +#include "SummaryQmlViewStep.h" + +#include "Branding.h" +#include "Settings.h" +#include "ViewManager.h" + +#include "utils/CalamaresUtilsGui.h" +#include "utils/Logger.h" +#include "utils/Retranslator.h" +#include "viewpages/ExecutionViewStep.h" + +SummaryModel::SummaryModel(QObject* parent) : QAbstractListModel(parent) +{} + +QHash SummaryModel::roleNames() const +{ + return { { Qt::DisplayRole, "title" }, { Qt::UserRole, "message" } }; +} + +QVariant SummaryModel::data(const QModelIndex& index, int role) const +{ + if ( !index.isValid() ) + { + return QVariant(); + } + const auto item = m_summary.at( index.row() ); + return role == Qt::DisplayRole ? item->title : item->message; +} + +int SummaryModel::rowCount(const QModelIndex&) const +{ + return m_summary.count(); +} + +void SummaryModel::setSummary(const Calamares::ViewStepList& steps) +{ + m_summary.clear(); + Q_EMIT beginResetModel(); + + for ( Calamares::ViewStep* step : steps ) + { + QString text = step->prettyStatus(); + QWidget* widget = step->createSummaryWidget(); + + if ( text.isEmpty() && !widget ) + continue; + + m_summary << new StepSummary {step->prettyName(), text}; + + } + Q_EMIT endResetModel(); +} + +Config::Config(QObject *parent) : QObject(parent) +, m_thisViewStep(static_cast(parent)) +, m_summary( new SummaryModel(this) ) +{ + m_title = m_thisViewStep->prettyName(); + + if ( Calamares::Settings::instance()->isSetupMode() ) + m_message =( tr( "This is an overview of what will happen once you start " + "the setup procedure." ) ); + else + m_message = ( tr( "This is an overview of what will happen once you start " + "the install procedure." ) ); +} + +void Config::componentComplete() +{ + refresh(); +} + +void Config::refresh() +{ + m_summary->setSummary( stepsForSummary( Calamares::ViewManager::instance()->viewSteps() )); +} + +void Config::init() +{ + refresh(); +} + +Calamares::ViewStepList Config::stepsForSummary( const Calamares::ViewStepList& allSteps ) const +{ + Calamares::ViewStepList steps; + for ( Calamares::ViewStep* step : allSteps ) + { + if ( qobject_cast< Calamares::ExecutionViewStep* >( step ) ) + { + steps.clear(); + continue; + } + + if ( m_thisViewStep == step ) + break; + + steps.append( step ); + } + + return steps; +} + + diff --git a/src/modules/summaryq/Config.h b/src/modules/summaryq/Config.h new file mode 100644 index 0000000000..162ff2c5f6 --- /dev/null +++ b/src/modules/summaryq/Config.h @@ -0,0 +1,75 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019-2020, Adriaan de Groot + * SPDX-FileCopyrightText: 2020, Camilo Higuita + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef SUMMARY_CONFIG_H +#define SUMMARY_CONFIG_H + +#include +#include +#include +#include "viewpages/ViewStep.h" + +class SummaryQmlViewStep; + +struct StepSummary +{ + QString title; + QString message; +}; + +class SummaryModel : public QAbstractListModel +{ + Q_OBJECT +public: + explicit SummaryModel(QObject *parent = nullptr); + int rowCount( const QModelIndex& = QModelIndex() ) const override; + QVariant data( const QModelIndex& index, int role ) const override; + + void setSummary(const Calamares::ViewStepList &steps); + +protected: + QHash< int, QByteArray > roleNames() const override; +private: + QVector m_summary; +}; + +class Config : public QObject, public QQmlParserStatus +{ + Q_OBJECT + Q_PROPERTY(QString message MEMBER m_message NOTIFY messageChanged CONSTANT) + Q_PROPERTY(QString title MEMBER m_title NOTIFY titleChanged CONSTANT) + Q_PROPERTY(SummaryModel * summaryModel READ summaryModel CONSTANT FINAL) + +public: + explicit Config(QObject *parent = nullptr); + virtual void componentComplete() override; + virtual void classBegin() override {} + + void refresh(); + void init(); + + SummaryModel * summaryModel() const + { + return m_summary; + } + +private: + Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const; + const SummaryQmlViewStep* m_thisViewStep; + SummaryModel *m_summary; + + QString m_message; + QString m_title; + +signals: + void messageChanged(); + void titleChanged(); +}; +#endif diff --git a/src/modules/summaryq/SummaryQmlViewStep.cpp b/src/modules/summaryq/SummaryQmlViewStep.cpp new file mode 100644 index 0000000000..8f73602128 --- /dev/null +++ b/src/modules/summaryq/SummaryQmlViewStep.cpp @@ -0,0 +1,75 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2014-2015, Teo Mrnjavac + * SPDX-FileCopyrightText: 2020, Camilo Higuita + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "SummaryQmlViewStep.h" + +CALAMARES_PLUGIN_FACTORY_DEFINITION( SummaryQmlViewStepFactory, registerPlugin(); ) + +SummaryQmlViewStep::SummaryQmlViewStep( QObject* parent ) + : Calamares::QmlViewStep( parent ) + , m_config( new Config( this ) ) +{ + emit nextStatusChanged( true ); +} + + +SummaryQmlViewStep::~SummaryQmlViewStep() +{ + +} + +QString +SummaryQmlViewStep::prettyName() const +{ + return tr( "Summary" ); +} + + +bool +SummaryQmlViewStep::isNextEnabled() const +{ + return true; +} + + +bool +SummaryQmlViewStep::isBackEnabled() const +{ + return true; +} + + +bool +SummaryQmlViewStep::isAtBeginning() const +{ + return true; +} + + +bool +SummaryQmlViewStep::isAtEnd() const +{ + return true; +} + + +QList< Calamares::job_ptr > +SummaryQmlViewStep::jobs() const +{ + return QList< Calamares::job_ptr >(); +} + + +void +SummaryQmlViewStep::onActivate() +{ + m_config->init(); +} + diff --git a/src/modules/summaryq/SummaryQmlViewStep.h b/src/modules/summaryq/SummaryQmlViewStep.h new file mode 100644 index 0000000000..f42ec9f5c7 --- /dev/null +++ b/src/modules/summaryq/SummaryQmlViewStep.h @@ -0,0 +1,55 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2014-2015, Teo Mrnjavac + * SPDX-FileCopyrightText: 2020, Camilo Higuita + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef SUMMARYQMLVIEWSTEP_H +#define SUMMARYQMLVIEWSTEP_H + +#include "Config.h" +#include "utils/PluginFactory.h" +#include "viewpages/QmlViewStep.h" +#include "DllMacro.h" + +#include + +class SummaryPage; + +class PLUGINDLLEXPORT SummaryQmlViewStep : public Calamares::QmlViewStep +{ + Q_OBJECT + +public: + explicit SummaryQmlViewStep( QObject* parent = nullptr ); + virtual ~SummaryQmlViewStep() override; + + QString prettyName() const override; + + + bool isNextEnabled() const override; + bool isBackEnabled() const override; + + bool isAtBeginning() const override; + bool isAtEnd() const override; + + QList< Calamares::job_ptr > jobs() const override; + + void onActivate() override; + + QObject * getConfig() override + { + return m_config; + } + +private: + Config *m_config; +}; + +CALAMARES_PLUGIN_FACTORY_DECLARATION( SummaryQmlViewStepFactory ) + +#endif // SUMMARYQMLVIEWSTEP_H diff --git a/src/modules/summaryq/img/keyboard.svg b/src/modules/summaryq/img/keyboard.svg new file mode 100644 index 0000000000..6227b788b4 --- /dev/null +++ b/src/modules/summaryq/img/keyboard.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/summaryq/img/keyboard.svg.license b/src/modules/summaryq/img/keyboard.svg.license new file mode 100644 index 0000000000..e59dc6f9cc --- /dev/null +++ b/src/modules/summaryq/img/keyboard.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2021 KDE Visual Design Group +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/modules/summaryq/img/lokalize.svg b/src/modules/summaryq/img/lokalize.svg new file mode 100644 index 0000000000..83a7c9dcf8 --- /dev/null +++ b/src/modules/summaryq/img/lokalize.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/summaryq/img/lokalize.svg.license b/src/modules/summaryq/img/lokalize.svg.license new file mode 100644 index 0000000000..e59dc6f9cc --- /dev/null +++ b/src/modules/summaryq/img/lokalize.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2021 KDE Visual Design Group +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/modules/summaryq/summaryq.qml b/src/modules/summaryq/summaryq.qml new file mode 100644 index 0000000000..626a42c406 --- /dev/null +++ b/src/modules/summaryq/summaryq.qml @@ -0,0 +1,112 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Anke Boersma + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +import io.calamares.core 1.0 +import io.calamares.ui 1.0 + +import QtQuick 2.15 +import QtQuick.Controls 2.13 +import QtQuick.Layouts 1.3 +import org.kde.kirigami 2.7 as Kirigami +import QtGraphicalEffects 1.0 +import QtQuick.Window 2.3 + +Kirigami.ScrollablePage { + width: 860 //parent.width //860 + height: 640 //parent.height //640 + + Kirigami.Theme.backgroundColor: "#EFF0F1" + Kirigami.Theme.textColor: "#1F1F1F" + + header: Kirigami.Heading { + Layout.fillWidth: true + height: 100 + horizontalAlignment: Qt.AlignHCenter + color: Kirigami.Theme.textColor + font.weight: Font.Medium + font.pointSize: 12 + text: config.message + + } + + RowLayout { + width: parent.width + + Component { + id: _delegate + + Rectangle { + id: rect + border.color: "#BDC3C7" + width: parent.width - 80 + implicitHeight: message.implicitHeight + title.implicitHeight + 20 + anchors.horizontalCenter: parent.horizontalCenter + + Item { + width: parent.width - 80 + implicitHeight: message.implicitHeight + title.implicitHeight + 20 + + Kirigami.FormLayout { + + GridLayout { + anchors { + //left: parent.left + top: parent.top + right: parent.right + } + rowSpacing: Kirigami.Units.largeSpacing + columnSpacing: Kirigami.Units.largeSpacing + columns: width > Kirigami.Units.gridUnit * 20 ? 4 : 2 + + Image { + id: image + Layout.maximumHeight: Kirigami.Units.iconSizes.huge + Layout.preferredWidth: height + Layout.alignment: Qt.AlignTop + fillMode: Image.PreserveAspectFit + source: index === 0 ? "img/lokalize.svg" + : ( index === 1 ? "img/keyboard.svg" + : ( index === 2 ? "qrc:/data/images/partition-manual.svg" + : "qrc:/data/images/partition-partition.svg" ) ) + } + ColumnLayout { + + Label { + id: title + Layout.fillWidth: true + wrapMode: Text.WordWrap + text: model.title + font.weight: Font.Medium + font.pointSize: 16 + } + Rectangle { + height: 2 + width: 200 + border.color: "#BDC3C7" + } + Label { + id: message + Layout.fillWidth: true + text: model.message + } + } + } + } + } + } + } + } + + ListView { + anchors.fill: parent + spacing: 20 + model: config.summaryModel + delegate: _delegate + } +} diff --git a/src/modules/summaryq/summaryq.qrc b/src/modules/summaryq/summaryq.qrc new file mode 100644 index 0000000000..62bfe78995 --- /dev/null +++ b/src/modules/summaryq/summaryq.qrc @@ -0,0 +1,7 @@ + + + summaryq.qml + img/keyboard.svg + img/lokalize.svg + + From 6ccdf79f7791ecbeea37d160d9177cd73a477d26 Mon Sep 17 00:00:00 2001 From: demmm Date: Tue, 6 Jul 2021 19:30:50 +0200 Subject: [PATCH 257/492] [packagechooserq] adding packagechooserq QML is not using a model as is now, pkgc option is used for setting the default state --- src/modules/packagechooserq/CMakeLists.txt | 69 +++++ .../PackageChooserQmlViewStep.cpp | 86 ++++++ .../PackageChooserQmlViewStep.h | 58 ++++ .../packagechooserq/images/libreoffice.jpg | Bin 0 -> 47916 bytes .../images/libreoffice.jpg.license | 2 + .../packagechooserq/images/no-selection.png | Bin 0 -> 188248 bytes .../images/no-selection.png.license | 2 + src/modules/packagechooserq/images/plasma.png | Bin 0 -> 35256 bytes .../packagechooserq/images/plasma.png.license | 2 + .../packagechooserq/packagechooserq.conf | 48 ++++ .../packagechooserq/packagechooserq.qml | 254 ++++++++++++++++++ .../packagechooserq/packagechooserq.qrc | 8 + 12 files changed, 529 insertions(+) create mode 100644 src/modules/packagechooserq/CMakeLists.txt create mode 100644 src/modules/packagechooserq/PackageChooserQmlViewStep.cpp create mode 100644 src/modules/packagechooserq/PackageChooserQmlViewStep.h create mode 100644 src/modules/packagechooserq/images/libreoffice.jpg create mode 100644 src/modules/packagechooserq/images/libreoffice.jpg.license create mode 100644 src/modules/packagechooserq/images/no-selection.png create mode 100644 src/modules/packagechooserq/images/no-selection.png.license create mode 100644 src/modules/packagechooserq/images/plasma.png create mode 100644 src/modules/packagechooserq/images/plasma.png.license create mode 100644 src/modules/packagechooserq/packagechooserq.conf create mode 100644 src/modules/packagechooserq/packagechooserq.qml create mode 100644 src/modules/packagechooserq/packagechooserq.qrc diff --git a/src/modules/packagechooserq/CMakeLists.txt b/src/modules/packagechooserq/CMakeLists.txt new file mode 100644 index 0000000000..0d98c7d1e5 --- /dev/null +++ b/src/modules/packagechooserq/CMakeLists.txt @@ -0,0 +1,69 @@ +# === This file is part of Calamares - === +# +# SPDX-FileCopyrightText: 2020 Adriaan de Groot +# SPDX-FileCopyrightText: 2021 Anke Boersma +# SPDX-License-Identifier: BSD-2-Clause +# +if( NOT WITH_QML ) + calamares_skip_module( "packagechooserq (QML is not supported in this build)" ) + return() +endif() + +find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core ) + +# Add optional libraries here +set( USER_EXTRA_LIB ) + +# include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser ) +set( _packagechooser ${CMAKE_CURRENT_SOURCE_DIR}/../packagechooser ) +include_directories( ${_packagechooser} ) + +### OPTIONAL AppData XML support in PackageModel +# +# +# TODO:3.3:WITH->BUILD (this doesn't affect the ABI offered by Calamares) +option( WITH_APPDATA "Support appdata: items in PackageChooser (requires QtXml)" ON ) +if ( WITH_APPDATA ) + find_package(Qt5 COMPONENTS Xml) + if ( Qt5Xml_FOUND ) + add_definitions( -DHAVE_APPDATA ) + list( APPEND _extra_libraries Qt5::Xml ) + list( APPEND _extra_src ItemAppData.cpp ) + endif() +endif() + +### OPTIONAL AppStream support in PackageModel +# +# +option( WITH_APPSTREAM "Support appstream: items in PackageChooser (requires libappstream-qt)" ON ) +if ( WITH_APPSTREAM ) + find_package(AppStreamQt) + set_package_properties( + AppStreamQt PROPERTIES + DESCRIPTION "Support for AppStream (cache) data" + URL "https://github.com/ximion/appstream" + PURPOSE "AppStream provides package data" + TYPE OPTIONAL + ) + if ( AppStreamQt_FOUND ) + add_definitions( -DHAVE_APPSTREAM ) + list( APPEND _extra_libraries AppStreamQt ) + list( APPEND _extra_src ItemAppStream.cpp ) + endif() +endif() + +calamares_add_plugin( packagechooserq + TYPE viewmodule + EXPORT_MACRO PLUGINDLLEXPORT_PRO + SOURCES + PackageChooserQmlViewStep.cpp + ${_packagechooser}/Config.cpp + ${_packagechooser}/PackageModel.cpp + ${_packagechooser}/ItemAppData.cpp + RESOURCES + packagechooserq.qrc + LINK_PRIVATE_LIBRARIES + calamaresui + ${_extra_libraries} + SHARED_LIB +) diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp new file mode 100644 index 0000000000..109260ca92 --- /dev/null +++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp @@ -0,0 +1,86 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot + * SPDX-FileCopyrightText: 2021 Anke Boersma + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "PackageChooserQmlViewStep.h" + +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "locale/TranslatableConfiguration.h" +#include "utils/CalamaresUtilsSystem.h" +#include "utils/Logger.h" +#include "utils/Variant.h" + +CALAMARES_PLUGIN_FACTORY_DEFINITION( PackageChooserQmlViewStepFactory, registerPlugin< PackageChooserQmlViewStep >(); ) + +PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent ) + : Calamares::QmlViewStep( parent ) + , m_config( new Config( this ) ) +{ + emit nextStatusChanged( true ); +} + +QString +PackageChooserQmlViewStep::prettyName() const +{ + return tr( "Packages" ); +} + +QString +PackageChooserQmlViewStep::prettyStatus() const +{ + //QString option = m_pkgc; + //return tr( "Install option: %1" ).arg( option ); + return m_config->prettyStatus(); +} + +bool +PackageChooserQmlViewStep::isNextEnabled() const +{ + return true; +} + +bool +PackageChooserQmlViewStep::isBackEnabled() const +{ + return true; +} + +bool +PackageChooserQmlViewStep::isAtBeginning() const +{ + return true; +} + +bool +PackageChooserQmlViewStep::isAtEnd() const +{ + return true; +} + +Calamares::JobList +PackageChooserQmlViewStep::jobs() const +{ + Calamares::JobList l; + return l; +} + +void +PackageChooserQmlViewStep::onLeave() +{ + m_config->fillGSSecondaryConfiguration(); +} + +void +PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) +{ + m_config->setDefaultId( moduleInstanceKey() ); + m_config->setConfigurationMap( configurationMap ); + Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last +} diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.h b/src/modules/packagechooserq/PackageChooserQmlViewStep.h new file mode 100644 index 0000000000..1ac2451c21 --- /dev/null +++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.h @@ -0,0 +1,58 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2019 Adriaan de Groot + * SPDX-FileCopyrightText: 2021 Anke Boersma + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef PACKAGECHOOSERQMLVIEWSTEP_H +#define PACKAGECHOOSERQMLVIEWSTEP_H + +// Config from packagechooser module +#include "Config.h" + +#include "DllMacro.h" +#include "locale/TranslatableConfiguration.h" +#include "utils/PluginFactory.h" +#include "viewpages/QmlViewStep.h" + +#include + +class Config; +class PackageChooserPage; + +class PLUGINDLLEXPORT PackageChooserQmlViewStep : public Calamares::QmlViewStep +{ + Q_OBJECT + +public: + explicit PackageChooserQmlViewStep( QObject* parent = nullptr ); + + QString prettyName() const override; + QString prettyStatus() const override; + + bool isNextEnabled() const override; + bool isBackEnabled() const override; + + bool isAtBeginning() const override; + bool isAtEnd() const override; + + //void onActivate() override; + void onLeave() override; + + Calamares::JobList jobs() const override; + + void setConfigurationMap( const QVariantMap& configurationMap ) override; + + QObject* getConfig() override { return m_config; } + +private: + Config* m_config; +}; + +CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserQmlViewStepFactory ) + +#endif // PACKAGECHOOSERQMLVIEWSTEP_H diff --git a/src/modules/packagechooserq/images/libreoffice.jpg b/src/modules/packagechooserq/images/libreoffice.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e216cc77a3e2df33f37679daea382e1a827f640b GIT binary patch literal 47916 zcmbTd2V4{H)-F19q(!7ik5U8#!~%k}ph%Z4pddtw6cG>vq$U&rrAiT$E>%Q~NRuLw zE-Hp55l{#qy(QF;ddL6w?S0PKzjMpE6NXHAGxOH9p7pG?=s)Q=;HZg#u>ruqzyKJ5 zAAmj!=<0`hdjNp3@o9h^000KSJCPau4*(+I{&!;p7)y@)bESw80GR&!IP`B3aHCHF zdH@q64R7cFf2LGE(ox`jfSH%&*vWI3S^2D7*dzn^&&OoEWS6>9 z*C}8ej;LFJ9*pG4S&xy&|x%oc}i%ZKZtAy>H-M#$-;vwm8yBGkb|7zC1TlOFA;sx8q z$jr>d%=Wik42%!Kor#y3<>WcmW0$SiTmtwc&&ROyU&(k`*Lg(hf;C>iHE@_iP+DbH zhVZv(|FrD?Tf<`if3@u24f`MMngqC*7{I|};ssy;RiG*@d-zk8B~$K4r4uWcOIWIS zvXe)0qQx|{Y;a#iY=T?>x&FrZ# z?7>VNvD;p6k$o zLd`pJVi_B{+`U31T2Q%bW;B;IZ_#dpB_l)9l@C=`y4+(&z4z-Y0q7F`oQ_50RBlpPFt>Iw}e$9dot?ed?Ro%FMPDRsuqxu3a-$WZvcvW z8SE5>o3A9$@^6^|K@ZrHnJ$;dKLbvnH-*Y}d4 z3UGUfMU($U2}@~`98j8cE)S5`E#dL@0+0WmU(jXYw=QY`vT^E_qlqTKS^0p!;~-oH zSm^`&|8Kj*E?<&H5^#rqqXBGlY0^Ktyl92I`rlzT0f&`OxQr1TCYLpRdH!s`ns){4 zv-5EyIZt$U9pF~@MM}GQF#`%ff2YX*)>r7 zHAONv)1J2a>Q5ei0FA3CX7M#Xb~ij%JfLcTCa{3U+jEY(;paQ`Z@g05PNxLfry&O5 zc=LS7WFl^(D%CI2^Fi65YR@~-8yi<+LN01#Y7DXcP^JSc21HTe&apiU%JBgj{|qtQ z{}Y;Y5LvD}#^s6YpLE!is5iKi1k zy`%%@v~9rWZPEA_=s@hNNDewsQdA8d9-zSYB%WGE?^-LP@hr%`bYh@iG9A#DJfH)B zJ;jS@3_ZIFV?-~@zNQ1XkE=#V9QZp%nP*2=Ckt*rRck6D!XIongHPu%8%8ddJAu{vgMsHx@|8xb+YwsJg9%dISw+-)ZU z)}v8K)k%VMPWrgrI>$Th_Zm>Y(huqBum(&t+GFE%*G}JL{f+$nJB`h;Qi`K)TSv{ewUWeVrLfY(`nn_ePDhlSw4cT8N zUMeGIb%wX|`PiM+?n@6$<5DyFBp6QzS|^x_`l2PlioA(r!%*T?!B*WrgmvZ8BNh&dWL<@!6Kun$z%p{{FPl$L6 zR~ro)7|1bR)bwuKu?Wa>nTzJQ^0VBp0gJO_GF_@T+pO~D*Y${347$}7ju#Ntq; zR+H9s97YlcqRML;0w3&ERFr}W0o)CQ`5PX&Te9`Qo43|ks%XOwGMHp7Szn%F0>^j7 z1>LJ-&kRY;bihZ9mE?ieLc7B!$-TvO{poKhN^|*+&G;H8p++UaS)hhGX&7|qvP+m7 z51#z|X`WKFw|9I!jtnQF_Ae1*9?quoJN_P+wg0fKY9{hWAm@wjefJcJ6wS1R4idEn z?M??+X;Wyf_4X*7XqzG7g2R(tsyP??R#`vkMF7PqA&fN|cFbqbg2vuR2Tu4up4l6p zITWGv68s;j`ZI+l&;dQHqQ_{kqi`N)^4|%b?nV-!YJigCj2js`clP@^)ed8l2tZX6 zmn#V>-%7K12Wo&8rw4QCk0=+aRTFCGlwcO^mclPTJXZjsUOy(z<0%>G$5&v)V+t?k zy!0DZrLlRJDw19bj=cttG?Pw?YJTvqE&b5^%p=y8C-dazJKF5kH7`~646i)=!NPBK z&Ba_S$$Rd7yYbvd*-nxVe9a-XzJ6NXS#ufv?eGnp7l*f9NPJZhx^GIs46QFs=Cm*EBM3QF^IP#6=FM+R>fyhH znbVRR#Lh7#?Yc~Nq{Vy9$s06W%(U3j`Jax#>D#RK&m8_ckN>xO$q<9S)sMYeSoi*U z=hfVCQgFfTdQ7lfDt|Q5A0aG@>gv5bn#L zh^-R-9@<|kSHcLYbH=Ant58b@0dPjd&l&u6aW&k2JrXyQDA?3-k|0xe&S~`_TU2d% z;jk_pxbbOkU5;t1u%bTNxTG3$GOfVUt9kF`8t1NhEHz9y?*E1uyE*+` zT~Tn8w0h;3df%t-{X;xR6G|Vo0*$LB^-T6oKfx!Aa4KoAohv>HH(WFgh&w3L>r#HH zHN>`BXMGu$-mUWcV=L6cgcgOO1NSiL64EUZxx_@&mx=F6zv69HqSa9)bimbON?{(E zM1zIubvpDXpHYp1TD8hQWUV^t$;<2-QU|2zmOy^qyFF}jyt}VyVD0)4+OWTX_;>tCtk4E~c zZ9~jv*Q5ka^7oan=T}^@&wJ5&-Ln?Z4yy*VY-|H8#J!kyra+?i?k~rx3zW)~NG2>_-is-zO=-lyyH>z|1vU+s2)ol05jWf3+ zYZx^mcz=lizl1*x43uk=Lk8tmj6g86l(-RzoIAK1iTuh=2cCt#FTS^}u62O&rlOF4 zKHNp`b-@;#6+arzQq~UXfC?SRi1#PJzR@BFkuz%`euKXt)#Cp!;FKXqY|4#&QT?Fc z@03emF;1|b_U4b%ViihJ(_TmpiR5iq)Juw7xbkOEt^fL|nHI1GFQfyF$h18Of8@;{ z4J(!Y>r{E#SC$Xb3^6-m4+pm3rQ)4iaB0L?alKvr9PH@e+zh8_#rb_D11O{E1d z*(Y)R((bWuE-^`vh|Pgj9XQ+h~ac@a9U`>}mYCMpOoR_w?ay`!PDuTue#T0g)sM)VV{0 zk?%C^2bN~G&)2Szq!upFfkR=tJ$NR}0O^i7JVArffp9pL=i{S?By2ijAdS0y9)wC1<0rDY4e7ZbCisKAH|nuT`Gf_>|(At$TMKf4QrVRx}5rKsM)+Lx~uwt z690=OHk8AKqJnf6@cOCyVN`h#OvMHm=K&6KVg(WnkLIf+qXm=XU=F~Q0Ga>+y-^G< zD*^n$I_`|th1usgf^zz~#K%p(Z_cZq&p61Z#t<_`S|LO^*$oev2QuDu#^8lvYVZ)= zyF1o*6skhp|IYRiAx*UDmXIb6&XcvJ%#-FF38$JLHa@$f(9lb6%>AmG%A(OHk}EZO)p8C*m_-tJZ+6mLcc(&)gkdy*ZAU3&WOU+5X? z)Sqqs1^c~#J_oNxzCXS$kK39k?heV#waX!GrTx*x=Jobmrc`NLA4M#SUl^O$vL7w+ zl>U<$_+St~$lrzHjndQXLZ;mN=Rmw;viGC*DAkYIdY(9N;uy-ftp0xdjuXWSOol#etK~U zx>;H$K}7Yy9znTP)6h_YygQzp$SWagi7_EGn7EhYKu@^Zxddum&phPoesz# z+PlO;Zq28VhQgs=qG9SV9114k7pX7{gG4G0FZuXyJnr4Bc!$dm@~!Ldcm0~F4WN=? zF7OFAnn?QG@@V7noS80?HRqt6SI15z;zstqVkpU@6|_l{mgE; z%ZG~^mTZ5DDg15wJ;eBmNYJ_toAvcO=+=-(74x}p!^kyf)q~+ha#~2VF5vbt{5a)U z_kIJRxd$ca1LcWydwq+TBzI5LvJTzmyK{Nr9aqXy4%_{{u$XHoah7v{zpE!L8|WS>yZdza)nv4!-!tLWu+Aie54Ov|;ieNcHHp{7d7i5ee`Opqa&TkNTorCK$g!Q<(Uq zvc*3!DBk$(soaq;Q8CC_WN3)LIky|KQzX*x)eI5Z?{M`X)3kEpcdtx4PoSh?RmjY> zxsOvc4$yEp^`w>#V1J`&@o>;I={ydh7$HD29vgwAGJ_n$a~wmGwij#MbTmv0<}-76 zMg&E@pMGectZcO>umNk_qU3Vh(>@qdYI<{Dk&OJ z|J1~9AI$bs9y?2b+C~Vu%j+bL*wG_e?!q(33y@j8VZ>#9e!ImkHNU;y_g#6%y%gIgE(P`@?(+hNWU?n67`WR8K1m(%Im+S=(FaAKcFO&ex2kohr*T4%v*X zBZnbB56`BPcKoRv9XDi!P_JSButSkZP;WY?(t(%uUvNRFB+Tx&nsC}IKRg#l#un#{&g_wC9=A6zxOB8A-$sBfCZtX~DhczYkcrCD0j{ebo zP=}j8#8y(YsjX5UT9c-FC$CKQ^(eq6pwFVdUquv{8+<^78IyIG5IvGZI z-ft_*lX}`sxr<-wID*2=OjyjDVWT76c;ce&56)7pC`|@_C$p(oiJ}CwuGOsXDJ+-IRbea$pPr+DvZoo^dG`?WcJ6nX zW^$tJm;NB$hBDc;U?~EntMuMs%&(`%9QqOh^Qkl_c3=i)v) z#!EMw+^qWIe7-1;8lcyiZZYZsMBLE_VUVO-^@k(Vp9%dN#^K53S@t$YCC zstk8eQ+>aR;_x6ZPg)|^8;#rh6^WP!iXF{oPByhx`_sH`M3T>cT?=#-&2;Q@qyu>{ zr)KV+@R26qtC-xM;>&B!O5`&XH~%E(BWK|QXvdMR?)&|3s)yZ4ggECIf{nAzaiZtk zM;Ax832%Efjwm6}s7JX3s1UN21FDG#XhOe6ZZIdkTG4)%WtA znZx$>wT4_it=gi6=f!LAq2uc^v+V7{WI2lV`>PYuZt)PmM z;W0~wYbrSTatS%coaWMr&~(F(BYQ$pEp;E`YnS4&r4|#TISeYL>%aUyv zhBrc|UI?AR^;P4N$>|yg-8P#|JP7~#fzMFg(6`4?=|B~tmLXkG42aR`)1!NI zK+x&#edh^>WcA*Zmo~R$TA0K007?$E0eSBQ(&wXLx0-e6T^LWHhcF(PsXx5D*vmL$L+8b$G`_|sw*(O6?{UibLRax3bzJl#~@Y0 z+m9dn71h#>D?1??KqI`3pdC3RtA;v)WKVGo5!q|w+SspzK& zmag9}PRRKKYF6?Ck|i4NkYA6Ttw7V*)QI-=#YAb@&eWOhqXYRDxj52w>vZ=U5J zX%=JH(PF&C)=&5>NV=-wt8Ne=NpFLVlxtNl)?ap$)0g9QEJzOrwp_pw8~%;aFwhZk zj9q6%{OYeJ*{>kuRY&Lixx7U>6W14MBMQX|mnK^D+_Xv9zB&+BNa}FwOSY~`oa8D$ ziWvELnGS?>V1|OcA~j#$@U~mXoBZ-yscdH8bO~U*Hy5p=O9g*~dufCCQp~3qsc`&} zBz9!pJdM1e9ONby;L;3w6g*myKa2M#a`#(X3D*OOt}qDFRhmacGyTHg&JiK4fE4>K z82*O;;U#T8S}z$%P-ReqDJlMMH!lL@o?l=Bh{~LBgUD#t9Kf`Wr{|r$M+m#-JeXtVXtd^`w z4E0fxkCXOY-VTDsM+VQKiHgOkTW5-Cyj!eZB;Stv#XiakQ5I5phjII^)a=MRPCtlsIGYifRrt#cef zg<+c&Br90ri1o}R(_YRJZONBT=q?BB{dPXU$I&BvrVmbcHHY6T zx_7(o)0ZMc)lCO9h3^55r~2NoY@ANdAD27LE%)_9tNt!A(6$+Ew=eT4;vi@b7T7(+ z|1zt(8}LM6-kv%Bejr2~G#iIF9kV|+CM;ffUZJ0HMC_T=37W0cQ3mN09(0a(-Bl%= zQM9HN<12CeS%n?2D&FLK&Y>oY{*OA?IxbGe^}w1{)uE7M?>;wQ(GU~MS`N^az>u$k zQ^Q0@G?MpYvB60FyzmObw*4aT>9(PMJ6#8)rLKg0vvDOUZ)BYx zG}8Wr`?`TvO?WWdBw7Q(9qB}XuI~|G7KAg&D&ye^#X4W}?LOZuV}tOe;kM6uF_C02 z&hn|ZX1ZaIMf`hVz_P@d5z&z1nn}Z85l3Xo#ZlxvD=;ml< zMnKau&;(m*rU)w2j8QS@^^!^dx1dW7&QXk~rf&X7P`@I;i z-<`@fr%Zha+9E?{QJ^o01yq$;SI6nV+U5)$xPmGKSKG`s<6l>%(*_;b<=*&==KR>1g+f_e7k;7RJgq+ekq+H^xs#KSP*;vZBhLG$D+^+fjV4- zIz$Q7edzkIHi$sbCg{Mn!zOxd1iAn(NgYA!fK)X|b1CJ*_f{a=sHC}>!{aD|@<8$N zUi7vyd=8$ab+Tj4eihku9yWU;)RWdONxOnpgczX4wjQCkueF0rr!z0|q%#|6)k&aA zDVQSM%t2B|@{Z0;>chIX){|)+V!V$VZTflJ=+1{3ngU@ zv=9#0|7{_lV6MvXG}Pri$%Hc~e=ofFpR;Z7EcoH--g%1g>>#YyLG^oX^;GST z)GtB{#;iC4jr42b*hOfs1@l+@R)1?p+!>R}Z;_SS^IFxI5wy)<qdi5mJk9pdXUGF>fOa1cr?DUqS|+*LqAZmLPFQB*+J33E&ZW?NTAMOB>92>Ou2Wy}ATEU#6d$gl zN$e;EAS-5I11|L(*#Y{V`6!sIZ^#)1BuEv54$^w$`gepvjZfaMkx62>aLDPa0Wx3H zN+iB$BTthd-DqYCWY#e#*&IJ!^jzq?G5bT9omO5kjusC|=nxL|v505Bn{)2-C!RO+ z0kSiv+QjVFUzl4ZcFy8{@#Pyg?O~fUVJ=?+Q!YXvthjdHS?PBAT=D zxAoDJ5fL_G9B~|CsWs6W!BmCq{lz)cwig~Rn!ifrhRD|NW%_KPrkn{I9b64YMtn0@ zYtwL`sap#NiVjf;bE_jc=lR18V97e7$v&6nPa2lH5y7R%ATdRjjZ}R{*y<5%{qaL) zWcPV*cdtBydmuvp#GWvlD(Q&$?*gya^;56qJ~3YHO4q#r&&+AY+C_9=0u%x2yy!Cw zR^awpUd9sn${JQ80-5^Y&P}S;+r;`*(WcGc2OFa=G1*JI+pQ8`RQ#se9?mrD?J>=% zB{ZZdT<0 z_C-1%Qf~YpM>^}*!CS7SiwQn*W;P2x-w!Cf-31=QgLjU+j(n^05RGfn9^Jo4xUdWp z+PHVX>tEd|Qy;UI`jwPK!tR$DJMIS)lO*RX)-}_9>zEL8_dN`=<`d()JSA~iyBrVT zB{Ro@AVd>{1hLGZZys5BYbsv*D+tNMx-MkDJD)sZJhf@~8=vy)-G$^8S^t&`hxy-y zz{rRZw)J1b&7a`FbM%iwi5ai`p9+VA*q{~_vxks-BO9N-MwaZVyuj!gr|f}I2=4_>@TCk{rg+AN zGZ}<|UXX(l=78pu+t`IfiePmX*=9Cx{-DEb7Iv*4{+jtuzyPWrPE@o{bsO(cCq{JR zjTe#bD-jF8Zl=M?p8O0AC+Od>T4}d zo;;HT-Rt`bDz|We%0{FTgb~LmqJ+d`PT#C+?=p=7!@n4eL0 z9CE6IZoWt}9gspkK}{(WPn*|VEF??%tndkt%@!IIzpgAYUPkqAO*Hk1o6a9ZEBWbq z-5Ia7?GBRq#?L_hNLG$KHi}@N2!alg_&2rlX)8)2J}c4PX7{_#^c?)bMcCIsFw=$6 zEmkQ!tYG-ZB>N!0CqKgg#g@?9+zm^ZmL=GZ`X(BVF1Gd8oGvV*ktETDW)E-vK*)yf zZ&|lxpj1=+D4)NDDJ!Oru4J+xej_`L8eaq%#3mqT!Ku6SyJhsX8KoDjgwNF3~=6RD@ zipv~|KT>y`r)JJf&vLv`N~FgRb+bGwdB}aApMf+5%KGPoo{p2$!eH)WVZu{ae~3%T z5?!DAalmkn>GSY=s)%r8r`X0B5D^eq7VL~BNk32Ak$PI2N9E9tT4q3vlvO)c7=#Zo zN8h&Y9~!oB24iGaK)?b{`2QklO+k{DW%clb_oW)e0c4Zo;C>SC$^=amx z5E;)^q=O{;{WoELZpU@d_Y6=->%W9LDhbHI>3*< zu;)07r99S=_)E8rT>oG*$1}*a@6ZKjDF1iW^FP0zSplUHYv?T-^|7yR>TOjr{w+mE z!&MPgkuu;g-kC*_@X3c9lsat@v<(8pxC0mPSZb&~B|cP3loAf2Ff9pCM1J%#+18sCC6{!tvRO+s8EWD2vn@iUs5eP311e|3oIIjHABG=)xabIkq(tPOT4e zG?QGiz~9U{uzJS9xpMTiUdBQ8L#f6{#|HsQ3*WNL7jG^EeqRr~`D8$L2L*Yu6E2h& z&^5a-SUcqyCetu^t2dJdp7wJe|hCElX>X$CFo03 zG>wg--a;%Sa9$gkf0Fvz=u}&FkWn^>0pk$`la7XWnCUp8v*w~tVLcIN9) z;}B7zGejiR)OKi7_Z-~udEiXfOc#}*&M9n&TBnw@G(0Q2-z_ZucwZ8& zG`Fre|2RRa%KWn5}R7iJEh}pwej*s%Vu32XP zQDYkENQHtowIIX{Qw&wBnP}fB!9ED<;P_YA~4QH||C>dVHR(qC%^(gm(li(_&jE@6EQzxy9W2Ll6Zh6g``TPON>JX2bgK zrHYzF_+H_jzJ}4O-QoJX;tt`FX^&*$zgKC>s6n_axEJEfdWP)#HK|a&Bb9iq-u@1G*x_~ z(yBZqQ{<-+!BB(2C~;6lAgCo9yR{Y$MBAF*idTsFRM|oQ>@TqKtJba)`gO2iiU(1>$PEma*kMn671F6 z?sv53ngyOr<2fCQ)Kny{OyU@EzVybjgi1#f9+Ng_C7PeJy@7f>AL%=M1B zvX-mu$&41Bss)|rQgK8}rWNiJxBKG`MLG%S^vFy2DZTs~1cQ3dm)=A2o_X813m#5t z)ai6ZD~7i9hWp1*RI5YdZnT)1DVxW<^*fb4YkSlaWMj+7x)g_2;%`EF5AA#lSK0M8 z&xDJA`q|Y}kt~4y7_51T!hZ}t2@K$hncDZASz~Ygx^>ao$v9^I{)W){M>4hm(G7pk zT1z&k7&qmtPMRW_y#wD&R+bnDUK4w4dEl|X3}S)8yJXEpsGFvatl3#8EQ}*9k^N%wEzxy0C?#y4ow6Vw!TaxsH*?F)Y897&4Z;L z%Ff629wKk*Wo~qCp z_I-P1?5;O~uQLS68_A6db)~R2{CM-H;eI&xCmbylwPZ85)NSU7qXRur54-XP+oqgX znw12Fji#e1Z?rFqFEf#@jBL%0?M|6~4HLW}`$Q%c`_j53&h7!64cU1SeUAzSSK01X z0`2rzX&oUXT`0D9^OhVs#(-ZzLJh?v-WxSNBi|`%@e+(BHYj-~-oIqKxrwXuivL#U z(C|j^oJtI5)g`$MXm&Q6v4Z)v;|W5F2fB1di0Fao>);)aguObE*?+wu^ZV^zsc*|4?5e}! zk(y9po#U%BtcX)SV38AE{wiN{QUryL85WeGUfnrCQ(>S&`e&isPWoc_WevyP^GEoT z<=)wLxJ(TtiFP`ROVM;i;PY-E@5Bd}L3V1P@1;WL4!VC|=+u!Ko2w^$Pvw}B{58<9 zdiGUUYu1lwToPHkZ#3a( z^QNTTnA0ooe*E!G(Cql6Y}(BC+mAi&$761nWMr+&F>-QC_8X_pzprbqOZ}{vGpu;` zr`Rz-xQ5xaC|oSXMkHF~w|xFx6PGnzNR^CQEQ>nhU#1R45mciYH~(eolxfilzhSt{ z;%#pSf9j(%$XyLQ$Q$2=;cFu~K@55Xz02SX!qoqj${S*v%>K`ekHiY4lPkJVkT?c; zjz7byXc8Hu0)}dqz;JjFZ$~4fkpH;zvBSl9TlArdnLn-LFC%yQ5JO`JC+7($7`r?T zl6IF>7)Y)k zZ&k?N3tGoBWn7WRPM@50;)fnGPZX1Hqi5lT^Xk?&-dtUKJ-+A*zK)r)cDyUAXYRDU zZ6}pv*vIPFVIKcQ~8xfQ6}0$N%=4kK@yRj zmtbR)=pAa*4Blek8yzUHD!ROs7H+>LOOeb|rZV0`Z*_s-1By@bLhl{{moS=>#*byi z(2z7J-jG%~2Fmj_kRt)*&3$OSGL%V6p`Y*`41Qe#5ZHT8sl4%v>+Ic-fTpJP z+Pb|^O6iSnELtLk1!2LB`*xFbp!!hyIK-%Rr}I(64)b5NenSWT zskXNsR|r8dK(b#Xg~ckG<$-&P*!#S!{OZAPwT)<-e3{P+*<%I2&HdbS#@ALc$!Px* zj=jzz^E4+YQx)MMD(7NRctM2yTJUCa)#`bL-xHSuSI>%gbsvR^pup}eN=`w#PatRF zL08hw10JCqO#!VdHGZCrXk3w>OE+J?Yt>_0>%|pt!4p*w-&%7Y(;!|5W&GU0!zk%M z(ciG@+d|R9WH5~3X#4vQ?^<)FSC1%dN@+UCU$2oDH{eEmn40YN=Fn$0<}x~4Ei}o7 zQ{d}?Lnx|qBj)ulZ`{3xOqv6F5UNEAkE+K~oQ`Y{NEdsM4{u=vx>S~g+O-bvxEJMJ zY(21t$&uq|7DRg|{K2f}6CIh=fQe;?pk_G>OrXKZ6l4QcVfQ>1$JX7Zkgfwe;$0Cl zA9*=(!KtsX(!txV#`lg7cSUQ8;{6l)Ov?&c+@0G?7QD8O?`O8u@f4^|5JAH3+8qh}0|bTB@ohnGIGX9f^1? zCH3LbT7kO5da^|siUv=qvC@@${dfhJCx0A47KuP}V4cBA&&)KuG^4ij(J1C(>{GxwH!Bn0`qLs$qu zoiRh@f#zfX2vnOHjjM8$oQ{cR)0O{0l6L#bpFZr`;#&4oZwQ-AK~f7q%Q8g}>0j@) zyLIeJn_G**qvy!L%aruH`+4W`mU?ErT~{(z6%9pXJbC@r5K$N0Lu;~7} z)QnY0&bNiP-RFN^ygVOwtAyF@S5TkA-sIxA=+A5RywZe>*i1Q>Ly@^XSj;rTxVvW? zz9?s#FLMpBMtneF0>mVKp%QDVJkZw>VUKZ#57hoSv85R+-%a zZ`(tPw^KMowwV!q%@+wWnTa83Z;E(FzA_c(iT|Xm)s94-EBE4TzBa0)$iF9ue{FaD zgAPh<>vVa0*7=IgANkac>$#c!lyo&}&aSUdH=1pCL-ST$zC}yI&5M`SyV(a=%wZaP zUjW7=sucHSmsedWPGhzm^Sf_US>j)E@IJIMh7Unxi!s^?ix!hJ`}}y%4ddGf+oy@h zzWbF*do@AO_Wr9ckWZqBQsW)@QYuFw4l5cKOQZ9N>t+OhoZw5vJXFFaYWG$CIUfxZ zmGN~p!m;)$3a3Ci$n@-Y5WnJI3p9a;>A^lmd=-s7MS+mpVq*5YdeYvf&$rf;-M8(# zOp0^%pQ8g4ZL|Jqi(z|Unph~(rmz*Gn#4xwlVc*pf#^Io8!BXONJYht} zALARk**v%P1S+9QoJXUvT6bPwn`w(Xf9o7o^7v-UbSBLyWqSOrQMweU~%bS{S{7k5$4HB!o&Nhhn75i3oZG6m}JSmd3 zs>{!Sc)F`KKb;e&3r#J?-;hxz8!vyjl`%_>B#bU)epIHhw-z~pX@bCmEbd&PKa?$a z1*!Q_gIUOe=U798=wa9Tv0GE+DaS{pgQ}KkA|sJHcQib5J*$KR7DaCeY7`ze>cKs)l4V~cE@{~mT?X2!Kces$-vNyzLhSHwxIjdI|RYt=KKrWN9Lz2Qk zkZ&Xy#J}>gKWj|R|HJkr5W+21(@Ej+89{*2xSe_(nvvS?OgUk~U#oBSU3}wEU>eYX zY&Y2YhTR-TmHqT-vhaR2;W#t-VRGnKkF>S+S)YMm)Xybc5jxP%A0bSPs+3h6nq)tK z+9Uy#QY;ep3M6m#B0`dsc_+Q|6VxUqB;QfYeVB0Q9%u?&xI;S>X5ZdQkWDGV*v5th zEE@AGw6nUheJK-OM8iQ=atBu#r=Bx9Ta_63;}W+_-arFQbyWnG*nr`2sAzgtHM!C> z(ADqF(Ni`BShB`Nc0Y~kM}{Bz?~hZTsQ6DN>L=UOWhz1Y1$p@!$JnXAySV1$qYT1% zKV!m4DZBkH#xdXJm=4E@S$O+7we`a}f2ke^iLzPpnm6)6l#mM_?{L|(P*@Dg9Is5_ zcbspI2_mlhQf`wf-srM8nF~CRhD~Y}e@8zE_7&`Qs`oK7>6@`^bV*29Jt>*7E7_iZ zlbY6XWbHsH;2|E{P4f}UNg6ZE+5-EgavU_Et7f3Vp(1jT#=ez)GzCp*Zqi~49e5<6 zN$e+pUWiA*$@#^{Lcg1G+i_MihGps>h3uSTTChr@Mh+w0E#f4g&rLn?qupO63u*>D z#L~ZigqaNOZm>=$?S2*Y)%ndTsCmOqm1#6a_qbTcdQ}aW%z_C2>*r0UIQldGb?f?5neD;a{6`K8IGw@JQyL3f^_a{WZRsun zEV@JExLHd3R?O-fDG)X*I_NMb`odGq>elHRwtMqzpt0m#Z{V{djqJP!=9nxNt;*7- zb8=}=Pmpz!%}b}Tpoo@iD{s995qFT?>lBcJyt)Glg-?wj*nrLMBS8DTGz^?aI0q1( zfk~N*DcD7Oiq6+=Lz?$yDQsf}*_BR=N>2bi(?zQ=B0qW-^cA<1sUAK9lSk_CGgQ9c zAdAD8O96p-;!mPK?a5{t9f&anV=+iRc}M2Z=h6RuOEEbD4${!jzl@-4>tislq2h1! z%>EYf^b95M3wo8h z|JQe=@p!S-02W`u>Xv8XG?oomfo5&KE=Tx?HD8jNC8PTYUoZ1qzAlT(XsSxV5aVqw z8#DP6BbJO3*}q1zV!gQm{%;&kV~^&dMZ6&=58LO=G8YH{3O+t7tdAiG~9*pZl~T5!N>O<=fZP-Zqt8(2u>$Nm|kmAsJiU?4^? zm;zlz1m%~`WHXJm5sF{+kD&uQ8#PFrkNwZp&|dixNGcte9h+gI14~n&ne%BJ9M(iD z3Iw*j_D`va(;wE7901}35|>^4w-grSzCZOhGh*Q6(KLG)xf}wJ`GB znMB-g?Kc}$S>KDiZ?)I!oXc^;ipPgv*{djFfkv#DSMoHF0L{hXYgJ5O`br?dtVGO` zx#7CY_f^DZ0GQtLH%;u6mlAlS#^2T72$<^YwNwX241r~?=9w)@piZsaZFgJGIoid;i7i+-H!P+6QLxaC@C>On_!F{kCrVh z9oR4tn~Rn%EmeGAQeM=+AjALVlDHhht__pej`?r!wZP)j0x%)k$dNz)NeP?PwbE$l zKUMHzbVxE7C?7nj0%WI-q>Ki#g#!@&{OXkX0txSgTfvKk2`1)dXEVbCtPWQ-ZMbj; zRk!QTsq@Ewc*RAr;aU>@+$+c_sAheEYwtDMTkOyLsyy1;W=8ywKd^2hr`g8zfh}T; z{d*|?k)1RHjV!&#H^GZHU$^AXh`C?4c#uYodS#?|)0@>hRZg4Rx@fs-`VcvN!p@y` zqVe(5gOK5Q@&P-n)~mYZ-YxHzdwwb(w#+W1y?ATB)E}JT~**>t2Phm)6m$GjkOb5ym6iO*bXr%Jl5VdGFd zXZ>JM^mWQZ*tCqr#~a4=;~#F_3)@r@v?N&kUmRU^TvPA=#Xt<=BO%RHN!7EtBO*w4a(8p zeB$Y}0Q5frjpBwU`Zwc)#wRPgspNbM4F2~CKo`_^YL(3KBIeinBbR+PGv!|g8#oP& zg@F>EN-uPTc|W1Px2F+g;7FC*mn(QJDU3Vug|76N*Ar=~`W(4jfsD-a?=)}q67>!T z*`+TDs9udh2*jmR1xVMk@M!=4E04UjXkuPDUYZ_c%bgeUesU|5M_VCBPP(yq8yH2h z!K00fVSLtA_1(`c7US`UPZ-_La{Q~+HyJcutu3bX+B|X6l`HIgKbso*pe{;J`;mn9 zQugww&z196+EV@(g90S10&r9rBPmpmlm1w)+U6zQ;}P`if`zk=Tbq^pJ<{>~w9LDE zQE?=M!A4AmY(1y(9?|Cj$k*XTsDk82C5Z!<4yRhK;G=&+DI>^gp1hTeX3f8k{VJsY z%Vaf8ycWQd-x4J-P-M^Iu)o!>bNgNL!i*m{mG5_vy-@)!`q-d=RY<0!;x9}BMzjtQ ztw>u1^EsIXcVD_+E(UQ!M*1DIXf8b40(En-4F)zN|MGv2=%VnoBo0F#U5c6iMUGVB zynfkb!F&VZS%=OgwBG6rs^&lbM->L+?8N3N?@pu+P%ew@LTZs=`?}$O2G1%y(GgV2BRkVdRCIk0(U9zX6!Z-tRq%6Ack8 zP$NGLWG~rXfSlQ2l~W058gnFJ*WY+DwN3ZtjGUtqf1Vm_bx>@dhdVN{y`KPhb-ux! zuoKb=H}!GJfS$50^pDB|!a1B$J91i=nQ;Am21`0n!y>w!@Cl29Hx9lELO#LQK7g2X96 z#z=|F2R$kgi7@q?V9Y`TO-z%_QAr!Z*IEA`m3mWLr?;EnQgr$6Uw_qYt#xGi19>E~ zoO-k4FmBoOdmFN%awBHctpb;Vl@%kJ+jZOJAU95+S zs*L@Mm=h0(d;BQQdH$m;7G+wAHh z2Y=<9z|Xq;O~sOECO2N5)xu7YMqTtrh>CTDQ;}*x`Co(lJRURWv~$_NMMrAHRl&|q za*+^He_Y_su>78|?S|mINu!E@A(t=9(bix7z*hAmOYX6N43H%T^R?9MnzG16)Tdt~ zo%TjW{+#uoF4I*TG2l=vPJ7ca>!Fk*LY3F z2#S_@kWA&R)22i3w7n$y1hwn5yBzaGi(dN$y)#uO^XZ%9K`IRfxdN0*LuM(s>XN9O zPhm=ZK_vTkno;eA)4ZV|AUFvn$7NuGQV8RsSG{$<&HbS78n6jeCz#bN9l!*?$&F|9`rF1v1i9)BK|AfyT8f22S2()c4amGg+2 zN-lHUpUO*1l6GA4BzxkL&>QWCG(m`f*Um!xH*fS&(Pn1S8rDdcX*Mp#Q*g0jF;xMk zCC)WZqpk)vA)MbFMFL#tQx^z8k0IEjVk?V4&D@%FMkR%i`V3(Hop;HGvu}TTqR^bJ zOP0>#ksM{vHXo-@j2R@`3mnXWbO<1`hHPAW3<1D@Vr%PS=5-ud1PPQS1F8VbMIp)O zPmjI=SvMk1|EOT&l<{`>@HTu|lhnCe-I_=qCMASH+^d#n<=)}~%0VJA~(;NG(S9Oij0FuK3iu1vjNY?KFc_w!F8A+#9t zq@)IWdOFAc+8EiGoWLRr)4MJupHL|YmlDg=zbD#-8k( z@JIZ+Fqg~FPaHuKx46dWySz-Zr7$QNMUenk^!EnET7~wzu0c%3O3EvoqMBMYUp4){ zIK?twpRaD-Unk~_6@1Loh$;D`Yf`hcZsqZ5N?1p9lhiFu z(x`gn2s^GQ~)B9)+A5?T8Wmfu?d+uyxCy7J$4K zc#2PT1Msare8~siF%(4!K~jh;P1%>m!+;vZ2O3=<_}*vbAC>rCQ2PeS=B#HNdUp7a z%9#fv2EbAe;Li`|C7hsBu&=`(0 zodteb7P_sEt~^(0YxIQs#LXo>D0kaF%!tcjeX!}}@$<|DniW~jM$;^K4pfz#xh{_h z-G%A%TcAJ&BQVaVzx^&IZDD2!&uVNE-~S#laF1A~%(>VY4>FCisATK}{?T6c-TY=S z*Q(Pd(^rc$^%AkWc?2d=j* zJFpxYFOz@rQby3%$l1J0ME!uD(3P&`P$NQZI7u_zepn^}T$vuv;xebU;ZR}4P}I3n zxbjPGM?XFzAF~Qub6~skD0w+C1Ybwwfq%H^s;;XtUL_(P8a)-ueqNQV7p% z6Z=`bfLrQ`O2P-EI!{%Y`>@^%TkbHD6Der)3Cp9uYmH&u!W#^m;FKO0g{Rew!1boy zITm`xWyfbgdMMJ&D`S2zCQ`>E6uIuM+*?-?mucpe91D^CN9BZ`$%fvroX2N$oS`1Y z^Rm`e#@V4>o*h)LB5A=7_MkVKUZj^L-wXD4wKA0#P>eX`#VocO;1<|s(?kz$+tnm$ zTwW92g+~xDfSOWO`*(!G1Te`Iw%R~xf5n5+@nmP+qX!4Azgx}wymtd;;WIM{McWyB z>m(v%f*gK#c*k}d=+3ZDUwYAxI}U{*7h!b3E#<)5u6cyNt*BY`83eCgd!d`d zus(S#*ozGFhtv7eO!!O&qv>_Ja@*dv1@i(X5le>7!%yj$j^W$ArH+*=VYiekX?qp6 zK6et%(2Y$u)`sc-2i;R2kM?@e7Hur;RK9NFOE5&}s#qB2MX$u^R_6r1N}hxxkq*ap zhIz3oS|-&6hkE~e#bE}w8ye8fYOP>2%?nNeR3XmL%T^&uP00phqh(FXA|Vwx#~WL= z|8uGsF~9X?A(TO*a}s`*jQGb=N=d`h6@Rp8VQiQmA_e$Bh_oiHuLGOPDdcw=hfh)K zMh1*7INA)Pr*lWWmC_*)Cm#{RxWvZ8in-@{t5T}Nk)+Hs|kg|TzmreOElH1+CAL&@|6aG^lxQodGK`YL2hNEQTf#V5P$WXT7P2B)UT4% zsXQJShgH^41A9EjiQ$-2%P!_rnOS#9N&f=BC5L{9k2*qY<6$tmh_8qKu={}@WaNx^ zaxqzhL}P1pUU*m1<@)8orq!|plb9}5olNPAn>9`!f5_^*n+${iP8YLd=ci(FeFT#~ zzbI3V;`}4PvTAQWSwSxG>9;sUl-D(uxb08H)ho~IKg z6nrrRo9hF7=2ux@F%QQYsO-}XlSyTTnx9yEZ$bs{PgHtrL@f>g%T#%j{QtCQ5SHoX zKdM`tomuc|Taw`<6V?L2FWDx%lvzVb(w)&hIify{qxLLq7D^3i2CA3L6T7o}=aoU7 zJ?R2@a*=cTkuMPo))5rn+RdX6Ixvv|nSWH_zh=z_1X8`^TA^9C->~>o-qt+bWymLO zU%@l*uMm_PWFZ&P9^wba8A@@SmOKQ%p{5c0h(e|o`FP=qCJiOZ^*rpe5d#ya8L@q+ zpH6nZk^EeZ+0<`aW2JM6vnh3iYA*<@_1X2mV%N^cfAT+~QsQOmyghI7Wyz|9Vdd^I zgJsOtAMcoN!YxDM4JW%^o9ta!UoK|w$u=CX=@Ti>k%eA8ZN+|ZdV5r44qs}A3NKnM zA5%MUF5g&fV(m6EK22TxN7aXgvKYorB@ve{K(AF%GnS91(XSH`cArgHj*v##;~htH z?Yz(33vT!Q_Vim$5@~bwmEwv~5&uW!^Vwz8x7pdvV`Vd%@0dL=;b`U2f+=<1@RpfP z<;)tEEyl7bX~WOyBA004eNbm1mtdPvaHC_;WyuB;-oj8DEv@LLTK&{x>ucAoJ6_>? zR*WIk&mij$dnwZxE37|n$1GSGbb-lz(5GaKr>E~1c_U<46s4mh;kIZ|)im7Dy=6LW zlF6&gE6KO7xMp%8}oCmi`=$i~>bGg6D=>CvjjvCQ_m$DZG(%32zdaIj0xUw{y zOrgQm&*-Mg7zY_aFJwtfkTvT4!Pe*;*1M?Ea)yd>kPxH`T)knQ{nM~k=2T{OyOlXa zjPKn+(n9+~g+W(J&PdEfL9e+$!E%=CPEhU8TlUIkD9&GGI#`^$qoPloF#Y0$XV8zbmsihD#h!$-6ENcxnyXGV5ZnL((+|jRn+ruy`tMz>LoMZ4P5X{6__)}f zg=b!X;qVdj)b6d5=nH>l^{-Hw3vN$#flOxliP-aag;qE9t!IVIjp}&IHhBB#MV_v%IgHu;8c#`Xx4-Kd=H=!yGBM^va{+wb&hfLK-Qhi=U(lW> zvN`ERS8R1X3!>P`bNhOiRUBo zz%z3-{0C2DLp-l(lxg*1F{3I->A3@l?2I>O+4eGGU*~$NJF~h&LX+{3ZdCg5+(gwc zebYFpCJ@d(@a;|7QJ#{<@I7lLqT+W*m3p*Y&kdp~OmP)*vpK$Z&h=Gu3HP|g`#%oE zf&G2xW6F?5MTqy2<@a^rp{G~oebLZPdhQ<211Z_gRikmB*!D@Mq@5tyX#;3Mh$pJdKjcPur3%FHcUFbj?$x~w>Ki!!Z2Bl+J(^0hoa z#?c9DJ)Xz$DjQN#c7_r}J|00#JBbr^0O zC9?1{up0MS`WZYPas|}E__+K>*YWlrc;Iz*7jLp^zyO!p78kV=g@sT<15%Or4nRz3 z%(271yuDr2p!nYH$P|qA&Y43wrIP`{5s;vSt5~>@f%Q6^(~Pw+lRx@v9x+){F(POF z0*mE)lZBeTXA~CF5zw{5=kcPz)=Y;0`Chg*bQaqGXI^5n2fN+Lvd;-O*&59QFPpgkiV#UM(!U~XC@Ad?NUjC zV@=Y*+D9odA@11eiN8#LDNvR%H9}+><}9kgZ;!giR@4m=wzy0BD13Oe;Z@*iH?%j)ERwP)Hu`E$~PaqD_<%jop0J=)tz8MAF~H zer|8gD=A4W-R2rw!*cH$rAB;6%tJ|ztXtB0FV_=C*;Q5En}j8-8W>kw=jHK_A#>riuVdjSXdtFr6(g~?{xou-%R z5W@KdNF;SHZ8cQ=Mfl~f?-ygp5+HLno-Y~dV_!c=XCIwWf`^G!hd0h|< zizyrM+Y}JoHLAH>?;47A@Z;Lhl~&ARvrodL8e#C!2wEN5;1b0ekr$V{V`QR>J+XEW z5Tw&()gCV{L*l%9ly0n5V?J*yj9m$?>QWkgFTQQmI(xa!;}g%#jCSwp!MZ>nA&Wy> zQRf+A!6b}m0zZ;kS#QXw$tz$GGzs5y97jO7Pxg$InASdpSU3^{YGTih^Cbn?Snqlo zRgOmOK|u=dJcx?oq36@clRyY$_~hc|1VFA&dm$EyOou?}dX8J_^!?Af5wCkUyhns1 zP@{aa`ARS4az;BV^(uqck3U`Nk0hrC$vyw597ZrVf}MZQ>?(Xv#B|zv`g&G#3G<$i z-092iA}VO~cEJkQKJk$RM?UR71_8oOeM%0flnEvaHHRDgLwOf~a%hjLU;`t<)r-zTbmX~U}j zDVPZ2xTrNB$DzY{gjkJp=XXxHi+jmdzu{hFHb0q*YG>a7`;sJ`0QqL)gAABSKn?C6 zl`>_I&Ro9B2>D1rQMn#PK<{ZcdH04gPJ%&uTWXWN-}r{7tFKz}uiKt7((hSze5Kb3 zGMO>Y&RS`W&%TxfTvhqE*K5&#^SRl0zK1W>p;MHsmYYph&OZ%BqYx5EQMmSzF-RYCssND&3;^G5jfD@guO@|YamJY23GF|j&wt65s8M@&EIdY* za%N!N`hf8sU0-Rux^BWIYi(Ve zw(A<3%n_Gnr(xx9y&@g!;oG{Vh8EptFwDmI@Mwq4B9C!U_d$ZoQ_Q`oj*4*RJxaxW zxZXZgFm(7WLqdyE+bfnWst0R_HwnBZqh%!iVim6|JLOfb|~4*le6D!@`Z)<9wctNtO0hcGXpmT&DJ{s;ECoU{)5x)-a!y- zXIHrdcfhe~YV={iTQ;DXR}g?Als4VMquyJajs%AkehpcgsE81 zGxNO4C}WjcKZd&rxN}GwG9lfed!LW@YWWdMgUvyE!WDQes8G4rIde~>XI(NNj&{9h zpmMJN+}dMnervcQ4o?5u=$8>+k!B^_yJinV0huhr+qiEnqvB_Gye*+i)}JdE7i_)s z`i!oGDZ60a#63{5ovlRK(S4v-F42&u4z-Ozn=t83phWs{5TPzik#$ayv57}fcR+`B z3+EK)*cg<2twkO?A5o1Y`$D&%Rsn>yKCEB;y*0N?CF0C3ppFuoF-W&SUUOZFat0rzF?UfVmfBgyGR>L;b*KRX;t-Iz!YpThy#w}Iu^T2U;IES*%84U zgq*Ghy2Fm)|KonZ{+?l1g9h)e?| zmZ+X6Ir?4Tw@t`DthYV2?VTHJmhN6z|Mm_+k!g=>AL|+ODMmq*s58*95Yz}>IA9J|@Gb87bO(<25_g&>~u z!oHbzRX2>kKCN0?;c@Nccg00H{D}lf^Uxqbs^@X2@_7CTt}f+JgW1QOx{bRx2mUc6 zMMI~A5UETAe6{ewe^fLC+=Y1^+;!>}2cV-=iUGVsI5`Np%{%* zbYjnIkri=#v|&PwB55_43zTZy=^*Z%5VH%|R%SzQC51=;>pg}Qt*z3=vI)6HuO#(z ztKjqGPRWSLZW@#rPfZ5sx19$BpoZ+$1wxTObLk)OR4vl6vFvf#)-ssO-gKwtbiAbb zR$qVo<#(z~eWrAw8{JgTce%vvu7XyS_u`M>AKhfMAFqxbT=Fi^&FTy4Jy7oUdpjXn zXlEzPCi_bLT1AnL%>6ZfpL4Y@Tf*=3!zdmWPH&+`}?Uz1ZX?Bq`~>$8IwRv%=?@kE#m zp3LnbuY{PU`juhKEw|zjNvn{9+8l&AX%QvlIY0YyfJStRGT5>JjG-%sg(hZy41Zoo zyqZDDqX2r_!Vygp$68k|>vFhos8wHi(eIA(D7s6YTsM<*J@e3mY6r+%?)KQ*fSWJd z9?2kLPc^w!biPQ7WsS-%#y1w7qMu+9;!ADSTaNTA~ zo0nW3&HWs@?D_)wOoK}k2HqNURHBkb#?Mga*VhfA^OK*jVP>5*z{3hR+}^IyO`CKg zD}Csh1IGMEkO7OT&H8#X@7y&S zU{SicK{xcd*;fuuU6O9JnK`n+>C&BMBqek!J_oayS*R*fLhk&^BV+{y$gMEI`|dvd zy?54-_&!}__15iwRAN^FWt7fasKil2Zh}3E>|Fpv`#3sKtT!RgQQ*=>NF(J^!K5ub z66#O7QdBePR<`u^ky&}RVS-SBS4 zb7P1msDJcjwY|+Yzd*fN@$6(p_H*R;@2*$vj8CuE+1$QH)rX!7 zP?RnC)?;QZ>Yc}#e_k^MBO#XLcoj<0I|3godv~iHc?3I_5)Xgi)Y~8l1bB}qt;C!Q z+PskHhI|qn7`@8?*EoCNFkiohMGrxy_w>KctyO<{(Zx5a&G|q{yvNh!^zo4X=#_ow zr7knr!&XjVpU^vHP3Un_6XH)mlvrL^uSN>!<8Big2I*S`3u!U6@!aF3ge^M`q|g8FU_}G$2Dr z;0)PhIEEUn5{;z}M05i8Ub}89_W_VRZkYOG2ZxTy-kRyP+0I~Yaeva^eqQS4Z<73C z%pHBdI_da@LC{ow_YPvyP-eahpPq7&k+5x$Ngy*HYQI@Z?&XA%E}c#ogbxu0vp9__B| zzdc?w&7{(`ma-BN?fPw5%t31Xvlci+t&%lS(OlyKt;5-h51XrqEARERuKcWWz3h|q z1Y~cZt2@j2)V;wkw_uwNdS)yEAE?E{(?pa8vL{p5DC+2{j41O+6E-kzV>Bcbdl~`% z>FffG`ATEfwbUrKkkMV2lD9!44zOW`~MH+tllW}LRx(b{Te*o3{u zBpWwbtQ1zi5d8eC@?mWBGB4SNFsWap^sru7UA=(}Gg0~J6)7z2lUr8fLYOXCX^qUj z798xRt~H7h_@K856t=;L4W#p_+qf3UKRQphHfVy=(UbT!LNSj35TzdIMIdo`! z4ee?&;&)t{n49=3N%m4o`$`nbE+#HnH~lCWvR4!ksP?kV;-!0Q*~i2s=^1*KmM^O_ zo8R`^aovFx3LE7o=RLI$Z1x{1!17xTl&xFsh%E3Q`l)C@T8Oy-(q!I-g*>h2`Fdp1 zj28m>M)uqGT|md^K{*(_=V?0RQ2p3pz;5YSysH&5nPnZ2OG`81m!Eo}uAAp+j*0Pg z#F3wk&0f5YnJ>I)d-Yi4)Vw<9nbH_Ip*dg#A)WA#YVdNna5ip}ZWZz07UfwY;Iv3I z!t{Xe1)o<_CO%1if2YMu5*ZH6V}R^!dcvLb{{n>1iL#+)3~lFB(~9pff zeogD@g9ApU;yK1$QzoinvlP}*z|k%V2=zjT4#1e$j+ea{rJ7SGylACa2 zApc^?@?S&THe0ah!1%e2zZE)GXUjcNQdnGX>iOcY3rwRQf(o)*a!v{tp9CiaVNyXH z_|)b>;5ut$T(pmB>IKmGa|`{BSj(Y%_vNsiVBD)ejuXzpga~h8$)tGX0>F{~t zxn5CV*8%INB8zlV?&3Lgt6GZki)ts_hAwOo@x8=>Lu-P?whOD(XisiN&b>#>A^&3w zFzgWp05LRSjVOkVj>dG1caM7(wk`+e47YFxTqv2?i$0oGFXwd|F!lSb)YBk3$B=(i z1LZP1b6C0FHERPb_{k#s2ryhyRjhLhJkfOnkoiJ*B!r-$AhC2P1L*=dzgy&>UX8aF z11Yr*>_%^@PL}yo(B$Z z8ESvigj-3L@GTbcll{3K^k@hP%$ba1M$;X7X72(D=NI@npt{`jAPF=GlCS0fYppKc z`0mltN9a{;ddS|V{Mv-3N3F+G5aO{&*6MPVFE2S{2w9{_f$0)1I9st9j<(2s!0mpR zOktin8j3<*+)xLs%}8vi6cEE=OZKs)Oy7)df~~xQV}Lh8sdX_796@22*c#3X$w3-9M&g)AJXx&$XhD#l%7of*@*0%G-n@9Eq9`~GF`9CQ!g&)@{_nwzSp9E;x z+_Iq|RZyx20-|&{d{>{h?#^h6DbwWnF0!&!)j&>%379oY*$)M&N7-+p^0398F2B$G zPX7k8Cp-%Hqa-}B_b?Te<6l+{8Ow z=y&cx?^=as@^LaNNpl~uz-Mm)i2qEM!0f(2uD+;_ubJ%$0+}(Op27m#H(P949viuj zR|N%L5WumUODZ!tQLp@*k4a6<8nWeTGm_d~@;ImK#fdN6h6&2ugO%`#_3&3#3*5cg z!o`EFO6f zzFUxX_{tS@iUQH?t!Yf~)&P1!G;Gd|>STRj4lDC_MG6vVP<-l;5z{85I+0&(r3m=O zl-XV;>d;C|l@$51@$v=7c-n45B%m50fG1l*+eTP)-K&>;DnzgAg%{7iH&?L-y+XSD z8d=5KHB8tOqeMXiqXZ1u(C*#_R+{P0(8=V{+C%Sh*n;%WS=xi-$3_mH8cDU8|?lcm2AS!so_`G+u3w> zdx+v)p1aANk-K~9AEqX(oF&!PEnk#+78Vp29Ry*PbUvDo)m9_=;b+4XF7jnV;VHkf z@(a<{W83j+2KH@hy2^=%zS=fpiv3}8PA+NdBqMlFT{PuhbuR}z3SHI)3SD!(MUjc7 zy#oeCeYAt}U4sZr-v> zy6x}`g&QP?)t_PQIZk(MA;(8PmWV$6S)iWisc};11ixp^Y}B!_jX5DAZ)-)YGcv51 zCF2vcmmYWqW6HT|q>MeG$jxA{0bUsgY7bz=ejKF4BYgC&XK&%MF43lKaysM<;LCaF z>Z3T_wla6Z@m!14VtLgT$j*eWkM6ec z;EP~6meJMlo4dF3=cUtq2IRI{6fkxxNDjP9*ZDO?QBVGUK627NtrWv+6b6eH9>EDQ z7a7}ubMkzp0{pd(BEZH4Zk&>|WYqPSqCf)&y+kdy%cewtIqN&8-a!{Ur~bMjP8%@NXUQrW(4?QhBRKLf2}(S*9>LT*H4WLF z`+uI1i)>!s(S4^LirWTyMP;({X!n&HsfUa>MaQc{Ht(lSZYUUJ7w-{9E=sK!N;G^N zAVIRml*CD3TR(H4NjoxRCpyH>MUTM704+ohf@a@bCcVb!dP`7@2nHoJ3+_vc3$5SK zgXr1V4SZ{Wc!Rc>hM|NGMM`uqdTLPMM&2cie~#199-BR6N``FvN;NJ|>%OK{z*$DXjR2EsE)T zz^7``PhoXk+{u9)F8~0$2(0v*b;aS6ID8`=0c2$vU~`d26639V4R8s|K$V(19smWh z^MJ%D7r)oJaZz~)jVv?Y#GZCJkxE8+KT|25P*ekvo$TJC7pI04qwVtFFJCD?0h#0b zQM$ikM^1GAd%DK1q+Te4K%6#m@(Lcf@`-Fdfi!p<@3Fgp&>4$-I0tfaAA9>5w1SNe+H(> zsy-_65yi8b3zX`cnUB{Zt%vckP^ehyX7ErNs><~{_$97v;N=mg}Tcm-P}L zlZFsk@a|0wV4kYBZ@Y2chqK+Ye!mRi{Inmz%2+Rf{8l~;S{w{C%f+(iv9E{-_RH80 z{kaB349vT`(|YK_v0qTV3A!{rFw5-wuHXc9g37VXo6W z_9yL29&*9YnxL3d59-Gu_i`MP+zgOyCRrr6WFEFUo^sHZb<}cp2>(wwrWh_f20z%t zoT?oGnQb1#k`sq#49xwyC^;TFRoQu&wxO>fTSvvVf?ctb%6HgQgMr6o&No*@=~h7R z4pbq;F4d!JUn@xcI>qReCX8>vZ5Z3hMiw~<1wpa3X#>O~V2g+u58|012IpY!^?tD_ zr|U5xekm50|EtPnFzN0)RILZizv~1lGcUkP}(tqT9wPz>!;<;GX*_I_v z7P$ulF4;8-!k!uy&{Oe6hW|cX!V;JLPh6C3Cv%Ukj>ZeCHkcY#UAnk6jj><)@02(3 zte&RuID=)dHBNf+C~yDNpKq?Y$+7em?i8Jg`k0Fv;B7C8%HcGJCcXph*Grk36H=SZZNo0 zZ+a0mF7T79IJ~Xb+NCCe;|rG^yRTJjK~x^SnVSEk-vL64<|YKCDkjez5Ak{wH-DUOl02h6Ca8yr`M1kccz-RAfO}#4r z0{`ac$$9n5)>BjTApVE7418~nG+G0k%YO|-62pO$@l4_#^p3Wa%zm^5-7(pvyVc=B zY4FN3fF@_M{#{U84ePPWXH25}h4c9WVyiPCwz_WO>ivM-3V>70AbA#zzV)DTc;WE-Z#_vY4F8t;`@crZ{=2FGA}42T z#Q5EmpK*2Zw(K^FCRZ2|rhKpBS-#-fHBO~`+SZwR<$s|0?ve)6SBk$-SUr*)d~X(K zk#hrE_cvR4hb?--;D6$l&by^3Oj^i`+pR~P)=_6gH#X)S5(hz!p8-oV>}8pUtt{a0 zKQ_&Rn&$yOOY3nUPvAeQ8{ZF?ZSnUCrtvL`gE~{AB*qcGq5uBaDjLjV;9I}paR7)n zYzc{A$Xt_G!l8K8UM}jlk{hDGKFZJ*_Jgk`nrq+E@Vi&FXF`QL?zR|5x%sr|k1Z-X z4!8?(EIUknUwnE6R9Kk3_Ww~s^3Y*`h09I!95Jg^sMIi>$&nX&s^wSSYyYHu>&dG^W({BsV1@1 zA>DWLN7QQzK8`JPHEr@>2w1pQqyn775aqTD-duNw$QUS8i8G=ka}vI%=ZS8vO%<9u z|LP2s*6(JzJmcV%dGjI$zx1}gR-rtFKRh=-2j*&q@#RmNWlUm3JO9+XBobDlR(l-q24VE-*2S4cVY9JrP<0^Ex$3o<>iuH6GjnN+^5AL!_o z+XEYvF*wtEDv$z{eBESviFQ+LWx#kZHVT9afntYjkX7eh8-1IB@NekdAyCFw3#;=2 z&>)W=^}Eqtbz&Jh> zG{4ID>yJykH#hK!t8*C{NGY?HdvASbe=SonT&`QNI>f<0HI$*qCB6=&<~!I66D_du zv!!>>A%WU{ZbxffvaGBR%ANE|-!;9y9=N=Q3_2nE_cD}_bXwhXRu@GE_8&>y&@1OE zc~_4^Phs&vpEKMe-V|tpmlmK>XIcUrrGlvIojPA(wdW>(8baQ{SOUtE-IPK4Yk5>jqjUA^PKOvun@v&S3{j;QQ{nEaSPZvsjyw7S9fnS zxcmooMJ-UMM+qWdjplCn1~V!zd7Ko-`{rzAS?B`x)#a(s(yQTHAFlQF|IzTabkDgN zw_j5WCE7qbnmL&3Ff7isacciiP+c8AJfMx?APz3vfR|IX*7v}YuP~+d2p=cI-;vpO&7rXl z6Q0r@H|Brq-U8=|zXvy}3)BvU7w_fsAJG?A%v@$TQ~R1P;&+zV(Clr^`Blw_uhM6) zzpPV#QdIhuPyNI}(h$$}d2e3geHNAFla#d=sxh$$%+ z&-c^@`Dc_`NmH;Fhu-Ta zrp89a`55bSWfmPrTkSX?zokV8d2PrA>gw{ipf+g@$8yn0H2ANTO(xX)O+_8BfrS|^vNEyWUmr(zsgLFEOexW8=Q(F#fPSu!KMJnGTH+=EV>9SU0Gc^KTO>n79xM=pTnXp zl-}`z@VJo56@Z9jvXbylK8v8(w0tAy*w0`KOb$~&!Ph2FSi>_Yg6XdTBgsdK@79L< zv^=op@`ZAyi>wNfS|7vKu+6o1crBY=>}f2EA;L}wH)RC zbVq6`om}*Ot?R;UL(zDiklbXfo=dKM18K+}@ECM2zQkpMG~G)>#t3RN>`}i9veMST zRokUJl7pNT*NE*mHk*fZBY8Md3%atzK>Owsyerm`QRi^RsyDcr62e!jV8BcdxnSKt zf^h))Q4Yl+CO;e4yt-jG;B_Fxd`FruoBfk!d>;03B4)=r9eGPS@-Doidn9Ae16X!S zMnZ(gJnN1q;m0)_f2C8{ly!$=V#K^J*4F0R=g8e94TA9en`@9p zsJyvU#2b!;V?9jhVT1bk>w0p^uKUoHwYYECd0?yCF630RSi7J{gwLxWaw4!jgD`#< zk0s?OzX5WmN+v@<#{p1vD8W~E{Xr_R0&o$^LVH7FPwdZC3pbR44NlS{Z9GF$+J;ig zPiT6IypME^|53fWO)A+Ii_*7Wbj?mwgFJ;QhB$vlcPm?vr{SN`-@zO&8*YVDx@=F; zLlxAnOOo&2oYrc5-?AH@ zSj5zY-rPam*YMz{u^-9J^foUx5*B5ow5YZ8|VQfEe~R@ zhnTJW{5c{~H2Xukl^l%)ArETC(0~80sqYMHV(q%dilTrhC_Q>W5h6`MsfpzPfLi+lE+I!=0Ye<^X`~&49o2O@9+0^Sg6{S#XyX4mh9-XST&RO0X;j_HbAR z0zwFB0CkWZW3dc3L#BLD!0bzMLk&!Qrjp;!IE4FM(sAA8dDH!2^NklUzB7Pw zCr8>(7WVt-jWoL|?_#3%${*Mz)1qzMt-givA^zOcBahe+D5M1aI+r|g5(s9N2_o=@q-EtaXK)h+`f82S1SnolRc>%x!(kKxvu~z`o-=V;f@_Aej0v zdfsZy@?;`yja4@SpS||ouuj!GZt>BN0k7I6%v3r=s`jJUEAd-iuwRkbILr?G=enWZ zj00hyWH+i7<_^ZNugW`KrZ~x@i4P0&>U2$MY+TZQ`RYcNbE$fCi!V7Xy7b>c-6g;>^&%MA?%EU!VTL67M) zdR&3A5l@b_F$6X$#acBm_DZKBKVlEG9}n){C;n(*)f+L=UEs`aQQU!QS$9$gS^vjW zaj>5=euKjq!<_Fd3K$k&LllqX2>$e3Dl<|4rPr+cIBfxL7M&#iJ)7LA@z7I+f#d>2 zJIig}ARhI*GSP039OOBjoZiQOT7z$#g*LFKZG-!YbNWTjc)I*rch4c?dObKiGG|n= z7a0NLvA_yKeShakRvdkVZt=S!y2G~D?+SiBuD4qhr|9^~rg|a*n`PtcKE9QBW8LcI z2S)0?jV1JlzK(>3AFiilqTew}ay7iQduS2!FoGOdFe$F3_>bgulVjQ(Z^KpsSgxG@ zS~<>1AqCTT^7)S%7{@&!YD)i721-Dm)6Z&r%G6tx6l0{P(Uq_$yJDp6>AzemXknca zOKbq^n2p;NE&gzAU@bcXuE66UE(E+x*+7jrf=QQy^u0#Ut^c;HKMsj1aUHX`B%b^pcEc z9f8Dxhc|lYn7^bt!TYvzX{83*Gju=iTUpA)d9-duR*9-t+CdOB-t?9!penicL_JsX{e2Yo^(iyfg4>@FJaF+ECyWK;;|9x4!J#dqLE1FsRxo35wAS(J10g! zSzbOhE6qKDCQSCw3hipsKTl>~^EUX2{f3`fnDK#$D%0Vi`{vQ<$>3LuYE>{ELTi{B z6MXPTNy;tBbG2V)y6Xt-x5IqS#GKXoVJBdep{(X2UE>o=b2t0SX$Ou8gLci6?CJvMvntT!INM6Cw3ljp!5mQSQ(aU7Ypc)g zt&h%pT=LdXza73SHN9>qUTuCBgxv|U)QZksw+*Qp-ZJoL(SxAl-NyXip8KdQhBez# zJSXu7FWK?4_>Z=@wWoE)$=c+V&>|)Jp>d*Rs6G%*IYWLCfcz@B!7GJNgbN};EtNTk2RO^a)&5XE5|>}Cys0(sWK%~NZ{!+XGZ zTOI#n8wj4y$!4)`+2tFyf4d9&u$-U0>>#@4UZszB(94^i*z@YfZ*%U3TL-00DNT0W z&b5gt=tmCj!}uNHQ*Ft0rPE(+1LXc?O96MWxYox7uj9iq#`dR?Gdc$!V-PpzFT~Lc z_8a-uk3ivt#TCd$HiOrK76a3tPJ(w3^4|<}i?s3(di$FdkcWzCd?s1BIXP`PyG1Z< z;TK1HVFE{#>eOzb>ZBP3;@$_`wT8@UveMZ4vEv1aO&^O82mBjtV3;#4P zQofPJ z)m7e|5ut`wKqMmAL3SMjTtIh#Civj^1Y;K{vl5PYihS`F7J*Qcmu*Qz#K4|iBx|UY zj|$6wJ8ZC-%xnaR!-bB{)Wr5TxRNA+(dN5wXZ>=Q39Ck3x_cy=3PUJ!57qM^Zq;VI33e{p#RJEO;X zC8;!Svlnm?DATg#?-WY*?*swwawE`oK)D;G${kK&XH5->h;=*+B74A~rbvBX*>XHd z>LW*7EtGNkTijGztt;UqKTz8JcPcwY#pS)>F~S+7y@Qp8(JsSuXkhHV(T#6JfY((r z(s3z#k3oW#5mdeh%!t32pFX}`10@GsPDVv1{Y=7!b_Yu|_0;*FiF9epVcZjeNZ4-y z^aP*7E!MT5U53seY&0R;*oFag4WGc$cyqgfeqrEQud!a?KHL=r)sTxlcS3zomm8vH zO7iqS+?ZX%`cpci8kLEB%LJ}ea)3WD!k8sDtbYIHVsd5W^SzVFUx^j|sw?&bSph7W zfKlh<{cXa+Kt@YPLJ}e!@m{@_*c#+%$ZnVqC9hKuoY{TsPprOH!WO};5Qy#-{rf4k z>?{o{Vrr#gpt?;~4SMyT5-hzg5V07BA!n`Pjf}jdB){71=LsdfxB37-rz)_EYaj1u z(=)=-7NGa7=%gBpX-oP^mhs+r`}jbc(^FfoP|}(ejg)OUmRL`Eii)Rg-xqpa9nJ!J zTCw2x+6A&Kolu~`E7GRr76YWY_T?}Ny$vOCCn<0E0l`U1Z06UTht)68t-5^`CbC(H z(~w1In-!PRMC+EsV1SN|}^SJDoPuWa>+ zMyA;wL|H?3=8G_A*7v3e>%;%@P1=0o3jllvW~DOasI;7NmqT$>NND!@Qc3Qi1IjK} zoLmKYEbAP933=J^5&fBz_Q@;DKNrY+y|K+PnrGlnwO^RCoF3j)PXnWa!tT5xU=w3} zL>*J?^mSBaHdsQ8fp6{4QZ9BC^|$xC-6_hyaQ~#%ec_d`6u8L7l@=dS+rthKv0xw` z73uWfSK89t11GiZfm77Tvro+Rp=-TBJ^_>`?L&SD4#sVd!wN8lc?|gnrO|H)=rT3{ z!9ft?eym+Hh9h~#3ycMh%_|2XrqJV6|FLC>Rf)kD1VQuYynUa|!JAHEnxF$tT!4v? zUce4rwx?EauoS&4fOwF0UXJ@l1O60i2R4X$L=ePJ<^LVM7#CoY=z>v<;gYwx%G9(; zen63QGMW8t(IV!Q@?ic67*ij0kVZ~<=tSiF$1ci-ds5_Fn}93V+XcYW`qJ}8Hm_O$ zKutrb@SfLlv8`R1ft4rX=kgA`na^j?t%A&`Y|!zSC`Ry{dyTc zxQ*J(fSu&pT%LhVuwn9&OT2;f^fKg~56&_4mc~Xw3fB!jDTtM}i`I?rL}{p2xw$!l z+mZaQ%JNkmNajjX0RG~ws?(~Mi-yajW}&$9FV;L%HVlZBgTVaVbVBI zamU#K`kiX)8KoZHLXU^HU>OK8Z`kLt3};V0^Y^Olr#w`hGo)J+J#6KyEtn|T`3~LOQH0my&R+Q)+ctqu&uj7-& zO=klvRiFQzt$g`@WFP9J817wX;4TYV_Y1bUrE zb+A0WL<~y=8{QI)Soik!5?~0K{HaZ)wG9W`+ z0xq63+u`l)R~$~(Dq#pic$G+-fA9AD+r8eYC(GV)RV)co%Dn>39;c(dv9(pApOgni z#+%$wFCU%?a@0}jc|`L;%l3EF$JGoL4e0A#$77=tg$*X}{nTRnSIAY3{@Zq=?~abb z?6)pH#*&0&Ef&#GsPjrZX{pXU2T(hE2CwLYL^_H*W9^RT{<)C4cv|EPBrbjFEI9dD zR`)hWNyh#DI;YfoScOZ@hn)(IXH#o~w|e3J$LHPEFwM9QQcG*U`{RNc5;2|5^o zSBK7Twmmk3kpK$q^YX998;U-_gsbZ_^U4^P%BnqFlxN)(YhqS8^5ePkOf=!2h7l?< z)yns6OBXUAT%=>_$@gcAFOsOZXJ4jK(-4XKjXqadl8B)IHT|beV>!}-S+wW0I^mI} zh^5J9M3UXikwU`Io6mrQ##u)Gymj%JrLuQWj_%*$oaqiZV>9S@d)oKw@Dt*9*#g0z zrD2Kd0r&;ZEAv*^qIGu*-}X(b^6jDNd|~Zt>lLlpIcZfG2?V!QPvGk$9npZ`^IY5U zgT5;ibXh%F6qm~_`6zrA zYWRV#siDQMZ~7)?I`-weVNj1|7`v*xTbr(X>5xul3U&tZ&E{D}>4?n4pJ`16fR)e` zGKcPP{QgXHUaN)=_; zjvfUb%q7Tll-;3S0eBX+f_xFZ``|(_y~kOBIu6RUbOhJ-j!0vewd3iCwS{M$uT%u) zf-Rzo(sxcqj7^w@+Z~DUn|<+zcA=wtrU(|_NG?PpRxjVk>YA6kF~Ypg_&>I69x35K zs91M4Tn^yRFIf) zCZ!VHULy81$CL$yE~Q=mTx+oIHlv_{FrJ;$VVwuZiOp*rZtN%&$K4!B-WpW1FPgSl@i;S= z4gpzMZ;SHp}%gWLLoR}uasH7rp3}CE;H576+85;*&gq!I2fvh7OB8G`ctoLfcL^Vc zqtkwNHYFDf7iIkk{sPmbRcpZf-UL+my(N988#1citKZxE{!P8>SYR!#0O`W1KGm4gKeZqD50v(C6W53r0L@1L zN4&JngDe|ONPeo|=hxCX&Hz08oG8qhUzauwBPw1Nmrv{ zxwqqHDC6ZUpX2#3$S9-&c$PdFhuX4ixd`KQ42Vj*v09WNyzSco-GSGyop}B2HMji* zRQw*kot}F1F(s#t%ngtlVI?%DqVXXmmT^67?%^owqZ~^S8zW1}-~GYyHASktXzG{g zZwf@4+UHtCMjD@+dLDE%2gftS6TRa9V}mu|yBpl79d{X)OnYt`Edmw4LpW26UO)r@ zX;7Md7x$qPPDiQy$A)GM#CPLoOa6z*b%ZWTs_#uT1de(c535@)$V=&8emvA|a^q?Q z7jky~%N;H^m|TW1%^`L@b-AIrp4)}*@<3XV_Ov+8ra7IQ@SVS8ste%ZP?eF@?0)erf8T*?mX8m+gqkKm<^EH$( z#QE6!2d(er>D|9c%Q*WEvp9?52bxvqwYHIXY~x;kkoc%Tob65fD<{^T0;uhn_@mC6 z@2AwiTr)_b{qVLRd##%+SKapauBr0aa-}Y5pB0vs-f{{Q>8*!azF&U(!0yR*|1nCT zx!z0T9IeF@5{mXA1p%xLCu z#UoHwpr~V zH>|FZbu9vJlJu2@6#eSHbHOG0Z348pA{a)1dn|L(rp`bk-Tgb7XN2JOZ_|rh zz?fM-bude`;UI4w;I{r_dvSkJ+fSoaB*rEtAsCa({|yEx|l`>rxh^)cLx#iWp4Brkrz-qj-V;SQw6Mfkcoe% zvy{*`j`lXKM*?l~;^MCp-l+1d%Oie@^0fLEz-zxhO8zI=NNi=QT3JNXZ?u>C;*qO- z;~8I^C7^S6JjH+UZm%EvUV*!5vl~4VO5#Bztq4oP)d~yXg~aZ{@&>HG#`#(iqtlt$ zIJ82W^++lx;O7C2(@f8>_4s)V_GlS778wBq7enk}XD0pR3D$G%zX5o6jU)_c^LsV` z%`2V+d%3)hupz6XRt(FXPvDtA)yTtxHsF&;EJA$7v4y;M?p#49OVh-Z>JsRzBb)*4>i^Oao%fStRC@T)VV^a=Oy^x-@W?Y z#d1iPF^O53XaB;JM^fcan8K4GhI-Po!OpVULQCGTqbJyFxY(Y_;etNB+6HXU-sH#I zl?pt9pUv((8sj^0nW+ z_{t+L+S(jGv}J-5NKRd7&b5a03)Ku{*83-=!nViHidM|O@x^#7xm-l`v2Km1TNbW+ zlb`D#y*!7t8(jG%4+OF?lZ4if7h}zyUwrG=2xyJg0xaq3zEzgw23+Bk??>gr;^o_I zCmuDXA6X|mkun1y{e~*Dmj7Z^h{FJO19fW$FR;>~kCLTP_$un?~h1E^Ho7 zTO|kTJDQF@Uyypd;X0}fzhZ~S>gRl`+N@rfbFY#E`Zr#0fX0gLL8bk8ncNKX5m5~_ z8|OQRufBUj5M#A1q)Tmf#YOB)hU01jh#@{+C%aH!sl{S}!=I0iX27lW=c7JW;C}QO z#(uoPIk|Ni+hf_cu`+5bu)B~tlQLLFQ``3afGx#_Lk4AfT77+zzixH8R)1^mLr2JLgCN zCb)p0y$V75ev4HQ26#*60Eh>=C&#!#S3;}`vXb8_UQRKtOC#9isRe@T#!y@Xxzq&8 z(bVkdT>Nf|O+?fw*-#V@HTdypVQ~)rGx6io&HPOrzELELZKMKo!ICgNBmPuZYeZ&} zUw9wK&6D&j<(l5YKg?;M6=>L_snw3p?z55aSG-q2=2pWrgQX=7;!t`N|DfgdFJR^u zM}0O!W=y(5O(>Qxdm_k@%?lhZJ^ggcJu~z$GC6h6 zf?(mU7ig_YgYKy`G%P3ie%$~l*4~3Qr+&9a_8alj$G-ypCUYFN#bBUu{mnc}N~i2m z1?qMc8|uaX5V74r#GA~`u|`zIA+Bwbjl^JAZW}_2Ax^T!ZlA!dVVJA1Jtc~;yo^P6 zVgchDrA|V|VkmqM9jkt6z9)pbH4lvV9$sL19mU$O1Q2$B&1Uz`v7aDebvf9>x9qGC zL|y`p-c`-I!}21up?8ogwC`jDeZK+yZ2=Ed=|JaXq5s3lstk=c)SAxV-*x-bdgjxP+yNGbbik@pJQ7x;V>j@mC0Im^+%H-P|*$cz=Qx$=DdVCF?HV z<_m9edQ==yuiZbhFzdIlz`JZwoF|b+E}l${qA` zjDkg|Fv5?e_}fOp_3bL1K0f}1k@@zRrI%;MsdbMQYAo&YBsr-_;ru0&bDS0W-uw#y zmK=yc$^Wq-o-W&<5>!RTPC?a|3MJ4lo~+zJ!6( zYN-HI7XZ;J3U3Dj%D^7PTne$pk0qnO?IcvaAf{9RU{QcQY+jN1;zG6KOw}lyzb~)` zlBSRa|8rYU&F5F4{muw6>4%l1uwX%){i2{lQ$ENMVTP!{70F4bl!q1>-3=f5I*!~h zY^*^z$^UpUDp6;=W9+Q-Ooa2Q%z#_@1%DH1=Js#DT$zfe9(!<={0*^_r_<_Bd2~Y5 z34Sq_d)PlWH+HNP$W}zqnE(!dbZhe-Kv?STb4MI~j^CyYY>(KG0qcuKE7@QIm$>-J z7@#{p;^^dG_utJa^`V0QfgwK-1G5I*2GjxU6x+JV?A1_pv|SKjEtmi|{~|~`NAbk( zdIp}{ZhwO=3Y5)qZ2A%~x<7%Kzwam8IWAEAPYxBk?Bn{!b~Mv<2Kl36#9c)Ru&9#| z3h@!XqvXTk3@b9ebXvsW$(&E>t>@yRYk#1e z<6((?SJ>xF;pGC2&Xs7|=;QF;ynA6Ut$Pozih`wf_s=hmB8&c&LHRe1c)d$yjD~2Z zx&2wGb3lPC%S68jPE%d{p_S4f(IHfv2KfdcoD&vxWE>icO zS5}s5+I!knN~{);(dy0Y8DJU+EtoI*)Y!e13RC*M1-ym!`<^$Gl-%b*VIKyP9^O>u zJ>Aj+*vFsW&t(igdVTy|_00h93}20WS!F|k``IUFG;g@dKcxka4EZ%0@~8xGd^9~R ziMe_8$EaHPyLS=5O4({O!0Iv%sE6Ltc&D$K>dxi?EGguUhA!#k%al>t8ePwlAB|)} zoP&s!S6Me2FgK7>BbM{Bork5^g%O~k6EC)nIF4{8Eqxl$6gw!M8gp%g#{@t|%F-G$ zvGHF~6|3Ixw0A2NzPHGx!;&T)$A9pe1lD(|Ic|EK_b_sI)>+ES+#O5oMVP5KZD>w- z$nAE#dCH@mB}0B>dpta3g4bwT@zjZ*shy{eHKot@b`5Gd`Zn@e+MZBSh4}GWhIIWt z9~S@2M#(}aNdKbSSbUqi^<1Fi**_i+mBqpe6zc>}xE(L19nqDrWlvb zcerR1e2IGn;TrI|+LjbYN3Rt60l+aNK#6YnxV}7e{||Vb>TOXSa%JTRWZvSw*lQ1k z{-zx^%VHvCFR!o=FVDU+UT3P<4FOF3(dW(5&Dx}czK*4- zJTtylqh6*@t#`?8FS+k^JAGFHq&rnbrP|P|$^!p2obbHn)2h+7JfBwCc0N~CXN_ed}y0!g~)L2YIo$z(=wNyc? z`cj4Fn=sVGYi(CrylpB_t9#?jwC(RK#Ew2H{v=k^SzLYA3QN7fw-!z^Zvl{tTqkA> z`?vq~KB6|O6+Nd|4cwudMV_ki^n1u~`qtDt9ttVth(yVjeK}`QiC)X{U#04#%Rm>5 zxj~yFB@F4o3>85O=wTbgAJokvRXA^KtK(a0{>&VbBu zaMJKF>gLqyQbXTc(Qy^ExPxLsJDMZ5{Zdxjr2Y0Yr@h}VOIDGXSc>O6QJED+0rA?0 zj=7Do6jAxO*Rf5ZO$>O}@V?{hr^9~)`| zKwTgG!lC2?B{i17@};q5|KX`+9Lus}NAg)OJ_hOs)M8rnEr=|r6Le=(ku~gNiJAsB zC#XmuzmW#Ki7YFLOla9s_1`A7^-+sqn%H6dmV)dea7*BX;Y2%Z6;Oa7WEfzl97*V2 zEkMXPEx3fA$4YCPu4Dms4+Kz0$|0Wx4ZEwoV`KF9rf*es&<=l7<<}5Ala_D98ccL| z_u|(I{HHLO4xKzqLiY!ePB&@a9-xg%zSgh-)dQ!}_O4KD4oiVz8fg1}Tz=jdQ| z05urU@pD*T(A4c7R!|J^;VB)YU_1u!7rqB^7Tp|29$)}eedh|pp@{UjLwy0( zF#siMkCUN$3y63B-?NybhVE#TS3`GpN3p;v?+S`EnL14?>Ezqk7PI-Vw*&TBl-@0_dPS6izn$U2| zC1_UlWp87kGjO5#oOaYVG;toiL;L&JShhlGu7Kkd`t^%(M%(}Wq98Z=y?@u;Y%ugU z72!VQM*T;0sUSdBs2Pw=IHvB7UaCVM0)%s<1mmWxP;4)myKsf!C=pgXR{ngF+;xe+CoD{>iH~?v&n_`02V!mgo=anxe@IYJSUK#IIH^_``eg=Nhi~7BpGiprg`m z8Jd=J3Vld)6X+1z#XY~&ecHI=_xQ4Mp>_A(VN{!D`|a$Qp`&bk=SE)e2NJ72L{m*; zAg{1NeC?vBEYbK-DId$D=#Jgx31=PQVhoRr`Dd&1J{Gv1K7r|Oh*5V+kQPd09Ur*9 z#7A(cI~s$Et}ebx9VzKcB6mHz+@`FB>VmMt=mW?Zb; z4ZNtpyvSRK32GGKGsTo#909}x$G<_s6H7{3%_;snl?Dx7ppZo-SiFqYDfYFx#d5ar#C+Tw?%x9nz z8*jG2D5DWr$6M$izG*UKB(cLx*-GiL5r(oMwb4KP5d*$zpoou>*GM4&|Dl%)4+mZ&b9{yF}=&Z24A zDM?~G;ljkFZR8+DfdxNQSb3#uiK&*Z2yw#SLF$Vbn1kdP$c4vEg8rjR}(? z{FWxFF49~V3g;7Tw~VNds|7i9wPC-o72ZF! zG{>TVD6W*b_V{Q0k6Mt`xlyrT9m?qTB(QnPV&;3LqgXN8^bI44ExiJAwPM+}IEZM} z+15EwcxoX9NZ@gn#s0uPh-Qj*w0sIsS`A647;bXj0yF0TNI!{s>dfmPA}l&o43hJ> zLgPQSc>St-FIH&qo}Z|pqXG}gxyu8Y!3?Ap_Y~CdjUB8Mh#$cW2Y0zeyP+=cv-_#D z+!iRMy+U;PozxDNy0rY(RbchT1)%T}EOjR!R9doAhZkRV4x~=)-=t6G-!*%`1=umq z!^rE@J&I5Odi*|13F}4fXEuRsKG_Z3XDN=}QPNAswK4C*K5Xwc9xK6<=Mg-pp(=!Z z>Cg}1`3b>8S)l;!1~LQ#NujJ=>d(DxHSH(n3E5$NQPi-J{|9SMIw^qrCh zTtgt?H<)90!qL5$%cPAUvU&3p|G-Kv^qe*R`HT3I!+Q)T#>Ot}!58dj$i)tE!b1#w z6TTjBw>rW3Z?B%}f%3OKYd~Be_ItrDz~=7x7e`ND7(!NoDWd_`NX_S-zBOv-<|bjf z!*24E?d16ZIt%6esv{FbZ182%5hfo`+TIc8YHd(5UWYgN%e^UG#1od-q=GfK;b%%z6~9`A&0 zYC;=tvRV+^VK=j0l=78}LmMSSweC-%rEccDC>0C5#s(`aEZ#srbHCHuc2B zGuio3@ug$wVNWveu>?)lgLkvh&2m`ahDNpsg$vYIa;W=2-R#3lb`rcqyRgr;~kQ%cK)EI%(D(}tpGkQ?XD+~la(tx=MU1unmyB`2X)=e z<#QSnCYE_o`i&KL$7-Rh&#Y1HA88-J2QzcPrFT;G{mW z>GC!G>5F=P_%_VDG0+7?&-eV_^+&E=PpvkH4jz%)PY>H}xjDa_Z>Xa**4AAA2x8xr za_R1--@=lx<-`x4EnALu*3Q8Fn)I?A!uY1$OSVOJmUWYt)H=Bs9z~kG)n3cKTDUReL4~il{^bKh8 zCb)cd?kBk7E9B2r{m}yK7du*&+cksl)(jZjZG?Tw*JeD<29`X5>3_2*0f{K3hqH!@ zCIeewjrdRb&_y8+D)0u31E(}6P@_S5w@HCFphQi+$BMYgKmtjtOsa?h-abV&B8%Qy z(I0Wu5Qh?tI!G%E;L%7}l!2^k#%4P$EXfgG>6wHK z*NpU<%Wb?yzT=$6%7kIonb|u}1G;(eX@3GPP$h~spcnQBc#z(P4*sGE3-+x;M1& literal 0 HcmV?d00001 diff --git a/src/modules/packagechooserq/images/libreoffice.jpg.license b/src/modules/packagechooserq/images/libreoffice.jpg.license new file mode 100644 index 0000000000..5f43e650d3 --- /dev/null +++ b/src/modules/packagechooserq/images/libreoffice.jpg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2020 demmm +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/modules/packagechooserq/images/no-selection.png b/src/modules/packagechooserq/images/no-selection.png new file mode 100644 index 0000000000000000000000000000000000000000..b32d2170215e9337a31614c26a6b60b5f11426f9 GIT binary patch literal 188248 zcmV)HK)t_-P)F{hSDXr$$ zq`r6f5X3NM5RsW}Eo3rjbd8@!s-}2|i(cL9I!3Ud+6?gZ6VEb>JH+$E=`F_+yhl95 zN^*htggD0OfW)^#S3G_bT=e)$FwbQd0l(-e728;8V^-n@@g#B7&?~HY9&wY9YOX9( z9;Gz~8(E}~gaic@Y(j^FIAxP&*4dY6_?A#652L?@DmXccD3LctYK6M0lr_>-`gByq z-2czh)~2Vt?x7^m`|7%%<3Qg&P_Mb}@2Tt7&w#)SaBa5yWt!96H|e#O7Ci>SJHX{l zOH&Sjt6gB^*^;^3kOH*)ng)Da0E2lTat{owd$VfpU0d$U-TnW?$$wVV>6)IzaXjL(`|F5I0I_WunUT?SKQy7|Vh)9J*g z+wF!%qv2pj((ZPfp;D=Ym6eq+Gcyy*YyQBOQlT5#?M^6_N+#Bh3NY3C6bDfcp~TL)ypaSAN>~{?KYH+N-ZkT+(37AgA4<9524c1D=Zgxf3HhxrWVKw4Mn zdm78`w1afqyfeC{p$EJ>p}ajH%D#HJbJ~U&XgB?Khbabb*k;mhO91wjIjg*Y2J?Y; zc*FO4#{4r6*9$jvKl&V?ow&WYJ-F>)`v(;LiODa091bp}?`~gt_ub~EX|V0`Y&PFC zJZVtoko`W~Y!bt8d&~jX8TI9Q&y(QxNZV~ToAKeD@D>2%QQM)|28>|t| z4@^2}<$%`RG?dp*%AeiLbC~ww=KyV`Uwd)?p-<((oBJ1G(zt%Nz2DrqS32B}V)^#F z5X1Zja=>lTw(HzB%a`~eaRaNyD^H#)eQk$Og;CHM&pKKI~OE=4)W_4emC4qt8Fs^X7JD!*3|>l2!w=t&9|zoT+6|S z?$ERsbUFW_eeWE|*HeD{Ojiiq=BR5wTLy4>Qb{Ns^z#1u{p~_y=Yd<=@Y4=pnh$ch zOyhR#wA_?8$ZiJ{;gj5QcU`A4`82@ohhBw;9{fQ~%O7hacbjX`Fwa z&W&hF!;^;7*(l!7fB!g;){*OvcI$`J`3~dB*57+UH8h!)G(Tv-FQvub*rqj&GkiaI z9Pk(kWv*w&P)pvZUq6JQZvF6mPXLYtFsYq3r097-{u#j$Ml+r0ve(Z0`qeQ+oCz|6!hc%Yl4- z^X>MFO&eyO;K9%H0^fVF2QK9X`IGNPhW@jkeP|>4hW>XrKpVrjZSf6OF>Xmu@%O9y z4FTLLR$Cot)sPEiJv3<9YD^t9s=YKcObTnmyBn-+I+;5kBJk8WjNQ_-?1oLa<6sKn zUs?MlO7K;Uhi`_6E;jY6_Jz*3*wA{#_}=YO2P`#vpT%+D)X^wozFoWhr~QbM^39VU zG;pJT@$inmw7emYbl}PRr{5_(q?el1FLmF^cgp8{$uBK$`o3PCOycwn;*yTjU;yU3 zCn023tju37t7D7u(l{z^u9x(Ya4+^&LKhwvD=Lr5+7VwEKZ^CxE>=UWV?CP&CJIw% z>CwPbkeZI}*tYpVJ-U9}Zb{U2Z-4x#H)NvuBZ2++G0gdO?u#}Qr|;43L2wR<8q{K!}ojV0Q`*gp*pd_%@2MyZfEwx zHcr8In`$lSF=HHdXzx4+_Noo+ zJmtd_%>f1pPek;g^$dRbzBMTPdg&ZQcgnHdwoH8Zlcr<79>g;56-}j1MLem5P8XN~ z=ojG7KgqVD9l=^82LHtL1Uz`QX{ZnC*N>BPJ=xzAsDZb`9Rz#5erDRC(eKziL$fy= zF#bq$a~)u(V}RRWI*wY>hF==i>1|Y(n+9-cLg~9R+AZ6KwoN|dZyK;ExB;6xqQCnw zc(-Uh%<014)TI2y9e;)eyQg7??}wKI`Ff`$u48Qc(*ei*3-{P26y_)z^I)U0_2VCL z%(so=A9a8DScpT50GgUgk@xsdFG$!t?C>5x6iAZ(xVxvP_bl?Z*p${$q$k&AY12%k z>10YAp3Sy{Z4o#ivgx1?^6vSpA8mHyM;Y%!vv(YT-{v`Wl(sXwV;ie@9L3I?t+csK z12{5?MD6jhWEYUU-FVXiy3=73){{-j&^&{N-*-4*KG}|SEMEJYki28;7eDmR_2KWK zefT)wi2=&fKE^lo&N7Vql>3+4gX3TyR+E+`Uxsv?$@>lZCLZZ}>>3pIsQYz_8keHK3F1+;0=F3-0qpQeY-7Vr{Im;@3r1{i*onBLFq#?;kZU?v)dO2 zr8o5390xpp*d~_Wu|2-Jy}2&=b~xe~^zn{K{W6#S{|`KXqhY3xnPNs5!1>$7bR2&V z?e#eTPyN8Reg^+S@s8w^Fzbcw7k}t>FgZZIV%%T&c3)zULI0K8hQp@eW8@?7FJHFJ z7AcLFe}{j^-88j)n%xJhtEkk}YWgaKh8{_iy4wHNo7AKIaez4QeNz~gTZ8UlzQ=QR zYixI&(7ruM(!Qx1<_;_7#m#-dH?c~#=8Yfu9q~9-?5#BZM#K}KL0iZaAfEVh@ZYkV*1bbeX_bYr*tD9jBv-p=79!3 zDSa+@r19ReK31_(KACssr~T5p_xn&#f4G|olbZVv{mX-m2OPd_+%8=A*lrsRa~N&P z;If(i{I}in_Mo_oPsiPKdv!szY?`TrW~dcb^vp}-uo!v*ZL=K#IIrpe^9R6MZNTw&%chOFA3_t~X}j|~VelUUxZSFW_oth#LQxMG z>cQ9q+mGuf-_D$><6{#RJHS24Qq4-I8 zhg-8Fvel^2LVJ1wJ-V0-;clCW!r&E{1Z11E%TP<5k?aB@uTwq!P{B9oryI!ad+BI_s z;LUT0GKp>2^9bQ=9M|9bVY?lrboHYHS_y;gvh)i#blZ6jxQ;w-x^2<_@pIi#FVv48 zD6yYyyQN_UQM@GpHz=Xq@}tAS2!l5>#SIl3lef({yYCi#$01$w@;H?BxRufU3Y#Y# zNEmSPzX079+z<2q$BlpRW4$p39vyd6Ledsmp%NBCt$aOjsDqB;)6-_uwf8i~0q^c85aq{2 zxe!Fh&xOU^Xg05B%4s-Dr`7M9utPJL1MtX=(7biMP#dsZvN|js2kG^4wHxXyC&Ng$9Hxq|hVjx%0&>>` z+$1~bTnZ0Xz8+?le)nahcS%LLAqHBCG9eddkQ7Z)WMM+ ziU@~hT@JuYc$_z>o7(|AcOB4<4A?xTViT4yHu-d%mi_bJcHgYM>k>E@#szU9O}PE} zh9THyNH*wgwkX4JLk=824!Dodzud=c!wuf)Q-n+V72ocI$B%1!Q)2k*XK!*mc)9eX z|E;Yy*bt~#?w$yx&c)a!D}^N;ifV_dq;vJsOjs_@g|@-~KD28{KMtjYR(s|+_AtoM zru(&h+%at_4tBe@TN-{)+6TeUebn|wG`Vb>4Zl%(N8KNO*`)7wGhn0b_<^?uZyrbS zGtc{_hsU(_3;`yB^)q6ae`-jr*28mWA$1TfI|q>)Jo1m z_rB0;uc-W^VYK|VZVh-(Z;O(=y&0Cml%&Crglt8S4Qz*9YO4|2!EV^J9Y2KUopIFQ z&AcY89~anu{@!VOO8_oU+-8ZP5H2`r(Ag}GyVNPqS2G<{IVpX`+X1y*;+>Xsx_)S~) zDO2*sxZU&au)H61lg@|z=uX{uXTHRyyqSH_OSu2^rESC1*vf2XXshr|!E)&Hkrc?FdjIQ) zE0qP{bRxB+_mSQka(gs%TjwOLlj2{UNG)(WwRC5XX1~%fN0^`Rl!+GbW&l?z-`S7k z_=k!2^kL}bar<#OQadYC2H@byM&Z-A$N4?wsrd{)GJZ;OoG3DPU8MZ#$7{z;!|m4l zh5*h5w4D;NnMOhw3h9pKUq|j>q(>N-gCQTn+UzAWoafM9p99oS`m7&v=(86bpntgk z_(u_aDL>ex{nv4@)4sMB^d7}L%+EZJT?hEvI1F~`ZvP``OO*&pz*$OdORrnAGZj`^ z7o!@HVpYm~3j%QAX6Te(mm0XUYP)9?&MHL)bHsdf+Xuj<(h~cd@8-E}yARG~|9qj- z&w5m(WwZp&^XYnVhVB^$82?iK`rWpF0Q;L*@H_wDkHL0*_&s{;(!YBGa3*#$G`TQz zDjHP^;P_6J4w@;ONp~1#$blgTvR{bwNBR~0i6`x!^eLP49k(=`!{qIJoV@>L(#Xd- z%HQc2Hsp;Cn@Xpf&P?ihQ=vCKopv!Sb?UM&g|e1aOJP~kx1jxSGhw{^R%n;+lk{v< zuH#xt9V~sL9l_&tPGO$0v2;3Z!@Rp*Y&-lxwA20!y=hq@{ki__A7qE2YzKkg=C8-j z)P{%Vx%+iLzT!qaOjSj5BBs)LoP&f2DY!57HdTHIcuciLO_nqTF%3t`7!A{+GF1Lf1Qln7K z+G4!>lGPm%saGN)-hrIhi{oYJlAq>rnvK_Ya?I+*UAHK9BzU>B25iq6vOvh8# z3vRq;b&!p{dj+J+RJ!txrq|=c%bnR~NQgI~1j@fdsNK@WgBt~#o}Rvo0iIa09Pgx; zGRc1Z-0U~Bca8%Ld_1m4r%e47H3%{|+K>05emPT*>91YK8QOPqzSoId>I z9o}R7jm=|s{M@g&VBFzIk1#wDU?{D_Y&yNRPKuTV#Z*Q?vI2(&q=2^|*_*TuhEa_b zy>7-o_=fJtUS(N6bpg2xVPP2=LPzyB6T#e6^+%!Cn$&64PlWl7{3?2SQYoURsJO*K zP5d8`dJw4_kz&fZrA1xMbz4UuUJK{TS0vS&iR^64rKN@0mCggm_`*s!FTHZ-q8`g~ zX*yKeOQFnFth%eUUD6&scI{|+x75w{F7xfQ?1!Bi($AYTPTp@P zzuzZ;b0M9H3BmR|euRT?yYbD#H%w#j!tQ4Xlh3DLxS`wLaKLq#=H|N0yAA6t<;d3G z%~$i$Aee8v~tx)PcrqinDH3Q#JJb`HGgX?xDLRos^O5GVPyS}QN-VUcq--)2DR(LPe zr1-ZawIscwlqUW9GHsW6OF2M25TGPM zMn{rAK&eWgXMNL(eG`AAeSlZyM$sFQTqnZXPDv?CFjA0IQU4?0BcFH^#o*-E=GT4{ z9QC%1})CH2S8jKTHh~n`wi`b$APr|()WW$>A|JQe6vj-;KA4}r5-;IH11a^aO)Q*jei{8;Y+Qi z6N{h)83t?yb--Ms(TKMxY=;k|%j0^oz1cLWFO1W0eABzxbPj4bz#9sAdqsg4U4hlp zjSC&F!h&bOIoxHdrALS(4*@juB!rccKz8p`sI{I5rHUkN<)4LSSwH?I{nBi!WSBdY zo`7Oc(y?M^Ce*t>k!0`BL$&bTaIW~gl3dQNP$d}6fG(wnuC*dTU{N@%SDgsU#V5mD z;h8Yq`jB+eJ*LAHmqVu_i6}P=DMF>t5RIZ)-+;fK)R+Xh4Kl^3 z+BT4Ln1fu#LA2ck;0Q>8(x!^Q|8#@Xx;xc_%E72N!HF2d4dsung4LxF2U@{sP+I1w6rEo44EH zkJG!?G}3x=8l(x`N5W|Nu~*Rci@<480U<4MmLx4}3vBgz()U(f%F5bZ1u)2<*rp?Y z%;MM;-O>=kg1}UJVKkH)7ecdpGBldwl4mUm?_7w0uhd?U^zHdD+Wl!5?|oAXq~8#v zdnb@>6qJ<&wgi+q*Z@eaiLxcA+!lar-q5P?R*Sn*K+O9M6+xBMCp4Rwn6~z!5xa1Coqe;}WZWfM~h1t=k%w+f$*{osy#8^YM^F zS5m4_xfL44v!U9&7Dn2yh4J>EhjB^X>ZQLHL{wgywwkA&RJf5)7&)!WYfpwkbzJ!g zyov8cP1NP)Na!rT6FQ48Yj53)TIpR1W0mhpYC9(h*!8f~`Yq*uTFa_uM7IDS7!-+K zocA{VanurEEO6U|Kw1IdD4 zzmpH|ZjT0V_TMP&qu@_j(+6I7EX4-ErQhb2;~aJ#+$DiaE8Yd9bMj8XQ|8dHU<}I? z82k+K{Ea^*O*ds=^c?=%cMiC2O^EB>b%nd#Y&-1G9?XHX?Gw^Gwe5aHUjc0J;O2qb z05464xP-^1&mCt2zmUGc2M!Bh%sY=i+u={j_cR@Nzn)(j4qEz|&BW~&@4&gW*=xq8 zeJKpl3DR0+M)EAJTlS^|;7){@t_~!KSJ@6T@j}3@Ta?63HisQ5D<2T@n++|2oo-P) zEehNaM;EgT6G=#QEmYet3%q?LO!fXKjFesoWrSC?GYbD`C|&rh!i@@homO1sDQL%X ztu)SQDOXZ2EmM|O9uB3sr$cA{mC#*&R$f`tY9}+r^%R!7FsUnNX ztoaJ&%D(fXLm%%mZp*Y69=E%E`{6sCe@Q5YkGyzavPZ_jd*EUlTOBv^V^HOz76)8U z*nSQcg@=b4_Zjz({4YcgD0yH;czEx4ho{85ODO}m2XTWrfE@4e)&TfksmQnYt@7XF zWLkH;9~mR5n>La~09UI{htc};I!tgo6q~v>tEA=7a7mMaPK;_fwaufD>=0wwQM=CK z)mnwJ#ub6L4!158wKq)r#Cp;dhcxT-($~UB;Rj(Nd^wDlUKB_d=SDvm+7mw)dSe2A zV`l^g*+(X6AN$EzuGGG?IA7};ua@)ym+O+y)lP)c=*3W)zbGL0Ev?=DM8|}0g!7gE zC(MLfQ3|&lPK0K$7AJWCX`w6O1SoQV>54{5BlX0gR$P&Ea6XLIW_3N-La3Hk!nGwW z2d_LRAbKjJNm4ldRMRT2z@5_F=;xQmgMK8$wwSaf+LgzRt+vyC=^q9+$_bCaCG>e7 zzSDl^a^(B6-4C<9ZtL_QgAFraj8B&GZNp$`hS@!h>xP7FcgG#t2b%-b*V>9lGEf|B zst*=*X`81H_;+x>*%KBWA0+BII^CCQ!8RiSliAWLdp>8z6~m74Bv9Tj++sND)v zBR9kN$ZajtE{B=+qXLQ-L?^0G1X_#aO?kCJ@4l*N7c4a z32fs1!ju(0Fh-g;F2BERA9j9~dt7m%4ww~0@A{T{9f7iJqaRD8OfE1gEwl@cyBTIT zGt2Jj_waphIY6CJFFdZl)QuBY7=Q#}01kA7wYt>C;4B_~t6*Jvk7{-87m@Cxqi)PA zZ2EyEKD;x@;Lbpi0xHLWhaN<5g(hgTCZEDFg3>^W(5i(u9DXmrl%1n7NXNl#B|LAu%#hPsZr zPNMd7(4Zq}SYxRiRvMDjRc=e7_lJ_Ly`v@85T+-d3iUIe4hj+Y z^Sue3htPq8CFy{v|h{va~iML(Jb4Jzn|3m9$jLSe+$HAu0P)Fm14JN_F^dXU>&Xj(PI?8VDFdLQeIMzG;!V@YZi>({SGfCtY3ar1N9kS@c42Beuxi1m5~>S8{-%vk8i zn|^NjFo)&4r0cN+adk2MoD|eb8i!htDB+qF(pizJ55Sa+09UFjD?2>G8cSV5d1pr%~(UkAzZ9hZT@82CGw6cSYlLSQfDB37mB~B~iMj zSR(>uQ<5ZR;5)FiiuA0s5+0oTsg{gabPd?NmQS^Jt|-O4S|*L^N2EffI(}WHJgHpA zROShd2^tTSZ%JUXBK;;PIqqk+(ncKiAdV#)(L{eX{r&hrpU0o^z!El(t%KtAOY11Q ztu3KOCh6o2i~_;8+ZoDb^1^S(tfN@{>z9d+m)7}49dZ4X4z~}IN%{Z-jScSrHy#ER z_ym7=JRsplUrLuq`R1`Xt~_=5vEfrT-el5Dcx`^eAC^WZCnqE5Vu|$SmtPJ){NWEH zfP44dch|u6)YMeu|Lxni!;gOSqj2ifsqo-~4{DN^N(+r=t{=B)?5s`)gMjVU5&1aJ zwA@GKos*X6^5|*vepiyXrX*{PuJ)V7lbPD()>#mI((-t8a2DcTQ z3bV^k3c!`atONyc8HQBZv`zCS1R+`SgX=3s{Er~I|z%X>^z?}R5gqt5CnUOJp;lCrnfwWVk_3L_1{f|U}2NZ&3 z33!l#FTUXcwg(x9@vpY4PoIwAfBfSghm$8yhTr)0|1vHuA$=nZd*+x3Fp>8g z006?duCTXSUv39ZgY;~0JM5-|iV(KlbVnt0dQezSm(jPiG}w_|K7qDM?ae5WtCX~y ztvzZbspu#R=%8jJ8eKEhmf)bJg9ojWu8NYRD*i9M8BRz7N3b6I=_Wp;lcpEtuXMG? ztt`1#sVxasrN0DgjjsZVa2c4?Roh}O9Ex>=mTtRJ?pqoCsI>iF36x8s@0Q$5CPQb0$ZiH%2N`x!#g^Bvxk__KeyIRs|R!QUH4HH_@698>!f8SE` zY*^9LYEOje<%)FLO~gYI1>Fb%aEtrjbUIaMEW`(?Jy|vR_OO|@<~B(`;D-<2@nD79 z>OMEIe3@KU+Zq12yN}tA@_YLNKf(x0f5MRNMrk{pqimP60d#c_55E%Vka0lF8iNaO zX3Nh&+%f%lp7|V~|9~`uFb~%788C-^^_@4PMD3g3{AOG(#cgbCEc&?);H`n+#Kc78 zE6c3k`ObI3V;_7nJn_U6(ckF;<^bkVGRIw(1I%{YyxWf3!GNp|rI!S40wg;1+Y#Rd ziaG*SOHF|v-N?`uu;~=<6M&Pt5G^}abi%a4VS=8PTm{$)JsmPAzbPrzdEHs6I@O8R z5uHFCk<_amw4B-2=}`9kpS&0fV-IR9(w?&*iJtc2YE4z5Ey1#imTCtYpqs`nAwkr9 zbOazfk{AL6B{vg*dn^uVtSHp?=8{yRW z>*3_+)ld~6RUsw8JFRr80&F9?u4_E1BUxCP3QLXg&=ipEuAJAhs%VW8dv1MD-psM$ z8Et|wz-=rY4|q?%*DE4%X=5pX>qQ-Q>%}-&?k>NnqAY&!qhDjp5BH;fJaZby$u2XP zm8DpRU#}%8Rb)RL48)kZFw5^Lb8s7)!_R@O)T2Aj;V<>(N?>UafC8{V`Em0D=rB*< zBfk>OPu%HC*cjWq6NV>s!~M7!CLVaiKn*_tV1O%@M}PLSpM^jB(?1NiZr##>1gU1w zJ~sRTVr*XKp-uqN#4&irAHEXjyWiDyOFGyt{%F zJ->e85273U(BhAN!JjrtYE_@@ihvt`aZj57jNnQ^d%cPR7DXQR z5|g5qbfFNxj`q|QD_Ty)U$m8Vl~=iPO@|adpk-9jXS+mOCu?WI_|$u0>ZDHEmS-es zl)93ITDaN15E@cKydwSDgk$XF@ei{UhvbPSyvv>UJ5JxLH!<`ta@v^E z5N2NLHhe!?9OyT>tk)inR>|)!4Zr|H*%@5eSkGRp`T6-wf+Kf82!H^90hr(&<9=ek zc|eMu!+((jfG!4cOV#*6`QnQ&M(G*Lpf}!oC-Rl0Pr|`}z%x8%iIn&l{CEI@)CW8V zu#v{aixCdJ-N2i4sn^Y#G_2dfX5$`)aMe{^X-KnzPH7f| zx_YSb(9&f`c2&nmfl57rDAb0uIS3H9#A)KzHCId3^P$G6PC05FNS%f>u4tL{s-$0n zT2<*~8#|>H*-3%CW$mGpnh!yrhTdzHjcczcIE5a%E}%&Ov!MNI`Uxh9AbIJ;eW|9l zbY85!taM)$depwk@^xWDfF6B#QE^eoJ0YN^!xl@uuu!}d8jCtnyKo}Rb##k^=wEJ~ z&;bk`bkM2iQc03Kfww|Qszan6xS)d`-2W=Ps&rM#0#|FP9VGxX->%YjGpHT7O<~iX zF`JD$DBZpEV_Y<7!}gCJ%Hh7uds;4+doSrchh!8F&EDx+>Lg&A8s@BI?c_5br@)H8%o`dO8p~Et7!k5kdN>X%i;6~Buklk z5Y>)0@CzuZKH9R|sHf^^k`~_!Iw)5u>j#hUFuK`#@|XNYlg|y+p-ywQRgb!CK2)_7 zsb$K7q*o^UExmN^NgL(zfMup``1++S=>atmxiW>4A&$ zp`>}7Vuk*WZj>mh4QN9^l(?02^0W|domh?%x}Lz_dM4j)HVStT+tfy7pdT}~GFBSA zQBL^CnYgQb05=;Li|N-e%s_`7+6R*ZuDi6Mr*71?r5L!= zp={HEy6m)-@dQaa_~S?Wz&$l-KB@b?zLOr4ygNCQFOx8v+mXc7M>PqrE@K)j5f&Pu zt=r6i)_VC%RnwY8hOz_1h)de!J)*&uvNGXM&)o`hH{T5{q&RZR%AWD8u{aY}*z;4@ zQjnhdXkB#bGZO?oRWElJ5Ai6CIc z5-8FqFYMhk@Cv$kFnsf1aI30$KnL%!K14HRz)&V=MxyzH@BK8e&y7>25%^Mf?G;Hm zq%TWhM=O~mG%lSn5v$A?>fZGp9rQ09w@y!uhv$Ft!|>%l|C8{gFMTOgYsIjzJQt=; zOoiF`Ic+LmP1ligHfcjoS|<1n@3CF(T(q@M;!%FuEp!o{I`O;HU5l{CFGzvn8BNj2 zCVUP@A~P!q+!Ut2dT=~_}XOcH~<;a^dvrjJYCB(zBb4ahcaRO{*h-s7S5bG6Ty+` z@nA=oy*AL08tMq}LYd()W#*kFQF!*k3ok@|u~!Xg83z8sQ^H9DYMR`Z-^ml2sFzn> zc_n<{u@9n1BC01Tae(1&a<`oRMiE@+{ldAP`uXjZ8^8<$P%EK>O~3`ZQEoh`A#zIv;Jjzn2 z(Hzx9@`5}P95l7;S}N+U(Bh2pUKDT>0IaADs2!Ju2G#TR&^MK(+DE#73|j8R#AQtO zrKz0UywKB%fA9#-SCETRC%=gS`^qXh{mEAfE%h&v<9np#fMo+2W@j)Y7d$sCPAP_ge zCh-9<3}%B&S^H(22f&7SJfwpepPG!cr8IfabeKWuZ`Y5q@nEpY(>8AGZG%6Q8NMQM zW9bsG_S$Q&g|B?&EAezG`r8PLKjD1(tfnQX?HG6k-(G$7)$slAe?L6%;AKfiM2nAg$#To8iNs<^z@|wNT zP$_9iO&|^lU`hMu3V?XUSE@>T^`d(AjtNLX$F_~6XFaI`>1m~bk`%O^h<$QJn>4r3k?4!A=? zF7JN!ihMdao!$ci0|7KJFaQFU<`*ImGJx?U(_IA{AxHL<6 z@*qzQ&k;b8J`y4rYRHTJ(=yW*J<$X5|{76muP2PM{2IvQzVJQE%zV)prd1Fr@24%g3 z0jv_9^6{-rQ_=rk|B((7z*{rZQTgx3KK@L2N;fn>3w4NO=Uz-&&O!016Q0yKuKAPt z?e#mm&R7anYm!awESGBeT6~FiY@zHr%fgtxcrZcIyK+mnF9^z@qN7Be0c0dm>*~gV zu9g(LrCCyrv02WPwmyM70kRf%h%SY*5z~o#_mB<^rfhUXmuhRT%ao)sXHK7r(jf*J@&!nY)<*7{fEiTD!^?t5 z+6WKuzy{O-MxYOX(ABI6y~HEV_}FNe6_{wOEQc}e-&>d;yho2&6YHGh*SCdyo zppf**ll^1n5&4rBJmSH9uZ;6@Jvm>NP_6z0esC)E%U}L-yavl4*aJEIhEIIE9NR5{ z+Y7u0@c-ZkKM40y^=E?PpV-lqY*#Fa2mr-6|Z7j7Dt?J#MsB z$&&zYf@Ptqi{)v3Q97r-1Zct!#vyk?CZ;HAYeF~jV|QaqCsUj1k8SnAqV581t6g@q z?+txwTsJjdnG0i;8`7mV6V8m?4vV@@tF`b*m}}@zg7RodiEg8CHjL{~0M}}T&J9V( z=GEpUuah1%Wu{;NqwP;$b=|m7=;#Wp-gN;u0Giax=uk#aw=V$NRtj<#i#W|%i|fK7 zv8w}1fHM`mE0Cu~8)+&C^s3j1hwSOgfO};F0OvMko2uZQc0zyNj3GQ@lGAYfXv5H5 zG%0X2&Ct!mH)9lrcT7rSbQu2I76-Q91Gbg@F!EvJ03Fbsa4%?QARs^6yfe8oAp@3{ zB|$3|vt_!jCW)4Qu`_8hupnhwZe#<5&ghn>;Ls@=aO{KmZPG@+S}C zS}z&DG(AY+PaMJ%hCOQd0Z_;TKtsBu&ndh?hUFRZYOXHD61Ing11W$ew-KcWt)x$y z1`OttX&RKrcKygJHROpK4>u#g4^EY`&y9z7!Z7JTGkhWp-|&ZT%7Li@47OoNhq^&3 z%3eusa(Mj7CnH_d(MHDQ*eKk3{^U;?`_%(!_j6w_t=(`(K+Qflz*tvxfGLaKn$%yg ztXdOrLVm`QCZ^4jzV?DOR)KG?EQQF#Q=9B`XyXEJ*gAC3l|-t#Fs{C^6h^BHy1`&B zOpM%?eJzYtuS!SSZJl5hU}O1GfUT@+v$)*8(bN5?h4Z0TeNj5%^aH1TO_I1-rK8(R zX=>^dY8gN!DAIH9rYb35Xuqpv-*;BA{5jo0e^#lE#eHx^fimrK)jg@|ySnET=~`&$ zW(Y~;y8Lp~saWc;C%(kCBIzNDi@Q2iThh{SByp4E5#NS1X*V{hU+UId4MX3-5YO$Z zUmVBXDcgP6V~_i8Iu4Ono))+Jy!%ekbzIUJ0=VN+)7vO#zfOi*Klg29(>E#u1Cx3> zFnMrb02#WnurNClb&Eay#N*-8rAy(R zcisulKKuQcKVe84py7vf0bu|#Xu_CI!V~UeAAUM6amJIDlKvnCYD?09V$&8HEQ-{7shu(V%p9+Rtsl<>#9RTHku>t+-_R?6c2Ci6JM50pQsw z+zhZ054v3z>KtI&Ue5Hq-7CHD1S!DC_*hKOQaF~n&zw6eV6eHAT|S3~PE6k2{%po0qSMcuL> zEop_*y1EJlxVq?F*GmDGx}66F03Qvl^0&mQCH0f5l9EqLHg=!BMF&zP_NU2Zy8te< zt_YC5A{03nmu$Q3M+HEYKLD|yZ4QzkmL=sMR~aV91oFg>hRU|mn9vDXE%$4WU|Y+r zy^f@I0(H>e(;*FUO!dyf^I(&28?-0483VX}Z7lCbJGYzD$n3%SZ`YUcC=cHFb{PyT z$tNwVY29xA$36ZKz#aD%utE9V(Xjo#L6jZ!rqcsdJeYZ~U{VIOh%8OejR>N+GU-#F z`cyc3R+mw)itd{mjG$w+QUn!%2|yO0;j)(4&YU?F_r?J<7=#!g0T`rfns5hHd60rX z(8NPnXhlMI`t-^8y!6sb5zuhS`sY9Y`3M$QmNVeD9@Ba{sYhDmfhv>do_j9pHOrPx zHScHuby?vP;Zk1hMV+nJHgNy?H@*?2ZYbx4HY?vnD#oD&Xot5L=q3)}jrX|xTIS5? zy&LM!(oul+!qQ?q(D23^Z-fh%E(*YH62aXg3F)MjCb1sR(lC4R-j*5C8@wD zOK%O}?NsxIfZSY^xB=ckHvqjxk)=gV#;PYa`p@fBX|Joz{koZ;sJ2{gNX3rSij3En z1=iYO;?&DJn4o(@OINi7IT!c2g_dqrXkQjk8xOaeB`uvk5*8Zg1tM9hMcv8;(R5k% zm@=AH``3l`EiIvnKK9ymk%9>zbxXjd?U_#V9bI?z4wo<}eW^t0=`PpSNiCSFkY!2z zq|c3gf@33Bq(|_1-Gw?IT2qWKlLBhZaAWpi(IO zdfrUA+X!ufcWl}}Pu4RWGPCi|8}}jN7gd)|GaqiJzv)}h$(V=je4#O=DRsxs5AlZP z-Z@b2*BI_Sxna!1#sPOecPP_O=cChUF(leWod#rsF79QWAd6!<8)9-}NxnU~<2v1~ z+N8%IflXT2ER8bB^S-PJ7$7jOiTQ-~uzmW|pVEG|@r-uS%akz4#3d4y;koBt2;Y*# zZAr^)uj$0%J8##c>Isd;ad0Lto~o{$TQl;rKW=aGQ}j$mY137u z58(RfM?MmzasaOQvwtnY_rIXBpoPLyq>%D{>&g`=5Y4W?0}$~$cD0J?XK@I{B zqO?H+cvW<=9F6qyYhU|X_~zICA`a|RquBul&1_*rpe(k#6>0KUOi-y`cXFOmUzpe&+QjC>K~gh#My6C>T(D{d*4J#NxIm^v={7D>vkB`{j*S8kkV+8w;axeYwbtEavjCKDrZ5qKwYtTQ|Zm?7B6ji=-$wM zt&-O128PfY3!@WX7oYSaQoLG}{A5qpxzO%l2en{n$2W~0 z=sXE};9#K1K+)<194F^&fO6dRY@{;)4{if^Q=p5qu3x_%M(P>xa2_c=@D3UV8Peb; z00ufFN(Nh2;LAia(B!;5m=fn8)E$$J2LPZzU%zyC$UFPYST03vM?vLI2kexOdr80Z zg@3NwuYdjP;R|2*!Ww;^kW#vEBW?pIWU23{?EEm%?+8iV0CMbylcZPC_-;3K@IcG2z+jX% z*CdsyRu(07)4>4d_VI-XvYOoq{qUF!vpTRazjB|RvjWs7#4CZJ*hN=QxpJCQfU?&) zp_8GHNSY@-iULpVg||X^`Z-;gFsdH_I(Q`bwk#f3Ibk4^{dD5Tm3Xg*)VSH9T+j(t zbkDH_EWlajVtKR*w{J-b_-?4py)Nn7yp~M`;5xq`p#KrI4~i{d+a8mY55O`N7JHYK zmZbi*DP4Hq2sI^BQQBkhNqv+bFq1lT(Hd)o#<-SzwT#*kZ8xrcSPF=x>#iVaA^=D% zWVxCp;OqxW_Mw(0cb*)LCr@8>tjjioju zdjL38e6W-X*lMs}Z9v&Gy0VnhyrC6?8>%v}S#CuFL_RiY9J}3ZYieRfSv9;nj`OhJ ze%K7=&||3qlD9wmvp<0)Ekcu`za!AN%mHhYAdV zkFtQh)1I-ebia)P;MmI+!68^qd#WTc>vgn0vGI}6 z(LJR_NzQu9Z-v(FXG6JG4z-gX)Doxe!POFLwLA@_N<;M$rEijsiU#0ORJ5x-r0AdH zv}mcQeg}Y)6s@x)U5yLRhslMX!~+@gg(t#H@4pZzd_t)#iU&Hp(LSYwx79qKimrft6`V5jnmQx)wQMAh)9@)PWfGQXwr!(l;7%5B|LA=SWQ z4<)4CXgr1N3^&ELqOY~SO&i&)q5XMGz^2`8))<5l&uI|XX?UzPXfu$re;Q}Ac@D$v z90!H~Zs&M;C{uDrgm~UJ(;+t#W~Z4!o}MU4+uzWfK3f_1QW{bH!NCO#k`uri`Ed!i z%Zu%I^Np}}OVhJIdgw^U6E%Cl&Ye4#2Ho&IU+#YSZJ5X|1z}3<3M0iC>xq2E7Dn72&a$bmf)$Wu+0S z4pN~O z<)*HC(_N@Q-j4Frfrg&!s^V6}8)%aNP(Ti-$Fi>48EQ!c{V@1rXmh+9SWydu3}I%k)>$^(H12JF2w zDNP=v$RGFh1|R$xY&3#uklct~CTtYRj_bnnkB5(Ff11-ZICGh8nMIqyrB{5eEsAGY4llT}!!%OMUYcxrkjA zZ6HWq{&4`$$ZJ1M0rek}!T~&L+AmnrDb%24L%{-p7&T7ypPu>=FoM&lJwPsp36Q?2 zTqWIi)m0hVT$$CI6aYFKW>-4#bZL8~9d6uuBCK@B!jevzE@*>)8*rs%)}qvM^jQ9s zA0Vcn_0}SLw&dQG+7T21w|XbSjqqvZIwz^#+miapZ|vHYqNtn_Kx3=eIB_7cZ0h1!gv9TG2Z zoNnGd{U$Dkyqzy?((kn4)R3kh$4mW(?|aLEA%NRkejm8p=(w9TX~*4coSg_~8a>Eh zdy-|~N*`#%U{f@IuSZ9|_*FLYteT$GBcMWHYli$Y8lcnpXOljv39{7CnZ*WWmu9YY2!l=JrtK*c}HRg_*;tgoaqFljHF3go*;Lt+?!3e zpf=vo-mY$31{9#-(1P9pMMX)F09Ar80$XaUl4M17B9vnl(v`FytfytvP?%B}Esch= zVR~8dl#Fy$hq?A?#n(oAL8zjDVMU+~5LD<0ICEQr4nSm^SeKRI)n~qN!n~6_2=SQ3N<96;eY?~hZF?o0U z5AD6-z@6D@Z}J=FasW9%2i}U=%TAjPFwp3U6B_cr4%0H=kEZm^7{HWGjHhvvv2*L- z&8cLz`2>5*x;WkAG5Oig_T4eluRFBin%33Eanp2m=bie14%+}DXyluBpIjzPp7y-k zZcs>`05w2cIw|7LW3a{~Xk$Nr6NWUP7bz;~U}KQFaXlJWnqAQeVeZVmaN$CD^wCGd z{rBG=MoyfH0FU&EPh4oRL@v$O`R%1$LWdcOd?QxSq|8Z9u_6Kv`2ntq(2W#Mem--f z799UZwH#WO(%znQxM|~?^ttK!spWAAmPSHzxgMHzNtM)uSvaf$UXV&jve(mHq1>jx zqGy+-O6_WkCei~)0wCzNmG*gDu zVgPKQ$;yQRFi7B#Tx9?*<6j=Az<1o3G;LmQCe04uE-DmoH5Bu5$U$kL-uk--&oB2@LrsZ~yT5?U%PxQU@41jLeRqo5^4B?x#c zDjyW#7WK`k&^CZhORw=%s6d=fJm`TQB!C&9ZY^u+QG4B_JV;rhI*5C9p+$!Rl;_C> z-KDBS51pdGqSVd^X9;+T$9lL8q1HaBQ>K#KiNq190Mca+0###SX8xDM^89ay+hb2l zYY8*~-g;qNJeU}{7Rp+lZAcO~w{l7}Nph~eaRqoK5Ek2sblge2r?N_&h9s6PeRrg@ z5w$i=sWxfputrr&z-?jRj^gy>q2?h8B4yVP3aJo5!VjC>mXuL6v<>mfzf`;ZebAXNr5K1RCcT8-JJh3BJDqR1hfm8p= z6@Hm(kYUL7Px1jwOb4WNV6Zzh_#qkcu%CYwGU<7MAuNWps`@2c(O}PJW+oZj)*u_{ zhPM<_3R^Y!@*AHbDR5MmprKX+tTe5&JR}?;=WPDa6*(0tG1W+`{mfdL(YzA-@Ea|mx^Jmq0S1kYuONFj4BvLFPa$Od50G?7~+6eFZO#OHIy{z`x5g@Ov0_mv7 zL7DV)3xMP)YR78J@Hk3gfh2buaXoWb)%O;!_QGkkKDpx)L;G~u*dIsPu3ftp{^Rfc zU*VyL9txlP+~>lt{_3wr-ptL-Nt3_!o2e}}lrQ@tsdwTS5Ia4m88f+uf3ZL000C*b z?XoxZX-U^!3801Qd|1@MikmB+3pbm8 zTYL3>F|?|Z!Zlyh-K@$_I`A4wr%*W+CQd#ZPEULDCw4X+st*4~u>0keE|0?t*ZiLx|l`u7a zR@0A8FKXj+wW^=-al^DM0fd48WQwISH~gUJZa}%QoO( zVxS%XBS@rDI`@mVy~;OV*7TdZU^(sj`@jGDQ8M>yzxHe4qaXdKwEAZ^eZW7Ym9%f- z@z4%%ho?Jfs2|dIf59#ZIM9!HQo3WXv`6YIAk9QV(DJtuKVneELILtsxKTb&}@t8Qrruu1(Yn zD>rqELp?0dEK71Q8Rl*-h2Q&+|1LB&uK(Gq|2E9M*AAa~;y1#Br=HNVV@pLY5fdkPLk>uWZ&JG0HD(o0;e#&oQV5@FTgfAn6|<6 z-N_=Mq)l`6*>}JD-FTW6K=<=M|MP(>)o#u&Mt}N&C3h@qk(PPuwC=?wowV=7HnrL) z@#EU1ly2U;t7AgyelL0NM4VptvX&rcv@H2SL9A&>v$VYd*;Y&7O#97xl7Mw3B4>|Y zL3`tRlC*b_wXYsF(4`Jxy8T#qul*$*sL+Yl_N7c}r&FSZqHcdENO~;QCUVp_*I$)& z_~O2>QoW@5xE)SQJxEbYqMdlx>HRu=sy%JmFITAQ4&{oZhuZTu*t~yy$cIns1i!St z@?raZQ%~vRG(47K(?8uuNgs0%>NgTH{CCeB7y`I^X5G<<=+3;+pphRSHd}fI4;%kV z^uXafu|2?G1K^0qlL9=aliDf$sk`5MrRh+e?1l3mygyug^ocOSa*cjPH}w;}TjR2O z7Iw50q6nQSsg=;OXyZdG;otn{SHl1M>i-^o@8AFH@GGDAo8hw)Y`E4Q9QLiKNGyLA zv`o`j$&UW7&WSPGh+9^X*Xmelax`eJy~dYDb1_cTNUkt0JD@J|i3IYAD4fe3Bkl7) z>dAFTIlK=pqcNK-_L;<8%ie8yy$m?uz!KM)GiTyq2h@UBFTwd*=CphF6!+uFydJ4%b! zBjBPh7PPmn5>L#IYnfGmNtexYHCX6Qhg;2G4YxX<3pcvIp~c#ZQb(d&6m$)kE^pOd zIev`k(SeGBeuxxxIekwNS9D9nLgm4z%Wkana+s`kLz5qEEiH9-9*#g}%*SOM!C1OWnr;h(^;m4T&Ez!tT`n8-f-Gw1+p@Xo}5vSO6nF6v&{<8Ig=NE>HDg*PlObEO*Bc>U~WKMTL} z-~Qvk0S69O_^LG|afIKA`XvpgL)*!>pO$EAN~-1j{QDwnoBG;k{M{x>J3sSS znCU(kCdX#N_~@H#OVzCmuZD^4o07=sN0<%~a5#cJyU@&GfkNv8;l0A&40GL&g{8tJ z4Or@H1@1Lnlr(P))x}{%5=f+P+E6Dzru}F-#L?6~yQSqzVZJ^SPU#eFr793!d{0ZS z(&^T|Pwjj%upLjMhp1RRJ-dSqoqj}}rFFGl^8SHKc*YLfj3s_|T&HK-?nC?Va$pGH z4sYG<2<3EgOlqecJbh0yT+clX!+W|6L>>%IJO*qYXmGP(P~ssE!eR5^=E2SM5+{9k z8n#cLe>^M;M||hmuZ2JT?kk}-(h2{~m;PyZXzXL5ab3$)^_s@@YB(_>#hscJ-fX-c z{`e>VUuf%u*~8}_3jg%C|5-Q@&g<8_^giiFEt{#Mss(Lce@~a9zxVFK8hy?)wez&S zk8kMQS{(fs^9o3Dv-rd&U*Iu^BP4ebR)8X5bJ^8gzjloR@`itSfGsMv$ z9Kg_inoe&b%rBS1;`C?2wdK>gJYKp5N8i&i3#t96y%a9hzaFpc8mV6m^^z`|*D@%l ze44%UYLA}?)1}J-Ym>rgC?8%{`8X}hK@IJXkn~L>k(N;#di1TO(w_XaII8__lFBci z56!C7lT>s@YK4WP=|9tr2_rc}B5WpSWy4f?zwlY|3m8cYOk&l5J1B}5LX?h?@2Ql0|*w`I6 z4BtE((f;2PxFzVM45eLB3}?1lgE7rz_+&40Qb{^95Uhw$XNpA%-2o+qgn=vBJm zJ6Hca{NLaG-SDH=z8CJF{80E;zx{uNGpz@;-%Tg*wA>=4`Wo|*lr_TG_(b^ofA_zZ zTXxDWqiXyADG$6sA`{Jk33Q{fZ=aftQvh&MkAM?{4+FT@Uw>U-6vTTxOujz&W>Q6> z27h?>#OfvTZ-4vS(T{I*$I)L12VZx>K!f`ZHtADewg4gEsHe4G3q$%;G=LeW>$cWb~~tT9yLcqLx=j zuBtyvnqK;h;Mr-()pT=)_RV#5=s-stR9@AGB=HsPnUhiyEuU&Hn?PCUNu`MZ95+#L zS8H$aOt?PsaF`13hKcG8Dd>GWG)6~svxI(x7NlN82PQiDdAHNXW9DYlB|PnlI^`YX zdiS`>H_y-GnZIiwQ)(HH(ncxLjK!`%G!aJ%tG zaUvCOEUjd+$58%a9CYu*$;VIA+K+c=rj9X`1NyiOo+VViH5*31qy8_g=k%RJ9Zak& zC&L>9GXtnfZ6ti>JKu@?LTbtKbF6nsPBQ*&k8^G>wxNx5$)9?YGMcQ-s)-RMPWTpv z$F{e<{I?ssa;q9fmYdq9rsD-8O&u=Kfd;7&k>*_`T?;oFmvoS*5Js0j5OuhXmZf53 z^0iPHM=icA+H+ zL~S|TUb+!J5`H24>>e*F)_JLR8--~Ho%8D6~lZus0& ze<%FTr~mu#@BjI~i|VMlC~%U2Pmwo4cbTf!6txuFR@n`s8J+(clR@GA%(4u`z%%QcqHjV4ja4t-b@l{kdrqkNuRwv4i4!72F1RbOe@7zvot5wAK zF^!}RtvTu?)~n*$5ZCRppsUrKR!YCiFr{k?+N&3-7t}9$tg)}&AxijJNqJCOTa=U+ z9dg-qRLxMWane-Mu)=6Oq55_0r#ydFKQg}fMd>0dgz4#95zOhZ^FRZg07(Wl*-^K2D(j;>4Yxap?6mL7#Et-(WcYmwVE!EFK9bMS<9mn zQtu&kA)UEb;yBTjUPNhb3^QtO<>uuur7Nt)CnXt1p>L#E3Y}Xg)~IQT{+1N~DtG07 zLVZf1v;Y#mv}*5$!iuDIo#}9D>?hKDw-RpO__*p`QdUK1 ztQM2uqO2!wt5Y6X-Wki*`%gb`Jrag;Q$N^o%f@O%+%T?R-ihlm+~Xk0uyAEG@h7|7*2i)NqAb1#1Jt#1+@Qxb~hHv{baPZg-J8ztR-hHRPJ3a1s z%qBU_EaB|fh42f{{91Uk`AYcS+usQP>_7Z>VMW^F-@SP)eBl$n8UFTX|3Uab{SlpJ zQ`gYI?DDb1MLCdMVAhs6cbeeU^vDMu^;7n{OIhAivhV~tvE4?PfYEaXj~d#5h<7sP|K2mdTyy`b7{GzzzEn->_syY7{cHd^OcYf+w~MZ^$)kq{Z8BC zJ8xp!qOO{P>*g$lpm=iVfY~kk2qCH zJy34i7uS|iwv|>p-UiYYh{TXacdjd?!9jcO zdXtqfH~Wh*Ndq>gPaD{(q5Q5h$EB_!PwkM{(N8~Q?C*L_f(&1eI0uFR?ub|LR*L6= z0NaBB?|w)N_q+WvHxI;~Bs>r~%`^__eV^-A$ehpT7K?Vday>@UtI(OIPPy3}5=pKMEf||EruJ*P4lwu>hbXJAeSXKz3j5opKO&Oouc|Do0l{Ig%&^ z7VTQT0=}t8_0cI^zocbGc`d50I|WWYicc+-U8fjzg=hRxzz+j-!vW%+fByOKiBEiD zjg&zz=C}Fpc4*L+-@=flMVx57Od3I42IoK~=2IFc|4y0Xqq63)(pviYNXa*0pqadA z4<0}0bMWMv6d*eceFHas^Z?N4GxPHTRWkf=AZ}5=1V&U2!tf11-Hz!Bz&F}cVW}y# zBV+nGA+Wx(tiu!YPv|->sT5gFoF5e!BypC;0q%I;tch(={4ft9{}q|?+s|p4xA4H> z>^HQJ4+n+-?)cR8z><0pu}ER5JOMI!zy|;qlL$+M z=xRg#1I9e!oih9Jgo?lYY!ilw%6_En^f}3iL_yPHjCWA~K|AHZxXkd3&HLPm`sT~o z9x{hX%Yhqvz?K@iJ5wGU*eFP?N|buS3jyi!nC`w5>$tBLiB(1URV2--=o{XSYdbkY z&Wd#Nc`_qi+9C$YSZ1#RlIV8lov`LV?|$5tYpYATF%kX4y(LgbJrTB3)OL6QO8NsJ zPH;rj0pLWR0O^}IZb|jUxHix0$AjXqU$7<#TmgV2(AsM0W`R`zgTh~w{Bkn&@y8#J zZ6jXM>dXh&l)-h8(U=`lurv!lw?!ud{Yc)#B~_k&pjezHw~TN24Q_v{KaJL;ZzRDT zvj#NIYdstKpw~R0Z~2{e#Gwvs#u=n;&`h5Jpz$D?!>ysEQ_?Ev2LSGb*$Gpw3Un`5 z1>jDG*~Z1NtZTUz79I(=7C#V{yQfudsrylxF<7fxW}{S&J)2rV-_T_BkOkx2ZIAZ6 z0sAAbT(4<58)iBTa3naeGp+ncu;O?Y!UKQ4^tfXTFc?&rq!=WbygV^9H38*~<6?U- zvKwLdbf96cktU}({Zfy=h}Gg7lEPI-H3?`L>!1AGKM#v5sP)ti7cE(xo*W6+rr*^K z3yT63+TbnV2EC@A!IEG5Of+1DWcNG|j?1^}*fx_66E1v%KY#s$k-(A{?H~nM=1;9Y zrgI20VMH_CxDZ-RlFt!Mz{T=-1Vo$=tm_!?)Z}}ol@#W_$WMV9=EM$3+7W=(!-n@$5OM1xqhVAk zesJq)PhwZ9KDJ{@x`VaDb$gBTy6^tuYM0A8R52MA zMTZUkQ8pg<@Ak$wdkpQ4jfr)%YP(NGk5xCqIjr4>_R-|P5WpSHdcCJoxzl5Nkl>xc zl|eS{*wGL2c=}XsgyD}cY219~slWZw^zF7Ac3WE9Yn9RP*4uA~uYU9EQua9#Z&P5j z?dXKyiSk8Va6PY$=F&zlY0fFBzj*iUcfy4e=R%PqfI5Xp`JtCdfdP|ew+#~&`PSeK=VRGeHjRBiCs8>%7=fgu zch|1ph+t!8dOqBkSqLw@@oxCa_nr?gUAwK7Vl4+MO~S$-^9}HF?b@}tl)gsCIxi_N zod)SZTiWkcpVV(n__Wvw<2cF`4qu48WxW1_Ou(lo+tjKMyi}ymrj#^yH~<|HTKS zUSK*r`~7FN#8H&OPwpKR{aUUI3onOexerfx9hoxyr-t_DGnI}J?0lK~hP9O-N zLK&GvFie>1fjO6-0k)r6&)@D$Ry>i;ehC~9H`h5f2Abg$?So}tCSHu|nsE5>9gV>A zrSlJj-~8oI>U8i2LXb{ARD%R5g=lLsZZ3076EG5Yj>Tokf~0h45n-LKJf>xD8PapQ z?0s9C*d%4`XPiH`4e-A9E&6ba^`>{}jE#PL3%bYpMwzqL2}Og#E?gA|6gUONL=cJ8 zN@dh%Q9$C7F8GlCkPyya5coS8KKSyr@b~X`bE}#S-;0^c6VrWw=lhXGrnX{m+R@XrWN#O89#fLZ?6<~aRq_`s7l{oJTS*JnQb@cZau?gPEux=_ zUyG(*^5(%>?Xf7P0Qo4OIx1%v04TY94F?LvH>||?n8^Twu^*Is?_3$_7KQ^&VD1nf zYH8;zLhQ#J5=G*p6(c+=hAO;-%9HU|Vcu9EE@DeTE*m*Wg9;lm;fesP0dQY%j&N08 z^^e-1;>Wq#rSa6=-R0&Zsi>tg)%X$#^4Lde{4As!-21CBD5+eMObPgk1GI2*fu;hO z*HeNeoMdF7iOSm*M}FGQh9Z_+7#?gRq`NRQ1?FPaCRMMy%->2yABEh@&AketBT1st zu4xEfw2xHZYVq%nZs%#FwLhl)ejKbeKk2-Bx%DYf2XME3A6{1r^zvUz@yy{`uK6I( z^$bCExK!QMelZU*fSa|{*1L8BuigJa)?GC8EyqK#jBhOO<|qU}l)RU?v0rOXNe79uVHH$VWo3*0Q?Bp9%mlM@q>r+3t^H=tvYO->l8%xW5?Z?Ci zSL6DVKS&DPyj<&pq{=#b_N69>OOe1&7Jj|*x=UU2e(zgZCr$3YXp-0DF2?BFpkuY* zt@x$-*^s0#Vwbv98V`N~+V!V#t zfB|=}<@>_E-mj+InCC3FLp0FXlJULTDgakRTonpmOhu-4>l_^uEd=yxi>I^3vCi{r zU8mo*Mf@{@r3x0{1PJ8|OIA!TTDmlC z@ghzo0VH_DT#Ke+Rf#!1m`DtUr&Er3`51Q{qYZKEt=n~ zWwpAAo(l6II{QWEi%DtGz7mW#i&v%xHIYEvF(&>H@`dRM_2R1KO0>B+yjQ)=4Lb-8 zg8E=!kw>AVL~6SvY>|jmk5wlj|IP`B=(nVCqLpamX)I8uYX#msfYY|W)}N=f-&aKH zCMXj@B^tzzP)}5vET9@HK_c4j%xj@4_(<7ZTrbmXLv^F0iQp9Gl002 zeW1FjtlaN*zR!QeKvt`d>gbuPr>Uwax{B6e1u9;wrrUDNi2J#F3WU7RZMh+jqpw`M zXloH5qIL^-MDcEIh~s5BubiG2RiYY)I;R=~uu3QG(<0C&TKdJ)y|&(>x0VaXu;EfV zHo0I3wB^AAW$Zd-kk1IRz5+Qu(=(PIKVfIj9<$2aIDoTY;YI*cXUdwfLX1|hbz4}n zg~b^wo>;&;yJGFP?Xnp5W+kPZO1!iEWhWq)%N|XeLBxyr{A^Pet+$?_1|lc z0(Ahl_WJaiTBMi0w&=xQxz8W>lgG_GIjpR^wzbqw?rM*3i{HNzsOg%UwVl3AzF$7b zwP>XJsQ9(7kG4Hsy-kM#eM$*$n;$xXzBFS?NUyWU#s$}&Ut z<4x*4Id%{P&XUoRC6bL!y(~~7fF|jZ=pfHj{U&(L1@NYGJTMV${XIQJYPa=UC5)$a zsDiB_OM#3Rghg~-wpfl?n3!}8lfyPSa@dx}PFiEQWL*PY)q0o?735R_UJJiK6}bSU40fB9Hh>AmjH-34Y+6WTTj;S?tktI4<%6!1uZypTr?KC!Yz&>9oo>tsn24!Ly5yv9Y^Mp-n$1>&wL0ko49pj8 zFKgxeu3K^~T9j#532>v|4$J~x!#E0bbTm3JqP7Z@NR_PP3c(^;6$mmdrd}(36A}D- zxRTzwzxHYE3eE(`q1Z;cLyQlFV~Lg17G0XQ!2Fa=9DRjoIHWRg6j3zo!24?`PJbiAJ@#Fi^y#p)za0T`Jx!PU(`%>F0F0F5_ zF$&ZH+#2i9chj5;ll{B7_$I$b@uOrou0>4H7fpO(kiP9&Yg_vT-~=+{L8*Q9a%BpL zexjY$wKSEqN#R6vOn_O(1WE1j=vz2r^z()qPZEzNb@7q?#$F@ReI>6@w& z!jm*oSg^p%Nh^$=CVt(LZ5Zsdf&O+g(w3pGwBizWa|FDOMhL=;WNmRSi-avlO0Y&3 z;JPqQLU%Gm6qm5)LqI3#TNT84MXG9`e!KDqq0U^b$Y#$0Ufx5|L1TpxM(7jN?|cAc zQSFKr{@vBRYH3rxMI>-5X`nV-ZPB^v>v~y#6sQBZb~V;4Uk;%&D+2G-QTrJLyIj$CGA+Wo@mB0 z3*=ph4cc_{jJ2b-OOn#4siDtKPGp?1cBnLC|MGwS9h>0a9N=#-wF$`ujF{-F!5ECS zvgqt(hJ^q_IAE??@_D3DP0gHNvGh{LjqeBv z>Xq?9%0M|E5QD=?I9fPR$ylUeY;%9!1uM>TIB9`sGh>)g7Uf08D=Ni6)Rq=Xj7PEu z0Niwse5}J}irgE6{2Bn&KL*+#?=49 zM;aF;w^0QxD;ugli3Kv2jy2nKq0v&jUmMEjt#amoWkz1JcE<7Go%cI+E&6Qk$xQ(~ zN;+ZGxx!di+_*4cvJj-*ykBWTpJbD$ep3Y7jq%PQA*--YDbJjwk7qhZ6s|9`qydd_ zJZ;sA3YksRz5oC|#65HLc^vQ8)k;K;ENUmuRtW(}9WG>Fkv<6%E6*2^MWwn{Tl}8t z{+so$pOZbfSHJ1q@$<5_^;^dUW>qv7%a&4exvp37=j*qBAN9Ll)-DCAv%}hLU%h2l zK>;z{t0^~PQYb}m|95jTV32BrVIWGXEdVFpB)>V#kztl>W582!(gY?r0-zQ#pe_nv z0u1z3Uc?)&08@~0Gq=RMkp$SKv=uQJ-?QUx>)Nsn2C`_KQPO6?ptFgTC3xN1t6C<5iGo zV&GmV{yp>`SZ-`w-K%-w9`E=O2$TDF$zss0fi|S4&RKDG!kPh#JzZ^1+NX~)SLlxm z0Gz%Oj*BGX4g*&h^8%p)5joVl5P>vcVQa4dvUwBoZ0r3i16(U%Ks8GVpdJB83-E$6 zu*D-a9PhCMe5hz+y5}-LtyZA^*N=fqQDWs>v2y!T*VOl|Z3@%@+}iHn>uQ}Q2+u$K zWa0KP(QEDZUC%>G5k)$Op)vUfVWMCt2hzko^z0JMrOem2V=S-=fjn3^yc=eNR89b{ zfNf5w5+gMc>K;@(5dxA%*e3=v58w)8zcY0EX4`%5?T(#?lpd)>1b?zL1PUpj0Qcd% z>4iD#Y;3lL{G|Q)(|=@N-T!~ucfa#xd+@Hut#JDuYSRNVmy{>&?z6b4WcL@?Voj`Svg zL@NsDaQR@BlN2m)K20AZRSo2qkPgie4=iPkBs5R8APEJ?hto*sigd74d`P$&k?O5h zl*2U3{hSIDfLKAQlgkkdmRf0Fps|(b7Vy9%>VFmh1MmRKSrbyl_GE(mX}#lJXu_0Jb#Iz2|x_^=20U+Wf>T zw$6flzl!!+RMhviec|`(m_N^r5ACRzbxVQz+p})FzS?jU3=qpB5r{<-7DJjM zCN4=%1comUwV=WrAVE1heb~ZdBdGLRY#?zD9(XV=r77ZY1xZZ|PTN}G8tO6$I5-yG zZ~yv*zqMc3^{e*SzE9YO_ARb{PK|+DY?j32-+$%@gn^j60M10Cm2~pzjg|XFKTlf$ z1)V1~n$|r%J+^!IZrid&&%CvZ+M`%-YQI+tX`cX!ipwtvYR}~YmQ$8+#T5g*73uE) z=fweMATgVrnzPqW&DcxFXYJg?JfSb9ER>ltYfjomVv}tj8nA7f`mC>`3$n%5*uFLJ&C!U;zlhyiBsXEb9Zke?BR4BHZiqTH5S@ffb#mjBzH)`_9PdUn z&Ic1J-Kf})fYNp0U?Y3|Fg??Gy;m`5!kUy`!UVjv*1Gx3q=hxI?KUsJH zqP5?5O*gvC$x#{OA@w9+@*s)>!%|uudBSpoQC=it$8=cYF!}jJ2uMv1OXg~AOFWHX70~VeQ z*uAVlG-r|xVV{%Z;P*EZ9BD3YE0Sc zXuklA2de@oYP)!Q1>IyOL&9wz03LQzvJbOJlbtwq!hZ15L3`@u+KDrxPQn`mkjeH;rkDvp+kJbE*+=f#YESIjZtZQINaB_( zyM(lhaTWx$R0LE7Bw0&+sy^29+ya0B!d(D$qKD`riKW(6+Af2s%U6HZBY_|iLW!Ig zCW*H?XE-7pav1!%Sj6*%k^&S1>3fn4*As3=QmS(4Hgnmf#F|~DIh6-FHq8zmtP6vr_!I}WOKt#VI*g>J%N(Nx^ z#D8jvHQLUBM*Gyg+wH(x$87(Rla`qtci=4w^VFxlsvZI~821_)8nQ%b%KrSBui6*@ z;O~9(AKQIx_gjOcAmK*K@!UhDm+asE_e$A6vxCDj643 z)~$2a+|p>De&VO>mwx$IuBMsq{v2l~^zJYJpsy4t@e(-w7Sj=s5opzR8HTTPT9_eX zzXrf@M(%hSN@dCjID0;A-+Se_{nhthvV+6t7!gtH>gcwP)(+x=g=~2Cj7>~T+0^W? zojN;f2M?XGU-|gM_EY!mw2;DKT)~S$k{~&zROsX|@y;TREmo(EUH||f07*naR5ra> zvhO_in*H^+p0vYLL7SVIWekO_4~biQd%I(x6B83QK0aYTc;O`*9X*BZW!8S?v4^cQ z*=m8s1teR16i7#?LOV4c7Z$P(n5+FE?BDeM=${8}dJhF~y>WWgUhevsbb#lS_|UM$ zNoykWLr+^f_JK&Mp>u(Nys|Cz@4xeyrB3d}sn#5O!kFdB%rJiXgw4-PSR>{LoqdC# zSN1P0RE_F2M)jWQg#%b8d6z=^(Bf8e=>oI8ywY|pCxf7b!rN-C|t?K*&4e|`S87W>KIZ98i=blguA?*(A1xwZT0nOH?CCzx3X zW)R2bt)Yw*14!2p1i--%QW!&r`KFHm&N4+LB}i(TTN3uMU4u9mpuWQHDJfev?2w`n zyb56+(#qy4Nar$3){)$1cWk}K-aIpI-#PquHdmUnU;p@jV-GalkD4}b-#+uCedEBN z*o$v{-}dzEw%~yl+ZwoA7y@;kS%b8*NL`AO)NsEB)U~Mw?4xdAaS}NsQMYnY|9Xj% z+M%)J$DG#6(KISM1wAJYa{;&RH)~wg+|&(vKUh zwXKIM<96=sQ9FKi%J!cax8oz{?FVlj=ONq|iS46%cUlVPg4IeC`bt$A!fwq{%{IGO zu%~}~(7yh?AK5EM#}J+cY|CJ`-Ff?vZ5imc_SPn}^iex=Zo=LosO^CxXYA0(xP9g6 zpIE%9(|-PeJ1s7U7-ctL+(=Cr1i+!G1v6ov$Ku*e+ZEzMN#zCL{JSM!t02CT!0B9# zzw0TAnWix-)52El1REL|$e0P_3zCH4!Ogp+`ncx{yip{j2x+~-Q? zD0GNC4$HbfCr9`y7g%e-4ypmWo7UJO;7nd`h-f5DfyqW>@D5T}!#8$AGq%N@xZ(@2O1jGL^)GXwEuX1C1z zL?b`J>IN%m<|k>t)^Rbl+TyPlGneG%RxSc;@V{6z2vNIu+<(UQ0{6);H}J11SU?kcM$%C@G79$w7#x5UPi^cp34PVFB8G{`O102)5ss!_T|p; z=hoM2p8|CNx5oQeFS%ZNKT&u_s_m+Z=A9Ek?ZhC4qVr_Gq}WutPW!w;I-A#3(gY0E zTpr>X$CV&d7!en30(w0c0b2bQIyH=4(6~EMddv;hM zgcN6D*aH0e8-tACgV;;u09^_Nl1DP6Yv-0y z)`zzA<9BYhfmRIGDmW;_qn25U0gA=|Qb(}iD%q#@?X)j^YOif>kKzeAZ4m%PMX||p zal5S}W&h-J58FfAyY0(=_q2WM$CLK-k+{u#>rMO9&))~oz|(kU3iCP=p`*r2H8fd? zyq=^Lz`l#5>?J~lG{tTI@VI^R<&*Zxk!fp&*xREE_TT^3uUmIpleMPk@XRdgNE~WH z07_Jgdp0!K7eD*3#Ue%f)31Nae)9Ye?Zo|CZK!86c~8kfDg!@kI`i0mg&CUz15Ng^ z2h#R8sAo^jq%GCjjU69y#8?t6qnrjfvjAMXd;4t;Fj=DW5oW!kXgs*Gyq0uNr)g7h z0(D#|vkE*uPD1()%ny2z^x;lW9YF4bL>DMt9#_igf&rb$5X+4*mugH|CA(y2P9C$- zBd^;G`t1$d@3xNJ1li$qg=%S(3VdeKa!BYB0J9J_hl}YsOC<;+g10W6s8D=X*>b0q z&OT|Gv#(k&X}Y5ER-1q($1^w!MR_-aNkRw7K`Dn~6{#d+M9&DwPL3+BbsIUo1Ab0b zuyM`Le!ivo7mn$-KUe4Lqe$y|S>F_>1GshC|EsrjG6Z+e1_;PTM<7bh3QT8?VL5Qa`9UOhA(&5LaoVEu7|pkmgqyo5T~UQt zRfHeqW~zO}`dhZzz8#;i@wwCX){*^IL2b5g*CY0c-Ji3q-FpaNDu#;TH$^r{o(5ie zZCk(>728dkr(S?p3>&L5 zP5}WtJ`p6*r;5`?5ay-^+q-9*&10BfCb;u~;W0b?@~ig7?wH+w_ihX0+!6v%6}c!+ z7>y$6A{hf@Xj~;*0F)_v{mp~+gCD(a^NSh#$Yb}~6Cb&gx^-gig;Ysn4vAR_v{ZH| zhG4$*&7O@L?4eydZ1nUf4gyJQkJD#3yBJd900X;7eHF$-jx-I#tlQkzZoNpZ#-_(` z0)QSuUn*k8fGJ5L^?{^uQxUjYK3qNN+W%f@{AtV;2oIuXCY-|zb;kMQ^vNSOeBwCu zuGp?S@3hXrjbt++mLHO~B!IKT?*(iFXD7z2gZHu_(&4~IfWDDkp&+FsaS3RfYG}3$ zPC4ayq}hz=IDw2?kxrJ3Aj*J8y#rcuv{^ux4s>Iq+V<-tz_pX?1Gz%|;OC4hRlxVD zUtj6``th|(fjWR&yM24bmiY-o>y?wirS|C@Ejs3}z2ZZzaDoE%$^e>a+){`S5-XANMIqaqNJE6cuzbPNkcT0F;jh)pYUBEa6PKpmtKZ%c-`KVF%P_gr?7bE_&| zH^#W3cVN)HwNK5w-cmcpR^Cfqx6uG53Th1>ErrEd8##H@CPsz{a-Fr#t$S=>^JXNJ zIA;(8u9}yWK9$2sE^lM!&JY$cih8sSn>xL#zTT3;;YmwN6RB1^KR#(`HDZLO=FBx*s1PV(EelS1u2Nu6qsz3s-=vEfuCe6h#zJWZe~ORx@M^XBTx z*M3Fuz?i(8q(b&!ERwp3nYw}m#{oJRa6cED>#L2Kz+ACDNj3bSU>IVcpgokG@xkNwO)8PPr9Drs5W)drtzAX|? zVY5lF+YFwm0G!6=xb^lASo_GlO=kgms4g{jii~mD<7r%JENHC07e)8>3qM@lbze6= zwMkfzfTYX->xHRtJ2!mN#?BnGHUR1FJ9k=Ta3^LA0INkLosw1}?UcGz>FuIimqTru zULu_s^a;sDyQbo@Z!MzpPb8b2I$LQTV=n`}FgM6+JVAI`LL6YJ*6w{GI}H0&ekG)o{IlCu2|NAlVF3s5~cZ zkrZarGs>YEM`D_x&!)(i86Qf8G2vMhCTfIz!BRGNtpAf5Zmd8L`4zs-#e z?s!Xkqiwovqcyam?kg(&7CAZ-oQagFj4C&RJsdC{aS_s=Il^O*mv!HLx7*zxy4#J1 z04l%XL&J6gsnHUWq9uYuOY@th9t!|QCoN?=kj3tcxN&?TIL}VRfjkd&KH#*8tR68O z9#W`=qYS#1mKJMh>$W8f)S`gR5Yne2p0@g^(1(GX3%s4Fz?R0|jV=x(@azEnq&6w` zpuC@p*zIY%OmOKW87G1Qnta%}(Wqd{l3*&E0`F}Rd$|%)R(CJx>;m^Xu*kd3JLKCZ zM-Gr8?;f$^M1#zXWloJ)V_3kog|uSy1zy7yvYqI4b|TgrO@I&h{-T)&Zng8V-(Ooj ze_Y43ydUGE_WAYSHy;Hw_tncfqJSm=KRNh`L)*U8P7>PZ&-W8X?X~`z>ss^W9sxPU zkiNua$jqWRaPlBNVsON2sMeWw37x@cA~2%@M(#x-0k|9hVRUrV=BKCZVD7lRwjYLFnzhNX zF`Glh4OSu;?xJM?;=*;?V1~MANUE14E%J3$9hC_rnW&I$kCv?Zv&N1 z*!ekv5MwLXPFyufToV|ji&g@8D(ZX3pdFBLyWZ6wy|1@^jg(B%M?m*9D%Nq1=aFiP<|SDY$@>xP+&RfPV#eSpk4mV*B7hD*z;C!<+*+$EwdM@&z1g&2j z*XnD(T&{^aUfYlF=-10#Sl_>OEsN0ejU8Zpk_wRylk|MC0nAO7MeNs~pk4r0rc^<3f&#_*zCTFlzlzW#mt z8&6bKFPRMvZgKBgUvDo`L8Nx5P^<6SGQ+;k?)UGlThkAdWeh+yj$%} zfK)0-f9PW>h>F?GEmiSZ_2Y;B$}Y|DE+f?gxfQ5GjE^V*#&}cAIsv$0(xSz3)7DDA zq%osN^WjzGotB;9+bYb~S}mfRqa6+OedgQh_xo)f_lw_GU$0LJ_!((^w!Yr#3lz{K zv2xXMeaB64HD z7J%6cEEPHKb}7ddz^=$mi(~+Z-~l;B#(?J!9z#u^v7dc>pABy8aR&4S241v4x-CLL zpCeV)v(LO}M~(vCxJ8J7w?$N^@>+ET32jwPFR2i9pj}d_k^t37pVUtprn0M3eS=N{ zC2wjrwVxclQsHZCxq!Fa1I?%Pk05Pc#O z1*Hfp=|f24952)M4Fv2ZQ1xW!EjxE^)W+DK0mO}y4^^@4ZohrAwRE=F$jj$lTf;Hn zEYelk(z!-b|B`G;lQC!lz~$>oA4rN9Cm<&qLVb*NH6?8pwRnI4+{p$!gQ1gvZ-rxe zuSM7OQ2c!1*H_bKH%_kR#QHgFmI8GEw`RNcV#7SR@Zdw>Kz1%ZFXP2CnJ&d~mWzIe z36`sf@S2xHF1?Y$Y7p`RW>dZ1pMB|dkR;mKAOSxCU~#Majy$3lr7~ zP-+h?!A9YJ*uOYEDF7?Q`K}~ko-lz-X24zz-p2jrZChc?hRQJ6b|fT3y)S3Rnf&1l zFo1lS5CxHxMH}0#9N&W7lIn~76&%wU)x#jA>M4~Jc`6HLfTn!E!rGHnpOxq2ls?ba1 ztu4dEmFlb<%>bg2ut6JT&QR!#Eb4EfgCR+QrXZR)Nz?PWB^w$VvLC&0yoEcI?MciPD`N*q2Fqr?^+5zXODfU(rK-Q;FmWZ;?gy znz8w%JgG?YHc90Fv!uD2X1$2?N2oB=)L{qDF4`-H$E>%lgKMcjU94p7Nu)l{zWK7f zil<~bo|68S$j?<3`Yz(bb##zEs;eD;h9vO><17irlfv65ge@`Cmfsomx$38QUUPsQ z<+IHrZJL_T+sSj&Hig77jrvvvk~v44z*5dmo_NDHZECT$_KlWA3YIBg56AegKy$&E z1awaEu@S>bhleq~BP6Pd5q3kF6rdacEXI2kLxP=WJQrg~J?V|a5S1zV)UZJ#?HpcG}Lpd#w>q z=|!Z|4MXG~Zf>P7`FNsFWX4b+#7K~SkGilVNFa#|x5N@e+Lr`i=aGO%6F9D5E>UP4 zvYC@7t-k<(E00?*ZY>N7B(II+T?x?&+PsE}A1l5|noBj0$o5d<$ImzZJU^!V2c70( z{q`mt?jyqAtiE1%6sQBZb=T$ZO@sXebEUgg07|t*@-h{HHwAYMBdL%LTu5q{>Y?iC ze1Yp+8SyJBKU0=v2@Wa&hYZ%2rl;*yR5`6%I&HA0%@PD_wfutRP*j|V7_w#PZ%zi)CYVFC|^D1WEkvM>2B#+ z+qt#Jo_P2!+rDudL36vTr@I+XP^3{f2DG%qTs*uW(j7_V${x%Lth24$nqM3b}gHab3KGuS@!?^~Y&bpUtk_u;B7xZF#w{g*pddqaPYCK^B4)E>XmZ+9JhL-`=3 zE`@zmRZl>%Fu`|~=QP3$E=dCqU}EQF);dqS^e0D*t`btaITl6mZ(`!l&rRCFgRk2B z={EcD19#hw4KSGyp*P|L@dYT9iE@uswv!%8TBCYsE#T(c?)E9egTRFtj%va0k^+W_ z|FA}&_kov7(cRHi^t!=C-685YaKN)FFnu63paO4Uf+P=A@I+*PMCxYt2T(N@VC+pu zhw}8Bl}LF70?cq-g!p@NI0TSD!;J;S`I6N2=Rf*@{rWHcv~B9@M+GNtuJlt?=ABNT z2ecs(qwfR`)IVMtDKJhHGbBf4(yr0nacY7zXxm2mzH&SFDcjDSI|)d8lw7H!mIfod ze&`65txA>4NTh;MoEjK^Cr+OOu&c2pQm$>b|MpitWB1*ChXv+P^-2_|5eaA!Ks7v1 z0X0L% zoP8QnP9E)Itm#g~%@eHCSQnVOQYrIM6K-s?j*UpG0dXfz9 zWuzQRs;(k6nZL&E_<;V@(*FIf0zxK8q&|b~E4LU$>drU-BZZ8ug$4PKlgJ@Lfyg=V z4jBaia0(!j!BJp=h`D9Jw+!^9<`f6lZMEFi-fR!-y4^N)BMC$C8bCak%b_3)$IxUF zS|&yCUZF_g7Xd64ZM!u<1QjCa0VyBSA0$~usF5J4*knJ3WxYLg=N5b9?%VAk0FIMw z5eXZyJS>?-wTjncB@2j3w%XX#0@6X+g(T^o9h>dW4eb`dKCVJs!2s6?ES3QkQW1x^ zuRbz@4uHKK1ZlhgN8AU4s{>$107t+#6lt~FH+0yC@7`g5_0$VCJR{XO01N5U+v>Q1Ru^MRzZB~umyWl5+|CjluCG6bW~ z2+e_is52B0xYKn~{kkj<4thIEUiOazwE)#nBuO@gLA-G@*zKJn&DIGrOC&7P)CbKq z22gp+s1F)CJ4H#h0iDXFDp20qB2V80A4Pz0>Z(A>5_r$ePq8Lv3LjPh?PES5fC>FA z^9IZ;)Q@Yp_;=fD1}@c9e~zDv-ada_>TGu?_W%GO07*naREqk(^+JKQ{dTOEUc8ES z`bof_s>#4l2!7wC*0txn+lfPiECk~b%a(_p7_hP}Bv8L4U|3QSNvcDIIES-Q)xhtn z1wK?F80s|61`AvpMlCcsdcXIqckC9G$Xny!g7kIx=I0hE5B%_mi8knaTg{ ziLzxsqNTP?Qg>Bt{Hp1EmY?cYIZ_PW4CPXNr+Tg2eY?U+-iw+iGD02dC|WB{fea}D!>fq0YvDxc4D+S8!+Fu+;`K)e!^4?@(cAKc4LYs z<|J%NxrFVT8xIl~X>o%>qv_&O2DAYcu!U1_U#arsrHtnzG0M_-AsaE??%sKuyCRB; zvPhPPiLn_Qoy*w*wpbaQTLkEWs0t+q4gdsq@*xnzp`v{DIQWpUh*OQjuGnu?0B>bL zMF|iBTm=YeJcC47^jk|AXBxL)t)CUZRJH{qWEGq@1g!4ab(?J;?6FV*@6=^lED~?7 zs}(gPpsf*m&}P#@Og3!GoSUum*m^&Bj}mxlH&^fi#dErmP&g6gG#p?3~RI_Jv5kREr*9 zDe8S;?Eo%dS2lo?B(hHt47nW%9F;-Z$cG#1a7o=W^Q7XMCx|j1Oc6q>sEb1YWVtF; z@a%<}t5$6-9Mo9XJLTsjz0@g z^Zhxxe&sz@yUrieq%7_$HC1(TVuF$l52~U#sxqmIB4Pky!%Sq3Pl?@%v5Ci^TFI73 zN>5->Rv13dTWtOeVIL-7#${{n*@%79yq%ssZ<8>H3P#|Dv_Qu9`WI8|s^#LcF!+t- zwV27JN(nDHg(|rji|@bpqi*V_3Un3IQ04<^<)ZXgDwKE9w=#?td5{A%lB@&(D$4sA zpd%#&Y6y`7697@c0j3kjgo2z3oD@l+Hu5$w*k}DLM0Ryi`@;aNETAAFunjm1%lnh^ zw(+My#j`X!}y7oyLsS3EqqxO?juBxJ^1{avG zs>2qT1t$U2`ZUPWQzJBtHTIU5^30e#8B($MGtG_qGN*Zja)%oic-7xXc(mP>U` ztV($OT$vYXzrNAWRb&roE)~{6Qkx*aR(U*?H6sc5mNB{*b{Ut>GGIYqLlV{? zYSNITQ-OI@tw^B&d~E=x3Le99Sdooe5eZc+&VoZgncSBZlF)}!O;#qyrUEtxu%&W9 zP>jqkYOwm1XVOXZHJ-4Dh$yUE*CTxU}IYwaKKm77v zIN%`Y)RFuFvDgOe^m%|Kbt+)z*51`=6%6kyc%;SvB#zeAFAJWl$LoVbRjQ6vC!Jc} zb_e()wW&%42a6nai=jR&BE}QBA`N)6HUV1P3HrF3Ikofx(#Q$o%t@Np3ZRwkY5|)$d1XqbDn+b52wbBsQLnYK%g?JC zW4^3>xBWT(_{wd+zrJ376sQBZ_1EXu)Z*HS~6^Nfv*jJR+V+9%*9fF>{(Cf1m?<=o)EYUM#Vh`rCx{oKzvI~`rKUW)_Y z^qtlYOwmbUHY9~}28Muv5Pc<}TTOIM-vVAjPVYt^0!Bz=@mI4B^Qv@36dVf&?xCgoNS7^u5LdYxY;@FBM6?^jqUe(weX&rn)cpDI*OM zh{}OL<(aCxDU*Qk$P$v@C?1jWjGe}2Zszc5=NYNEb407b-it6OWPxZRpRU|yT{<^C z+W`szBZUxQTXvHUSZVA+pye^{D#st~!*La0f{K%n8cEc`0T;wJPUbBnYbv6r?xS!f z3|Ru~U_(eI5ho#o8~{|Hv->Attn&q?^;-ZZ&buY>Mr~aEoN81X4nP9xI92wGQgk~& zr1P$!gzzZEa1CJ{{Xkp6z-WXUt%G2{=g*GX$zulzn}RAAAQr-IQRWC|&y3h2>d`h- zu7g9H2U>K^`H7tXuPj}YP;d6~%=x_~N8%sy3|w)V=TbtkZQg4vcNnV@a~!V9nk!-7e} zfV6KmiszzonMTP~I&;<%Gh?=dGeZ`MPhU&ie(Aw>5~1Uvnu}RWJVR<8?6OeFNaa(; z_9~E=v)5laX?u6xYrWm1G=gzg5->6BpDNKq9Nu#9s;P!c1?MiD?>#&a`=9ak*gYuTCe z*mb3?0ZA$vL=XTl1%TAj7`5JxZq%6zq(4JK+JGI@+$j5@DbgMpvK#hb75ci8Xt$RR z9Ve4?8itV--5OLrmjXi zJFkd#SxZDni-jv}Q1)pY%S$YVluGHWHa0Sju+wVN2S8qJZ?WfIecc}Z?5C`7_(#}k z0q6iCQ%HW34Wz&-%vuIJuf))1TRJ^qsUAtENHGOS3@UCL15w_$X+m!#v8O9D#)5#A zfdRZx$-f#!(w7%XQJlQ!0^XNM4)b`J0*obH6fmXZt2StyC-q}RC=E3(o*pI$vqsQLD_7ng{TOvrnBS>C14{WiaU3ZxEAW@xJfYyAl zA%!hW9;}**dpAhNBDW;=;J2(^9F09>RVVP_I;X0b&WRrLuB(t?&F1i@WGt5t?T?dueG+dRGm>SQfTGS&D1Rk!V$OEsoNTN_x4PE)ZlHY)=(7;VtC_8J(XoT=?gMc=&C&EZmu?>9Lhi!6k z4wVQKJA(WHBog+t?h#J;!!N=n)^VI zx>5y3CFB1r@!g((>3RF>Cx2i&cWk$Y&MqsE(kX}|MGRn(ADhO64r$b`du?WP*8Z>m z=TGg?2k*t3bcoO$U3?@Ik>)V!063d_y6y9y+Go8zoq)i0d*cuRYKMpIyDz*9009^^ zrcmQDh(ZL!#aZC+@e!W;q;1}_&H9=MQ*!+Td2CN(=U9-}tue z-Fv@n8R$d8$GBCSmE@gvxxS=5E=&rbSRX`c_aZ7*AtWcTgnO%?urvZHxr3wlJ7^v#< zTp$qPq}BjRIh%B$DlLG{CyBi`3r*0UTI={(-rWiJ?gVJZ*%PO2dh`s=3yTB+1QAbCr)&Czyqr$7%$pv{Hz_yFIr1* zgY}0uV0#B6BRYH`0l-kL2sM^UBJtsk7|EQolaYgV{P`#C@uAP#Cm;Nbb)-66KvDjTR14P~Wd$XeY0H79d_F_m4RTYgFq(~(KzeZ%(jwh#>ep6G*#%BOZqB$y0?F&LwsWWN3 z+vZ2LF%B`{IDty@{M5Yt-S?iiU-`lr+jrLn3lRV~y?`VzgyaWlT^aBmj&|B#J^PG( z<*%P|Krf-VV+EvcQjLoiNzcvrd?XQcgek1Nb|tB$T+L*M>?qxCr*qkNf}Zy z(Fy!{q3GkoT?#;3t;k+cfqVtxGT0c-2V*W?UlX==$}4-dMbB4}R9JP_wz2`Vb#&U? z!jd)h4xkFhlz|j!h43kyQli(V$&6nO*91Uwdt4bo3DM%7J`#@|Bid?i~GK0?WsP?D^i0Pp7Y#8#f4G2 zf(o~^kn!OR12f zDeG?elno8_Tf-tAqS(xZ2~$%Jj$x((V%N?J`BryK?<2>|^>6L8hXGH6eeHJm>=fy)=4}p@Zg(fn71XgA1N@OW?)}X3_Rs@+tRu$w z6VT>%^2iOg^xDh&kJ}%8{Yg7LQ?T9*s76V-MH&bvNs1wDb8P|0Iq{?_!TTgf8D(m4 zHhW0N+S;1Qjmiy4hc!QgN;XumG|y;6H7VP@pzgDb;N+x(a?{xwN=Ua_K?X?okQWx> zrnwF!GcG07*oz5`=c<5rwOhR7nA)RIA(A2{QmCdU=K#Hg_`w;WtErW!EG@Qpehf+6 zc|x^hY;JtavPdFZ+Zt`_<}KFL(FgHRD`yGhtO(4gjdQ5u7f|^wVDp&a9V;?cB)xq% z^?OH!Z}J`fyp-qO?}_mq(B|Ot<8R2wN-lY{lXM^#i9vAi!c7S z?%{v?W0zZ3&*OZUi9ArFazc=&s8pn@lq8@nPAG#0!YV{LAMOX!t4>}@*i%**5Tq0W zaA+8{HQZ~z@v+~vj>={LAz24_W{^+`WunDPHP#5Ddg6&EtReRH zSLj+NRY~0h+QbYcrI8W1CUghh)LKpA7fJ6Zb*;}>g}m2)2=FFmA{Aj-s74%@KAwYl zpFMRF3CaD#vV*J_#y59BG~!P^n5-_#eOhUAv3; zZJ&MYej7lAFL78H0QQ$p{m{Pl&F?d24%y@P?}ls97&=Z3L^TeKxW(S{8htQj?>k!1ohU&J%em0?qr zc6!=fVl6B!`!fxq5>n?yXd7d|%Zpe+w58s?Qqg#;j=8Gju-ZLU5Ydoo;n+FUvj9a* z3e;Z-GN2@Jbm;2sLK0W7snKzpBA{;sReA*5Hf6#9l{?$UY;neAmslt_P`4By6PrX@ zB{i{}Ul2oHsd~5kaS!0G)DZQ7=25+GS3B=s>7MoDw>Aad&V6p}w$y8X11O-0;(7ps z?097Rr29B#0xyBrV`vRafzivZXSLFdv3!{8!!T6=wK7tQGB?l!AHryU3Fa6eaB56; zJxJ4#>tHtn!_JU`2V5>lXF{qU0Q>H7rXQWxx* zk#E|czwifk;KU0ynA&LVxs5ht_d1R#;1E=p1hFTK%1b;mS4fi?$thn~tNs;_d502z zVr{HCP3)3hLb`VpKbgPd!27)e{x60i6>5zcYpfVc6MYO zsaZE40%aQ>pS3rK&)f4aA0PyW+2arGwG;y^B(TI-S;B!p$<%qUa~yCXOnA03L*!9| zVu(lVI6WBPthEgP1-S5PZa_-)v4`%kZ~owQ`&YmB@9ifqyl5NyHvqN(DM;A{qYqef6B#I`$rK{Bu}T%~T>R}mI7&7HBNJz_IXp_XGaO4c zY_mwu1|)Qi0JbC+3@luerYa@+U&6PDf*4<+eXG~});OvUI4!ls&%2j;&)r-~U+P%B ztZxd`0o)qze?JkZnf`^>+Am^iS1P*4yDb7}P5{6S6r59_O)9pq)I~7NE0su*R6G2W zt(EE;AS{Ja?nsNutw?>uB#*ItfXTiBSU^w)TSD3+X&v@g$;uh)Ya=#XF=0Kn-G1%i ze`+NJb1xqIzMabbGyCn&73}E5oA&&hPuYGXZx7u5uzh0J=k2*aKZHl1Dh+Rr z__`v-i>(BZ2v+bk#6#jrO?X$w1>O|SBq3X?cXfyN=^`-^&rBTf!dRZr9O-$~*f8HH zjs_v5iqm7K0Y^=!FFOc*fiJ*v67%u#aVK>QUv7*ks4H}C!h85LKl@30;n0YU&1dZY z{hMb2Y1nh2_MV*0ILVZH;uk;p5&QUkcaY@(C?IJMAZ+aX6d3?G$a5Q#DZmlZx3Ljt z*H})FO_e@P#c_Bc{7jj=os+0AO9PB4B(7~l!Tkj!tKA7cqzh&^GmV z+u}58$4S)7NRY!Wo=MEbRBOe~EJX{QQv(-C$`y2u9#+7G?^%&|SQ6I|<39{2Bvjy>3Q`$?ryvp?#}u*VDHrGYjrAK|h$vE>!FvcsRYCov0H_U>)3)_CLRG*N zi|HoYnRv+li;w;jn+#9ecg{X%iSPX@J9&0L=jUv&dBDE#$d~Ny?#J!vseeZLAsBE4 z!)!nz(<}dimLXSXhVHM!Or^?~?i0@H4~%|cw?+R$vxc%RM#;6?y<(_7mx&~LF60PC(D+ic6GA$#-K zDLhXV2pV-Ufujq`5>F$x4mR26p7^Nk+&X~zbiwi;~nX8pQa&f@i}t;7B=GokS36wqnxh?GYGr*%WkxRf;5V za$!&;IH^*(3SpVNQ3>$NJ94Gs`qZC9|7dJhfkX8pFofhgf#+-kfR!Q3cr9WZilm(P zRq4rcfW!#4s)|<9sD$!q-YnT{Ul|U0-X=F~tMkZTo z1GHgC&X>Ivmn@h9#05}Cl}9WQTSUqOgTjfgDCSC?qlp3QZ9`dkDGc>MooM0@!0^kcQ?-i$wk>oIL4I4h8^IQpj-- z5QE1sASRY3yvKaZrt{c5#oDX`M&3R*Y;BF?x&%9vDxG%VT+aT#@4jwq@_v|MK_U{wIBZQIf6JhqLM4xzRiI7lW#Fb(ny9Hkn$|p(&!o6y?d8U5t@V> zqo#e?n%cX#&61U4UACpK-~Puhe!)Jxjes+%8!)IqCJ>3Jzxc0z(;nLQn9bvp zu!MS29@1IV$Z{NT4JCSTc5&Ro9nhz{)4uxb3%38%sQcikU=P;By?PVSM6U|Ojzt=5 zo>+86?892nC5Ey*D9<>Drb<8N9DoGIh@U30up9`MLIf!$PM;*(#xS@KKhD-s~SQkl`AO-mBWhy<@y{e!lZ-y`P#BMQM3xYt0ME zd<2MJUbNqz@7LE@o%-pwI0df!33iJ&uwMP^r+_AhcUv@Bspua1g=`E40FRaUMN9xj z$ez&7>bGqbS?^v95~c@=)=nb4$x7m zaTzLwkgx<@{5P08{Sa1MFvU6nYBm4>AOJ~3K~yl~f;?)q7=4kTO*ukM$Z&s%0Je7! zpY6!ACsAj{ZG7^Koj!WhCeNLAy>a?MU)UMY#}}9ChXfNF4(>q{y?_j}46v6^#!+Mg;Wd7Z;o@p+E&+ z9n}vp&Q+X8ohQE*ez||Tr)B_s&{dGI`JA%u#`Ql}MFIcbUe(FHu!dckz4E zz;`=wC`5;Fm!wxRq85XLHMpRn%3>M_C>~XnIjE-oIgTN*oyEL4g^DSx{E+EITb!K6 zIDQJl^t6)}l}X|qMj|H3zyd);lh{hN;RRO$Jjkd%jFh5*kRLhaDT3pLkRBD&cphR{ z{m`bLu`hmj#(EkD>?1pWnh5os)RXh#fJQ)xycU(x%hyi~OTPtllxpj)yY8~P@4C+s z*q`GzmfNAW>+bG$&k|q0p5p7Jdic6%pBBfA0mSaPNOIH- z>It>arK#eYjH2s9i!gm4PhZhTD!4qzE(UEfglTapqB!mlI_g4XwvIWc2&XYRKVz}h zCa2m?FDPzWlkFhXMl5pD7SiWYf(Px{AHQtdH+I7mW=;)=5dFbZ`;cl*1!62>Nq?Nu5JczX^OgU?)p| zRG20Dp-g{N&ycJ}&`!Y4$!&DmWy=hbO=a6q*g1NTqAwpABM2!LGZ=YK131Vr+0;g?-ZpDO9TUUY9E@RS&z-SF z7=Ig?8ziv{az8A|@RTFhCJaT)i6=;FLnX|5qZ{qNeCQuhAL3DwGASf+6ZOlX>Jx|( zZ>gP9C5aQ*Q4z>-60+-MK(!BWcfR;XOfo_M-0LZ-=cW3~(^*+E!q+Couo(Gv8mg>|FYTe#DYEflcNB(%{EB1Fz(S{H zyq_iYEzVA(BE*JE{RExElKugz%8Y4AjWyPz3A{@eb9QEY#J&%B`(v^-{P-kZrm9e2 z!S)U|+vct&Jg4~}VV{6<9$*v#z$ulIfKf=`c=`R)JER=1U^X{az}V68a#z&% zuO|xB0o;1(?dxc(XZZdWwG)fqcd504j`B&*{9Tm>D6zI!MMicz1n`tcqVA>Q*ZN%r z5oMbl2Dm9G==o739C>R(y4Kp&gN;&;#fd>xMqMYBPY~5p10H~5=gwKn*vZ`{V6jq)x2}8NCNZbzMnc-ByfRwAM4VsGrp)wKWbP z$s-|>S~G!4F9;}(Vrvy8dVZ<0ggqjvP5N_kYSzw;P9Uu-*_MqPtgpMzI{NxaPkJ6H zRXh9hPSutKD5U4})|qUx$M4x~XHJjW_(GFS&*kieqh!DMga2rM{mcQo_qG9hosHhRtyQ(?`ba#n%qm%j7Wq`uBbW z#4+2uZKK`0wcjF)ky-5QTDk^lCvstDB~S3=wg&s~zU}s{7hkaxXJ+gVzWg^fLT=NK z-nj*p_Ey`y{dQ}|(I7|=Y8R-OXG1W+AD*^yXyGHmRaEYmAk7?rcLs^!t3Q0p_P=%5 zo%YbRgp7eD?pPWd3#UlfsKQX&KL!%2IC|XYqIS!lw@R0~BNT89;5VfY}Mr7rQ-@o+8=f)#aJG zlOI2>4%$Z@x_Wz%FfvZL#=Q#~XS{a-#!rQqiGk(!-qk`tpMK2ZF`mN<7K4G+E4L1g z>fKxUZmw*$=&kcq{7064Yk$40Zwk}_-1_eSt7^TUu(iI@WV7;yZjy1lmWiFO`~Z@- zf+lfPD@#n|?UF=LYVYeOChZ#?#^Vt1lxiXr0broDvx8ifP25Y8oq*(bNI)dVAs8-< zL~71CBqL22#Dn;_a}pJ5#Wwb|Y6Y(u`Lt5}u`L?%jwJ0p6~f!AR7#6W0(E8&-*=Dw+GifO4R|0b zr)2~H800_}X;KPsDQvkM~yneu5CO+8s^o;%8^RKbIWWCKX z8|Y~vC~S&=y^Yp_>NE=A3IlE;@(NyNYQd!LU9d$`UO6B+K856M-e%^OoP@23I_=ri zZcpsnZ5vvUZq1DWyd+5@z8Wgj3Wkyut`BnJBlqpLU;X)y+1J1Og1!0XuzmB%AKLeR z@G`b~32X0Y2EgH|iWg-g!GR-;As6=!PuA-931bI|R|eoepC)Y-sn*7(rfhb44$!th zebobH>n9-b{oA+Mqj%qh&E=pyxUI!by#A~U;;SqcS-fc#R;0|kB8(<*6b8tvs9$7T z#xJ+6RZ-GFz))HH1-$$*egUKSw|bHKG{cyeGl(1(q;{=fcN#~6=tA-Ep`|gTadTne z8reBE60A3YM=@7aC2jPr65TtAo1}!QCV*GfmE)D z_h}dj!ypo&-uB&=Z`P2<<1Yu(!_Yni1CJtQQ_QY}+*B!LJXqz(fbG0362?S~N}$ab zKj{kWtgNp;=X%!uS&ngD&yBdYmadYJc;Kmf3nWIORiku0Q^!R+dBL7Tk~swcdFh4c z0dK@c6L_1Nws{-?Dg?g`Bc%+(tY_i<2;R64F};wqO_9!O`-Xn&-n)q`26zht+`{BC z4H5KMzKBZhUOs=$r8#@}{twv$JGR@KNA9rwhu*ToCr9nj$#FY^)b$MMmtHx1+Bu?# z_dCyD#*x(LekcjVArk};aL*b#wY7(B?_Hb8DcfV8yXS7QBW$p4Y#@WPr!8}~>L{W# zRv9E@G4iEK^&6SZT5o5MeesFM?W6bHX)nEg$c~*nWv?Eax8dOv_QsK6_XIs#<2Zzu zrUY;W!lbCk@iI#MGh}9@z+&u3W<~wF(Jt=7^L5KWzwO4+;*Q&fY};VJZQHcb;)4Tb zhhDT`ZjpB20SvRw>!Smp>QEtn6`L*yh!aS1eTm4_VIft5^NZNPNfoKU$lAq!&UBDU zk9S-8d$~fFb9R`JIU4&kLXHMV@g#AJJ82_Qvt=pK1>nGQmD)>Y2E3Zi_D|zSDpvPC z2zkn0RPPM;s~Rq-a=g1dtD5f=TSPv)=)KETZC&hFpZa(7at*GXV{X)(bGc{N_ut$U zxX6`m?t0d1cN0+H!UVotm)eQta@CU)fXao5N=!wn6x3<5-SPMI_tM(`)^({)LWn3H z6rQ8yFkwBoh8$TesH!AM5eHE)T^St3Q^Xic+BmVrvUtbIzDd%$B9Z(R7*zmJVKDg4 zMTJw%0Yd7Ep%|FUgMuC zeQGZfuoAth&!|0e?Z16JHSw$NTK<3b-t0-PEWhvj<(^rYRarX<``UXqyQfD(a)y){ zmPlH*LUPyx&UvBLj=AM6Of`_T{flOOzIhfIZICF>(}kx zy?Y+gMBbu`Qzoffr%6Z-X$9fy0U^Zc(;T2jcWS04sVkneN~zS`w)INYuHSxO<+o2E zxx#QC30w;aSE`V;8sS(nIGh0Itb!+JcYDJnM{l2-uy-&0Ejpr25Zwlj4*)|#Uep2W zOGx@kTiaFxL}u8I06d^TU;zN1?`=D%o1C7vGk73R0LZX@BraJFySqHOSLFa>ws`GR zyYuB|mLRmr_{1dHoQP3}6e)%aW~MuCI5x;mum&JIL2lJI-+7ZbcO^T6)OePZaN{^6 zj7=60tKo6nT(augvaNpcDK>8<>ZI6ie3USr+w{Fa6NGh7PzIiekEBgDosP|A0s|ox1)To)LnJq$0q}T4z({5Ka|hd-W_iM7wGyp z5Eu4`Wq6;xLq>m&Jq1Pp?uZWoz4&_RRl>_JDT~ySVV}+k=Y?~_grTL*SBfVsgOo<+ zg>(EykNYDqg2WBZ<6rf0BJ-=%P+{qJr(3cj)-V&u01~phk>PbB!*fVk#TPq*H7{wT zFL9WojB?_NM<#&*b!Y+16ndeG&CwWPDdx`3+UC-yX5_(4EWB>pfPwVHB@gzRXsr`e zcHS9pAIJE;c@!mj6>{kau=#-jY&DqTDufd8bG%j2+OzsA8i%4lzA}p!KNpkazxM&M zD8MGfagV{al>uET07P*DP=YEG`t9b;FYW5ptG2kfXg6-$@Sgyh60^HB zioBc+fL2R3RH%}rPL?Bs} z8S;4;3mNnw?Gs|_`uJ7=TdD{!t=;;<@=CQfQFIB=I1=4hhIW!MUgwYji;sXRo~aD1 zotiL*T^L6VKgl_~175Tw7F-zjdo9B|7M4T~j;;-VMGvILguZp6mRlw3@ZmvE0G5d@ zNAT!8F$il&feVwDZF=DX{am*=(qUx9bT_Kaq!6{*ov_vBq?L$`(oQGaEk-fW26DYy_I*Cy71vuCYIv{4j&~#sZ@~`3UW@xO4bM=QUZOB z*ivIeVAlaTZ42w#FB{h~9?dG+uYLN3u@kNd`*hy!bF{4z^?|Q`Wjh>ybY!%4lqfI) za7U>(pFvv&Ckx$96T|bI1X>seb&#w$fC8Aoc^5<1upJ{9D8XYBFvA#9xgK7Vl5q48Cv_Ei0cDOPM`?}^ zD`65HcFtjsJ#O;VeU|V#YnFi^jLqfU&Nn&i;&ojzMxEjO_6!_Hhlyu#T)3m?-=nh|9>oZ8dU;mzZ zT6j;QoUIWP4g37Lp-z$L@~ih8*iyeneH)E+^`*3-vhR!|%}OD~ibF%UA?v%E3Si5= zO~1(DfeZBB2q3HJ{8N#K@qR@y=R}kw(l>eT`dEZaZR`x&S>7}9nYQW6Ix2Gzrlt94 zphxLP(U-T@-&vkTklu(?lCr5joJXB{i9C`$fi_Gg*sky#tRmSTsauh$?pMVleSC0k z73~MN)o|~RJ_WQMen*-pqsASW0^*#battXDCW^4!iv;1=;3P75o{m56*x-4?)|Em> zaZd?d>Y)t8e)LnyEeTYb4ZQPUWHIGDg+WQ5*CxhWtz5ARshR5Q%YeJK?Z7~G$g!9K zd^B*5C>Bpy=JGp83NBYa zx)6BHkd{mJ)Q5l<1t{FFgmc4E=X2kOSF)~cp_hks4f}NN@aFk7k@N+?L%0;(LpFH= zn>p0Madw2WaeuVba{O)GDcW@=~6S{o0nx_ZyP zsICJP@gOAaR{#exN>38JR`ywi$vN9vU$ga684y>q;+wD9;+HqAK>%hk{In!sDx52I zT@wjv0ea@XNQZ4wF;BXXPsP{rhsG-*I80=$0AR4!4GKHC8kaiI6VG!!-g`<#)X5YbY>1Efz2Qj__>lflfbk`N1>kR4K$Y`38X@2& ziAe)cC&u4NML822gwgo&%P+BYyXpPmHhV~Alzd(NEJmTC{gSw8If;$a^8M>%GKf@X zi}&tZ8PCiX5*DdhX&I?aZpJd>6IQ{7tAo_A10YAnLv`!m^bC&Te;|LzGu+hJk|OHn1PYZ$ zBta@6P5fd+NjyrYW-)k|-cBF_rv-V8_VTkx1EkhNl?XFWA%TfWazHkQYae}V&FMGc z+sG*}m`?!kB&kq7Ni|0Tp|0$uh7?Vh&$EPn2=ool3foD(xTW$F^OMv{9-?E!Q;QKy zS1LCJ6&4ea*XYvHlB-yC58YQDf{H0N*tY^^pMLtOpSOayZWddlZ4#{uhm@xLcHX?pO#kEZT*X1+O50G+$(8C zLUZikEYU<=t8SCjRP{-q)>aPHeak-dSGEY*1G@TFI`=+MP(!v!tyV7KxFSav0`0c+ zY`{>A^Ez&uMup^EGpq!lw)-5~;3XUnOYPLL-N&P|zxH=fMK8Lv0aIzRR!q*GAoL1Z z9sptj>KgZga;)I;gG39JWSL)!e6NDSaoR{%(l-7`5~+Wx#@C+s)g3aVPe@Y7dy_^w zRv`= zXiFPMkr?fg9NmB1E6!kxOXaJ|r4KL${7FaiPw+V3t93s2azNukMRU<0fD8Nm;ONh> zq`(Nk9r11tK)@%1z*Gj>JZuusF-@=G9s`#>vsKx^)d=iahw;kpMzOv8d6Ei9t(q;u z)Q|+p;}S-el5LZm7>Hjc8?7p;xvcEt5GBMFh!n=$M(Xt7_FenG{=dJno9$^pAy4T7 z;G}{ge2Ief3c)FG>LXRo-c1UUtG$mNe(xatchgzhZ9-V20k4|4#|UP7561+7FtPIt z0gB~$D<&);ClzV2Sail%N7W@J9=wgi#4m=S7;h?)YLZC6>LqB6BqvckV+$wG*esb8 zrsq%EIC1qd>1p>+Od;`1V$&q)kQ8|y`5&M#oln>{L43Q(yn9IYINrhj?Xw$ryppo& z?1=?}*{*qZilC zN4aS0e2A2B-sv#*1xqDM)>sY>40?*_tYgDUop&PXDpWko0o@e~*VxX07x$Q%ii!0ra^o&>@q zF?inNt{pt*FzZqWDIOde6^~@!gBn>c-#7wc@x&Snx6xf}mh*Kbe zfRfiYV9*&DbZRV5=!1;iy!F7gWCM=bG?rvAD9{Q_O6){%P>+$F-LRteKhLte4|YGV zBMC>k?jb(1IlL)RvE@(~OByGsTsU7qQ|q#E+i0)5gw2^gG!#%91abmTQlDPBbjhYK zd>7;XJnFhxO92oSZ?A_vVHbPECQ_`a0+K77BqAU{-@tfNbc6#&B&Y3q!gjVAHl7+s z)tlo!1ypGXY~WUHg{1Lk&s-#=NWp5q zSwNsmnb}9nL(TSFwiy30>Zp`m3L30B*HAsHF4NPfaIvxz3`~j+s;BO$S4PAXTvYq| zhqR|os=7KJ$_johK&i|blECR*>#BY{PakPj zKquqtc4po-8|yZcK_XRUo7iOC<_dOQoDZ@aLpiGg1+0szCz856LJdmq^)i<_hT$n< zZl$uaJ|p`9;D|Kh@Js@*Di&AbG$5*q7b&TpPMoosxx2Qrat|qpY^sPgcKR)wJ$=D0 zoxehm<7whf;jxR_I9Zq^Lc|nmQKkSuF?WM|0MNwqc~YW7Ts~X`tBND$`=b4z=ZIY3 z39uYBY1;StTuNbm06xNg;*lFgsJVDlHR z0NP1#FHlXtDBDIHkOiFQ8jVK*dqD#I9$%73U~2^7&EzJ~s&^fPSgU3mH$JlL&TX$` zn=BC;t0@J5u56>4Bqf&Y%bE%ygALcP(tkI;b_)0VS_$X&8Lgjz8XE+ymy7WVAOrkL zp{T42k|a-^dj$z|$~N!b;T=oZ+=a_l1oU=@uclBN$fuE9@xj8iTtMu^98#^Er=eBBxs>7u;&4Fs3q0zBq01bQ zMC~mVbks+YWGz~c6uh5bzh-~-qd&J-UVYWxeDf{r>jXSGUBin{si=l*(-d2mHsr(((iqvs#0dRSfst2`{Nyo^R$QtWfk=A_NkEeF1Y9ZO zo|sH*3ivC@8Rz6$o2VJLtihLm3`3kWo~JrD2cw&r$l3ZnR?;4{c1ZnR^q~xsxg?S< zC1A z5kxrx7s`ksm8=|3x=6~#$UU2!z#yIv0z3_9g*-zeKJP1iY$Q8Kfy!Yej-6gyY0qGI z8owRFg*3KM+3w&e34j;Sb!i(naoa1Fie;D5vxPtzO3$+>%Ykcc=_g5_6rM$PfK-+W zAu*eAXIlFJC(M~`b#FNLAWA-Pi;HCu@&-Os z<&NmZVV-^T?i{?K;o5^=F*@@oQ(y$(j&kqr(YC=!!`J)Fa*tDemnMwCNn>#Rao0S_ zem?Rog<7pgpwBH-cj*KYHvn9wEAKWWD*&;s49+D1z{q}cb=kH_LF5?(@Rn;dW9`}8jO9EsQqmJVFvODv@tw>%JJXa1M^9ytE zeLxO?t5_Td92H!e)j-A7Oy#hVoA%5Dn;5%I6bQ4z@kwm|nk0^|0Q@%AyB_;(VuI`! zFm5?9D0i)l)|KxPZ;*Y-qcNd4WdZ^Pc~9bby0c^?bYBNtQ+MheN1{`h!U;w678(V} zbpZg90CUuxOXy+Rr!9e0f%bhL%?ScX*zZZ2EGZRuN2*7hBCWxap}}1NPCAqJCAldJ z2aSj+5AuLRog=$WZw7y4b1AiV*Mr|8iKEV)HY#ay#-_&5^r=NdV_@0=jUK6Ox0O;Hcn!Xv8M-&KiZJIAjrJTh z3Ot(`;HXjMh_^>C|3N2!FlmJ4vnEX!=YvceH3QO~ZKcqP5loga1!7f(^Fc3OfagmE zjNKYczY2(JpfZfN8@9c^Vkaj740uQ?8GWWOg9mEH?ZoOZ@5#vtTiS<7cai+P%telx zF@oRfCwsvdQYFy>9}XP&+V<_&uh_zP4(SIen2_icuq#v85yjzJS=q4Uc|ZZ)x|@}T z%|nxEXp%!EU2G}kR+AK5b)Xv36(lU<1ddfcPo+(g2Vo>B8crSAILRDJX}8*_fHFvt zlpubS%NAERhyhpQp7LCT&K|^9k{Li7ZHNIHx;U^zY@U4pJppbxBq+Rv0vLm|h8B$t z0Y}+~wNc4QvNnP3*8Hh6fPKQP5W7x7L;*sN8O*(-`T`&s8_ykLsNE{i2a7)uin>TH zNETgAp-Dy}k5pp4^UK;ej9n5KsqmyWOam}d0FxO)S)7=kMZHw9n@nh=fwY-( zueqI32Wd|eHDMBlGBrDC|Ji?f(ta~RKFcA+Jz9qxf6<3p*d@8rlzx;&lzcc7tP|x9 zDz!+}S+SW|ofvv`a(5=|bPg#P;<`EjERR|=n;9qM1eR)e@|IxExfYTzRMABwaVY>_ z6ML~5pjdq@r-uR#4N@yB&6p#dKK^(d9lElKgWkGclCLyCB##6Rxslzxb02dw<@O}M zEMqO$&w1Wb0DA?APdk-Irlhd6C#D|M8|0({(q`}-xY(^VZLKTYf@lR4s+ z(T0U{7j15S!S3Dp+{)}%DyT+{=V2$8Ap{1BLY!X!mZ)E!XAwwKy9C_42=D^F1i&Ok zBM=L9LCVQE?{H3!K9RFW3NY*74R6jasi-QL2W$f1wupP^5;%ceiN6kskMy1o0*T&P zljyB`4BlsOeZT8R$B!ljMgZ<;_UmI?rHNqh=SEma00e6dsjUb{-le#IStKn04yonF6D`}Ra>!f7;gTxGiIA_ z*qx7mYCrnyj&0w+Ws^wW=yC^R71Yfe338Ygk;0){oWM@5-X?foTlDxzLB}!eTz`Q+}(*$wi6eI5Hmp90Qu!&@lJ|-JOf{LVa*m@E4*O1Wk zIvHE(ct?gk_OV z0_of=Ph(gT&A3E|&{2RblD=jACRP%#8Naek( zSc`i11>Ce>B`mdHA3zckCIIoOx30<2$689gP2>0-?-GF4AlLX8pK2^k>)BTz{S2av@EcUVPjY#J(hCI0-rpVT#Cs1V(fbEup+xTIU98859J`$ zSeYV*nc~LX#uN3Y|KTs~)XXFv#XG1s!6P}OaTCOtJO8G2$-}xDp8_lzc6nvuk%`%h zQ6Y8W;gZDdH$e&4Oa1F1Q>cqevYLz!>YZw!-kY4a$?SxsNli6@>bSg$BLI(yLoXb4 zk^DXX;@C~J1bDR=%N63cZ2(?7s7|v;17*(`0aZMyAqKTay{z-G<-@$70=U~DXm6E| zns$5)aD{zf4_JrSZiD+BrVPH@0u-`?6OhxpCU740hbkX|hDdS*z!R+ne^I;YBSZJ` z*nj|Vfjxn@g8&rW_c)b7dOztLs%!Oo((8^BeUDpP5BK&TH)k)*v0aH%k+#ogL?EIW9-TQ(t z5+vG2Js68OJ^Ft8-W_YM+_Y1#ykgflZ&-1O&9D<*@G&uV2W~J)sWjE@0^nu_#$8Mx zaRjW!3Fu2K2&=7ZTXEr>{o{Z14*;(dR{p~u*(M&R%A=Y^D$*pSRbAevsk)8fdFq)I z2*08*F>NGMCGwX_g_b9&J%|tnEa)-3q>3Nn8AS_aK!h8{NHUXss zXi-2Imp1Qo2ni#pCx9tMXA8V3+^xWyd{b(ud~49Q4)|-wGkBuXJ^*tZn#Te0h8*@V zMN(FcF@Y_&V*`+BpM-6qZBnS466OgVbAZPQx+aZ;uq8V{r;l>)ox*{>cQZH*{!a0-k7+`(z}jXYDfOmPQcvbjJ-!-T6qs)9-mm-5h%H@Tx?5(?+q?hSAIGvJ%VNbv*K3he=6F zl8_oo%nqg&!?r7ivqKSM_44_u)yQ}G`Ct4Yj0kBE*QSY;HhJM4>lQECmEMZo=q(Ua zECH*-0Rric6m(hAYt?#4nOJ|hi`comPXVwn?=*eb#>per#hg7>A%&4bPRI@nppeFn z3Uy%uySRV)+ppMv@vT$#KmMR$Ki_EC%`&+yQ*$<##c^SCnZAzMSTS#B$LM#mDa42^ zrnqutoDS}-5{3idAg@EkW@F&^*pSS{Rf0TAY0flWP;&R34#*%NNh&~k`qb-I=UH7_ zwzblhy?>q@nE<&apnN>lurgB5Z8A4(Cg<^M0Dws%1}HJoay5`N#rUNFt6ji50qcf# zPntgL)Toaf0W!)0!Od`R@$^lA4FP{F>7ySbDZ!W^WL{K=3Ab;dO*O`SHpN(xYb!Kr znk;X5EH^06y#)QTv<;##p3?w21!+6{_|?0tyr-+n z%dSF|6fO?{7l3m|mOhcf`yS>ApA!IRnl>Oc;2oP)RIo~uro6?rPBXlb!&C**I#$4(hobBp4me zSB$TGF=tb!&sg@Kb zwM9hz9QJSkMBP_`Xxj?BE3n9UdZw6()Y?&>aE|(q`ew6ZR_2`btqKXw<*6tTA`K^C ziaJXw76XuqzpFRpVe8TUzea)KJ30dVoDzAgGA4W-dI3BYpf<%vz@dt4#ME{=ASPWe zz%2m~jnmND`i}LsE0#XRxEoiVUOqJdR!Ke%I1Mlm$wS)^lw9>pO5%zV6^WeyDCeqQ6+cev4&I{s2{0bEXdaL>$nDws<0p)x z{qC)6y*jEH^$#BozMo@Me7{>9%j2SN0L;S(5c=T}J%^n=I(FPBFamJLt;cDvCWSCD z?AQD-acKE`iekWFuLL;rX8_8SpR^4iQ$X1Ys#2-fG61|d(w4ZSM17v%=hu*SAbIO5 z;IGte1OZl%-yXJdO$7rE5{&0l`R9IDR|^Xi!TbfBVleR}>nWr>pfV&{k%UIH7-S0C z7Bh|2%l7RPNvqdVc5l68pVt9UsGuPkfVY7?7?}_pnBWwG?N}aT{~omObjZ?xtyrnV zJqQaSufinv6SxqF(Ea__UylF=Ub510WBW8QJ!|&?hPPJB05~J3Dxgj3NBT~=R%O@d zc2h9;CJ+Ew8TS_GqJOc6R2Rz=a=+5#o>_tS2GD3y)EU$ZYNUeY^A5S8eKzDI0rr#sOPGQY`u>K~P@F28D-u0B^Nbc71igbluZS z0f0F-#d&e5LTR^B!zo5y55OKn-Ku9}*w?Qk_jT~rAN*=tSlzc3k3T_UhNrliPHpsU zp8G`eL;v==CdoL7g7`uP)n5b{6{lyQt;nJEg8;ZdIv%|0bbcn9u~wYxUg!eFeNn7lea4fu~phue^7Sdm?zd= z&LwG_ioFtp5fJJ)j<%37fi}rgSHQW7O6-wY%3fn?*xhx$ipHHJwfYbU+rDy)|A;nvHv)|U zT@DK1!n>^N!%zE0Wkdl{UH!9k1a*=J9 zFofvQ1vs>5cnyG3Q6l)>I8w>TJ}n~0*Ci+IIC1kJK^`d(IE!oq*v0`8;;3M|3SrU4 zSRRY~9VBsz=_R06$ma<33z`FnEN!efW8WbhiRUpT)|z7TF@RiZlOX<^_nZ0zNtNV8 z9e_r0YL-wUIqdGXkicQrr2_&WayGy|E-on`ZBhH0^mAR6lsZrnDE-v8`t4JaO=6_o zTearurcIwaV|J1}s}Ly)1T3&~*up)iyuhU18D&gRjJY=9SmLFwWhbYtKyKFkr#di7Hn1CqY!r~T2fAr~K`Lr#l< z_6pR6kDh_uUt0~=J@0w=YY!gn_(o7*1mM0A-SqU83=^yFpmminxrS}u`ItZ9oUjbn zhvne@$J}D*ZZR>1TIfkHB}oLl%bA}TB8;+*mthUnSRIDg;+&+^Yhn)ihZsnVQ%S-* zc&K(!o5}_*E}Ns&gePzJq?ki%@NyrF#pUG(2#}NuFxmhFZ3DXSNdr`nMvTxYgZ-)g z(6(%vv_3WgT^lvKwb8TtRm|p5*-hdJ8pBSo1(=g#h(?9*RT*iUr@3NF5~Xnxtk=7f zWH_k1Bu)ShyhwgkRG{2j3`m&-I`o^?J(sHYAAqqqNjQ>8RIrQ0Jwr{3N1~h{l1OM2 zgH38yfjY%NlMNib#&H1?evAi6;2h2G(> zrKqgTB2D^7IW
    Rz}q34nUucHuG!D%B|-euV4`QGqUlMIz9?o5SGlr(GYkfpaOV zZhwHHv8Jw4(U_2`J*ZH1?BT)al+oV-3LFH$4V>=u-MuXmkIM0-z^+;0_!8ncwLCEV zm!Zv)z{zkM!zI`)>NAPp*e8A`hCmP#KnqLu2`D&IpyIBQV)k-X6}&H%CPP71Djd`m zpui@!LnVOAH@(QDOvdm~C6d6w`s+w`YNS@G6KX~D5F-eE8n(rdB~?jg)@*ZU&2FsJ z?S2JXg1{7JB+(%dY=`)1x-noXj?sLZO!f-&yR%hxm0FtplarIK7Sp|yCsV36^^2Ii zmMY=-zQG^W!K3jLib6`cCim67{X76;T;8WhrgR=xd)t79tkc*hWJu{0AQ3yeTc6#s zH6(F#yn`*JbxKHDcGyBYsVG$gV2ai>Spkbn8{5Q~t6P?oZ3!i!XKc#;O|jlONP@d@ zJ|;vS#x=-}RU8*sC(JbJZyl3e9Ds0)Z)iMyJE(tKgh6TJFwx2YZrSdzG}$yuo2 zbf`9J$!-daByhVaa>TavqU+@s^9;61T9>VgmZ1zz5Mf_f29=1m!##BVvzSCWiZO?T zDbu&rmH-AV69q;L$jB4Cx04vRB@SRMWM>KGFr_dJ@Wm#_lAM!3>LDK6sY&WY5LdiW zk%`zeIY8SSo9~uwwL4)OjWoQHX!kJBDmgH5UPJ<=Ya<%zsiKM6rk_BNOCxmP1(gO7 z`(f*(7DK{=q7m5+ZOYhE?1ZfX8m7u;a1dx&A-Qgu?glwgflPQhlJt|#f=H-Y?=)xa z`@g(z>;_!X0d^5%3cY;p&x)laC)6!zHQ=*OrS>1WtuiQ1%RMGwzqd| zWqlJs76aH#TP{D2SL(WJ`(k*vrj4u$sJpw39ZM55w}e+~DqgT3esRlw|IPO;zP@4C zvkR6w{VsS1=~xa>*CZb(K(fKVCE}}{0etgFq=tZ^%p}sQ4ety7u(My(+5PRte97K; z?+vSb@W3AYY{gFe+NKrWou}^@EpiqRfZ|zRSg4)oZ(Y?X&)&2eJ**%FcF7vKck4Jz z9e9bm$X?iSDSf!eokQ)S%2bjcqd2a9-(7UfUy|Jio_O2m0LY|wK=zKZUvp_( zGxFe#B!?pRSLqbC%#*OrgJ}qyFuAGd*c36(E}x#aw=Q3>x#(@#Xtw8PzFU}w%;NeNbp@l$*+le8`sU_RC(W=@u473IqsWb%~0OxUR*itigx16y* z{C6MOXZN=(J~m@JG`-$N3YME9pl;MY(JB1YUNIPDWRTsP!i`9kJvKJxKOJp&kH`Q3 zAOJ~3K~$G_s+hf`agqor^oxWpU4acGPm$eTjD+T6E`i%ASFNJ_q=3UDHgHKK0JA_$ zzi@HTv&V$f4OIZ>>NfXc6^f^gYUzHZgD39f$r+owauyHImMwmA%WS!9V~H&N3D5_; zwYhOu49{s7F-_!$WNnBfMMIwZ!VD?5jW3_o`pme~|h`?L&|YJ>A)*5B9?T zgWO|u&XZAKMB68$*HJxt1mKQp&pxJI0o>^D;QC`u?=zphkNzqq5w`(@k++aW)OrP^ zM@6fkLX_r!;PbKA$mo5TFmuxtAlllxvVi}e3dbe(CV1ZI1PnxV5(rBG#d)BV4B+0+~ovB>7F4UkABl``wmI8fX5Q@aJwwzszlKO!}q(ru07of@fA z6>VR+Q_JNtz)1Ilo+*K(8vVjPq=0gWC{E3@p0E`pciUyWMB_P2r{utZ3KeGGb~`SC z7yuFgU20Ti%s{`&F8Y#Q-><|_l_$?m*~#}`L1LG(`#<~K%D=b^$^ORH(=!FebZoyecuuf?8{D_w^~dRW zpv&%gYCjt2x^V4&=Z=maFA9tR-0|vfZ*7=B4$|~6d1(10*B#{E2RTPpaFWD`vDbQe zD`69~)0PxY(hY%&2!N<=p{|4bI<*a}Z#=MGb;}Ca8Wpft0-sqGiBMJUfRxZStp^*P z0OGXo#g-sB!c!2&FGwk;4cu(OI3%^t#Zi0VS4!~O3Ngm+m)iEh?REPb!E-w3Iv(05}rba_x&ox=h8&Nk@uc$)1ihBmAIk|8aDPYDn%j8*AFt~JqbXR#Kb=cmi zE$Rp)WCDQ7#LyzdhyytGxa8^p04{-)4fkZ5eDkE8c;&3M$u6;iQ$y!2sm8L3X(!K4 zIagEegELc|cNdC2HOEhHcz@fQGth#WT}3J~Ji!`S7E`1ODo! zdS6&LU7>|?G1LK#3jg8&)sMaS4+K?JV_hDoLHeeB0-dV+L5t2E3?ULeq7HifQ9n;} z%wQ3{4oYA3g?=gry=L%PqxGXpfsqZ|(e2x>wQTpx@7ud3mfaT(f}-8WeihrQqnsQx z{Yhe0VLOEZe{)VhCai(Y-@^M6%11h9=+MX~0{Bicz5yq84h0x`vxu{i2C%@+m~>+#b!*>T0u01R!rkg zH|_VAVi<~!QsXK$TvrlMj|~UFlN;`%p|)RDp38BKD*?9?zYnm%#aO^GYvBorBx%R81o+KcH9q;UZmP@Rmuh%kC!KfD zkN`NS8FMp8k#bq9Zm!$Xjq4Ez;eZ&IXd=mzn9<8JIeL*tOv~9Kx&rEPXm$g zY}})Wj-rQvY>OCfwJH)cyi@D-rZZ_dHwet>_>QtQY*($O5H5hPbP6EX_h=m(FW>}G zKy_%gh6JuGhk*QqwUHJI^birw+oPCoQi!*)ZPYJ7I^}5Cw-7t7fxTW2&xhjcb9Uk;Tf9V@sNGkjC~-MJiMWsRsZU-8>m83KKYIkbU;cHT&|XpIHT3 z%wIZb$sGM3j4J+=S9o;9vGBw2F+)8-!A609qw!6o}LK8azK-_ac@-+NyUb zyaxxJA5`Da7D?bj2$7eiZ7+hJ2YF_o*+I@#zx-!?F(|-@i(Y*cdfAm+jQC_vJ&1JxY(2Kt6fk#LtQ~enrFbTCg zv|ZyN0q7Afsd}K_E$BRssw_#2I0X?lyi&`kqU(S-LTaF*E*9`=1z1YLHU?Ex)Q6z^(l52>S+#*)kpEqLi>$%oqR?pPA9 z&bjw5*tw0WUHh9)?e4$7ZrNheF1&u(lBZ@+BcrCJ`3m_Vk4ew^G4$qUEyhZUdN;mY zv70~s*f#F0+T4kgcKY=zX2q1%a3Ik*iSuC*!>&+EiQt@uv`+v|jv!6?rjBG%c7AHH zj!RAaqKoR@B;d8wvBT|9`DRRhZ_I!rQF zKsx;@*ycsx<{$t^CUCi=ZFkC60_0D}s6^%Pu zqP(@BY1W|xz)hadZQ|o7&#cZ9zF}lP?yI!Z-O9y@W-5~nX)eC{o(MoJ^n9OXbmDXi@gh}hMex9sy9H!P1N zskFVxb#0rPn#R+R7+u^SVT!A|1Vo&n^%>D%dk5E_SNoNfqJ<4tM}c9Hp0%+5Q~rZO ztYiy`CBkJ8I}Fuj#{g#3u@fUmZ?YNL!L^`BW!+vqS+w7M>!cOiB(uM{WGk&n!iY>; zig;}u=pj2fHw}a?G5R&mK4rL|bDdT((q$=NvW)o^szV;JaRSb!2-G{7)HorvSG9(O zsY(3+QA#g`vq&Alx3qG@n#(r`rPi|F`$zu`s@nzng8NGSicMo0TgC*Ss@1E~1|*0$ zWMsiTS*1b4us()oEl(TrlU$XMC9wi=1L@~R-Qr}QK=5cQsZ~4iY1hj4*R75kcmjum zG@)cVq!6o-1h$4lN0)FTDYuQ&Z5pIFEkSF5KdH*B)U(1DHM{r!eqeY1^g~M!DEj2z zyJXXU_q=81NGXO#s+>YH{(+%zE8K&7Nqy>ecF?nn1hW>)+1>4?E#iqQIwo*FNfVx0wa2@xeIahXuqLo0dynPjlN853!--i?h zycYdsvLFek`Yp`mVL9aT(V-(wfsq96h5JijN!d55B;k?)_KFuecbh2 z_VB&*_hDcj+3T9)zAw=ExYJ?O{=-vX1mF%&!*A3bG$+q@C?${ouKi6Gh z(u-7hN%xu)5ZgI1Z@H-p7B9{dLso%g0S9>bwP3nkBt2<>i(;O20Sm#N>+apVcK6PG zXF6j3`Uu{_$lq=VpqZV!aNe?jxKeq?8Jd8K=&+l1zY5xjxvL1IMfPwgkdY+Hl1kt+ zMxISMHE0j00WhHc1-v+(iZri{1d2`+s@cDAT^DJO*AcoX=W4fwg9P9)Go80r{^0Le@}p1e ziw{1r)ob@`6A9${*>iU0waYe147c1onK>pHFKyJY>)WK`+OXBn@7eMyQfee*)8GA$ zoj8BlF1+_^HvRTRv-vUdVRYS|Es09B(TLuW-S0{m8)JY-62sbMz8%I(b=%sh+RDlb zju4yJ9|{B`RfQl*uazdgVG=;vBGZUGR7Dax@|l+1V^|+1yF-ZVZp*L==v>`X(jhr9 zc)O`{_~03K?QuI6#>DPE*pCjPWw*Nv7(ivlA6ceMKRK&{csAAVAqJ#I1x zlg94lfgbXVP6~BX9fI^LFb7G3u3o!k7cZT`cz(>fNYtVd!IC;4B}=Z!YQ2ma7*!QO zY;$wlu6};amX?;??oFyI#Zi-5Ly{w@3uT}`J&Wy}V32dsNb(ly5&)f^754QX{LB|} zHgF^Z2y>5AnZeUM0lO}MNAciPMJZ8LR3F)q^^kf=U5AJXKvT9@eaB+NVaotiQc@=a zPCBS4`!Xw?xNiyc@1iCY?N!F0scgW;$MUWwqL;9VtJn@fehbiXVrrJuXldKV$zr|Q zv6FbIwn;ISqS9Vx+UGQ+K>~6eL~l~jb^vg3m#*zoEzVUwU8(94ICNxCIjWv5;=?K6 zar&J(JALv^o4zt<>z~}V#ZPb9=B@j-`o$fA;D(B}Stg|!wtpRfSBDP+r@4@Szi52ur*WF)I>OXZH-IjI ze`imaoj-rh>J^+W=(FXOO+FN`-y<+`OX4|HW(nFZ{3^2mUkNup#B#53s(n)11^}n} zM*AS@6BJz&LWt-x(f^TT^$BitL{HsKdu@wG2Prx?jHSW*46YyKKBIGvCIvCIvu9!p0sXj7h6wr$y7TqmeWY-J6am|0j|) zAdTB1seY=b7_7?X=BBGTlX5lyv>v2Hv`4MiH*`CxIefpx_l- zM+&BpBP--SJw1sn87Z~u zvJsMDBzIL{UfE2hl!1ZL#(7|)e2f0aJN9+L$1J>Q3$LEE?R)E_!&1mrpy*!a0LpmI(lxv)%4~lI(bsIsq~&0`e+hTg$_@VAzwtS;xX$A-e3j6 zI6x>5Xih@I4D=kg_3e^vZj}ggLW27oYSYr9E#AKiz*Ha@p38r~kBt8LDYBjVs*TvN z!>*`3% z06zMugz*{1Y&@;BVgNbn(Zud>?f$lH1E$CD09HJ`6Z7+|NAc5EvBO+mUA0oH!g%JM z4wUyHzyS`2cWCg`@Xo8gvH?|58^YKgJa^c7cqjFNFct4@mpO~M3 zl1iw<;N%y>L7{{PQZtqT5%=!hv(G-gY9D;?3s2BKJw1y6 zCFu?h;=3-tamF9DvrXjLwe=Ot-OAYMvlm^mAPIw>tGbBE1)4msc8B{)LL~$D1jhbS zOLYYX+}=&zlSD~_G+6t=eFoSf zi`^CelHpO0U50TIXb^2HN`@q!9hbz3;t4>U_DxI_Tm`zeS+b1^S!}TZYx1ncJ2$Y! zL!GTY1+>Xl5iy|TajZ-E3UH$-909y>4mc6qHMAhV0}ui#HAcBFRPuZJMZ%da<$GmC zQcUR6z`m>r1yZP6yLf_T-&(Nz80oN15CC}M48SdAo7Ivv08(87_STThjRBI=^0q}M zU%>&PTHQe{k7sLh)4J=CbW^lZ31dTa&@W5surWRi(s=BqlQ_p?fbqdJm}Uw-(R-MdX#jr^3&pIX4n61$>m#cqB0 zk=wjIc<=xwleTl`F1RXiduzwjY&EgXl9WvhvknkUi0NVz*Mw1DzkZ#B>~k(b5rZBC zlUmnrkdDuT4k$n+K#Bxw0Jshlc^mKvHX{^w-^Uabv2o2E;XmN#jxwO7GR`hHE>{7X{rD_ zW7xy#zV%kuoflHjSGIOrYfB)8CiY;YFyojcWs2{I*sNc1!AgGGr6%+2{Yo0OZ3j=z z7HUA*)k(EU%n~>p_e71}#pbRBAn#$XCfa0?Y9(C7io*kH@+F)KigOn%o}WbWm$E!6 z&)90(*4B{1Aq6X<73}P++4|BATfTe4*6%Ia_Tqi35E`YnanBZsrx&DeQZY+ytB(SK zHpR+IpLxTIlT&u`^chVJUF>zl@D!&i38GNUHSx+!f`s9HH5ibJ>oDww!7HJ;m_tjkb^#cg+>>}J#-+~V z*{Y``MFLQ)0yMB=Q)CRveAs&bqi%LoL!|=Ut!JnWGU8FaOCTX>>O^N}| z?yM}^zxt!^+sw?2hY49;UUqLtO@4~^rcy?FqLRV6feesHrvPt`763uy%?w2VMdhPk z{>)x~{dFr`B&Hm7ZxH$+(6I%bGS7y;`m^@>(=-D0_Jw4M^A-mnketd-Z6@*jB-Yy) zfFw^JC!k>$fYM3O4+2Upt>-O{ZCMR)D%J6c;+W@2UBeJRohBqk4^Tzf%^Tt`da{y}6o_%=j4xngn_zlSRhnJLJiY%~-WH1#ma35ZCRqjhm!6C5y-XTekSuAJ}!q zz}-)OZncs^)j(S$cQVn_7?~o|Lr;j)OXMx6vEAzt*ti9}zVS1=1;G5Ysldib_sYHW z?yuX$Z~qSIxZd#?amWL0namUu6WnktZD|59=Nh~Rjh1cm&L~`rh5(R{R`7nRDZD$9 zRK|E`C9PB^@kV=)XN8pM3ApoX_3hHUdi)9f8kSvh<1Vi(dKL{iQK)^~6$vHMRm=&L zks)eN)DPjhuurMa2>8Z4LC7AS#~befoNK6o_5Lf)-*GPLAJI&6mG=?rEyhKgcSTZ5 z9n(+rbil5&!sNrcB=8CKG2>LWx=wcuKjuG|&i5kQ)|ZvW4AX}tj2SJ}=3m7J@WY26 z(UnIW>xedR)U2;kKrhc=Nm|Kmhlq&4gaDfWmBmo==)5kI1k z)+;XAXjDJ+iAR%v6Lno1=|{&s0L8=<(3IyfAxT}9!k9gYH(rK7yGa}fq}nT@zUm^~ z>R@Ot!}S)4)4L$5I=M9)wJzR`k`SS?t zhd?u!JRYb51?P#2_K%Av?48Z7{rj6W`|}T%txSS>oK&A#=>TNZ2Ngi%*jN@RpVX-n zHaR^*g%rTFi3+1Q&C3HMQV#xp6lK*o5J%6TLz@Fb_bw&(``rN}r@ zAOl1Zkky7Z>({R##k*;@KKjsR&c9~g{m=i2&EiF!!qJAIZ4H2{fKL-Zo?^_UaKe!% zvcofxgf+bfx<3aT#PLRI)qkR2lrD`c`f6RBI;`k<`l$pk5!QX@kUzRENZd1t%b8iT zvT605O*}a9np^n{#)Ib|fT@ktCz`N?*`#8`Hb#I>%vhd=M7@t=6O_ynH6OK}90wLo zzimB2fW)SzEIvL3$eZNLbc}$iStLyT0pL{P7~Tt*NQ5F|bxHZu1_g`N*Q_Qx z*}Ey2tYT74anE)=3U}c*c#1y)YAbjM>N!%QP7`guhcvQ{N>0au?y6J(03ZNKL_t(u zbV(<$l>$h_^@R_aWG5H*0K{%N2aRD8sFNjCIZM2=h1oGH;yJncplzS7V#{TR1GoYc z5W+#1B)1ALB8imuJ!#8|lQY&ibsC_UBkfe#0rn+8T}s{~)KfjH@i;g}W%otgUv)SK zpEHFSmX*r3rHeeyAKJ0T#(n$CKmLDg@uNRyj1j+$a|n0mlHf9Utx5a3WdFcn)C#CQ zRrkT4Y8;qt6De8;;FYNUwp~E5y(I{eISv+LZ}a*-t%_>@XM*5MME7xNhmbQkfM9&ot5+_ zdS?OstVi$hBc}VfTj;zLs%ojz9cTbRbx)PSK7HKvM}5C&5XQnFtwlE#1#1ptC(vT> zngHO!zHm-h25=X)U$&(_>O$Q^JHz;R+3NaDtj`F*eG_}_De4?vqTMf#?5PCYx-f}2 z%wJ;qj3j5MLgIiVqMCZlsyd#Y4gGdjtx=T$_qMA7CJS&SCTs<6P4cozHo%nSAW%Rs zDaPP?#ZW31Cw&t^wX9u+Nps}doog0X_z9#mx#^QOUOa6Rlc%jPbrQ+Qq_qKa0*JCN zLOBbAlIR^~26ICxi|rEuH2_vcq&jELoN={}RHrK1|42UKyPo(@9y_KApkxj8tQ%<~ zU793SR1fuT6G@~}bG^tS$y*!`NrBo3?Vy$sU=|M*HwQJe>M&?j$KCq2Mp6P^dX|$u5u{Rdql7lkQR-m?sCH5HDZ6nn8SOPW}gJ39r~h+^f`v-Zw$aqk~%&F z#;q{P2Ma1>l^(WwJA8c9vE9_iiRh6f&6v}M`}cURpQmKFm@~-6A;E`)`d-h|JFE|} zF7I@Q4<^+&y23Bp^N+t*1Ar|60^Lt@#(qUWL?255!0Ecs_Jdr%-~GSo$HTm!b4Y6nL@R=jrP`y7DO~ z5GH`|Lh0qHc9mj1j@*1mtu zn%QY{S3R$@6-E7pd(6h&y%al!LhS^>tUJ zj$zAlm=a_18AA-&#Ng}x-8(+fX0BlDK0#QH*7JrJhpBmVZ3El1b{vW3IKgU3I8xW*6n17Sx9rxf+xB-E zBR#xVJBY9nh@?7zCeI1U_)`ikLH-6eZK8J1I*@tV+UmL$p@PRdV6nPIjHo}7BG6`@o0iRjcQ2FaUddQRZD0Wf_Ob@dF!ze2~y6rg~`xUz|Yz7lXMo<)i8>S)#FFy`5#N zY%E!QbIln^x_#Ft3tf{WP;MeOLFyr5eig?phuSAM_ZzOhRIprm-DR^1P)dSwCMP|! z0^n)^0P9GAny9LpwQVGNTihGwPvdz>W(Cws2;`Xj5HMk+9RiUmkm$mKJp7_bE=b~@ns8iLZ&cl*um@l) zlVM=-{yk4DeJ+LC%Yhvgd4Z)1Jv<}BLs^R?SYr7Un0*g#&=y$+gpA~{AtSCbP7T`t z(h`RCpprus0WSRLn=D}cpYw{D@fM{+9Z5uigE7uqoW zj3jpbqJ1*YYoS8T9$JPP?z;Cf3E;^lGIo>nR*iZV`>|=uQ`d{Heb+9XJwq6oU$=W- zequMTen1$M>$bkSWO4w>RLJr`m3!b8hPfAB5#E((Teyi=z_31WN8dCO<_nijk(TR% zz47jM?A_n`kL}c}Z(BWVUTj+ZBL94VzYi%k16o{@##LW4H82hr>KE>;}3{;7uP; zIzL?VaL!S+k8u$_RKk21Y;y&iMYAsNNTB^7?R1Smn$8jE)B6M)=M<_BBk*{i=z&;@*Qk{Zd!Bu9+BzSQ4b<9 zW8#pLS!R6FZNG|0#fm3R5q9B>%`TiGs{B0AZ^D6^JT#U1NJ<;oVM!IHGUncBNX@X1 zGxA(&*#Q*QvC9%TTDwKka6sM8_I;}oW}=DYtV7Po4r!4y`YUh}2W%O5o zB(i~Pp{~T(?C=#Fat9679%|?=fT#wjU0iHf{r)Dlg7bD^`i%Yd-~Z>FP_xw=ACtl3 zL;LdjRa;$rVD&BD5!r!CirFvW-4Z=ylc}*-oSe1%g$$MJ}rP& zt=h6{YuBx`UgjN4+8CfMgX4$7oG1ofgYg_E_;QbNE*v0`j0^|mYs1Ejw#>*h>w5@ZrPvBS|rs^NPPb%TK&e8hITw(*`LhX6k>-#d(a<96L0Nh?w zIY#@s*tB&jE7o5B0`PPlRptX%r;d%`LXa!iiA!(T1cv)_7hkiPv#+AoJc)E*5-Exp zG7%eKB2f{AX!7jyJ6)eqSxa@F|o2n=!N%f@(e1Q0>NSlQP3pErzST|4gtXB^Ld*m z!u<}Zi4F_k^7)*n;F6lK08MHD+tt-&f2N)@35b1>MPVES-Xw{OBr&3{C@l|QX-rEn z0h~vme-o82vKw38MjgC@6ch&E4AS7mO^TCd_@2*;Q z{wxj*amN0)Z0^dp?0Zm_6LI3%vho_z>g}zEbyho6)b^lO%wK*5spJ@PMD-6cG#nUK z)^qI!ct*(k+>q;Av_GyH@%E{-G-D9#8-?}{S(@tO9s~;cZ&cbv~=%S>Zf)68x_dk zmplbJ3E0bCS6N=pWTLd-Lso;wr;nq%Z+vK#`)}L)tAE=TF1}}LnOUng1su9W%Yb#E3MNcG>fCWV_tv+4 zf|D2N4mN!X`ysEd2C?V5*kGj<7h)d?S`}ShJcYqIbyk`!O`b(2-#Q+ZAARt1`}Obq zHaSyg9oPww=Eun~3O%%*A%uyZ^E^u#FUV?hhMcH*n@(;LgRMludin-wn8m9Yxf3*( z)pm8u(j-%_b+Y#J)wun9g`EW4rB&WGrJ+J>!+)vUBjak-TXC$!*wZ*~Bte9-Ta&y^ z9=HmSn@W$9T8b1?NMJi0Z`04&GH5{n&eDz5J695$fN!8!S zzVi$JgU9A@FXSYHHxIeW#L zOPCpCnt7|_=Lz|;V-tIrH{=LcYqHY#?tdI~$WWr9esi?T zJi?ZCd67g}#XnLs_WTfcWT}1!Uq38SzGCX2bEuP+HTqK$Y5p_5csB?To}+(XyLbWb z`5E4+=yE;((cBvC(>PHZU*@8*E>NnXHfXNU2epdU6VPF0W!1JB`)S4Mft+0@BJEN? zJ3amM(VwTFzzD!S1<}4qmlT;SD#W*HVyrWU4OCVjhcrNy2cHm4{;JK?maJ7JMG%wA z#Ox_M`|3M(?lls6Uw*@;PXVf0kv-dBoAsjVr^!Y0q3m`9h6LUkgiZM3i!b~ozIah- zsBkpkTrsZb{I7mB0vTb5lu-Adn zYSNJhX+vP=03}SWf%)nZwd>BEJ3jGF;7usTu6D+lm4nK|C;kK6|7lOz0@WmFtJG&X z7?VP;kbl5gnX?^|rY8VZN;%ft*s?$U;3NBs8yNrr%wuZ8l0^Jh5$lV1g=8m^`9yu( z!Q)XNNB^48S4`Of4AR+T4)C#q(hg3Q(0KxKculJK7(u-U8^=})z=8TaNo=?j0I7`k zs|F4b%u-@feJO$hHAg574@#aVo30)J)w!lKbnT_T+_3=$sdYR=Rk+fDK=kxTqT&0c zh8gTQ)5MxC}{iKw7E2@<^}i0Ji0|4f?O-d^F4WQ1E5NgG7Yx{Va8MLVeONYD0Jr zv`gEflinrm*SePaJ+8gsUSS!0Xfzh&h@oc+Gx?AECz)I1NJQ1Ve*}U$GQ;3QLKH3V zK1;gnBSXW1v95L1DZ$*+Xh%+3dY*8DK0E>lQytU90gT$j#ZpCkds+9p>#C@OEyzC{6f7MfM2-|A2 z-j}dHv@co?5YEpS{drmni~!uzQtlgaoxYH|7-{oa&D@T(YvY!+?|q15;S=j@-LdWR znvG%CHh1xLTX^H!_R2fovy*4vVD>059mUBs@W@6Zyo9@(p5kj=g?HAz|NZaV4}bVW zXY!XWU9x}n&;F^a3-n@Zg4g6VcppBJqnVj!#gY>iCxk;5=Y`qAJnGuBRylFn#ujg4 zhc{tcx3AeYAwp`~YqnXzW@-7h<(Ys_TzVV3qH|UUq}FAy-%z**LRb(4IECZI$%WGn z8kVtLY9r}M;bft?u}h!#wAp1h}Giamw308F)sdDelh%Jo@S zzRwbpUVvP^w1hbuk|^9V6{}B7R_rb<4^-+JZ2^L?4I}rLtN)0AMxV;23tOU5LJvKDN!sZ_afjSMfL7x< zfR{kGuyjDrah)TEJUI4s4&NdEtSGh{?*g-!qM8esF zwvs5td8a!HAwr|Qj?`6Ej{~IRdZ|Pj#zdYtkEAQ{J_0GDvTj+0G;;S>%65OfWYtOp zNEJ>6c-{v$s#70)4)EGgcO6sFw$^2%rSYz|YN>sq$3aS)Ak=<7?LdG^o#}0@t222_ zGdUU2mj0Fm778(+MS-*>;pzeAgsi-7&^N_6)wK%v-9^&gLP9GLDoK#&p$`gWoRKq# z#t||}ZV~}g2fY!x<9<;ayQrcy79@z2C9EWPU2Ut5yl=JM7WJP! z)l5=zg5>Z-YX(@NKVY}GrzB!A?ZPuAImSM0T4|1G=x-QTfEm_#Z! z$7BTqWyY#8As73(qBP+I@b&eVF{&loD7Y>^a4WNXNws+%ZG+1B`%w(;ODObE3c;ZB+# z|H#s{Ela%e9m~vL@@pk&O94D*u{Dtq{rF_jE?vChl~g=8sd~j<+IX{~=^0wWgsYQ6 zyG4i42BoM{p4B9hfD0EcSdJW+RlIIRuOw0u_{MWBNu)7J7)cVzL{ecVc&>9osV86_ z9+!+&soNCF<2&!YWsT{!UGEj`7Z28~gfvEyAEiK2TgB|+v`?CFl`OeL1@Ht5rACb4 zAz#-_(Cuc$cI2%LP;22)+>m1mfS|2yc@{$(8T!YGnb&2TD9|42LY}ByBqecxVT!Od zF;tae&En8XuZ9sCPfVcP?b?P?y>T=J_{iu78%<*S2!!NZ?%S96Y2*mDx>Szyy|4a% z_TK!-uH(A%%(vF7eM2p%!dBS0lM*FLvSi6pTXJi(j6L0I+tJ+rnO5HB}$?sQrrn*N1=e)_vO`F=JUz>5_p7x0!a|06j2G>y7%2B zmy?+%zj@BdljJ#%N^!41(ZQqH!0T$*1b@wk3s`m;?2YSAAq~8~liEspKhm=WXuP)V zr+19c_o}3g_7rf6zrI)k+UDj`2v^?-<>}W#M{b@45XZw{emzuBH1u~7b7-Hf&8Kc)ouP_1knme22P`?tR5ySEFhrKOexH*`o&sz&2A?U_hIPl*W# zAWhrAILV-V?)z&xCBV-{7$uKL7nQ^^LCtyaPELSEd+7q67s!`8mQ()N|A*G;LMukHhM zKGMdsU{@R6IwDxhl0a}P`QNLPb=}_P1#gzkvlET<%tCpcX#9Is$luY-?gO~r(TaJ$ zvem;XxXrcMu(@BRj~@(Ae(_(0Bc~r?VZd>c1kIpNiu))Q z>!Azd?dTMiCw9EMF=g$1WKh1VWFpxDc`t#U1bi%?j7CNB$fvoVi?Er0J7+L=#cRNhMicM&@6>}*9zoGRq06UUK0 zma^G3rHF&+UJ2aevt9>(28cc+U_D49E7)#jAjs{|C>zdWp(?7fwYa_2AAj<(aPq+r zo}0;s)x|f$`C>oM1%c3=kw*ZKNx5LN{LTZgG}K>NSp=BjBane|mxUu+81cI`R1>hV z?m&cpzZ`jJBK5%V4tk{bE^gn)!o^ zz=+kl4&_lThM1?l-M3#GufJ{E2HUeCwT<*UeUr|i=mVe0?p+0b4Fe+%l9eQZp-#V0IZ z`t5sn3e6%CVDfImP|Awv47)|@lzaLL>|6LT{VS8`Y71w11YXgZH+0___&Cz#PPXJj zrO$*3eFM^4;gaov#V0woLF4^0(5pn>aOG|XAg)7TPI`qK5_s#b^`U@H0BMNrOO7P$ zpj{&Aj4hk9lg`!VCUDSUlnDp*m_74t^5`dRL3*_F8$n#1{v>#_%?N~lA46*YmQSgh zCKB>rf0xz%v<2_^FV@g4^l5u-|MDGDU?0G}Lqh$&zSafPTAFzyES!5LtX=p`SZCwv z&fbYI@$e_Z15bTE9QoLvM0KakC~BhsG*P<2n6&Gl3R9A~*h$lXbSGNqMAzLAUV7=J z_`aLK`&(u%plcVg8;9{~@vJJy4b9D53zsH2nDq{- z(cNw~Qh)6n9{vGwmo=#8eOh$S!3RPK+bM8% zf!4Cid<@=8gLDzYd}*_R!TH6D=aCk6gs}-$>Vkq?;ixCG`xz)QAVw$5FiQp{x7BhS zvNCJjtLayaP1Ltr%(bVx6pr-(RwnzyFNerCo5Ab#KdL^F94bxI?#kT&b{Sx*OBbVr zqsf+L#;<*HC*>*v=2R1{Y%&O~%t1#X_l+uyLz?BrnhJ!8r$K<41N}DY<;BHCRCm-3 zJ0D0(r4^t~|7U|L<%ysUb>AX`8^wrVE$@I!US(RQ=kM-nHb6MU7RjIBO<*UObAVpI z@Kc`LIcN*kJT?*n2IZ;|bx#vrAK=GBDCqJ4gZXSf;!XZINr~;4>(oBdZ{M-4`JHVf zeeZjzJ>_VydGv8PGM&@*jsDQUF0GEOXR#ZXIENm`^$RPV_2(m)04QHRe>SWx&xQw% zjIm?MQEa`GatIzW$+9~|#Kk$ZO}ubJf6{<%O%}5BvS8t<2kA?l{o%#4bKwGZaOSOp ztZ4Oo1joSw}(`|_IrX3zZaNTK7;S2d+qPu?pmoD39@4g5;EF~0ILMR0;Uqt zZWwLMatG;KiFS<^p$^b<@l17nGxC)D^u~W9W#GWUQ0k*T-NA+Ij3c>I zDr@Eex%Q>)?I(Tn`*60cZ!#fL@@Bd3Ru0=q zoNW9)6z+F4kGJ;G-_dODXY0LEVDa_m!ZK>pjVr&#$J=%MxE&5BpZrpI@Kaw7M<02L zK^_$V9jU4$iotb#ehFV#*qPA*yIDvub$I-SisaTj$g~TJY+7MxXdry?i(f=CFc4>z zk3RZn+^5vX4s%=_t0Cua`tnIQIw*-(H?!q4&u34_1L7nb>-MX-{b{nbX7Vm5U zNLj8+&Nss(ApG#;p)kOrhkk4kvyJNAaU&O$go9=P03ZNKL_t)Z`^EEsKBRO2KEa4( z-lYyADC29@NUm&j*6m7UvE@30@8;S%QWL;9bn{){F#{umEHCJw)=azWM+sm;ad-hj zqSn-9ii;Zz0zP*haL`qHBcSw*<(d@WjYe30`B(AXJN?Naf$SQ5Fyse$pQh{zxg6?7 z9TIyZbALn9mgAPgI1_NO-0jj8pV{VC0wPx4jjRb0CGT$ziSu?-QY-6NoUbJ^RX^6a6+~z z6Mxi)5>G!{*L~#pSg1hz9e~CX64n|(!Zu8kiFH^KsZ)MciRRUi%8-70uU&oWbDyQb zJJ|>N-kn0Rz5y=V#U;va=*8@z50J(hZ`N|Ce#77010N;dO6bT#WHn@vm7GpAlwgfq zKO2^D{jxBBCM?cf2tBi-VRUjTj2xVVf6xb60c@T!_(U9$7~}?^P7?#taTc^0Ic4=a zE2sC6wndeG_B9V$#V|h9{rnovZP3Tq>W|2ru2lhibxi?y7N-+8($3mYY9kq~vx%T| z68L!bkfygzc3TPmPM)N%pv?)hXX$7D+uMm5&wk4ZpmY2yy%SA;CyVwwpQ*c#Ucd82 z*w5fz6qtGWr(x~d%b~Gx4X+WM;q=Eo6+ZQqzeGxPiY~+eg=D3`Ouf#?xwNtrUU>Dz z@WL-%g$b9#;i=PMVs!9b%?clU@O1FFH8|r;Au`m&>={7N-bKE;j9;wZzWhpf^|hDC z+iqNDKl0^2iK^9{OV9~9q;Ug7$53w}aU;%rfjwDY+z5+j-$Yup5mt6E0`EV916!nR zx|jgCxJ!iU7iWn2L_2)!DC0pbiu+|GdxZqlWVkY>G)P&7#E^C|+%Kqt0x-;>o^`=M z4})YEhuWa~8J3YOb~CVdF{JEpjm#jbLmiMDW{TRMvFIbm4jDyP>sA@uq1z^d;E#U# z^KjNQWk5kr7q*C}r;dap$4@{r27JcSHJk^#%GWeT4;~7armuzd ztsTG=He=9H3{ItTpT;1#686-n1_QJVr2=sShVzt+_{7!A7(jHJWZtwgET|z=8ve#^>Zd z8pHc}Os{qJI{mf{didMH**2ksC7o?IUi&PyCErc$DQ;lTpk1d9>y%f9%VQ)CV z3d-(5?BtM%LkFd-dDQ-gClBLdq#AZ+r^CgwuZM&6lVJ>BVL7%(1GyntmWBd)cS*pU z0BL81J#q8cjMdojq|W}qT`UrMWNIv|^-Y9VUU?;4$H$_JZ*;Fwps(o~#?|FgA(fTL zV_DjN3s5beWoy50`QAzBE+WlEOQ83wy{X@01L4eyuKJd0k{+LMcn=Zmt27aMlR-xXb47P*R z7ChT_><>|$%5U@Fz26rAXWg6kq&oGtZNhSR|4za8B+Y)fHwx?nxO=1D2l91n?5&g% zlkx1K8fjw(bL63ZRvBg;=IC%gd(i(jyzLT(M3tA{uPx7o<%MfVU6}jgB4HgsHix9)`0-($W-82#7D$i|JPwE$ z$I71JHa8A0_zjCQ-UvDD{Wf0yyD$TAIP{UPU^HI}t1FwKhxi6jPi*V>6kIoXm_cx> z5?(^BY(Aqs6@!*)w``MjR^Xy~+KoWP++`uvMWVkNg5-NG-QLH6nO7p2s@z;?3p@{S~VF4tIYlpQ6P!Z9**t}F{_&@av4yN zvTWent2BH#Tsk)$R$lo9+9CatW$C9e*8$F5wm?+)p+!=C!(siw}d)%hgGIX=FBzjX^~E3g67Bk;gtHcg0T9=&oCz}k;d3wk98kgj zue~E-x9323^7CH~1E{a-WL#UT0_rtYln(0A)=s)1!O3;n<`~!ugJBh^ac5xB0sj1o z;Q=&rsH2=9kS|vO7b#0Old2Pysc_*EipFzi!=<;*Awe&OBM;$Ry9YXBhZNkY0V!Oq zfrDT`oO#eiN&v*|A|(l1t4!z`;bT3`F!|6x_<3$Eym*cUC*4Qrdzv52hQVP#+B?8 z%{RiCOILA~Qwyg$hcJZ1w=3&BWCqGE3XSX%V-J)sB_&cWvYJjo}^P=OS8xaDUa6zA?d6H zKjRNK`Dsel@6xvk=y8jC*&C3TIJ0Z-CEtBY%njbt&e1qZxX(%PWxOnto@HPA?#=X5 znm)6R4e|u}o9FayDwFkZoQBlj(sf)QBf(pFjxX*1dDj%!2XOD2WFPzoHhw$Dt-*V1 ztn};c9|&vgTHqT){as<2y&EsR^b=M9USi)%{E{I>dE)U;hEIO_kC}-hh2g~t_D9jr zRVz|Eq)fvtUfe^}L0WI&+GN}*q&(f)In(=bKutg1!PzvOeF|_KFwBejO6hnut(2bm zD|H?RuV8<&x)~PPwrd&Sw#MqzI&K(B7hVkGr#==X6GDVd%B?E4iDW@T{fVQKVQzZ{ zkjfsc>~q>cswZem%t@7Bau5B~)9zPXUm)65K|Jyg&@SOYr z#Bu;G^CvjJ8Ej3A^BN_i8g|Q{K31&eptsx>98w2=bst%9UYsar4AZyWAF`kAx7 zv`yn(VXie7`;`&4>NeFI3Gyy<(nk)Vpt_iH9y$yFg;rNDT?&_HW&x>}!$kgY$kF!7 z)PZ}CI^h!dWO3hH{}XB&qVr*~3gyVFs*XT3duE=cMLOaKZGY19be6sXIYXNCwY?r` zoZe0M+sGcPy8V6vZjx6r`fhZ%&P(#3)IZJNtvoxW<1??VZ?6UF_8C{3dTpN5JEraR zez^Y>*avX;pT_TN3hkZ5h+RRJhgmo3s30`zUtJ2*ulzi$B0bBkUk^(##1khT3m^aN z{}9GbejG-_ESSN#lNobO$v_+bayC6RHPuozmg8QZX&aZA7QNq2Y`8TaxBj+M%OunL z@uR!^86IZC?_G&}SI2@zON$} zRv0pOSg6sBrl-=!N+8Y_`gIumX9*kOSjKxZNX0908VQe9u8{@CpTfZ}coP4-HqFnkP< zBf-NDJVs{Ehig|+A7VSISF(=!c#L-m8_yk943{t)a0Pai<(Y07Ha0PdjXz-Af+Cge zVK#FVsotgQZ1IKtV?dhMMZ4c&aL>^f(%@`V|$KkG-f!`*4MlM_L6X0D1yk>P8(U(xSK+gETUrMP6gwN;yKLBXvWb zbbaFv6IOYFMNZ=<`vAEtUV8IP?As+w8b*=4<>YzxX*z$Ad^_2RZ6%BGJ^m$8B!ErI zXt}MwCXzlOYdal`+;Sv3rDvYKXGr(to!XPhFYGhYxIILASnf9F?PSyMxgCR1>hp4G zY3YWP%yjIN_D#3*(#g8u&ET{4`0V2eJf=J+p5SkRpZ(v%-v-lfFHgL=|L49^U?0HU zSMt7pk>A=e>@?o%h7oVzLZcTOrw&x5=U;j*tX_Hv=D3E0h3%6LJrbVy?3csDL!Tlu zFk|{!@_Tiox3{vX#Otxg9*dyKTLKU7rI0$XzfC&@8H$I@J%wADPP)I>*>7CAIx>Pm zHk_!3LEgPcQ%LEj0VL7{ljjch1sa;bey7IXr?_5N!zbDLJcjtQuZPPo_lJ`Jrs8-n z+uFchnXwO}TB>6-zFyyqD^rcn!D@CEXS0#XQa%7lGfD$e>bF0eC-dQVp8ah({4FEC zz@i54xf)kyDO2{4R=(HbeYcPN9o%)`cVKTIeW@ZX$)UcfQ4MR0GpLd-h3fPrTu8hW z4q*>eVc*lU-+d-L{evHcx7c4+bGV}5pS-3c%a4Of#?-B4w<24Zn~%9k%-a0R;D<*r zpyw<|v#nTG&)EP`!S~#OSdW5M_oqE^;snoWv+R+oJz^%Kcn1Z&!z-~3kXh@{!{6pD z)ypQpKGq9$@7W-Hv%Hoi-!p{j5&-3QK5vzq7J}b7R75q5>>2Q#C~dQkX$1*w2aem$ zy#7M?!MFZj+_n9djqd?(yu7l-ZYC!Vg|Gh0|1muNk;lTbKmJZQkHg$g|Fi!-Oq?7; z`b9gT?i)DcjjlVSJ$7f>tT|2K7kQ#CP<6U3R)O}pbnQ|YEg!`pHM^8V+e5M#)n9-W z)S(3y42^D$vY+uv+?#dr(pzEu`ZNHJMK${2+g)Q4g5;34xJ}z18a){I)*Pg76*`eF z;-}AndxSbUdY~_yxy&vtEG#H9;fX6!X-m>A(vZ59W&*m@&Qm}4zDIi3YeSi>9d?ww z@vYL$GOETNz}sMMJq$Eak7|3V)GC5ET7zlvu6B6Q2$Omu;w)|>w2oTAGz7ab?Fdkj zj?%Al?8GuMaaaO{*Ps7++<$if^=f&rKjtrepV~wE{a(+sIwatj6o`mvgRY*{HZD5x zZHv@=+U{-*G5ZzSF3Gvy~4z8W@aWVU>B%rGfgH_ zpLK$zw#6*~Cnm;Y{OxHQr+vCT9rI!EUIK2O)BX1E&A%bti$C`N+!qSm9C7bU^!t(C zD+TNXsYBcvm-k&(UqmJ0Dz4cxFN7JSZ;chyDeM8*GcXcPe(tN`k12MoC zI~XAB?u-#PLXwy{@Oq?R8tF)#H9bpb@26*i6R#6vPw(9AEMxFHnTx^|*SgGbfb`zvGEaiH2dV_^QN5a?s z#s3^8Po56H`o+(}51;;PCJp`Ju_r&xx1@4Y3^%T{It2l^WAE z&i5LKqe?wMacG>;$?}+2fq2X_d5ynGSX$j0(zDby6HR?jNnGN2meFg=kU~`Hx1`uE zI&qhibLY;*^NI^rs58^F4&`ZnZyjD>V(GmjM-GKkr*P)}K(^&zQmGoh`SM8h?>zxw z;$Oy_`dRz?UdOt(-2T`P_l*KKTf%)yVn5=0rGTBmj+BDe-ZSiMZHE!uJ1k#*Gn{+j zd!f8JP0zzv9pms*pZG#}{13j)O11;?eC%l8k9^~oaj52=1A-mYIGy!50N)xCgHE0D z*5~cNWfC%=cN>gbW@AW<%ltRVawLBnlxbihlzOfs`QbZ`JZdZlhI9zB(v06SbppH$-gnmSvrIDD9m~=0P8k3K z%VyhYKcq{QhG!l6j`imN5$%N-_;v*&Sxby*yq7=vh3g^ic5rDP(jeD!=-q; z6;S6dZ-lM`hr&1h&Ho-g{*jM{A3yzH!_U6`*CCH6)Ikt!^Q&U5gSY4%7wGhHm*r~ zs`Ly*VAX@!KnK#b3R3wTAQ^q4vm6RW`Nc|r8$qgI)k#VY+d8&2Vf_Q@_a4;4&|;T5 z6Tq?gLzD#BUTwDmH`RJdQv!U56j7}cJv|JC$wVW!XV(SAMoacQ@1aE z86{N$Hv^Lg;16xnwjpnV$Oh`b_+!19p4S|C`l*vo?fCL>KU)pw`He(MS1`7Pbxb3C zhX>Fhn*_SBpcHA6MgLy^>MCRlAAMV>P~FPUwql6(dtA3lmECIrxLDUbOLU75TYnM_ zV_CUp-$`mp+qnHK1^Gt@?a`n_`^=d$;pLZK#tjn-!Kf?ys(se_a#C)6_>BNgaHo1z z-XyqHTKAEUd?fZG<4b%u@i6mhJ_K)`y`SRq{S;E!%ztd>d$Z5<+5Y)GQeYpzy+^`* z7@yfGZte6PFrg}p{Nn4s3>(*84TrigE`^!(Og<4F{>)$Ch2R(i1Y5VTimrq`i;gKB zyct{R$P8LAOvBweV`40KDz_cpK{CaoBu)v--9lmnsch{GAbo4R1{sgRG}3zx3~?0T zTrLfSzM-iwdTa*(he`?itlIJgRH@j+oqHqnp*||W%$lfK8i+((m8Z9M^XkU-4oY<# ze_pv%2y6I5+r>sE=aSgF1oLD5EsOa|btFx+ZxXc3&CSKZ#AiyY99S|HNo#<*OB#22 z+=MnlIDMyekp3nscdxwqO1O5GePS7aO+!_stG;&8VI4hklDrnf^wk9h@nRSnKqW|C z1aO`cfb-hCF5w=;LHjVPb{(+2?;zsf5Wiv2wCsjdZqIe{;(~@et17t!ux73jeAoO4 z2(lH;cPiOCyFW728wV-#Xx>s=NnZn*(q(KWH-5A(a!3ewSLXm|xY^O*pSP;yzmcb2 zlyorW$H@=vq=K!Ot3j_%UkbCAu7u&v4hB99@y8E^Pk#Mhhld|}kd@#67@q&ue+&yV zi%7qUVSIr6^<#fU8>uOVBTAhNt9Fx4!W9=*82p{1y_9h6!O9c%E#3@$fT~rTZ|j)0 zRAP}&kqHXF=cn<1#x5kod9B*TiFO2>xf%*7fS&8 zZL=P`O7Kk_wQh+m%KFJ~VQvd`tCD@%0Q-(gQ^A8^;K-39aS|e}{eE*hv;Q>yTib!r zZqq?26{^!(=)*zp5R=P(j%>9l{a7iLFGd>JuO&Fy2Vv5q@I#zQfTASMGC`ww_>F1$ zGT$^@JcI3-3s=ffBGo{W2oFGlC73b)26;$S&&FT({-;h~+Cg2t$?TY^TvQcD-+2H# zxmA1bPW+)g)zoM1L_cZocL~Hv^C&?jlI)uR5L*dvzWHW&;|(0P1H=StE*7%SDkZh9 zvel+HQ&#dVZ+PvsSHcCPac9q-jgy{_e)OY}UiMGj;1H;q& z+{>YW2l{OXL3~8@^s;~e9jdz|R1q)qb@fGq{3>n?dV8@0Iy%K*P{*ALc66(2p_4&# zui)UIw8#2r&!6AK@<0>mDoC83o{r2{b)rl-Q#bDw``w>uter=KQb1Z%VsLVswCOW% zhGkU2gQz#FxN4}PTI)oGUdP_3%x3AQkDm;qgEICmcG}A7&HOvKrMBjPA+z3PfE{(q zwU0j)2Lr*VM`{}mm=3^xm%h!ev+}zDzy$`rn zlLZn-kvbm@<>3jWc1#MGkZoFazzj;{SjQ0*MY}l&0N4>QqRbP`M393zD?Bd(j@iUtnM>Hdk@bnk^TZzatEB2+SWNB zR+S^HMTM~KBL?`9{WIb@?%4+IV&mpBm z%5;G3$eeJPkzE!sXg6oxV!nytUINqB=)8A_MqMRNcWK}hOW24i)wj2A)4W|s^z&Ie z4HKV}x1@gOwcyHc)D);TP2kPCdg!5tqOGZQd5MXJlSky* zJs2$OuA#(sQVy!R!;pdYEw6^({=W96mLH#QL7np+MJeEg5Y)Th2ckK+H1{>M-y zV2k7XJGd5b^^wD=Tn~16Px%D4L=XREfW#Iq7XH)!_t)V^Kl%|fwyiKrUjC8kf13LCqt*x=N{7OJrlzPgNm6YyI=qBMH+NZ0^) zY@R>Q;)cwSSX(^pYRWusqM{M(=mNz3BNK3wF&d1^;O_>8haE6I%i-X0^}Ld?ayWME z7%mhlVHNd`?9x#t8u)u&;Z31+m=cZ~)j$*IFD2%z9ITMxMs?DsY3InD9NH9KeXfm8SaWV`b z3Z7b#WooI_iej0ptGqkR~$NxBVDd}ttl4Vv z zC{<%w!v+fj{=Pr_bGCUp67s09i_~?K6_MMe-mLvt1H@Zut~2=49}E2ok-{2soBDy1 zY*)rA#FdxBF7MB;0?O822n8H+=aH;-9)2wJOq>b_kFdutAZLr+H1ai8Jp+)Vvs-`! z!~)FViwxDRizak&(qth+gM1aF3GWnGMA3-t7N20yW*9oz)iX< zag+AZ9S@mRgg;f`N0AQ|ME_abHfPap*lxGXE278g3ucqw+x){dF%p_9O9FS zb~H@88VIXw<911#Q}{v+{!?U;NhgT4gnOO_4vMSnCb5m1oE$Dw>e%V-0OD(`YA!Wc zT*e}^UA}E1IW+%<*ls!dJKamywtM@56Dz^9VA@Hb5;wt{0L$O5@;-L#NZd{5$3Olt zJEUL|f+W(utmItaClEZ3)J;jJ^zLzwhb++dcc736>cj()tXlIt8IPkdIZwIwy2Vm8(y${e&qE;ToMhHfX z!E?D~6O-~OePndHRPo;VH{XisIA{q(94s|NS1nOR?Gzb*%-)rn{U$M7WINt8-y% z3>9krfzTYAkwrE=Y#W!~o{y7_!Qq3U@6ZFG*fWS9$h9be>U0+d@=OQ9 z#*_MEvY_sFdgjg8<~q9j!pP_tHjRTU&V=ogRvqw_qdeM<3G}Jl2+nN#xq-1TIyS^A z;*r?CY^T=0G`2o$2OdD5Xy2BN!xn-G4N*nkf}CB=>+0GLRH! z`FV#>sV?E?j(VCc#(j-l=~-cC75i_g(#eY8o0A{+NLAJ6igM}QiJjZwhaU`G6ZA9o zMh-X%mL}Q&0#U(gxHRb)q&!Hnpa*($?s?z#4Nb`Z4zwx&W`+IkxKafSZ@6nsX+5lz zak{(BP7kPwOSGFJZLAJ}+pd??b#Uau0VLp>VrZJ7SwRj-c&*rnB_NK-^ypZZnGhxhiwhf9Hd0Qce2|E{UKeUM(qcVGaB1K>Zv2$-%u&$d{3 z_QnhU4X3S}%w*Y550&7_<4=SKpZEi2s{PE$5w!zQ&Lc_EkJs?<;9XUkcg@gkUeJ!r z;Bs}rn_#Cy2@4GCopg2?jLd=8<6vi8Gc)tyJKysTJA)RzP9zz?yylyq5-O$}aD!*qLqWM;(VOczeQ17I{FfnWM@NR+( z`0CZGL1x|_caoOv6_5#643|jFYNghcAxo0*#60{Lg&?4)N-sqrM-4cjfNf6#Hv$wQ5iNEkUR0I zS4Jv!9hG!n?|~cbGY24i3hDO4r%$oX+)()GKm1kr*$=)Qwy$3e<484Y>!`Y_`7r+Q z!{L*E_6=0>$5|+Y>k#r*L1I)xj``V4+Gor~-U*RVR>0<6ZF5Kmy8y zyFygO0xN(iV+jJ45Hr?lr0t4n({Vx$%JsNgFdz2O)b4%XYk`=OwYT1SEB@Bz&AzG= zcJ1Nh2linnU&oFei+$J$wf9q>5d>~CS+l=C^2j66ZtnT#pN{}e>6~Ct0B0Ud(|n}h zz5VdvQy}%<4?idSIk+ta^wXtHNEHd3Af*m7uE4b1KIzi=*TdGr%VB)tAk4{?g5zQ8 zp--?s;89r$40=1f^wOC)u&=HyM*!y_eDvty+ottiZpKxtt&W|5fP-j36$PC<9ec$s zbMQT-jT+l7EUbj5pME<0&ENbDYT4EBFoU7NK}N7*@GJv*_UF%sMFwFdVJA;K5FR{z zI&?E@E|&Vj=*V$)9k?3$k*@4aUkVGWi(v%-H?Z(<7&wftIgPYYccftcQ+_RjHd-ec zs9oK)xG)z1Oaa>KXf%QuRjBFXJDg>D=G*rLa57bAz5*@FUBOPpvUu$~27#2nWwf03 z4603Jz?Uyyj*`9fy=lIakjk6hO*GI(Mq3zZ;5+8UvPc)t={@s#zk}%;Ov|+WZTUPb zdkP7>c|VnFovoY>XlM84h0yrX&%zcGhLXO|Mqqsvq`h;fxUq4w-PHi+mP^+jE_6{s zWZjgptt>HM@8Ab+et8>5xKm*l|8_sZ=Iw`=FKjHWg#&$^_>6N=Kq(w!tFXuZ*;nzu z__eUHxQ28qbKy`2Y*mr^7Le9hj;b5W60eFRZ3#Pg-a&o3AS3tS6QMqOG`jV0C2*0v z_Vyrk$DBfYx&~_eJYcR+#ZVu=Ukj`zTxI38tI~Dm96=R?8DZtBQoeo$@(NCF<5F65 zl1i5{dZxYyjR0KT-2-8wW0=iN`k*iNfS6oJ6KR_DYuY^Y_pl6kC3pfKBLw(l4OVbO z9RQGe$VeBobk(V{GjdzroRPbZRQBQ{P)i+LU6hU=P^E z)_6{eOumAY?EwADWxuLfwKZ*)kA%71&ajBoG*`zKk$hJHVcM(ZSdg;TKy}`tg=z}b zwMimp8ON|4-lm_gb8K5as;mQE+sR~^wZfQGtVeSKS`J00CMgooKkh)mgRsOQ$ShM| z1-1pl$58}(6?k(q+Q_BWd;4>HoA-^>|CEx;L*yl@Qy+cw(I_E(?z!jUgj1V8ZQP#v z#3!PvROzn(&k44CQ%SuOdjXukjZ0o4a1$K*T)Ri>-C$jtmsI!OOTWF|4<8N%Xm0!A zcbNjnrT9n3ak)Q-`*aSljnDSnLb&kK&%;nBHYrFKwsGP*cKB2{`oNR05@zr%WT9G3 zKS(k;XI~BuI&XBqdOt!z-E1oeJY+Bq_O5bDGrjcuPG^~dj3Rw4?KTr9fZ& z;uqtm4%TTIz3EuC^XD!=7iOe5@7=||XH>sr6NALXpa;|G#BE03_>r)F;4Qq&FNf;l zbl9Fb9|{LfVJpNwi3}=nAmUwv`S3`L^S~JPGf{O|W7ZE)WRP`$_Z@BElw#}^%%|lu z4$C8x6cjkKm1%aOt~hw`U|iuB2X*SnxV`qfyWt}Np{i?XA$^oe`knP{S`NN@h4!?3 z*E|}Bvv1X>TRYfkk$2;?EFON7<;{`!g9)Z*uwD%QHXoKbl_3o%K1%~mAA3|Z-#Qm+ z-+eah{OUKMyo;^SXjj-pAhWd1)?%pQYS_Hhkh;}z#H%#RBpS4fP3l>r^mU|JdB8}S zm7v?K%5{&;UN)H@Vuyu~eCD%pJ3FOjs#=d9dn7#m)aOEJ@F3D#)NN}h(@^P~w;iNp zIi*tAi|Xnk`XMth4pNS8RSMh}pbZ`v4;@1X0Y|h4?rpN?>i~eKB0!-&wwa9JOC-!) zxe)WWx{gg1B+`Y*0AQ^TX|W#)#bZ?mOnEjwWFp z-bSwpP2Ayh^`b%rkh;6XFm+$S=CI0Hmo)CK;I0eW`z2gByO|Hy0Ol)9*7EG8L6rjF z=(oh7gf;sAqkP&?QsgLg(>0GOR2Rl9?#y!!unevG5m0xbTkn8|dDNn@{h<}v1hg+; zFS(HG35)p8Tiwo6?|}8KYIwMJBRn|T8~RE+xYSuh0!yI)f&~&&r5v6ATF^a$v^IFQ z9a$G%3%tBmYARn>`ld~seP8hU)KgEzv%JA~mC}vj8xL3?rFVkBUcU92(z#>Du*>B; zL7|7+ml0GCvJ0t&BXB+{pbQF2Ym1`HWeMd?Fx z*8vH?RYOO^&cr+tm)Ao6+GUKESHteLE1`aPfkAeFLG>nBGanwt8znKV-(yHPYpA#c zH~NUn35wur)XHAPy74SAT)&t8(#HH-Cl|0m@wdQKz~#HX=e@hp%>-1VIFnAcZ+>Te z8;t920M7UP#xnbz*8)lboO#-=uE%G-XMW7Hhar6ze|*4yQeBy6>1A6pU+I3LUHQ!U zu<_jUVds@sLJwf5Jjk|UNJ^T^yP=;pvIU^p1YGP={sQ8Y3aU0G-fp3_!)V`I=(WdT zcM2e(&Ufc=-&hRFJ>5g$@YodFQ1ynng;mtEfJIh0D;_eB zF4$2G2#Ep4v|((k1afui$t|m>E!r-?0Ck%UOu$hCoCpr{JTJQN0N-%+#cN^i@`bR% zs_HF#8g_Jbh7qL9y~9K7gF4LiZ9QyYk6D6~t6a8sEnPh>OmSjWRQg3(bJ%n>MKo{$ zrNd4X&F3zBqYj|4{iMV8VMz5aeXW0lj@forkuy<_2u>^q=}?xwTs2DIR1e!@Tri-6 zTNw|j#W?r+(}|z60(q<}3FL@&bL6#&y_%q!{lxH5&SBmFS#EVENHT98Rea956GT<1 zCp?q_P(J#&BOi6&MgOPKun2;7B%mdmlq|kmAfNpJFEKAGNqDD|b^aaUJnHp}sDc+M z<7@ z4w1*T^*P^6{K?6S^`HdKdXksOSG=brO|bTx7k(Rl@rz$XFy^d>pD zP96OwGsrR^5c$V{{7(4Z_r4dMOCCLXEUu{f+~+E@! zxU*bo6P`IYmTq$L^B3629RnQ8mA$(+4O6@hkX}1LN`DWpH(|m`Mx~e1#w1}hPu{y* za0QwYI6miD`Op4w4HbI06F z5+Q&~fZq7bSE94`D^LG0G_G91_G%jk#;`jOeq%#*meOLjC}Q9)Gmf$rIjS?=#NN%x zq`Z>d%~g!Raf)l-bHPA&HHnL~JP{Qu2(sL|~3;LvD}~vE`L#NuOOICDiF8y716XS)0RnIp=@d5G5}9(Qax}igBt54= zs=;7rnteUp;V>&&T@13hjugZ}kM~-|hM22Lf1dL1yI$Y#aBCXr zx9NMhGEmx?M}MbaojFL2zVa4>I0H9(mF{dKKVdK~U>{j$$AM+)b^ujZMKKZss=}BW z;+qDb&cQwh;HYS$#^lMm*`#A>6DECGSBSKS)qto}OSp(33k-aG!^-JiB&l5kl`ywF z3osgqbaIvGjuLRTZ;Mhs+GiYCX|9-5;S837-1*nIY#dLj3C8(2C$(o|3t%Lj4*W+n1@>a|kF zMGR@{wnXsU#1@Vy2t-C1YkwS-aO<#(%;~9nml_gpHYf_nYNm1M6>NPl#g||F1&%7` zLf1$iE(2D=PGuqtKKj|P+kY7GJw~%I6WDBA$WXzp!Be03=#9>1=QDJ$oc;X?+2Ah+ zbY}zoOF0PIx#7FqW0e*RF7DY$g1X??L4D-CWQX@xfAycj_rL%BC@Jh<(D~HbIJ^*{L|Lx(|jq6X_9IT98o$3x@tnNXWu49j!p zLVn?)&@+AnyCy&|gNu310)W8TzAD)q0FOaujV-ric*l;PMmo}3*-JTl859#UOX>ZrEh6a^`3yuv}M4FX7R&2{PBJBuax%Cp+iB5r_5glF9Y92($Gqpc&+Pf#9<6+ zrJJR9YxJp|X+ZBFVLIk7-8X-hPsvBhzj2s%2aR-Hz&6e2=FzhIteqa1=!F%eWPQ+U zm*>%uDv}X*O;`qOxjM6mH-GKUh$w8b60(E-0h9`*Fnh19y$f3K0D($$8B&tZcOlFt1RY2NS#79_;cC=XB32RI^)-Rk5*RH?GqKjG7 zx_#m3gHMLRqYsCzGWEwtCtsm>cAh2?Oz6#)zULEZSw}@B!u5Qv8D6wB| zeI~vujigx7He^8!I&Kr(K?D7`8E*t@vB70&u#A@S(FUoyzQ^CT#$l$oW-W2Gzn?Wg~o|<7zlMv>s04{Cbi$(ns+-i`a<) z(n`1naZyx`i9n&b251Gm<2!D72U|!$@>*j&EC4PGw7)!CisgE9;X3`|0B%R5sUe+H zA4%=riJ9QaK4jasKlv=1=w7MUML!a5Fm8jXzT#z7$GYHb`e~}0C{s|=RE}nTE zX};SF+Ai$-JM^b+XlgKTsqWkJ7a#8b`OqkkMywAl1N#Z@O#wS&o=&xck*)^x>+FNL zzP1vLYVA;}6#7{aH!=oefOvcS<`sIYh9#I^>p?nt7U*~_c-qF$+c>=M;UJWLX8>yN{2RC52-E~90w-0f zGHRbW@XCN?%z{@Lv+pT&yMWD$G*5I-^&B((4*v+M(ro+a(W8;cn}39=QB()pgjbNk^v!F+rEOwY1O8;=?*3Y$nrT%l?3-2&;Dme-ruEc#xVL+8KJ*!$*D zx@|In(RGBFz`-Y*o*?zAiP38`s^`;yw10CpXGt8|vefQpZ_sP0`R z7M-jF=mM0Nu{-Moe6xHY=Ieg_$>^0K8q2x4u^sDm1!+LOfaYfQ=7iK1@odRG}e2oZpomH$;JREXE6YPMKGaHv)sk=tT62j z$4;IOo!GEmf9oxH$N4ZaIS~#FOsOG{d=eZLL9${y9hrBcYh7!pjW2K%-q5vo)LWAb8Y?RTEN?+R8W)~>eqJ6E3Dx8wm0R>`M4 zcuv7@J?yaWF9gB-7;)$Zik=!>}TP--~Dbh!j~a^{_~#? zU;p~oZ@4)zu1xB4Z)GSW3Fv2QqCs3LtS|s>fOp>?w!fpN}KqA959pjYgdM$Hw5I3I0 zxCL{5qaBNWmXt?Y001BWNklU~4b-8L(zYUT3dZ6${E=psEtNk$;E(rALpvS6mo5${($+yHse7)@ zTn^Xg=h!xE05wo=Z2JvFT(&Wty@t8ZOARy$bJMGD@zNp4(*527uYgyZ8c0D8E1t6xj;t0 zF2k9sX#N*aeK+jG)O8Uf$4(@Th5BZk9B7xgj^t|vi1{}wUE%rp;qdYr?nI#fc;{;P zMDJ#JylW*KBfW{9v)Hf|LN9T3hze;ZyBwP?fZ?3SR)yA!1W`#Pzz!hmVwf5W6}HLu zKw%B_?GARz8vt7*$VmH;#YRb82a_K(`g;cHU>iw&OIpbj>=UWqNF(pb3%rh!ZQgT2 z>{eMGqoW66Iz=YZ0yg`VaXtR{qx7e0_~kEu8U1+rjr~l1oH;Yk0GjFhemdfqv}exu zAAS%N*avVQ1eNb04d&RWTWM|J$6O-|!blu+39i;U~M7HDJdw>7;e;;i$wEI%>_Gf?gX8?%_m{X=s zktyAKkOAS-t!n_szU;uzJH!gK3#{B_v--7bQI*+&8q9qtZwA2%G-EcM7?*jsEHW^` zgv`=q`He01rferWFU;HfCwMh6He&DGOktl`x5`W&l|XQEwMC#v;rn$`|dq6R=u02j-OnL@Uul`2%EqT~q~-F*!iy|O{t z0a+SLBSUO+Qc&OkAjkpQ;z9*?T|i=~of?K(VSe^Xn7wup*AKsIIrYo8DdU!`;g+V)MVvkU#oDD?>YAGGKUb>5`G#eiK09hsZrk z6FNYQuul0@J&%kXjEj6~_`y5-#_M5ib&16yxcJ!4g(H(}{lsnypr`03v%rKchkCXK zjj+6nrY9vNnPuF4)}|}683ED)ywy5 zOoDAsOT^=9R-G@$9Xdexd2HvZgKUdM7p*Wk?EnGhU9^IVev9vMDI7+teWHPygW` z{$c#~1y-Y~QuVz92Zo}CLsJ&NcNM$Z1o?^a+s9P78ca9w7|;IpuxX%}3E6wOD}+kdB3-DS|jV zTMF%+G2Oc#=hWd%&wQ&2&9kW?(C!JkrY={=jzEW&n$9xdX6}aWw%9IcM#WW-=>}Og)+aR2=AApiAFN zswZS(8vF}N9DIF88W`t4LDILBq@7l#D?QpnV%RC(B#9EdIMX&?DP;LhzuwtdiJQz? z<}U*mB$ArJtLfJ)!G~M?%N7d7NG|kTPI} zA)F^;8@dGe>&F(fi*2%canid^9E}e84*5cs3YZg_q*(9IIinqE#x@VI#2zzA8l{DM z{kr+O_H1())~{8utAkF>RSeFt{abkJ&9K0#^evpk_6`k%vGL=f58zg*3}9Y?ovSNv znTXJ^qMez9N%a-a_gFqj)E)#(dSSyn9tGjs?dRIxyKznVZnWE0n~C{q0fP;sYc<+i z2Yoa*IE-|Z1tw+oC{{AZB8bU}<6+{&@lYCKODq6M)S*JlI;wj?e2J~l0`_o)8unwT zOa-vTA|?sg)s>MR|0|?zeb_&qhNchpu+qJ}9##Qhi-2a9JFzwyNfnu`V~^{?i%MQ# zhd)ZBiv@tH^W{3gu!(KsHa3PETrX4XB~;T}EL2#4pG;t{mn&{y=SUj{I2O4la#lSL zSHD4u+g(Tt>0_VpaKh(ddp~yU7@#b3x@((pHwA&4Anw<{{&nm#?&9OtectmMrIvzu z!JLPSpqz;6wA&pVu3WhiCvvJ*oh)|5362w55qj27&CiWGyIrRD?|ont*t_+7VAvs3jvwJyb9XyM{!M0D=9AO9q-HhuNgSL1-~D%r1mE z-E$B`5f7Fy4B7*1K{OQYqjnhpYwOn|fJ@0lrX*++cd>$3@a7@o^O=CdK~*{m9%Q5% z{L4Hor>ZaSrFR4%2$S{<39Mu^dwU(3j&Y?KxN)0SO3#R;SIqaGsqFpGc+Z_X7k6{8 zT!K28yy+aqF3vOrSDrl*7&GtNNEHm`HMOr)7SBr9EJHW@R!XCpE7Ren7ha4&(RjMJ zFP#!VPH}nmdsktbKhw1yd{25Ln#AuNtdVBeT3nT?A%FDwMgCR*6J5H1dFtb#2#8yM z5r1%~jB?mTxyg8OhjzifqrEuZZB7F0`By;V-HG3|67k%EPt4Z)8l;&!kfb)_pqe%i zcVfXT4GEg=9~!u`V5=!hPfk~2PaGJxBGQbBZH4x>lp{?DJvDg;e?Zi+Aq-|pJ zTcQ1wSapkC2#b7hu#BBzxf_SYy_GP@O573>CG?uC)Mvs#8xgQNG1C{G^jlk8N7_n+ z_~~;|j^JFy=OC+-|GaxSIRitb1+G-8Z56J4_dS~l()c&*uR`t5tzm9F( z4j^!reNVU8BJ72^LtzP?aTO`vm0fm`!6%#&y=Gk59KxTEU2qju7y$@L?>hCDC!b|) zEs0+sw^xWfgm!HIOZ~)tr>gTbyUr{uEJbi8Kzs7Zk3`o?_8Xo0#@!WYL;g;aDEY4Y zq}q>cUv5!2H8pj^6_M$b7-QD7gy-9OsCFEKk% z71_jIYdvhooo%s?fmYjpIYUeNx{ftnh~<@u~QVI~%|sVmSm7N^i{LJ?B$E z#$2}po2M=STxU1l(@{6=;>q6CpjpWBoARwXNFY}rPl<{8p4a9_Mi)T@J6gEylnl{( zs#CK%yD7o>f;9&gnY~gC zuT8_ajq^%tL51MS`bdX>!@La-v++6Um{-r~NcrjP&UPW#Mir*iZ4KjmSBm!a^k(mp zhEk?zgx|_+dwfdxN~i!$%do}*o|VO=m^W3wWx&Y}AaRSsodwXMMLQ=;t}3>hiNG#) zKc!QLLh#Z8LNdQuM$gaz%pb7jqkP4#LO6Krbm&0+J;3&5p$xdCe4F&6 z=u402>PWwg4$Ks)tlFJrU*+vV-17{eB3EKYpVvMQSub#%73Q?%b+BF$`j&9M>oTVv zZ00JvxSe4;v#nYOe&9O7m5oxku+tGPg9fKr*}O=9xtt#XSK`J4pxEG0wOvHz+l7>` z0`TjlKXq6KsBm|gFjP^Y?obCz6XL&C=`$MK=CAayPkOem+b`vvp6!d;spUK4}@WKmG(k(BOx5x{$DHSNn zqimmkpMr7TsH=2y|NMbdU?0GJ;3R){307e?orvJIBU)WvfyuEb09PA2n(V@!gW(W^ zW+hxQN;oGWf(g#_u^8-ZA5^eYd!!C7GcdgT@~hz={^1{PY`%Qr#EI~YZ+rt!_EYk0 zzRB|IwahmyeDL?Z1tZVmEdY*j%D+yq$;z{cw#o8BuJr?g6Sl<4Q#dNfX-nZ8U_bz)-Z2`IM5?|1Je z2+YjC!Ms>58MZcN@tX7vmMi7a^G(2(sYi{&x^{5!+PKVT4L@m0CRO7I;FJs)f0FQ( z0cOUP0Gc$j+#Z%Cuj-2Qyte$tWgX}%@Yu0qVGaq@<{Aa>!r(_A4wb9d!aDY1`HkgJ>7*4P;j2+!Wk+_}#R3C)6#%C@Uj%#fD*M&_3zpmV zrqoR-%K38_qolDL;A=b5=zJGdou(9Z_TN-Rc42Nl^s=YsqfC5yAHanUV1Z3PQ8i|( zaG@5HJL;`W+tV^%`Z4&6?eujfJ^BB>gjhFiF-4WC?ssB4wDaywzZ(k{%#itPwcpg2 z+`*w@o(1YuND&}1G=3;b_~eDPxC)wyAHMi>QL?RzA^?@`8sf1}>_S*!HEwBuT^E=% zZ0|xN{JXi0Ra9;?aF@ZZrr`Xz7cGvNa7j`MtE6)t+WqLlR9L{??JR)pJU-y&*j0hV zpf~yDn}IxARCUzDqm}LOaCtLKqAKk{1zW;3OOv{**9OCA1NHsZGVO_7A>ct99fhz3 zAg|Voq0?F7U4k^W&qx#93psJIf5>~h)}gr)boW7ZQtVz*zXefvtO!4 z&76i;FlRU$!JhroeyCZ9-}?Sl`pU#X9HG^dsA5Ww0b59`4gwpku#MyI5nnLMKVjvi*K4utSd z8EF~-WdIJUcGUMT+-yR+g3z~FT`%b{sIJaIW`1QD%P-;6A%6$ik`{K=xxIyN+l*bwziGMG(c`$XF8jT-t# z@fn44SFMqm*_SXxE@4wxWkxOIOiaqW$^Z>%pvhq{?bbO0goz_l)Jrac)OFGp&?qUj zeEu`Y0R7f_@X#}S4T*t+mt}|ylK1?^^g4*&dRxPGOE6T?sG2zRW*_TSHO$*W8v$F7 zd_UE@<&jd0Tt&S9Hd38C= z6NmA5n5KtmSq_hsMu&qNtM)n>$TIgK+Pq~G56k2VQbYEA<{Qj!m2NtisNzvl;J}0< zH5R1M`Ze??)RA@+sXOD7J5`31FG@JCaT_?BGEm9d2z*j327B@jJT+aF7k?x zxA~bjakg9trw<M5dLQX(gopap!gysRjPnl;9BEr*k%Kr?cho&?S)lA-$6=p2_&1b?@YQKfHGe+#G%1dmQ^;-bV`9A?yfM zYjG{X7gq5w}5pT&H8_Sz(ug{iX@1N`uBf0UxbFB)xyH=ag5|GcB3VGtWF5 z#q+wnaK`BD@XKHRa(L{q$L=+`_`PW=DUy+RoysWF@P4FKDRl|g#$1kmQFrxXNU2EW+>EOjw}r20wp^SRgF_bkIUF6%!% z^W2{A_~15w+RI^CjZ+%fZUk^XZ-2)qd@s=@fmiRR^wQaTN{-U|mML9(Hl#eKZ`#Z1 zwIKn!1Ts_Feq;Kc)2dTJv4dEmPpR~FK;-=t_$=!foTvtX3VDK#g6gOrcfh62V%Wgp zDHn}iyzTRNta~ifyO|KM*Qo8*Nl7Y`ZOz}RpSO{Ox$0ZLYB$P8*`>u6{^`0~1Fqku zvIsmcT(}TdV6S3}X}Qg}&W2TOZX!*z%oXedci8zubz7coy2cJ436C7^4i9#(gadhy zCiN(wQP@;KyjBDB?NW~TJrb!QZU5d;Xn_YoFwHZoEAM6P`W;2lddYI6I>^p9`_^sa zA@fD@-hf`xp-0EDTWhF2r%{WqA}wO!5r9tBY?B#<6RRe`w#w@78vUVna00%!8KtO2 zD!GV+ody*a=zr6fr$ez9)hT}C$~gBevJt5(NL?xFwz4|jJyy6HE^ZHm@2ro6S2io* z*DJ+vZl?<$aqbb34-=aU;pk{7JUZSVrck*L0+zd3FwzY`tFXmc|IS-C`h_h%ThsvU zY=`vq9Tt+5dr{rub9fn-H7>L`ii)*Eugk1X)mgLjw!L_6r=4xazM(Wx@Z{OHC*ZPQ zC0g5;m8kh!3AYOoob0^9{=a@F-;+0`_~a)_@|9+L&v)EPOZBUL%X%;`9togXci#71 z+qvmGK~DVEca1BR!*^0yZd>pBH{TZu>;t&>g^c$vk~qlG*Hs^R*g*_-CdWTJr(uiD zlY4RK8IfGP1OJeZFe^5WcIM!<;r;Glreprhn}?v|o8SCqw9#+?)*sQ=zV@~7=}&(u zroX}p#2z?{kN$DD$za21lbrcK9;F57SS; z*Z2Hw-r8xA^59{o;DgAWcxKsRo@8P%JOYfSNAq@`6u-|(QGy+iT zEe=XiXO}?7ZQ8UVCIT8r24w1Vk!1}6Fr+YoF2#&>wsY8>!47U6R}=jV-c;XUXCI3J z0OTY2Y{0}eN>!)jzYH+Yc-)X|2&J24kuJ0djNUUxtCy#*MDQul6}UNYrXy3eHzSZ% z!ja-iG&jC-sTf8E2HAn&Xc!zl7>2Rq>h4%%MLIT|F5EymR3pvnvzNp2^(&#y;J$;3 zuy14xkPc{Jhk!kUs=!FYj84`Ct+e$C&+ZaZeJV}yUy`V#I=;*2an-GD(LIL|bzz?h zKm(Mnq4wO>{;iKC2hq?@RXTaIAJbOL`HoPAchuNpv6)Oj7^chYz(BT`W=AqAaCD+zRuM#UAD|6Q8`M)B zCe*-XQ5_K4Kz~~Ucq(m9eJ7(m-_RFq-~M(In)<8l!8Rj+^BwQ|+jrzU_6M&8aq?Sv zhJ8ALIOCL;c($+kz0dRsCwTL0JGT9$cT7_rVP52&#&6o*H!kDx@SaBssVwRD{`vk; zU?0HUAG*G;vDz5~Z*g#-lcY|=@O}fpWrJOfS=B~({nb~P)$ZW*^RX~7ni-2HhF}Nv z`}+}$*N$y|JM_+83>WJu(7ui!h0=~+KAIR|5}4cDhH#rV>D z=0UeG(#pKtumR%Tly*wraydB5KvR6}Ofn|$4*wXZK?W?-_H6uup_FdS8vrGy+hXDl z5bgQ#neTb_zGY8wo45AE^n9K|N+-pa&eFnx#$bJT-|xKdU?uSJzP34n9IvH^WoWdn z6Mg(Pg?Qw+a98Lb4qKEDg&p7FH;ivhv)*Z* z*pi9CQOU;hzx;Jnk+0z9!n|5;`>0@3kmomoP20ZDq?ym#2SX(%Tc~k$9Wu+Fr8`W* zl!}@TttuV|QGw}Xd1&GYhVn=Rx98bW07H9C6;S_bAG@`>g1Yf?SjUNPCp4=IHWB%_ z5q!8CfRk8)xEP%1WfFfKTjvy8-Xv%1oxM+Qum2S99^bGK3quA}pxK0rWy|dId?n1y zUXS&>jWlixAm=J(>#>SNQaUyOUv8bHZCn@r`=UYH=31D!cqvR@nvUg|I5-&wClBNL zg9&ilCzdFvD^L}hEl^MAfM7G^h52htb+c&r+p8dwewbS<*;!g?5LB3%XG+h4cA z{?!7!1oe5&?E;~_UIFsu!C1elr%SwBL=~-zl05c$d1j7VAiCz(D(d?A&`n)5F^Lhp z?EvO>(Uug5$B^iju2a9Ujo8;LvuE3RYHz-4zwul9iU3UhBbal-VB2#N>Dhi{-|+Ao z-;)naO-3#2c78GC#zxvg$V*Dh4%89N11j~lbCm(8(+%1 z=X7{KeQ)~hM*__0dCEh2$KPJ3_UZNQg7?jr!E_A*GlS($PLds*9GEP(aY_r{cOp;& zu=uXQ=j}niUv$K@>Y;^>{L37HOj%w9Ghv%%04Xkd>O)=1&uwGQAZq776zZe&E zh+kdwW#C5k&VGq-7)z=;50cq6gmAP>7 z()s8T=^!fO+3O3aQ?G=B^rcEKD^3AW?l0WfLHdJqGU~>W1Z~VOg@u``;o8hB_0hy0 z^;kG^?0DEk^47qN#H|S3T_cu>Jli*wew{AQg(p~*{veXgKj>cylZ`7O&&uCjT#3|+ z!(pEMnMQ0^0B3Ffib&JQLFg(q!?B$!06TV6pfT+Lyj|bA4k&E`_5_vJSYR?(o)3-E zV%(i#mv0*YYu()BY=rO&gKZ@BCF{dJU?20o?MmS9^VDC=kH76ZKKHOpwmZRDoE$)x zW5kubNAV24{PtU*Z-`&*4m~?5ax5{=a}?tx#ny7oNGMiJLdf? z%k()G?M}ZcAyFdDUYEKIc@+I^IG5C@+zbKlG>%dXwGSb@>@146E zzw_H)D|%VJSRVOY=20R(!9Pwg`BKZ5WkyQge)BhflZmClm}Pthx6@Jy_mc`*=)L{+ z+r_HN$;q$J?|l2Wqi=8o>$?WctebSq$;Pw6v;SP4u?_bca^jS>*&j}XPJn_A!Ry(x zXFPHaZU6uv07*naREtiWX`TE$3{KKDe0y28W#*B2IWhX>?AiXx{%cO3^}kbnH>P(Y zwyrV-$CcMP2{-3seG*(5Z$8b3an{Ln&GpFgGHu@X+#H(omu4RJn{@GuUmYE#xJt9s zEtGCb1T8bKb)~ZexJl;HT#r&eShg-*kq=;$Fcmc=ZRlJrVf=$DE_z&P1A3HvRK%5Q zJhCp$1;ngU&XSv=Lwf;^`d9Xcb+ZnI31R^*9SuDggt&~S1kL)WA}|67k;XNa@r3mA^AbPU88&rL9pF0m)=>4mnqxY!xj z*ydvn*CR{l+kI!(M7%V-4bK7BF(^TA4?V>->aHKU8q2@wrYPqQ-wDT?6Q9Yl&C_xnpT;{jP3LpQ8Ja3netSm4FV;EU%Al)<#Vw7!JCMBOl)d;v|9dHHfa zh+w`lBFpr!ZvX6`eYZH56uil7Y(wh3H6$(fUzco;Z8uK=qEaR&z?__vqnOTm8JE{d zhmr@3r`(5*{`M%6n@n_zb247@bV8HH&G`?p;r6E4%}8S!x+^*o%{tYP!u7*QGJPp; zy=*5>!9q@=*6U`SNMrE#-9q-c>0|;4KrGX~$b7R7rq9D?jBgH^-^O#M$u{I~>0`*c zXMCQU<8$oD5R|4Sm{FQwzxobXZZZ?=?(dBZ&b%d&Ss7&CNcg2z+&wyjEuq1btebSpy3T7Y%5MXs3LPq>oc(=R zkV0$v-1N55cQV^*dh6{`LmKF2>$XX!(SFp7vdr7lbCNQ;Vrb9K7zFRTTsVuX5MXAE zFOnWB^lgC0_AVNVquAccW(F^no&wxqK|0(8cxy!YS}u^Z{xDofluH*bn_7XWGMbxqF1sS_un z7mHL^A8JbBkdCbaW|?(jgeCUf`wm9$_FeeLbidP;=!dR?=eae&6ISNMfirl!o##8C z(+B`;0ZFAmZy6UKwVolQWvHFdn{7*%*^nOpfNSn+IuJAL_;kvx`zF|itZex$Jl|8(HV2<+eh+*{eAYPcS!VJBpUwB&JbZ6Vmm$*|?-=#$v*yuUewJZ+ z=h!@Fe3svwcb3sQf3g&40k}_=o}YMb<;5XaUnq|XFJZpKo@MYETryNr;n&b0U*%eQ z`o(G5#ASHFrhq2UXzA%Sa1;lu^{xUycKR8W6N$%PY$hu7{0 zSmhI67~(`D5J-BkKnUypRbVTPJnl6J8tnroFWYPxwkeOE-fA2;aG>niU^?UNM<-@~ zFR^^&bspy9eJAhy`nEpyb@qGK&o<`u?dse7jMwJxSsGZ^=KJQAhxui?+vS~Un$OMG z=4D$phAhLg^~v#){UXQ|zD@eL}1#s|5_21l2Q#xg?(%ihVZ7b->wYy|SoR+D!p%=-Q(zQ-} zg1ID`)FCPshc{lP8M{hcABfD>1Zx2fhn&t~!q{68Tj-hhiQh zj2XZO-r}%qWF$ie$N387y7XJ8K5Hy3y9j*8ur7HM>e>by>auDh$lQMwz;DdUXZ&X< z&*wR_D0goEXJ#C$$#Z8hI2dEuufIsFhj#6yqgle#r~%8|UOsZFxJFXgm;xAg zvjnLmYh?4*7#SFhZEUlJ_>D02SapPg|>=-n7-{*49@ob#)lp*Jj9Mh(C9A-aS zAFs14uRSuoXAkoe=vlV!rRA6|>ro18{dpi1xXau9K+0@o`VlCgk1#h$ZbNyudkxP; z9Wr~EBFg!L!|G@7!lQXHU+<1SmJj~jzy9yyUwrRdF)_ayJMjawefyU3k~P0fzL1|( z$ees(J5bo&wQ~y_O<%`d$W!s{Z-1L*#D)^CWj5DgeU7;~@!U^+a`KX)|K9KYUU5@m zSt`A6-HzWUFs}348ejA`CPr~1F%|vzAX{eHqX$1*YfRwXEJv;Jn>iOR@0@AR$|~N= z+Zw>(cJ*7Le^f%!|CZD1s)|H#ei^r6v1Tj)fvvTkUAwQ`?xB zy@6k^pT*?mz43+59gPFq_r?^Kl68RD40*3&bkWm(5km%<_iBut9A&TM%P7mc+{d8- zLkC-`17=jXRMOZcI8!vlz*!^BD*o5ju#_%3nZ4U%0>5gV(5M@L0n~?14WEGx#tfiB zCrk@oL8joM&Qh=+A^ihAv84;Ylx@?onJud3=5Zs0@_s*ivX;I@0;QicTQ-iN(dCQh z%dQ+teQq%3Zw$mw7rNqg>ikM=2lEA0;yrd-vLVLCq3)U3+qV$IJxlTYo?ez; z!H!7udKtT2f_UbWHs)n_h8SW?`zvGUUiR)rR}s*xbE0{|J^ zVBT@=;T$6EGUPm$zdbjDF@HPOJ{)h2-x=RL{~G6S^KXuCem0*oP1d7~ZJx`Jb62Ld zj;8fp_MK?+J%K(-r#+l2y{{gy!S|&VK0XCn0Pf?{?o)fxm!^w}Oud;B_-ghA@#UFg zYb{?7-+$Of4DdzT)5|2Zg2FT|5wvprG=eX_ngM0GuJDrQ9&b+t~_x6wA(l#W(j%L64EqI#7^2u zPe(^bi}Xb)lwZM*W3bI0wmE5J|7E;m+e1g90(1K^51$bxS~gsWG^_;{OP%+AODr*NyWbq^mM=v%`7<^crfuAO6P1f;GcVp}V20R$kP`@?mrld)qIxaaD2!S`>WztuXg!2gl)POEnb=Dn+ z%Q%k(9ObwaU}(sZpx@upYxZIo{v zq&G#VS|MF@$UKD9P0;Q9#utvL0&?*L{iwz0UO?TV#KgD+R zyl`e-W!bazB}OBTjc%=rk(}1Yug9f}7ue^ti|x2ZVtV}@lNJ>KRtNEwwqqC=ZHe*e z{qf%1&iKhhCEl7_i%Hy#D8JmYFdm!xS7ZOkY8)J{$6h3DTQPbWgkC6X04Ar4<*&vg z#c8@v>BN_h3PxIKi~VoCJPeK#Y2oh#Wzsbd(-_}K*Z8(9ytqVKXa=*=UzZLyi`xVe>MXSEG{D64A)tE@wQl5@^l|btsJMUO z0zRxbKS-K2N`LTw%Op)P*_P&WUS}F>BVctY+0HTuN- zvaW(M%kj7M_PzAC?(mimy#UXUGN0&M;p?j;=7EoUt#%G(B@p>E+TDw zBtjK_p4_c-9~rO&+>zw^EC#MYr|jGuU&<>*@UDL$JS zr$cv0JcY&3L`t%F!0Lf?YhymMY-wM}4JxH-)D!6}kWw&SrLTwB0&D#0HMYc>hykv< zdy#9+0*I8X)7>3Nt<;ILjU7r|DQtnAOGYt@m}U8N$F>78unkEX@45S=t}&mkvK+fa zzg?euHeQ|Si+`Bh9PhIsDmxiRWneX4!ZpcDh>pJa0>%U}$Ns3-Ii^_+VJCBN#A1cCM8)@gV`NS6SNDa6%fkv22>a#}=Xs`qcA!u#Nt*?f&z3E8HIiS^)0;==Z>%R!XEas7ptb zyc_}#{t-bZM&It;Xx+!&% zegYZeAE%K0lWnq(3^Fqh89*AK*ml8?ph*ztS&-zIQi@ab9U0&6m3Hua4#N(|hoVhYONg1t~i~LwQjT zU`U;+I$)-~0Js~pZC3$F724}|O9GrWmUr77@Qk}oksR%*vuruf??piC3i*JIAzh6R zF_u_~w_Vb}JVx0Z{_NSa<@nyWe=A;o`Q_M(G%e;a5TS1>3%rZysj1rG(rki}#&VhT zUw8oJD@Yud0A4fr;QNDP&&8|kT{?>~$id#( z`1Zh5JiTQ;o+57V40WxH10?}j(5JGB&ZVCN%q2BI+DZk9E_!gQO6%C&0bwI?O5kiM zU>5@!MWv3Fn{8Wv-~BB;?cbaOY`e7bw})ZXJnj%aYYDw=%l@^R&FyTw+YL!|HX-lR z%QxGY_gd$VPJtGH`{*?LRG)Cbmx)S?QkEEMFbS9c{7P2W0yGlKH?Bry3(JP(GneYE zD<-qzLAp;bl)CalJ2B-%Wa-Tl(u1r`PI@^>SdUefjEca8g6k{`)d5JgIX>N)bUSe~ zATXw~&&B6< z`D)!*B(1zhg^?h|gG&P(_mGrG3xkc1hBkGwKr}QFy*TKMV*Uc#P1P`n z=t4(y4fiZ=7N763?Ue4v-#=d3u8W+1{Qd70n$FV~9gweo^EQ^M$6^ui(}Q#gtVEd& zDLfMvKcqc1VV+n)AFYA~uKDt}oTU;o9?vuYJzHa-+uLw^bN$MNSXg0+cJg{`+q^Rd z)L|sAc0dvj#NyOkT)l!G;FZfr+G?>0Ddq0{Pel9hHe7=saRUpvV*{T{jXI%QJUcKE zhx{)-`R)wca3A&_j{rPwlXaTs7N4HP!DbR-#Y`6L-e0d_2 zFD?o^tDm#7h_~$vXJXHmCmMAsOv$O*`%ajjURCo&%@WHCnm-=kStjdbCjfFXal*_m z!%ij;Nk9siDa%|idL16SjZ!a;LAwEP8ZkJJl!;RboRf5t4u7uktV3f483;~?+8Hj>e0@{)G zbWhL5DgdsEG)OlRO0bJQm@Jq6)g?#Kn5XAEXYmn%zSSyHpEUqSW&L9)^A)t&FP*p- zv7XjRsguSh0yyhxyi2Mc_bY+!0z~L;#(V{{ZVfliE(O2D=h-;RgWo%Zqu>6mQJK4j zum__A!Kq7xNRu_7I0xX{xo0sp?cRrhW-m1J(+{RgI+O-!KY7!ZiuV?fMk1A_ONyT| z)iLTw_guPG0($xKC3d11Ez73@YV}RKe7`8GyJrA!M1IpOKC=OQS0BbhwJCrhOx!VE z=Ai=3=x+f!Qma+L`nr1+K^QL~Spkg1WdI<@K%LbG9NrGF+}jJC1qhelI~F%O&S6A= z1!>h~%Eoeg83TZI>9l{({-TGwJhV0DajJX02DqSH)-wvY>&CiuxKfS(`PnHP^G57k z!DR`KlCl4eNygY3u0sab*mVI(+al7yd3?l?MH#E=*!6Vbm#}SH)K(ZTNZmR(1Z?y^ zwA1Xx-$;I`xAikP&TUoBSJJgeEQ!xF`CfQ7otFA{3i+HicZA-ZA{wN zMlZ*{mjrDB0VWD9Dw*I@68C8~F<)d~QeWr&WuHWV5+ zowHqnIQ!1FmdSnnTAKLV!=+^bnt)D_E8|nzW&X-kZUx}%N?skzQ0Jn4O&ul}3~`IR z8-2W2yeT9Ar15VJ$xIv8jeUTnnafD)KK~-{4hGspf8Q<35y181y2A234944ES+4}* z#@$a)=WH3|u!uCQ7facyduIYRuF{_C?A_WsITD{AsmC_lXROk=6-3B>jC4YyUX~Q6 zZ(J)(vkkqoVI1SCQ=yxX0^m&O5?!SyX2|R66z>XdhlDvR0Fz!s_$vEL_sdwfY8^c@ z1K`0L*M9f_aJanm4J3Xn@ltjVzBxMjx1d9|6iL@VgY ztpdqX*Ik(CneV_wB=s6pP!H3s*4ST8?Y8Y+Z*lU;9xky2?Af z6}L0ncI}QWJ9Y*hyy;#nQQ4W^0|iNZztLuZV<&CsV>$FCo?k?lxW=4$xev$4=(e$X z8UsiWI|S=&VDA=L{kR!f15B-8wY!Y;ezvBuM|%vmE6oFz0YHIVjAJ1hEdhx-)*PQ1 ze6JZ^g`TQOxJ6h${{0N*k#m6Wf$u|!yUXzDqTZin$nou5sor8c(rSbAsCvb-vy(Ta z(6&qR8*G~gBx;5Gpg;@2-3ReLjYkud$k=5HT21E5E|6Qo9m4q7mEx~zjY(0fvR(j; zlR>*n7EA=6R%o8AEc4RZ)7DSc{=f7GsRN75k2ZF3t0+qN^Am-kGU zhtGQ7y&XMFuWv*30|iflu@%O;Ksc8xZ|3FjC%+Y?004JKf#5~oZf!1)IXK|5`e!Te z3Hh))66H*=Xa?9rgjWn6tQ5ig1vBO^Gj^;E9XiC;RpUh}C5Th{5ywA-}y=LW&WRo>rESX05R#+p~91JhST%_xfXYayhE?)8!+q6W@DnxB&^RS;?eE zzb=CoR#>%|WsEGC9pIHuC4jo1l6qjNTkAlo*`OwvHXYu0)IGbb1`rJ+|TI=Ww zlC}$QU*+g#c^Np(A}nJ{J-A>ApSl|7hlB%88K*`Pj-NJYEUikL`3QGBOH&P%I;9Ei zGDsKiIldj&jxXnhRY2mMg3o=H!8+PD$Ab0uefRLUbz6o;xsuR`r&rh0f0p%rT*__% zxQDza`{tQonc&z#F9vr%7fWxy#w5*`;o?+`bmP1d#go~wGqEytIXX7&L1gbF!WU){ zEcsR2kVeUToD>YcSiVe;O32B<`Z^gJ67<-PoW!zC{&q4kjgG?f73LN?;}=iF#F<|* zXHLXY7gBaSj77YtadIDJ_idg6)V2TqW( zfNqge9i>$Ep=~PdqC&ROjj=OGCl7=7JPbLRdTpF^%6lpO%6rYvXPgtR=`Gi1Jv%9@ zgEoYok-w#RPSi3W>+Cb#=w5kW#v}lfdHLINGi1Fzo4;wjPKUlq->id9s$IG>|147} zbbWrg=*6ul@?gZ1#rhbhz5HuGg)5R-mdEgjuOGAl^qQ6s*{HJ>Rra-9Kw7el1Ph5( z2bP|lFxM^&U6ycBqL9iUDfKOP9Y?Z*SV7iNfbV34C?V6?u=-5tzfLzW{uapj&Ux4# z!C1D@JiTr&N|*k+b!hLTUP#|;S@*hhL!lNfQ!zx)^0XemJaIm@ytq4tmZxHf{Z!{M ztmwp_n#-YUY~NH@*KA=3aC(?g4xj<7dyq4$Q*yUouXiN#lr$7{d*DbBaQ z$#Uz~ICu5}J0HAVKk#_ z&mX?Ww<_EEwxK_0$XDL&?@Gv*tMRM#_hV3?1>img(LT*bWJbQ^N{Xs|{l$BC9m~^Y zqzB7>`7O`I#Pusk;V#DRO}o&=@a3>u(fWev>4L-{!^_|V@+gG_5Y}5Mq`^23K{hflpd6TK{aDjMF~! zw`padwmr|rCoRmg!5|xe$R>Kv!{9xi^K6`F4})cRWM0O3&-^{7frXM70m|a6lC1{g zQ8Fe2$~+5mk+JctM>3m@b|AI3^^boZ$Bw-dn|MEt z9XnS1%jMY2`er+%=k@E?f4$D%c{YO_55{?& zzZ>+va}k;L&Z$~=A6E*r0Ng{~vrdw_2GEz&;1HAK5L;zkzKY2@mQP3#+S~9wb>kw| zX~$yElb`2H6Teh46`Xx8;|8FO$xX&$K96dUu{JXi+mTFIP$3v;ZeLD@f@l+2=?oeu6lb7sWdQyb+!(9wvJwV zw(d$C^_SL6Tichxc4u2M?xUV(*-NtnYsl#eQnW4mWAegG47j5J4UyK%e8A~`NNemm z;I5Z8cd>N0wu0mcS}y8F1%T6owC)A`xt+RrHC}t=wdi9>avnNh3Q@*Hj=Sc5GH#At z7~XjYz_)2AKKDhWVHhW@0-7uIRS&vo(Y_F~Y?D<-2TcHmwi!DYG(N=Eu%It`rqHZ_ zH`iJT(nv?RZAxeWadkG2@7QvHd9XX!a0{Pz=)RG(3W%#L(;w0lkf&3)g*7B??4UBu zc@c0sha_&L073v9qIkh2e_Yf6=zUabfAsX(ztSz=3v=yKV)>xo|% z3bX*+L*CO3Gk?{o+oEq^Q*6Ra|NN!*V;-hHhh6*#yXCAhiC+BR9hOorNB_=4Orm`4 z^Mnky!j?Er9L*EOL*C^7rh3Udypa=Of(_%6L3(Y-iO+bUPv;s;Wb9PTj-FxZYcYBN zZe7E>(R;y&p*-=~{mFjuY`r}ME$(Z3>C&Yb1~3WW3Nu~@s?x)@*{?~DY;#Wjw#e&D z(|kXl_bh|)5O7$A=^QtL5T$7z)<;m8;LYErb*b>3)2GU{dH7rzbL5-#&>e)=S%2%* zJRZIF8P5jWW$?H46DS&z2AQw-EmNMKv=A(rjey-}4HZDw{5VUfGHayPKBKae(i`(? zFUvR$PF`G#Ac5;(d9HrtdUQSy@GtnYabKY7VenborXG`ROUaz&YK>|+9@fdUw$YIN z<+btm8)j*38%xJ?Y?8j0WzZ8h#!&7@-woq~Za`E8*Ewq}^Y#F$I&nhFdMrQ+Fb8n$ z1{f`%$UlHJ=Q4U>6$~W4^z!H9*jsPM2PfZ;Ck{W2j_rq1VC(MDTyH-(Mn^Bj8*jW3 zTX$@VeFye)pSH5}X-~wK!${x;qi?G_pe&%qa6aZ2+0DScO@W8)Xhbw%GlX6Ta6VR+ zAGx#0#_|g|!<}O}dt$jeCUE`Hhf>@o=-J=K(kTWQ#qS!x5py7xNjumhwku{>J}t|o zNZ=g_N?@fni}Q?*##qbZ?za!_^n4j_mcQQDd2W8jxTLGsId+X}g%$m+mThHCuPbdGv~ESb5DN(HH@&b>kXgdhC2$yKo}V)qkWznYAKvy|!ZOZ#9`<3jKl?Cgk-t6X zwe9kG8G>=9^?48DjZ-QnNE38OKg-r7h9FJA=CzVE>Fe`_rT~-k=g-I6Z@*ov?@~JF z{XAq`w#AL!E#EQ?=3^d~ZJcM145qa_rEOlDhri9&kU%JDAzSu&)4H4|kkY&T&48(04Mi&H=MXJ9ifNQR=bhNG6 zj%=Itb6iRr>u>$C4A0GZ+^p-zxX{;HKbzanU`;!`=ZV<;+?V3?Yd?+!mM90R=zgtE zA$eoDynB}AP{ulqMU#?cRrCmZ*q*Ovdvq~pEb}fXjNH9@dmKKvKi+ulmoYs#!PvNU z-Loy-=%cO8&lC&QSALFPMS%a#9oyMpf$@g5_X_*5c5Y>v6gu6&1<80D*1GfTR)J)2 zsB1X7*mA3aq|8q(o+uP>_ZdD1nD^*Y^vb5uPn_-;jw!&V&UlvqXRAz#bM)gvg>AHi zX#BP}YqSp=bNsR)Z6(J}K(+v}LrH4Mp5L5Rm-NnuBkyAn{~jK3OxgF@-=1?Uc+U4C zv&wPQ{5!8bOZP`9WV;`wIzLKv{cv`AlxqEJR96*!3-e~;>cU)q%l19!nrw=t8%vn( zub{BZb~Ai!FV9WH5 z-WiQvS>Pi$5;UcM zHSc8}*2TKANLZR@d4hTC&;xL}8HnrFcLVQ(b^dA?kozJ1a;aEQYWW^Y;cP>5I}*J4fgxS3TedCxo~4Sfym2Fr9zGB+ zKm9TQrz@_V$Kfx_m7Q}s0A{JOVBDDSSLY!0?JB#F3=Qw#OAmmhqB&@087oT& z!3QIN3(4j7o!f4XgN;?SE%O3Jbo`c(biVV}yWr!t_>HfAIS%aJ9l9thK}9hc0a#C;&@X_oX{g7p1l_xNPxL~==?2QZne?-|ux$xU1Z4sjnc|Btz8I5$ zCEIAf32JP+X`S4?PDz?|m!W!?pCC$rBZv^JnV$e&K%o@Yv(h$!mt`g>Hs3rfM?mCn zX=)lREyu>jihh^()u*yd@0p)v8+^w2dac301U1$*%gMT1Pt!F&W4*1j5-jUyUgqn$ zxxFPXcw(ss`6z+2y(7cu6%fkaw}5;!)BM4+DAJ=N8cTp?@>>Qpbf7Ec(yENy{EN^U z@pXOt28a*qO&vY+xXm(e>(ke}Zh=UoE=Y1bS`X`)ZOwLA&!mU-GJW%J<34T}WZ6^t z&7#})Uw?iq4nOyWc>16It9Y6Zy86tGxOU=rbhCw+eKWY{P{h!79D)yE$b-8Lza4OG zv7~DZ+UUq`nFRoo2i=Y4EwfM!G?-mEYTMj)N)n1lt7dp|g!>1g}xVq_pB6LGz9IPTGZGbq+ zW4V{nRivR^s6q%3+W~Eh%!O^}{dKYff;#}PP7EMpZXlj3UIvzadA}Qbi82;(w7Y6Q zD}g1glE?-)f3Onx9NYGs&=#GhV&#QI8F!&pH-L4`g&i$V)Sy#`- zS%zuzzGazDwo}6a^S95fIa0uyccB5f*d zCSKzOYUX3=9he~>Nb~p~Lx~@&O$`~WuVq@-492;Uw{&dZWFtMzq*$t6 ztUF6{3-e9-F*&DR;{`F8QmY3zem`1Peg3&1_(eP3TjLVXq{5JCWBPpZSS^yF?#)KnWT>#eI5(LUM6uE0Gd84 z9ZNBW?%R96_$ixU!=#p(u>1DJcC2+ruP?+v?*NV_T~fnpPA-5%Mn+QF3~hkSxLHt= z$t}kT7shsI*}DeSq5piSgY)r&OoyfcbQ+Fd#Ru(rduL@(5Ows(3oHo^#Ib>6#c05| z9vrvI_@&3-$Z!E{E*~pd6SxW3WV*IPIvK400>H&h+#3N}Ajw!j-%FaV(k9b--AS7Z zC=*yg7ePn?Z>LY;u4W9Sd7M+oIEq8EhV)LLmY~Hv1XKP#{K7Nw)?07I47*^ov$UDx zYKeBZckdc!+u|WOuzdzWkA@RUgp@woChz;a^)a1*Vu3pJhd?zR#E3uhcRr zuoSdq+s-)j)RDM+{58H*Yb=q@ML)V-E|ZL1x)jIXd_BIj{{^P5&N%Yi(ddKe%-{oR zC+;7%ZsN;V=F7ZryIoi|P8tsjiIRcKM4arDDt+Ty-;4{FkxrpBy?f6-By0d7W@+R= zQDf=o%_}w-B56JjqwMh958=mU=1`WDiJKD$rFL`*kj3S;I|>`(Q3} z&){F_QXm}9*HEOE(Ld-H$Uaw3O@QW7xWLFbrEDI(1C3?NoY<|Sbdqs6cBIvvg7;H` zCi5s`Y#mIPr@%?@rp2ktr-BuO_X<6l7)$~Z^YdO>t!AFyw@&$dNne(-lKqxjzjEI? znV;n*c#yee9;FWJc^W5u4DxR@`HSON(@TXyqr$=IO+kq76zyOnaFhO}uS-n;Y(+l~ zdgpTs(91y8OvL? z9UKPV3Cn&Jy;pT8zxA!Jl8?{X#zK*@HCP?Vl+RX_$gPK;{`9r@i@*4bB4L&0(%Sbc z$DHX60#eH^bhnk}{VjoBGnb|RTU(YKep1RY9FR#ecIxo_Z|58K3HeVo{A zyN8p1GBue=bz3!hdm2lRZEWW=19Ku7?x&{W>U(d;`CtAxI@n%pzO6s{_r4gzd!I!| zht0Q@{vfq*6KbvA3}u6J^<=zO0_U<0<+;D1+vONs#&!#{Wu#YpGsEE5zxd1DPyUa< zMaCxs^swy)8LY<~E-$1}GDYu6uav+g*fIWA!MtU>o_$6zV42d|-%8PRXX4gBf&GQM_pO_GB(rLMKJ&@`_MRZsay_#Bwke+zf|#F6XLjSY ziODz&&T;=r_HruQXn}H&ta8(3M5H$cY34tJyIBBdgmK*9ph;`AV~PDnbvt30M&dS$ zMXTGet>LX7^wVeu+1W+_{vCAITdx^+e0&ZnZf`*|$!wid7SdVkl0yF9S87ppwI(kq=~ zlOdL5eKnX&0d6iMcA_B7!d+C6c*3S{9uJx%PU!Z%(jS3P_KhG(Yfzc1_dSv(#+g<| zdbc2bWxmqZ>nuZNZGJ9c3f?pr@xJvjy+;P?jYC{s%u3|cCf@5rTRl|8NwU4#&Yh{Ca1!nC^o2+vJbRO)` z8WF{)RV^3D4^^o~T}(rtFOnDg$CofUi`yRR&~Qc309GV!+~jZ4MDS)`DSdRT-YwV; zLo*HhZG6%zud@vA+jb8_(!y&&q|dp3=^y>kA7KD9%{N-34BZNK@h*5?;-l~6$A4R!W3rBY@TowcWNy2EL}>C;-5!k~Y9vyZJ#OG=Pc(12{ll>gF^+L_-^g z9Sewg&_SkXyKS>fGMT;75cTwOvQOGH*GGnVr{H~=u*}2p;n`(Vuk{~z`t<1{QL+vm z0z4UVK4V=h*SI{C;wXJlC+`P8`f-uS`K-Y-d2L(#Z622Ek!@?v%k+W=L4wj8LzY=l zs#XA+z&_#*O;6x`#oER7;X1&#A$L-OXh2c8qBJ{WnFmjOl!7*qo1SX#L; z%|{R*v!^{KW~UqF^RZ;vZul;+mk!oh;3F;7eX||vzuCUK1)n!$-!;=i5N%tG^M2CY z{4-rXXPm(_x?Pc0KmPHLxgIJ&S{*d+xeRW#LJdF;lYcp`O9OJTG{(e+L84J*0V~{Sk+4H>w^JzZr^|^b= zyOrkgr9cb7J>-4sOYH>eQ6_Nr_G3fn_Rit5OnT~_zsEu51td^_wAxfmO(TUH9E$N9 zSL3ID^{4T>2R|3RyY^%7(1~|)_>|UNFtWx!K+0`&kRBGY*#2f_m5eHBvdVI>a>X{5 z#@Yd=?A{&c-hDIP#hK}iiL)`>ha=ieyJK+gGqHyIg4z;>AZ)>-JA!4TZL1hAz#ci{ z+*IZbQ`X`Q&r=vFAcesw0{M<5Aa`rntP1XQ5v;QHgGRu~1hU;ZvFBv3!GUqfB)!fw z_F+DEyZ+3ySx)LW>5@a~o02#4NNJMgBvW@h8nR5!GIqh6J1C@-(B}nVS;xZI*T=Qs z%J^*0#{5jHE}6hc>6Y~~znjm{k85bSy9cn&SubB1E9FKHPJjV$gLtQ1;aJlWaeXXV zhJN2l0KlyfUl1H)02yTIZ+()rBh|)a5&+j7S0``a>uiCo>QKZty^m0L>nH6z3vdKI z)>lv?__`bYtwYJr3qsOTdf8SFjX0#GZMGjwZ@!*=kBv{73cQW?d7t@%KlpWoh7|x zbYMVXNIGPm*4e{)K8_*#@qXH79<9)#z?~@Y;Kc`bD!p~@t`sN}989X42~s=wWj6O* z0eI+*yoyuKr(XObemL38n)o#w{f@J7_aYPXKzDmwI(X*>e}lQeZbsqU1-V*f z^jvgp+EI3=5QcSDkThY5w*U-tiL@+}0?|4Fb6p(0fWUt4j#L(6U)y+Wi^&*lbE6)> zfQAh~H$fi-->zDpSiJpje+ZhAQ76+gPKk+(RS;p2QKkeXr6hN%Ofy4GFrt&*vuDp1 zR}hwEyk%QPGUB{$9y_LW`Ank=&*q^d$Y(rkN0w*Z&DZ#h%W>y9+hYDoluRce$aWfU zc}mgR^bgT^BF3*zG$e57LN4C8PTvAPn)qOG8It2kz+M0x?^IchBrl@0WYoB!lN}6d zSZ^-@SjGXg0+((iwI(f+PoB5#9@ZtnD_J*U4A@_F?#0N&&9iMzaBScu18-#dmAEw zo0_;DJGbvZfx8}m|2IE~&0F`!(XIPX5t2~>J;Z{rAg79kH}VD{l5sSXZLk3w}mw+@+{?f;Ex9ZQ#C(oI8(pZqB&pCIwFrUt9Ly6t7XIdpM$&meR z85yjPAi(7_nY#IuF}u#NO=lW|jNR)BA1B!+^U6ABdraq&toh|~qG_yKqy3E~U5!o* z8uKgz-pCX`e>$xOz&X;_b>PgGLQ2~55*6Au0EKDITS=Zq4>cT{fD!?1>d_I<3!rr~N#UO64t&z_5s>K6Pw^~W^U ziT&IAqjTwGTxXN}YS&fZA_6^0t!%| zN+;5$8d5asUqRXF;yZsCfA@d?`c04 z^t^%#72{X&Besl#)GmC=Ea9u|)X5WZ>Ed}-lKE)heoY`C<7S*Fb!QhnBo9vZ3J~~zalu|Gc$Fob1o$4)eP5@&Yvd-BS8N9(X zUOP4f7)rPVN{-7;md@vK*4oiU`v5sh)k^GrVs9Mn2Tc6<~&1ccRrzW6$>ayD<<8WU6O$icQ)3pM(SeM~#6 z?xMhZQTl}bgC2F?NBYa7ruA)u`sB_yqTXUD&;IU27uGV9&X$?)a`SuL9A~_3YJl%b zJp1Acap2%V<`n=ROUPXSL5~`BafgIr*==#_!DsWx_U64u^_=4~`_1;*Hv6x}Jeuvz z_IWSk>bzgl-#i4@j-9-3dg+&GJ-0%O0?ia?N#L5P@d#em0tNk@Psg4oKNoWoH_G-} zt4!STs#&(#>c)}g_|-G<+Ry(edNx&K-%G!RWnEuPOfTX?41)&TEp)OUp_9YnVl7Ue zJjLFr?-$6ZCE3vzpDoPD3Hw&T$;XL5Cz+h=orIKF$jI&#nkOZh^YP=y%igU{Xi9Rv z^WEPmkFQbB#U))CuyX*WfIzmgB&zS#YWq@LIR4}K(VzWaNZH1bx^0O%h6_)=`1Ly# z-M9xv(4fJ6FFTODb&^+i1qNAs(*q0&NP-z5af4;Dyo&3N=*7-e2O=VX&o&5R3`xfX z&si&%!Llzhoqd^%*yl_mv&mf+l-^`ofs)VXZ_CRv%*Xy$A|vBb&&uUagTCX`3AdPU7x2EaUihd44hG`KTGD zBtdHh@VUxIL>=*XC-u!bS$FGYn~bwQ*_L~$htF+HuawNCSuI3A|M|}se}KLt>IC|J zDe)B8`fM5^2qeu%nt|xbA@DXv|5Eq?yD_%+AaVaK!IVyhh#n)wo6U0uW)Q%MIqJzO7+ z)9iz&4pbXT;iKb|v2)+9!kF(wfaZxk8JBTR>Q3a%_sz$+jgys=osu`L9$mhZ`N<&8 zo;w)_4jkYMALb3SuA3kCe7=SxVg-CSdghh*jMmKN9*<3j*E~Az!rVCDll!WNIH?o2cja2WoPs>>v0& z=~RFV^p+;lQE=wrwUSKfpUgzsdo2U@=mT&VC+*LjJ6FJ%>CIE{ZCd-(V7$+mUZ!mt ze_O6T-_(PWX`5b&lpyYI!Dr3aJPrQNcKAE%Eim#>KTE)v<*x!z+K|k;ZBh>g2J=Xy zM$!4KDc{-<%t=*@l3}2^~u)rKS z9QoW#j9Md5o_k^B^LTuKHZ+iRq(G37oo{cMIlcIUWYfPUe?&6tFoa1f-TJIC3df8)SzS0HQs7rPaK^UI zj|>I6k*=xd6qUZ%bMWPO@eAKY|LbX1PTZm4MoiAkvkxj0#PV`stR02s>cDUTQ8hfz@7}SwOwLXuIf*A>HvaZ&Tc$4aaN_c} z!AZ%(kk8y|VlvLtKKsgN z>_eY3-rvb+{B67vQl&3iN$Ntv-&v0Nd40EFo=R>~+SmMy*I5tKS(Z{b$A?S4-YXWU z>jn&bQfO2fH?Cic3EI`xFfF}X74CSy#-{d4^rVYpTV2G)GAh6Qpnygx5fsQ|{iSVQ z-?0F0mUhsV49&j3{Ix!T8EozEXg*ed&jf&v|V>TdxFineWFro2Nng zdl+)ec{a}Rqrr;pwQdH>&g&BKnE#PZNgtc)b-r(RYI@Sp=Qq-;IlnvQ(Yp8ROM#XV z!z14J?Z|?ZM=he{??%#FwrqpJEya~l9Q>j)R_$c}fI5<}r8cZoyV!PW4fhZiC=1yQr z4!qZ#{&pmn0m}GfLIQ$ayLQF1M~@Bc(#gSe29* zf9mAPvMebh@p+lB*QPU#OvG!0{b@fM=RJe2Bh;1jSpl4VsFduTcit)a7sG|7u~Hu5 zPmUeS6SzA@tgm?|Q!}mCmgRk~t%H(U&z9A_hQhpCEl^MgKn|Nrfc{*3(eX2h4jz4a zKVhoU9Y0=}j*Iw%8^Zc~0b`ar?db*3YrQ;+OAgzs@j|onUh8YyvYof9L-YOSYt#FC z5l7zUt0P|D3u%;nB$!Q$Uuo|>ft$}+exc>vg@CuKT8VG2Q(l{|*QK9$IR%+ss{?7D z*f-YEu+fO2L_S7;k|v&|i$}gYMF*6RP48v8YQDaUPvVC^{9&1p1Yp1a`@dfluVpCBA(@bIUR#D~1Oy&816HC`0%dW43dR}J zmrup}ul_JTc*U|+l2WLfIofgrFv-K%^XYz1|b#tK>8l+-g~LU zozhUJ)924cXHPG5W(;DAyozMc@v^v7E0Rm=<8r3;^|1cZE8mMdWq-GO=B1QWn)*IT zWBW>gE{z0D(!}LU_2PU7lWz8JJ0BsRM6fL$*$?KK{bir2KPi}e@x>QQeFWLo@7F0v zo919Y+{^gO=aOFe+cP9@g%$;FOMy@3?Y?dHts4)T0+nFvthR;d=m*3hZ5hXL{Pw+1 z$LCoZU18g(v#5f)(E`7=1d^XeOB;_P$ zoM)Mm%qf4HrW3H_^5q)Kp<{r~pa0FD##=x7^B7oR)AH>-ad`=89h=l2dg*)7v+D`k z&xYfGzMjrav06j_rhV!zU4RlkR)vDqN;}ss&#p86HuT@xRIXwcbw#z|Ys`I7Ye3)y z>aZFU9Yc4?|H0mtVW$CtXZu7zkvd6(gS`cC3AzMp_L2Q#AIg9?A^q}NTH9y#m3i17 zf^u9$wDyx}^|)_(`^)=E4+IS^pIV0b+zWt6$zK8l&mI|aInpvx(kMU_ptkps zj?SqtMwV6`D@bW^((DcaS}qs2C7IF3IO|^LDt;AX>p(2cpsIjGmc|y)UkAVmA_Xpj zDBEkW?$SXTS?7-uk_P#V{h%aAkZzv#h5e90{W!~c`st^Oq|Pm}eD9=j_ z3(K`m860c2-H(R%-g~cr%!3CHmT}T}k2B@td)`Q&Y-yog{MXRLP$6_!KSXlFZ2NtYpAxDmm_SZUPiDo%Uh*JUCm zU&u_*d;);MMBCd1z+6EV*M{ePmQ&fWlQ!aVLjQWJSWS}C3X;(~g*q-vTxK+1C4mBt z3WdrPr0c>GQYJvwG~l6w<#6Nm(bm`772^Q5zx=z`V+O#qWu!lT^Xp%WXPu1PIrHA^sfxX6lILp$B~vI`KqIHrKE0^ z-s>2QH!n@bx4L(sGkFa^e|&@hw!7=pK|G~lN-<8c9z8L;autIfXkNj097VU|3($RX z>;2U@v1e0spTJGYjj5;(ZHr6zmFwxn3G^IG)aaKAo>D?+9R+a$Ew2SS9$q_!th;pd z@OK_m;m4!0hU}-8aIs8)pXX$ z!*l{JgP>l$Py56)*3WC}>)GGN`%I?sIq!SV{JJpe(HZkl?{LiAn2mSdJcgz0_J&R* z+tx8yedMtX_OJ9w+S*X*D&3@+hF1o!4aR3E*XrLw!!GoEox#<|)lH2O|FX+WCT^Wu z6u1QiS^(}AM0uQ|Ui#{{VXXb}!JBwcpF~2lpp_Vt226M2`gjZt4r6S|QqcIN_{Gou zJT8oWfJ>4u#Z%9JF$Q+-$I4H=G$tSw`kAy{Hk1J=of06pFX#$On;j$?86Jq|o_z-A zrVUBj$jIi{zm4Th(3=`VLXtL_83bO%>eKCtDt(*y&2p4TkkA9VbLY|JMXU`0qE}A8 z9dG>fCvpDmR{=}YG2DrROxh6aYr6ID!8rW#*JBWd|kPD)tdAZ z2#pDtIyUBEa#y-TX#gJ}73G8Oxb4Kdo`h2Gf*wiHS#IHB^ZzeqTDRKhB36o@^WRk&l*s(*GZAE%zv+j7ga;<8cwAnak5`PLI=E z%vVZ3bOKh~@ZS2);Vj#B+b7m#W3Y|Z*K_lAvjl77Gq?I}9s*+ND!r0US*GQiryxQ} zw^pj^6}qhXF3yw_M5aVlX`aDxq@OtRH{?0%=h^-?U;Enf65M%hxz@!xEv`!l&C@hK zQvf1h-;hFc|ic4otvt0UL067>#;Jml9b0sDhmXPR;#O{M%il<-x zcC=N8(0N7eD;z&THd$3n-+wgWkdr$n%cYZUTfARVFlmGmu@spqb zEGAh3>)XE^nGNu4Ym|0*$4(x#%l%eG46^Z{qt zGIJUE?U<4A`K(KUS!Y}7J(-%|z+m|aD5QaTTgDjA4G;De0|u8;J5^*POhLOFL)F+m z&9XQjEH@=?d?2j49$TGke0MN&-T#h>6w!O}01#Ro?L%NHE zZW`LSjoIeGt)&eD8td51h_l_++jtM-GQK(OdUbAjGH>ba(zJSq0wd|-;ZmtI^ji9v zw|(&x(z>#Nz2k*`(zm1c1)S2(JY43k^1c`>!(d&re$90?{{(N@7uLU{<3p=gbu2Y# zu?+LS*Y=fyAMrog);voigEY*zjZHMZv0FuBY}_v0#^+kUTNFqNv;bUE;xRp6p5e=R z5GSBW)!Gr$pF4FdrmtSW;pr5>VL2|2Uc{MeM~n=1W5mFIh%mIp8)I<-E6+1;yc+Mm zb0YTcL(=v1bFppDAfGfRisP^T4HpXuYLA5 zJ@CReV<(0hEB*UeKDq|eAqy-7b@p3P`UbKzPB#yY1*i4mKE?@_3$v%jR=xx!Za`4< z>~!Ocjc>WGYwY2Dw&Su6Hg*l5R}fv}!CU@i0fu;M*+6Y#Tmf>%t+>1kP^q!qRo}o+ z0Z6aD`Wk?BA%5@Q{EzXKXXz7`^;Xbto52xt`!en%%ne|vwPZ&H>4{4+EYsB6V76Ts z*pXvr^z7IdySEO;KmQm1G}iE)^8fwSU&oEauf$>ft^nMT0S%#^%m@SKOsc}k1)MJIU3kZFBhaFM{mc*_xl`0Vwu@tDKa zM}LQY18px3i1|0qR%oZuX*?ob^#_OKY?&QLblmK?SSL5#!$2QfZPIl0v-4!6s%;sv(5>IvhCTf{O#Gp_>9YTZ#q3DhLsEIN?(m4Gj$XAG5_`DMMcZ~SfE zo^7L{8N6AZX$9@l;hATii30}?l=ME=(ZxIA-0&EOq(Ppgl{85Jmrc*H;cwG!494Zr zoOWZn*6$Vtnkmo%aLv?s46o;xga|NQBn8_K9Ytc&8&{C3OaqpdX2*14=9g=%bKlp5U?z zhLenwLhmEUfB=Q$UzSIa$jRtC@CE0U9`xD)y^UC)9v9++QXkqYRqhn(NQy|!!MR)u z<^&Vw2=3_YEBi_+MXMrB`Q@9hv#Z9r`1Uuy9^d@R%dvL+C$TUyiJw3AZ`C&)v@Op< z6F50lCyp_ogmATMITq2MTeyt0650=-tF(iD{M~>2?Kn?A{KL;)jXpq0Pd5N)j;*LT z19u8TYPA2uT^XdUOuCP~Iz7vDJd78-nck&3!NQ$FTE_~=d?rJdmjFh_n9R{Qfs4;} z^~^OK2KON$V(cnOL*)&J&a3enePqmX{{4O~>@qG|QcAqjm6T42*1vF&y@eUp^CyQzx02 zVa8~XugtL|Q~a#~fO^rtVv^sveGw@O(y?<_WAwrsNb&k$+9R=J_gX=TJRY(rtn&{_~8uu%FU?USL)e3D@a67u)$n35nuNt&R* zJhKe*OD33Q8fQMGpD9zoGRQcdo4ghk_Wd1nw+_ZYC-le8CQjp@Z0_*(7_jr^p)WMG zy@G5q;<_y6LkNEY(CNQAz`Pp-SmP_?EN$;a#bBO$N?~1+p9Z|m32v#c;3?Z@9SupR z@`FFpCJ)nkouD>#(K7Ab&H^~cbQ&Q@2WezKBq+2Vd2M;77aY4=h7viq;?lsu?dk+_ z{k*s4W3cW?Y<;{ZeLjRCcWc?Bd*A-d@tJ2^ zlQc~_-l~N@n?%Yna;tQ$xE2L&M}ZcAyB%d7llWek^gN7xwN_^jPxv~1v--B|jh#pv z`ZsNhlW$>|z(icf>F+AKJ#%%I%#>o(P+FhsjID!MxiV=hjcH$Z=P`f%a(uut>T!L(hAW7+c;d_dGIk$=IUIa0R#{4&1nezg-PT8a1d0oQIp@Jn z7_L^XEbNu~w!z5MTfgrh7ZPC!hD1TMxdc!^J8kRY%;H>;+>o#U0qY}>6u_wzf2U9( zjbKe5a~)iF6i~tP6M9-&y3V7+)(_z7qaSNn4?o4WXh-qAwxe?{Mo%4&F7(;lT5OH< zTJ^R=hgIm{X6qV;bRk*lVrd*r{>FVMv|OhjmXJ}^dSV88?&xWcmybLdUwHON{QPHc za1ZN55h%|K29)R+WZW{O3^JV#i0t@C0ArlY%XB`QAS|D0KAToBVmkAd>F2Wv5;E^( zaGov8c%M`6YGQmeCIMA#gZ;5NhRPwr3OoP+AOJ~3K~!!X*b^go#PtkT+TGAsiEKsp zFwjY(5PL<#hcz5v>oZUr;2N~A0mgM0Jwso=ef3HVRFK4B%zzAzA)tl#WGvMeV{88i zA2?VkBZ-5p5Ew!|)Us3<}NMI>*DSA|M6S%K{asyjq*E3%NxIGiQp8PF<9SjeN-0C9!*Lb!c_aM5`n4i85 zvqs6DIKhrzv+h2jBt^ifWu=(wzCsb#G$!T7Tns}k&V|VsMkVMHgc&SKO`*banUou% zo(2Q<{;fi>Vx|3>c4*Gf1$|U2_qVuFK)rpam*r4)UR_;??|%8k*wN38u~V^gD;BD{ zK2zro9Yijo9Z;(;j2cHzb&wq0VS}2j;A#T8n6v`WW95)O6$Ib}_}r-&1Rx(hd@$a6 z^=+O=a4xzv7cFIIU^F+Db=RPU0F^*$zdD;* zD7$33GLLfQI?|_AQI}SX-FeO@u3at5vRcQWLRi8adjy-sq}B(zJ28*OM`=- z{pcs<{WE>@vzB38f^f^SF22k5hsG4{4xz=X&Yb61HnnbDNZc7QrA~a`6m^EI@8fvR z{>irGZ|U_>g3sl%ALY4L+Fx%9v;f>=-v7&3kIrDZImgndOrRGAzQzPRk95UNxVne8 z;mv+94({F;lUL8i;`NIdFrlX_n@YqAb?YDMFR18)*djInleGWPZa~E9S(b z@2pBM3|HpCv4+c!n%GPICfs=}100A(YS9r>bKC>0Ov7O3arH2VG^l&vKJ^ zY>B5VjRs6F(|1WVLA^_RS}E%UHR9o53~;pj(?+i#^-eUJlT>iu)bgmg8TV zBweJFVTm%5nRg=z_1)OEduLp_bcrql?D|3wn)C5@=Hu{f=Y5lIOVH#7h74_o4efj~D-a zYm9U0?;-tX@ORgNWiBm?S-@^PV0Z8S1M$*JFBPMOc|Q2Y^*c#uw5I{|vL20EJidPu z*k*ej=f*ildfmx9(i}3KarUw4JWFrydF|O}eeZG{H0RN}Zc!j9&;oEtiO2lxq|iKh z*j#@vvE3BxiKW#Y(RW}tdY^a>eWB?XJ$o`H$H!vo%2{v#TXEsowGIDk6(kT!hn$x> z{(tt~?8%Pf&iBi+_udV31C52?CW#a^l*TiZ#v{!V<2w&GV(ja8zxx03gClM@!ePJo z#W5Z`u6^UmcRZ`4kwzp%5-YKF1HG?j_2-jyevLx2(cK_KVLJ&_*Qu(k+%tdQ`fZ8J zhPF!Jq?3s)3w{Q7q#X;H7LF3y3Ja1JX&r#$9>8TEox2V`&}J6Tqey=-oxk**v~b~D zX=eU1K<*667a@9SS&3{`w&Dq5`}*_+6pdM9{|}$k>20#=rAsD z!|`wfi`)jFEdvxqqHzDTBpp_z0FqvxreKei9oCa?{z@UW| zp$s};ewGk@B~gnb#-c<^&=y21h*`Xo$7|8NPb`8&PGBf!NzkXYroPa;Hb4A+q&+`4 z`1oj|H<^3ADd^;50-#-$3x~*9fL3FiGDHA$lj#<_FSL10$J3@IuneONuPtj%|A{3l z9vIJhSf{9`Ww!27&l8f!kDXtFIO`{;>!5xoyc}(9w8$^c-iuu%78VxL)vH(2_3PKO zsMfkEa`ITdo^EcE2u~^4B6Gifhg}wN? zFZ{#_e$;%yT6~>JKO0N+iY#GucWnyOKE52UfNlIm^z3$6;)Otn43etTNd9m z1HeUoyNLGO=12lmZ@^`noWrC2xik;wuZ2F|;+yZ{0C*vtUAUN96FBvS%eDt$Z9^Oc zfn##DAb#cW*tIS%2)SMv7?oq9^QWIRiKn8_jC=qR`M3C_;7kaVc(nj`8X#n13vn0G zoe*lED*@U8$RdxTjUn0~I8?d;MsoZBZF2K+l9UJV=FS6W`WtD6-5Ms~hmN7=rVd;Y zIFo;s&DwLja%u5>T%;e-BK`>leZu2907d=5HvKx*n@m^Eok=%tuVms}(VF)e!J=i2 z{wkjxCxSOck=}QF1gMF4c`OOSjtR!~Jwcl~Vgek~RWD4Sv&FM}i0QAuebNlI%11#T zLz#};MBY_g+J#f8gWf716m3B39+tJA+<+5}__#rQ0him9$te`*n7%=dq~$&?#C(Vk z8q4Yth6u;K8_%MS0x5m$Sx?2Frs*fhaUt@LHZ6lr?^%AqmtMW@Vu z-i=R;XPr+PLq?QL);z2eJsnVk3mAW)=VG%}CY96@+pX zeWC%nZN68>uUdut>s&`Tytw7-N}&@Zw@YFsH!WKf4uQwMJS341HH38MvrIFAkXtYn z`fTtNNkCt3nL|U|Y+R7zo9>f?TX3NPb^zkcA9R+}GS4bvIoOF5fpTy^8yl!hPuc>% z+1hS4P-x{X(T1QxG?_!e9aQn&1wKf1?nm><^%_R~nkUPE=VN5iTWJzq#|4Z@Dgc^+ zdSP(3eEcjSh*OM-01)1ni=^?3_kxoaeVprfiuyV3OiKVK2QKzVHEjbboaqZJpnrfq zTuU=jKvy4sh3f82FvhH47N-O97@*l#+%jYL)*h}xP%Rh-yeaP0ctB2{I%no*h;zPp z!k>uaIe(B)E&-hNwoRfvp746k!#KWge9PhC{Ib5Vai8>RzVCa{meIC8h~I)j=dJCp zg{nYK-8lDCbteZokLtJy+yr-)-5n_MTnF@y!lM?5zP7(k>eoka730XhEr&>}d~fu7 z)B=ZFU*{tJ`p@sw4*6d=M zfNQ2$O<|<^KQ2>s-pyt$p2d>BDl0U{xq5>E0lMVXWX@|MGib|CrU z1Q>BC8d2yZ7OqHy5*6xV@r8DZfaL&Ihu}>RmxIk^T>g=0aqn6FsyhdlRF7}4RMQN4 zi#4|2>bYx!MJ^ES*UrH)B5`u8#UYUKx1212me>CFcpAcIp^R@@f-6ChTTZF0ulUb< z>x|=TfRy_)DDT60s~|2lKae%up_ME;U+7JC*7$5`VGw|h=T!j8M!gVm3Y6U2HMnn< zSI{HiIZSkqYNYa5jkfSz%PJT$-Q$9F^F0sWbDjxO<74T#cYRjQ-)qx5>TJ59cPNk( z5bK!Ny!`E9d1IbiciYBtjY81^(YCg^M{#}f9JMWDEIoQ})T*NvIJpHz0Pf^AdL?2U zUdZFRjzioIirgKH9QIjsCa`kQtwO_%(-|Gx8~E5l%v8g-SVay7T#LNjkaVB5dvcMz zREGFc<+qlaCaE!l;!MGmp#WV47LpVR zy2zM#BA2g%M{YhA3h)N#0dQqdNLv)4NGJPrQj9)Qz0{Qc9~0zg3@ z92v^jr{N3nZ2{mcm7(0O8N3aNaenx9|DgQdM-R@OwlEz?^V1krOx4pv74!vnzXbqi zxdVjQhXFly<}P-9w_O%P+S{N^dqJqf@VFAm=ogjr?* zoM7-I0Ovaffs^k#fAj|@uu}Z&96T-Zb@4?u zkZ1xB8i2ELtUbqS{3g#Dj#D*?sN);1f}0EhTnmxz7=TYgSKld&7!EIzalM6EW|5EL zPq}gUpQ1dT4V!(+4t?&!VspcL_eSUf<|JzZCIJ{^m}}oJj*RcPcbXv3%mC4a_<&Xl z-VCH~8__OWpXz5!KA}K~O|jAf=O#cggVvm%PbH?jD&V9)su@V;#0nh8Jws;baekC% zzWvmHdI0i)E<5|?mIw<+}#; z;8t)_tS(wNTcMtm!sE{^Qv`ooC-acQW;q3kf?&@r^xqER^UOD`yNCB14xHCG*j^Fh zx9xJ!X7TWtbBv9M64y_YM!Y*Zzg{gc0&uT*f5&1_KD#i)bq}!ALwuP*3tWnBZyUy# z4q5?HxH-_jQ=>6-4$7k4V8L>+A7HiTrr=$yP)#o{>VSNoNqa5{1!l!*6_G} zkd`7)ZD0GKJYk}hLJ*cF;l52%=RP`z)vSw0Ubz!&57IQOj`V5E|LV|+fV0o=id;0|K^G4i%g+-^-bD+x!^yL*gB-g8gYUGiLm z)6_wiP=?Jz=S3u(-@Dd~*jFTfvR@^jBl+k)wM$gvQbWaMtZ+n@B?|E&R{UDdodX@7s?fi_j!F)Xo5zn}B@1#1sPS0(ZXy2!4pQnlYI<@DhuE)2) z2*4fRKCi@67ibq1iH8fYA$|`A=zs|@&^L3zZo!e$c|;%4+O8l1PQ`&BF=(lnA>#%% z6^FY9St|e>$U{M*u4wxx?swsOogLgo*Q=AJ00;sWfs4Br)DWAxXf=9pdPpM&09f{z zsyt7k54U6sP*d!63X#vihVr{eLRk9f%vA?7#k*Y0}h|BSNJnExS7kehY`Up zb=$6tktTXfSRC$wnYR10X%o-;`(!!jji=@Q0`svPyThB^3M0y(_1aLZ-|cj_^HSn-&=13_4Ai4co2q! z^WZvuWEpW>JjMA?dM$Qk$OH#YWu5+;>TRU&E>5R^0kB+sP{9{pA=V7SZB7CT5Btxt zB^dGAIOXx>^B#R+XQ*RY1r(@nD8QP9d*q=nK=1F7jv~sI+kjCwVrS8&z~#6ga5EnP zhnytKqot_V`dWMYow+p2$Hp?x{u5*UPpRYl9-WPRs(~|gb2m3zJ z9)PvWoDkf$$Y)}(nVNiLP4VH8KgwJSOuzh(xLth1*#y&*0P-3A_wA%@{UTOph&h3S zoZYlT`|iNaZQxkC%Q~~Q#kP4Ek_@n5onWZ<-2x8I`ws4GdhC3`lXRxLnaARCbCJ|v z++f+Oj497W`|Bv$4<95ItWh=k>$qT_y6#55#XRyI$A-^egW?y(H&AJrV9~b%LGJKSe~+YT?DM? z6@MIY;TSq@2&xcUJ}Se2ofLA&+$R@v%fv(;$_TY36kHAfXC26Str9HzD~2FSpKI`klJQ*b#EDw7ur zKOhg>`P@Su1GKGdKb1>3Lp~5`vJn{_4fed8;lFNwJR7dShu;kvl(=mzGaPiSTygQG(d_tk17)F;vGSm z&*Sh}uKO^$zau}(Vm#ycTM?(vY%{No>u=+D-{5c6AS!T@^Ka)=rjbG}03OG_7SfE@ z1^`5TO+Vizm?P6}LB>3o(rfe)A*aXvd#kt7otwAP8Uy(|@3KEKB6##4vMZqd&SqK| zW4k@daQ(|AfO<2%d--Cj&9LXP?p&CWUG-uC`F<=qx3}^vOU)DPPF3LRuaKDRIevWy>LU7ci$O}cOY+lE4RQyuZ zM?VEh5*ij@&+2SVKoaNCZ<~c>HZxcSu<<1dkgB0$r9)pWPFd4){BA>c3hD*+2kYe?!P_|=xX z1W5eI9JByr-t%_=sEf@@SybwM4>?c*47XzP*w#Tbg)m*8c?b{%}=0U0Zp`t^<5vkoPqlQQtp1k*;9n+`apdu}S6k;TB_sy)jWwpKNZW`+)f^#_Gz- zDmt2OImeb+LoSzjME%XPC|l7UULO^V<2%0VZ_69)Y1+0)0Ahca(>FceF}}gG+#0Q5 z)$x14t_<(u_QQ8fL-1_+(Z*iOQR7WUJHfeOdAKK!mr~Kr=;JZRCgCE_z#X4t{7>-_ z(?W$pPIeuY3Nk1T(=g=nkQnF189-NcD{U`7Oe>v-skt$qW^l|sHaVZg)y|7aIDE@% zpQp{W2WhhYUYfbE$o#0LT{!O=%BUT?&AH&PH<*Vw59Z@(zlvcC4z6FOU|+;hjF00> zZ=5*FF}-(qER>(WO23b4C+mLH{a2~pzm2+#0Nih*6<^>qVllCZ$1Mm)O_t;0N0n>( zaRY#{-0&5TI0}$5y?ZZB;rw^Jhd5<#lZ?@ggJ`%DgG8mD4=@kJqKieFM90HzdL&{J zV2Mz^hf#(1Du{Tp^(){=;?u!*88neeUT}Y;Pz8}>;^!}Sh@L8v zO&V<6On>m^Ogf7{GW7xTCZ^d)z;ZmtKwY!oSAsz?Du~p^8&m1sH_oRI-d;}+y5qSo z1P=B`0JrELugieVI6eyi*98=78S415A43!vfX1`n-9GY}`N&bK4nf^f-aES-(vjCrX|Md7Z~BZ%~+bI+3RwPk)2o1O{ZIMML%V%-X-r%_6!Eg zq;s=pa(OI69z&F|9P<1)Mfb(~(N>yh7Qe(2K1ISN|J=`k7kObY`ks-!yVz@L8U~6RGi1NspfqXb^@!^BrEdVZ8m-SZa(E#*O?3wVxU6>u zSgYR#aND+UwEEy)+S=Yp zcOGu0^&P~w`w!CZzcHRZe2aZ&$0?UCR1}})Qaxub97YsC8QMe(LG6$?Ni!16HI$HtY5lsTQeYaa!G%a)nB zeRA|;|70%H5Y*&;CV%s>OajMq=jPM>WV^}>HHgSlWsTNx%O$gdHZhq7Jen0_Q4)jxQx3N?D83OWGj^|xQ3Lu zk54~J^s)roBKrF40J!L1>sxN?m!Hrp1 zwJUhLmwHQ|r2YH9N%f68+(S1G0#QYurs7_k00h_t5FZFB;7a-oi~?X4&Re?xhaQKz zZUUk`HiLI__`QdP8xhN{BD|upakk)+;~=*t&0Wlds|Ki}qM2J^;&Su&lglCJLC%=2 zIWjQ=y(wx%sFk+s==|{YFVU#NbqGvlR5@!W1~@v|8LaJqD~k5+M&4I*m%LZeA=}4N z;>zM!`tY60>GJ#>lp3P}d0ueqIy+kUQtsy&B-nrh!LIG2o?fT7mFC8$(s$linRYQy`L5R-`5x2$|D1(*&BgXMPMrS_zp8e?|D3jxQnjly)eamNh zzFQve(^%9lBM#jL=nT-!x(YhKj>7%BQ!}Xn7)t2AEnx-yF&yKY8=HJ|pa<4(rZW?> z`NLr!|A?k%2=M0b$fIbHwuuD*03ZNKL_t(I?;IWCU7uP;%NlLywOly2#)^9pKiX7K zmpPL3k#Ve_pwD-;vb}ZdRzCatd*AzB_I+m?+RnKhiD$pMb(N<;nG?&-(PgzpG4=ea7(^T(*+Fn_$JsUZ=b!DTh#l)+wZ^;T}AY(80U+J>gNhHk3V>1nhE>Xbh>7H`Wuj^R=mAOJkm&$eC_fgWY7NPe;&gmK6g35R@Qt$< zQ~m54Y4`j*R<`e@UCIpaDSiGg|C%n&jiSE>(7`Sgu42fp2yq)HlgwvWe z(3lT-OS#-;fDZsv)<`w4A=fnOmvO%3;K<+`1D-u}=mc@CG5qjdx|q(g<=&m^H`zOR zHO&B)>!>1h88>yn>V-GoP7l^r)6)IB^vflfb6VFjW{9IB?{P%#a{k5?t75rbd?G~d zFXq{PiV*$h`Ltu$c!%Rg|3|v7^7*K`mfQ4IuKTmrZ3N(+wFO_X_YW^5Csj|w1a}jd zhmmyl0*+H_h)f!8Ni>fyty$cLpsWvQQ+%oiG~Gy4)v?K@_I_c*ArMTddjl9Us+<6= zSv63ovhZs~C#dV;pR2>xUwgZN0svjN*G~8Et)#Ib=qGFK2iq}tqA8n9)P zTW1;G{On5l&ENeU%G`hjh_{3{;ZkI;U0A8=JXWdI^9%#}LZU1%%S=l|)8q699!_u# z2jI*iR({)n1TAOlxaBZ-FLQY~mkF0?8U$-{m;@)rv;INYB0bL@-WT9R9N&-o{(e#r z{1{9>$`EOLe*;i(?M#@)s8`h!%(-0?bl`F;uLesgv{ZQ!u_v)lL69rpWO+1*Ri zt@*ULu!ul$BW*FhW`{bIrWNHmDj%Pp6askJE>T{^yw*XEndwG|JOp8avA8x3?-}H@ zStdDhZXfoGU;HA2xsN{jD82jcyLnu8H?dxY3#vY6oez>R=F$WpX^wd?&7m=mbI^|p z4IT!e^hUo|;7AYT#tqBm+5GZBIXrjv5yj$P&l0UMH|OT2(%Flb(t~^K7O}dKX3o!~ z+7v)}i`ft7d;HwxG&X&mJ(M?j7Yp?E|uFT}eiBY+^X7FXgS5m4NfIRZnX z%4&?&9UKC#i?3_eQWt3!-8T9u13(pK1+4YW)P^9`@M$*2f{g%$?U(v#9)eikKaWKw zO33(IQzSV72LrQH7U6>6$OUk6KE4GH3*Zp&xK_K48%LvpW(H)Bf1Ubl3Sw=YtjpPp z>ktt3(*z0CC}Upuea2Q1E($;bE1lz7f9tMDsfzmq#XvXi{~~?o+usEN04(8FOpLR+ zI%32&08c4io$?$Ta0J_1TcVvlNzK;xaVIu~<5)GTQu;4{^attI)tl+#&wiFZ`qsr% znSg*nw8l+X3rOzyjSXsU zcLfOSZnHB6KDFG_Q@1Hv!)Cxt-xW}+$(Cm7JZS~VGt%nghi?~(YOj@yj#o-?u)D%_0=Po67eI1NJON12vEJhOAS>@=Hq( z(trFmiode0;6LsfRkffrEV* z>#1kgB{|OiHpG~TD#V!ZetuV#68b&XXzw{61ofujwr{=@M>#$3m9Ha@^4TFFU=x6O0$aZMpDT-oDvFkGxJAB9pTK*uR(twH_6M-Vgh>p>U|~(b1f62;hZ$y1b)!6y8*abdC_v=;=aF`hJ0N= zT7V<{XmYQsgF=Zr?wN0SO6E=6iARDtU4N=uS1^ZP`QIeZ6ELZYlwR0&YZ(r35y-&mCMAk3b;6U^@%?Q0508c^!L%#L)WJ=js>Qi zMwXVziB>wdcs||zw3pW4@VvDMo3dj)NDh#-2bf#BeFH$$NE1_MQXS{A5^#BjigQ`n zvvXZmEEL4)6Ux`2ZoclKpDDed8%~UZFWb&VP!1TRHiK=s8rk8obQzGBu=?wx?^I=n zi^<6e%KgNuTxtsS({qok0^ur(jNxHN!lP*p*(i{VN zoUtk|JQH?^D_Q38A+swxowd4tAn8MqhuKdYXI=ehahVd<0G7Kzkd5 z6X(Fo6r!(BTjm%C#*cTs=Wmbt(BXM`T$IyxHylHx6Y=7@NGHc2Jy(t*Zp1rjj0r{! zHP*z#V9d1j#p&4)=ko6;M~-mBpD2G(&Z5o{&3o9X<#ZLn3)dVs8lhPh*Su$4eU3-am>3&nra&Op-WOnNbf z`5ffws|2q-x)AaQ_wJ=>#IQOe-h;C>2_ca~=bo@9g$x#{XRp1LIveN#P9Z{VO}o^j z7MrJEdHYKGm;bMkmT*ncRZImD&CZ48vSFdSy|$9}01aml+s(oKtDsnp9U<{pun-}4 z_WaEP%AS;#w+ENQy<$OO07eKLe(2J;`4xTR;wIC`FZ$ecHXlS?Wpf*28(pupwTEfy z>=}*)Va>5s)OQ|m24EO%Va+^pa{2tMf2^17==p$4Rr)f2*7UnMZCp~IZ-pmkctHDU z9iY(WeiasL2k@;hbY}_t9bHIGtU?+wh)Cl$wolY@FDtrWuk#?W?p@U^~BvNmRc?ef;qn#)F zX`14>#)&?29NUj^eNv%ftt!WhcLh(kZeOLD1uVrFGG45g-gCSd{2lS)?7cET^E!^m zS26r?p@sokeur$d$oID)mw~Qf1?66p=}}+hb&dy7)+goR7&|u5p623MD}EB6-^Eb$ zWB*aR9GlK7`fvo`UeS(?YB_;o62;_;XL0s@_WN)PMEkCzg+~T;1s!4Rzm`h zZj_d5nZEnAr)UNg5!3onSssJ1<%t4E2E6CAxBT)9*0C1tKsd%H<&Z%NO$(q@3Gf*29dWMVv&u!Nj~kWV z_QO=$KLdwBfA$7M%Wmt0#p9i|4RnOMh$Ru-qS)VnV_Ap$Fat2#LszJcE|x|U^(J*7 zy)Hm{8ptrqAoDe@<9{k4t>` z%s$OP7y_X_p&+h}KH6_1bOFR5SjHz7pg5-0ctwCVAg?am16{i8p@6?lrKYu(rd{^o z$n61~8#9atfW~htC>9HyJ;zuk_S9Vf7x!(880Yc(xcrUlINoDth8+O?#fulykN)U~ z>BA2{%*H)hcD8WFJB}-x)~?5`p=vyA=)&Nmnclq-y z($iO+N9gLAr{LktWgPGzYSox}b7eDq@#*KOySD{cZlsU@<(KLF`){S0@!8Zkx0u(4 zz1z!aZS^4^5i9Al&pu0MyRG!bEKYpkx>W&ld{L!4H?F4pi8=Wu{nL1{x6-ox%OL<$ z^quR>aUlR$IZnK*DD~#et9i}yUW6DQaqY7>?3eiMbITL&#{I+RNav_?6&*<9n{K2X z@$%S18d7e9h#MawjqFAy-uUV{;vFtiTq|iAAD_V1Wh{?3MW}@v8<%z3zSJ&XP5srs zGXik0ejh(pLnlTAC&1y!7tc<6o~}U@00wTKRRA{>U{wA`{G_f`XLl**;X>jesEFS= zZ#})2Lb*KNMu?D~#=_ttlDPvA4}Ui&08DVR^aZCYg1nycM;5z_gWGT!4(e_FhledO z1!!Bne?M)(l^Ta*ff^Z^qEQC|Y^tk9nU4zyYjd^P1rog}M5wfdh8GB+lu4z@DL6ZG zXVUGZo9P}_jtdvr8G=0~_W=%7_L-fXoyOTOezV|`$xaknY6U1l+Cxw2?yYNVN%nSv zGUs;797(uryPNCj{;iwHuoeJtM5nF;+M5Q>#kGxk)L|drTP(eqXxksVTWc^(aT`J1 z#?c9rk#}5Z!ZneTDonF);92G9wr35n15SLVV46DZwf^dWsnjo5U=Kffj+18%*sx@- zWrZCU{e&;9u`t!7fxO$q8p62u- z{l1kR+_{ey!M=8{MwEN--$Fln@)BG!-t&LaTxEY zP=43vaUG)h^1br=uE)m(Ij4t1q+Q%E>Kk!KXBGmreGUQX~e`#l11uXu+aMFe8f998vr77InzsVXUQ7n6!NSw~!Cb^#{4 zaGn~SjXarlI*3tFT$i&^fh(1Uo28qc@yh_t{Hxiy@8czjyz|}R^O($@ow!bNe{VEr z(|N4kJI{Q75U2?wWxi_=-}rw-T0#i$CWLM;;k z1r^GGQ&F`XGdH;kW|ng%eEmX42)36{>96fHR{z;E4v*JAa z%>D@g=l#dV!AS`{;dvET6kUyQ;3C?dgWg{10}{63U~Zw8SVQm4{cPP^bRFwvjVLai zU(EaX))~h=MbFO=tXGUzIg1%sXP{HmuLjpT^x(ACjrg{ObLA^z_E1?IeaD@B# z!n<|zdU~*QA5h2ETI{qSM^3+sVKJNM)v$lI_a3I+CfvX6U7S?6aLafhElkYuJ=aaM z7Z=m=z1x7cm2~~;Rg9nb7~sR?+ZWk0_43>7d&*qC37}iKm6lf5(%ysZ)P@UqVHOMF zZ@-<|Y=QQmP{BG>>lf=Xk74@DU|Ys@9>2r;PbzT+A%`B?=f0Z(J@eO(IzMvqgywz( z%-W>tBm#@#Bs>Cs=e5pLK4kvQlGvk_$TrH2hW-x~& zHV@e*sGx^3`I2i-pt$&|`Q#b9NRE*=*WiztS~!dN_||qSkyMD-^hKE^8*o zgf4C-6iqfTBdlnliT^jVj5@rE#}i>2SV zjECT0_|FRT;A|jK1xys_(eeNh2s;2|3$9BGaB&W2se;V`94ylV=4Eb5EbA5AmgLre z>$DAV?xN!~!xm8!V^gWO16N8J+A%?U)9kMgg0Jk9|G8~B4S8|LynKpBjv+aZ_OATCtpqhETIzk_QGftvo(6tBCLTLaFUdH3N!dHtaG0MI>y>lX|4 zmE@lKhG{$Qt%uw$`zUi;NhuQ~>Uj3-*(~lf@mwxIz)^(#sLTa@?kW4HfBL8CCx86o z4Bq+xH|w0o;`$w|L$NqzAl0!L4VJ57_5tmoalyFyn1K2A1DqM(xQ0&XUG}4Irp5X5 zY4+WBbGb8@kn&S#Cl54>rbXoBd=5SeUvygC7x7v**$j0Pylf{5K+2 z-NUK(1XkN;a4V9=X0n@}?|-n+|rH-@pr{Kd55hoA%PB?z&$+24k^ zKB?$2zRU0VuGfx*Y&DVAL+g)n9FNry!;xTk6*oC!v=ZX zs_aCGiT$Ly8z&}|3y%KU4BqRq9nt>gD$Y7lkcI;`fiidv@AlIWj0wKD_a_%~`o8A` z^ze6)4sI>fdl{yce+>UbeuJSW_JeEkG{p7B);@${E{mbuV^vg9DBBh${bcS+SEO2g zm*3XA4%cl4h3|)V@1)I#E9v~=8zg|s19ZpQ=t7+Y;Obh=0nRdEgW~rfY;{nMqQ?<5CB1$I_(2p?s|0#?1ffm}f1SzR{`&&uiO->K{6;x~=%Tbe-e z9RgXx*F_s0`YY#6jBS@wJd8UmT+s)Q&WB!lip%InU&;Le77m>dXJqQ z;9|591#iJ&Tf*XaZwnnn!4$eRlBXU%;uI-Qv75jq93VMQeZ4}Zuw0~}g*#%&Xw$j&|-JuF0F zz2-bM$R6-hckg z0XL~do%%gQ&JK=g_Ah2UZ(`xx;Nz!(5y-yWUOph2=jYNq_xIrdwj}6?rt^?)Ow!i9 z)Rf3B_hHQS!k14bQUZ(K0ma8{f^&?=L$4lOYBUvNF_)Dz^BCaWVk}4xim_}ta~$427`M16IxYkd zG)_)u7+E8T2^uT+FMWp}--TTkZzpM47s3f4kaAMgTDZmlNbqTwAWaA;(NknfD{a0w8g)ym1}xM%*ztS1LvLC8%hqSa8UrA>2Uc z34c-&po0*L&G1IQI)@tB8);^JGu?iO*y!r7(tE%6`-qFM`rH->QEzCjAdBS=?wVhK zv;<#*`ps&v0|ggZ@2^>NHwi^j=(pjnqJj7`>7^b$wBF2xv{q%WO~jbXH*ciPTc4-- z^Ow^sI&yPx!P;1{`feTHV~V3D0Doho?>1!3*^A_We>A$f+22Ck%RaNXEoq*+kg8|q zpmiwe1DMrgvW!(6Dd%3J$n`d68sn4|F#YB7O}x8x)AU8ScH{gStfM^scG|&UpjKsP z068&?i8jja^hP$$*v7$ee-Ge6+uFpv2EM##+A6v+SGw&vIep6VETMx#-UcYOivoUo74VEmra@o2otyRz&H>%9I3Kp?8^>Xr_SZif z1M*q2&hI+!1ZfKxvj`gH02-{bBGoPQ-gINK_{OC)fj*@Bn_dS<8P7P1E)}Kaa+biY z>3UB;j30jQTj||zU4diFaAS~+0p8N;m#MXS8(lv7m5$5vCD+G!LIJY!B48hoXDxRy zELgsMBa2MG`-eYbe9Yx>=+?b71P32pwi&O-Tx1F`^#F`o0+DECkB>Iz0;o%1S;LZg zP(iN`3w4vAm6<0N5)et8DFESs!Q>kQxPuLROVaUNQ(n@W=q=;JZlQS29PX39V%Z%!Nsumc#{BD{C zc#PN3>Ei1eJ3mzPp*7=|WHAQz4 z9B1^wtTujeJ%9>(JA0C6Vv8M=+&^Jm}+UIbL2 zqX%fz+DlzLxmOa-qRzB!Zu%1z<->(K=6Z8;6NUS^Y<+59*iMS;JQN{4>+&p7HFyr9 zs+iWckwD57%Y@PXqy6b{I*7o^b6;(N5@MpNm_$jo9o?L?p<7)+Dn9n}@ z99JMS>HY70z{F+z0V>DwW2lqf2+=li?b&u>z!Y6%ZJ!@MGxw|T`q0iS@@JyO-{{N*oydGJioX0Q&%FY4Az@4WL) zzHdHF`wrt4EseXoh)+)pZa3G>mbjNMUP)t@F7rO(PDGo{7FNoX&rlvy*?{ETxuI^Wb0u!cTeKh(G{!O`u|#K3)KxsXfF8}95-%WcIKKu_>S!{zjh<1J*!~{nYc3uumCqv>FOIn9*?Tc2%lAjWM=fx;1x5hwaErWR*RiOS z7mlc6EHve7?;RC4;v7ET@1XP6V-s+eSK)>Wbx*FFVm*iq%$&Rst3zYDdBKtpL9|@l z2JDp@`6-?;|=!**AhD4@tT+N(SW6{=v2ZXAaM&VLmj}Q81ST^cyvcj2>N7m z_~V$EJj-@O%cO&@8301PsGJv^f+97h3`9$gL6@Tqh#H$;Of86QresujZDTLpz}MRK ztDmMePEGG{3{c|kqYrd>`X3to@FupzYegPhXw0)~8)Kaa}~Bn*bMilV|78rc1aX z!6954KXVZgDnO3VS9cEzsi?foP8quLE%FhNEAHVL|0Jr9QPuqR)BUk8?)&p-Kf>fOCg z_UO)0z7~c99o(#RAdb7;nY0auO-4hDben*={aqaT0^~Y~HU+a?M7m>oqkniWoxxZ_ zG4AGrB^na|M>#9pD~F=}9;a$exP85qwY0suipAx4y7Jxcr0MxffEaX)D356+w=>fd zE5x&#efq)O0f-BX+bB3G$W+W~-6haf`qK6#Qf}*V8J_mHfJL#Q;KuOfmtUq^w{B&T zVg~HF;h#3uNAU$ajuX=ooJkbT)3d-yFy}b{o#4sqgYm`t&l2nt^Y##o2~z!S`Wb)? z%Mi~kk7cuc1(bjGXMdJ{^{Zdy>*eL;{7!Hxjpq>e9XbO`Xd4UHCwwf_(Ww-AXKwK^ z6|j6`%z*`rYR1@FZD)NWZEkI(#q;M#(Xsw$JjMKsv&jm+@-Gnp(^}5apNSXOGWfX_5Y;+a!?qWAV7 zEyL}C+UT&!NvOlo(D?=h0k}YHEgpY#;bC16wn1)cX%C8W7bW}t08t-q@G9+XeB}xT zwP>74SKfRF%Q`oUCjkie*bMuv0+QaCLmz4b&fex++P`~Eq?VfOC?SZeB3kO}I}gIv zz<1f8J&DNkU(?dPfQ}7mwS7nYVA})+C27`9y`oX))+_yG$F&}zT7)O2*CJq~zY>&zLiA5?un4gF1Ls(fU zJoD?FU!Y?DW-e7}FWd5ar~NGmGA-LkE||p9Lsuf+m!l=H6F>@#1aC361b@#O%zu4- zJ#)~^=K>B%Er&qP^vz2yoWIT6Ao2FT5a>Prmyy}<%%)K?4ZD8 z3ujj6A$zC*Y*wgqe+&@E#|Iz`hzy8h&rBd8Gm11F-4%dbCvBqJIl=uI#uT4mxuiSX zS?>cTNylIvsaXbdo(=hXkaNbY`OfqIW4q+JJ}gT9P5VV#9WG&v#lz3N_Fc!oD2!U* zxE2@zxZ_&q6?k@dQ8}(kE*ys!ljGw1tbxM*4vX^xzO-9>Ja9b%l#t{?`6 zyroqBb<7|9R|$qHa7QF6IUmGHrjTI^Z6d78{~t5<_;Y+Uz=fvF< zNTZ7NUK0-2fOPk0r|tG#_OxWXEr{|M=}fU}M3v3M3r!>HN;#!+#o}Mo*EZ@>zja(^ z3;;s2Gx*gGe_vd^mabeJ8nggR^#eCxYqkmcr>NmErO%vj@}o^eMY>bzVI*_s#`Scb zkB{m+bLvpAP6zGcfFKh=eV1dGakT{pO|95%IBgZimA;U(z9b^uqCW+4)Rz@vhrL-h z;l`~F*oi?7FJ*A=4}`dgQ5D@6H5g9mT#^jl%=1vWp2uahgMC(R7q6cbjOX)+6TjoW z@A=y`uz<8rN@;Zeb#H+YfP39Xz_9+Yn0V=L7m(A0Iz)Y!{WP~(Z1?&4Pt8p{x|0S( zKJhi4R=&jAaxW{XORVKK#Nh%p!EO!aCGmKelj?8$kjr@%4zW*PXpuR@`pl zuSyV>>4{}Ge*oo4^nVQfGhIszu*|F@+H}Q~0Gg27b16J6h=&A+-#!O~=?$R+C8=w; z09P%S4Z_ptvM}2YZmEUwLccc6GxkP>m{y3}!>!Bael=|j@N7SODa}n?N(0<`)YbvA zoA=Z1#uCcs>tyeKsl7DKX5@3|+3m@}pj>V)KZ$it?;kTZy?tnKS6aP*K02r-2fvh4oBJ(~#D}xpaJI01TT`V1_ z8U=u$AlB@nGqygMN=yA2yrhgF`h@W3eI}`D4PCCBKk?OZ0}e%y*T^uG0JYOdc;b=-vD@;{5o#sPi3?UmHVrAgE6&eR~swFyq> z5Qm=uyp5$5#Hw3Z`1SywwqYFtt4kC`r~MjjW@y{i#rX2lF=L4S@mlaASdp_TFbU3@ z{?4?pym#w%e#eC<=RrgFcF>0+Oexxa#$cYdQH*QHioy0OhdhROR<6To2x#g1qMY2p z@4R!ya87yCzH&}pzkWUI`hA!EOWjGK+)lQY<#isk_i;xz?Op&fr-*%!jdiS?9AJ+K!-*?L&hUs6Ta2-Y z_D!Fo+!T&R8s;`!kGwYq2iv~d$A@4a%kCC&+Uk{Jo!%gx<<@}9;Aes3%lV;AZj-*L zW4S-T33`)s?02(hvL1CXAj$hnGw)*EGY#J_k7YkA4Ke5PMd|u9V>sR!onO8d7y-DK zug|_#iJvr)V{s^-&EW8Y@T5%DL2+Z@0broR!oJ$YRR*Hcz14lZyCcTI6+r`_)|zal zS-3$h+;V6*P>1tXS8;x*BPW50Jo8yX%b}IpW8q-&EbeyMb1{go@pCW^MEg_$1#4g@ z@p;G9(~y4_X?5Tt$_Z%6+GDZYMduI48*m)Q*xOMTsm~Uwc4IJ^- znlt!P{Z^WK7YDy>M42m_sonexfV!8q$JlwIKFNDT?i8*fqW>(7?UCD%Ht6C8WEZxf zdm;*HJGhr{kI$N1Ly7SYybi#c#tPfrR@PZsqi$P>w00n#_y;b+usv;}@X=>G^&!HM zcl2T8@0jzMphbXUxO3-D`s9;OGJug2)u0@&atHumTS$BbEfQ)ubGFUTfBy4y<;s-< z?pkmFqb+0J#u)e7-&&|<-MvO9eRlK9^nd;zf0Mp-?!QY@XXjG&K71?mB*z#dWRk&K z9uEMG01%;%s-MMq3=a1f^0glr%b6MQ0=yz-!-9cRAWR5oF?gQErV)nW^ryFo= z>sV1UPj;C18N7hs#t`qjl~)xmaR**amV@!NXX{s!CH=YsUyH~B6ffb@}L#CwX%+konFi1$33r+dea!t2`tBLMe` z_kAoNRx^Hkj%(J599%Hshy|xuSWZ~L;3g>!8Spikzq}`B**fPfcGhVi{@aARu#hb( z>nu1`zufuK#Kk|-Rly2h|H>qz5R}UWPIn*%^RMdgEW+^qqf59?!Bu#4Gk%@w+(X=x zgF0Trs%lv$STpQXzKNQg0Y$uZM4#j70o=DubbLCviMyZS?0l z=`CDDOtZN-h>j2YHac;LRoQ8xK6U}30k;i{;dR8i8>o_RSJBl2*wSNEo81ctF=h_` zHZKpK2XXQo*Pi9B2G{AI|M{P@7}35J)D7U&yvo70hLeUbj=um3vz+mCQP!n=Zru09Ik=D4+7 zo@34}4$EQa!5Q5JAgE8N1+w$5htW$7kfm#po44-(_%X_XvoxlNlYFy#9(G%iue`g( zt|N_eeAG14@~*q8P)5`#a(P(~Ht;?8>94P&bIHdC+&jlfIarp%_sY*-gx}WXxS)=o z!FYl%4}a&i>rj2Y=d-A{eOmn(UfeLg@A@orUTH5y6*i$Gav*=6~ z;7995#e0e=Zvw)pBe72pVoGsa&h+PtdwbLvJfW?S@j&_k~j@Nr>5;j^LfZD^6Z}z_>=LAqy zh3nEDoKM>nV6)dqTj;&*Qm?+?4dQ?|7%XcGPQhbDqtx!|XXSn(zQDkEp1o&z1R7dS zsC-ZD<_9-cc*Yb z>^p+80KnE<|_l@cOpE2*ACjeeYsma3Sz0 zhq%t?6Be+2tQOg76AM(hM0|nkc0#7U_EVmB_8y|^fu)~fNWf7OW%)WfA_@(&_|?s_ zGiWNx5Q|kV&*R0)ghS%-SP*9p%OB;=b&Gh1>h{>XT-4z3XG*m;)FYT{-@w<~bl>gd;10l{u#R7Jl{B3sd+D%P#K z_()ph;=n{s3EFE#;d0wO>POqa`b#9_;Iuba*w?e3=23jFq03aKe|l{2et&5#{Ti;# z|M0*5k9gv*A}+-$7H%W0LD~=$M8@j-O(5!)xCkCRGS>hCVjkvo@$#jE`#u+(2{Qa` z9Jxuq_{A^Ss_C;FU!vrFiFl-OT>Ba4WeyVCsHX(?u`x=;d}jL^e=t&o@G2PP?g7m|sspvnWTTA;`0RM24DIlBxB=%)cLr6&kPR)-1R{v<1StZP>Ttn3 zSoA29CGxtsS1fwvvXy`5%!Ui&!F{iX_gF2TSacs`i_rjYD(X{so5Vdp%^!dESk=|i zLqw-51AWL-L+UF>OU~o*sUMqle%L^NsD~>B?I#3pb@HuYm{F$?71~EXdeuIFj^6{o zW*07|1{)2y9n~>F5?f&ztb4Rs{1(8iZn051qPg0_m9z(k?O(3mha+|`{o+@jrGNh9 zV|IqX7=ji@@RQS_Q{b!U(TkeFVeIq^ZkYrnz?%^xuYdme&kl%j#1Xs&0ScY2@Utf2 zk$`z$OHenCf0cuTH`*%B*4I9YXSRiHE0~d^dH??XOq@0J*jQ(5(D!oYJpApuwxh>5 zdZjCy?00}`nRn(U(tnKzwT6Xp8&Rn9FdGRFKXZ!6SFX1r)fgkWpB;PvGCyQG0Iof( zZ3J9b-v1zVHKmCWFrN)~-O79WxCx8CuSskLg zx6jse>UH7d8jkPI)^<*7j1Q3(1`^h>Pa445d^nem3l%s}FLXduY_M;SI@_<&XSR97 zF@C;gp2u&m`+PX%_$24}aNanVqQ7z+*8<+R|3~5VZh;YidyV=(FBrr6mKOwXc^yYw z52GG?ngwj|-HlQ|q8 zBO)7Z_=V~s=i!3rFa~7oS7ZbC*Z*z z)CZRwH}|82TGOM5!qAHw=XV5m&k#W7{*CsfkIhR^CSdfL!L#=Ta|;Vt(ZZFB=b^Z* zgWK`?vvDw^Y%l6L+QYsvL|+9_mI&KU9zL_347yeM_~Vap3sL|*+fJ^VaU2(Mb_+H? zIM(p>w}nNcfUdzo46Kn4%?aK$AInsu-vy3s_DkK}rXMEcyusxIcs29ZZoRa8XDK}Z zG*+AYX@_sFFS-8w+O_mKmcyUlevodmMO^i&9|=3@5C7naX1{j7ceIll!zDScz*cZxSj;*Y&Y09 zG%LKpr9tVshVnFy{xhJfPhNzRw2z+E7VZqT@DJ5V;{Z7~-PX&+1;6|Odr%gVbTx}F za&zX$;Le}^4z8R(eeN5@5H8m)%=V4rB6w^Vg10WZJ30`>Cw*$uE*-dTI;(xqXD>&9 zlYXk2fUOqXGTUYk*9p5dJnDDZck&s+pud4NsT@i~Y2>4!M3;QJl)cVJ zsui9UMiw+8WvrlsNP)QbNK6xbC#d@A$M*qjo9QRJ0|0ZcJk~!+s5C58h_{ABA8zSErTLe0kOo}!_daUa}MK{b=-$&DAa=Uy^lCm z;~=}N2iLa7J9!=mmWF^)cRQxlU>@c`e{|`W3L?}N{q#?N_p|ix|NZ}z{uR(aF?$|R zhd;XAZd%#c%p&(5+s#c~`VL#J?jZ8r$ecs_w~sHmHg0OV=vTVCgC8fl&GF1IW}dr0 zZ{f?atK;aCLNU!xiuK%{SNRxqoW~J;8U?c5qrW|ugK=Zs@_k`#c0N8FBT7dCtjD`C z?~1--w-m(IqwxB+zzD#-?0wJTXn@4#g?^u{oLDomQvB`PU#9hktC=Xo#E-=!s;y2^ z3j)!qvw(Ej@SFv~MWYeQvxrW7CoeFibIz0N&1Ugz92WxFStt5jgA7Kv@2&zYm0jdi2SOevZQJ`F| zgq5a2XSBKErcJr>bK_u9DN)HO`Z7er-+aSnf;ZTo!_Zb;Y)LfNUrW=y6{`r@7!DI`mZMgJ?rw_W%G>xP%~Gi8y&_pfOMpkpOwkT(^9|A9--<zfSrhiz|rdj#;2 z06MM(lm0f?KZdwA?%{gp2v6}R8~7Z=w|z=&MAdC0-LlvxK9K{rPoM6rBN|5+ZQQbH z{9_<~52w?{!)I?Emo56GL;E(VXCI$_Tifgia$zxTE#E=+Y%2{~5P9lvU2BZ78ty#| zdjP&F&-T%=+QxvTih0ZgmddMlm(u_Izx+-5>%aRv{bun*VF8G-^XC05E=IOaKy~szV6OYcbhJZRs1NaVJx8z=N@%)1ZXY+ z001BWNkl_j!JoHXemnzXe7B?j`SI35*liSsz5zNi6YEK*-!S5Za!LwWyPZrq7StOG)*OpHHjd3Xq9Sl1YaQ2cqJ3^ z%-tZq@6-TxiecB`j;J@~J-JDm09 zBL=x#_EW_1-tVGpk)L@RERP&TfZ48!^ux5FIR+Mzz&%jpfrXS8?JJKDp!I*xu@ zqcxST-+h?={+EB7{{HX(A^qZ$tB7M~QfCquK(e8a3G9xQ$CPC@M134*0f^&upGBOw zH#(ob1rCo#+w=I|Ieprrm@j7wi~!ur*>4A>j!Es>7zEM9Tf(H3*&ePYj1$Bl7Eu%M zzV9ezF_fPf-{%#+)Q#g2&w~KuI03M73Xc=Lyug^o@F?dI_v(W^L@Ml2iRkCdM4kN? z$I^w_v3#CpcYrQ?e**mwG0NY8$Z0fz4q6{hp2q1ZpGv?j8h+t=9ufx$OSVAd(VU$H$MN z4dfE~UR@Jhf@0AQdrTT^w;FYBsO;_ju(1krj^CkZzDN3UTLhs%b-u^}sq}RQYyvrH zJasosgH^AwHPSYD-D6XDEgCbImAoXV0!PP(@edQ&oWNK9MB%>j;8Ztk1M>+Tu29(b z~QW;FkF=d(kEqBec^#~ApR681H6uw>y*miLYm!_|m(CDp~z6C}A?xpX-q5>|G z5+8w%i?a);IyC++FW%+qdf(@VgM=fFHddqAwS|Js;i6l(-SApSg@}iA;@JQ|XNc>H zPH?&9tKPGW2hVt~3uj6X?kl({xQ#m5M3uciN%AcES<@hwcduN`gtdh-^aOyeiLM>k zC+p3*U*bMide+183S9hc`f{+$t2>TJl)XUL;7qK-4O`#eNb5TgNffLVQKpG`2n}T< z(Hd5AGV-bbxjI14w9X9OUYNeukyl(7gp%@5=SN=St*nh;(>!WR-wl8usPSlGv|v<2 z*Ly>mr2x*psUlLQH?ugiu$ZNfGo~8m!9@=-b?!&nK7(A`I&7fxcH`dC0Z5Co+cq9v z|1N^Z8&^g+#UTbw}5SA z8y^nd&+YfsM~9=1u3zC67y-DKymMnB#~cqr5MRJb4vS|26N(DED0tsRw!A=?UKU3Z zE#KGm2NAVSeB7kp^!U>56k7t7)9`o16n7Rm0j zbHFMJ)9PSd-?*ItixzAx0Nn&ST$59+G&#nG?&$E$VLfNC+!9`ii9}G2k8SYzgWDKS zAWp_@2{b8hLJvuktckeN8XLz;$YybA(d1kZo?`Dv%XjvJ-y<3XkLXbk-~bs)7~z

    Kpsl1eXLr6 zOkMNhO0GwpvdEnjeA1X{c@-f*NnJ45_KxCx<{D$M!PiV(F7Gix{Z`9uTbf>vNoLwd z0l0E9zw5Rw=l!z%jDqPgM*NVtSeLFntfx(zlbrG`%hk7JcI8eDsgu zvmC2Qp8Q zQNBTQj@RYP0rb!)&*j6Y!MGlBx4!evJLwNU{6TsXr?eBeU=S=S`gHSeEmMhR?GHlK z#T)K9X*mQW;xB{G728?{bJ&6VCx^mA?uwv6e_WQOi>r=`zTf1)kbnRqmocZr9{_Fx z!-njejdEl8q46m}k+SV6Ff8=Sw9Tk$*ubs3xOlj|{4guUTMoxUw2$c<;yPb^gMVxv z%V50)C@Sg~Ugkr8^P9`ux?0aT``fvpzctHZdk1imJ7_<67(dGW&6Vy^AJ{*Z$8yc@H4Iwz;8YhM1?4mj_qWe3zxSPVWf@;>V~oL73|%lZ8DO|n zXWVHdvtLruKdKyBO=<}noXm)0U)!$ZaM-O&x|*vNG%h+Oej8!zxK z&>jZ!kM|WR*4Y~|g3l~dQ7$8csZgS>0z&jLme7Y2C{`8QAP!}>b+~76@L(g#1?!WZ z@ALpiyLf@uu`NCi0B8U+?inKQjBbeTc2NdmWP=C^rTObdp$?bgqd)p#`tZ9Sr1#!_ z8xYKN$jJbBAYfexlg0;!1IuTwr}xM6P7;S>P;}88ToHBETGQj{3`csyeMhwbEX3Oq z?0d`WfVjd+)qcz6w4NN+Wehy#b~%OBA^F(8)HOq5>aCt$t}BnSlU4vp8-jlS;R;+h zHjAIVnENK${h)nvQjhe*zFLF0Q?zSbJ?+^(kFgOzN$^%S8hF|?pEkaAE|)_%lthomvimdz*xv1YI2V;z*(Z-*EhFuEdmgAkKJMV zrV)J~dFDD|91U*#cjsPOoJ%yc(4*7Q}+nA(x?; zTd{57K)#~u9Ic+_ct95 z=jXU|OvL?fI{#uU7UR>r%-fF}&$h2^ZDMNMduVg3>mN+_-PXe4rZtaV>9ML&WF0h+%sL@rQ+!w+<*M|4{xQPeSRlfE;ptZ z7<2BVu!&W8F_xcH4wnzx$+8=An!|h6$$aDRdHJ{3qcCcLQ44(i7I>VxeEoF3_M3TO zIp*zH5RQrR+C7Rk@!V&D9cQmWeVs{w6ai}OxWhu;aseNLE*mM6qM%36?qX?<8$MUp zjV1ZfEn!{JzTA6syLeMh6vD_NA&G&Z^u7iG;uqsZZbm5w#e;@Ss z5PueTEku!4E)|?RiH9ON&q0(er`HmzYE2LDg;7USBL(hnY^Ohbq*%(K`<>yVsSD2TW&uAlYZ8WXOJjIuuU5HC}|+s zodh&oSe#00o9l2;9%ReWZ9L@fpGq5al8t^D4M*F}J-oSbx)SmjT;(ad9#CO*u{937}a98##fm@uz}y^E$=~ za@QOu5AWSe_Z}|i{M8e4&e*q>QI|W03v4~6o}Qr2vEwt#WqAyiJ?`Zj$NY)9m)pqq z4dr`^*R>e-nf14wELX&RQWh2Zbga%e?Cqzi*}3$^{k8Oe{o^O;d;k4^o4VJ2$@mbk z>pO4)9aA`Z4dT|Y;#SX%okZGIjFi?^(?=hCkbeBZ&2;Dg{wF?K7^eV0hJLETjf-G; z4RQ8&*C9(F+YEx;~ax|GGKouM9IGtVh~Ao>AS%w30rO<9q9JPOCQfKm+G+wlN6=ansFah~BM4p)z}KPnAp*0`E^yHX2a6r|CBhyO zNQvTK{^eh$zxa#4$nk?fmKVZE!}g1Jqb-eR+VLznCh^?#JfbX?%Q6}Q010FQ%yke0 zo1daC_n%a}IEP~SgO!I_XKsSc#s_UUDm^TUA$)4p?H0x}hhuh7(%I_Rb_i3&LZk9v0I$EBZm%;NR%i-eMatYj`P0DqOy7(;a$N9A7 zDaViWEK}t9wDop;`Ho}D;9jP8us&YJuiKd!obKv1Ig9e$yO+_!2c0;|qu0S$!Vf6M z(c;3H^us^+F#XeKx6@}!_zvuj!5R0nsrbM$ZOd+%%XJ{7d~G?R3_g!GHhvuC_xxSH zHvLgJT?>rb?sV<+I>dVJ0B$sipKX}AI0o?x;wx7n0L`#8Y_Lueg6~U?hnvgjXm1>d@7PF8?>y z*U}w0TCb=i{WN%R5AGa#pbVT^{sLe;qZR<~xA1dFclEK*ZqBsQj{$K1`0H!w)_?qm z)WelXV|?PV`u_jyy;+c)*LCN4a?h-N!wwKtT)-V9K}r-?QIsfImb}UHFyWVWN3_Eo z;fQ|f7sot#V%|FX!Q+RXn1~+7M0eOd-PYo^q?RSSB~e@?lHwweAV7d1h<&TQvMTqS z|L=Zzsy-yEvak>!mOQ|%@B8k4&)xoc?!D)d7cYb7i)tlZ_~g9eo3;W`Cg<@=m%FP4;2%x-7h!Ecp6C8HK!^8IU(@)#uk3YU_&ypESSH!`@jz1<+CRCr0;3FV| z@Bl#G*(c?Dr3MEFLwNFl@reu25TB4kqOm_d=@B2xu1$$V8q^sRp1%8}ek8Abc!_zb zL6K^Q1P3-W0jG4Tms=K+EX`_u&#`0;m=lOo4AwW$Z_j@Di?-v5FI!>b?OKA3F2jZo z4w|N>rk26XzP;~;_Tthh{7`oP5wN6vbVvm$FJ*#PxXmxj27iM{d0K=U<$|aS>cGJW zZrEY)kGzm-{8| zOU)l)Jv?!e7Hy8QJAX-&c!}TrdOq5pxWng?4#24KNPS4wj-5VlzuxzueQwV~oKIHU z&~jU|qN}siC)8-_s^7E@D5P}aRHqemO_s#8#c3NG8MQ|ryvyF$f5<*QrzLsCnQrlg zbjh#h$NA<@_(r?o+xr}TDF;sv7tgy83*K!yb zH5bvL87wQ3ATU`mh_0Nfyul0EA^S|mJ~=o5U_!&d6YMr@*kF%6_Lx2R;Dce3flmO3 zx88coe({T6go&C78<56@+=KWt&+OwuQp4V#JMX;Hwr}4a z0Eutv2AnW4L*#{eAuZwsAk;NUQiilZSVMLYauf_|RdVvvkh?Z8QOPRuMLU|c=_Rxr-420 zo|pB~ATOj5T8*Ab)&I=QyuE!;hZ3|L`s7`@%T)K{mWs2MS33H2AV{ZWcb4EeJtVx% zxt;3VbZ9&G?%HX0j_;LzKs;jo`<> z*DD`>yA*N2c|{v^{&jhCYjdCr;BN5xr&A+4@IjS9lnLlo>EKKjOcD%gJfr2LNF@V2 z*s^6ykh(qm@Wa8~s~fQPg)e-;UU=aJx4Nw7IbB!9WPkklaeL>TckJ)}?(YIpEH6?CG`S;09f8KNR9!&_(4v`CgJ+ruM;~Q?GykfXb##8-jW4u|3kn zA5F*&Z9f0_5`|i7T}h+c9xaKN#`_5kK}ASuUp$`jRREcfdKI4+$&0p==)3{qeli z{COA$iAa7uKGG#VFE{q<5q{uxbP!qXL*I2Rdw+C#+Wz^MZ`+>o5QEF9QHTGROWqq;!Beq^A6>xvIutC zoumnPK>F--Yk=;5ZH7rvfwUPNE&NuyYIeT!I=Fok{Z?Qz4zX;*I$3#KKS4R+xOnVAk75qFmY1{ zfHBf>K*zh6&-3AF@=aLWM@B}1R5EI}5s-0E;QlZ53D88!N8TLV69;)C?Reg>Cv6Dn znD2#S`Pikg@%+c%L!educzo`cCuIV-v6M}@<9UF8(8ZRU_?_=4@@PtNTefGwX0`PF z@|*A3v-fSW&pLqQQx=Jpb5|{Li+dIlCV?qEuEfE}`uEt)te%(qU&{~sZGNap3 z8oGBF@^XZa*dOdeJC+?~!;l}0*FWC9{Jaxpt@v>7(&`+5XU=1uT^_E^r(4PPGY4?D z60@&XS(yMJIyD3T#SZ>gD?isVUM6J*GM_YjfCDf+_0&^#_uY2~HzYksc$hGe__(Bp zNd`M4A`SrgM(W~mk%qg)%Ld<>=<(|W@5#@-Qp(xHD0C-%&BVbmQ0%76>h^HleOZN^*O^8mT*5(D-nEa3&MIfC?x15z; zyD{AvyZs&kxB*)dzGLMpf+D^rO*vHi(8_E?$|F?KO&9PWB}t&)Bq8)DZ~jZ4eSHzo zp_yf+GUAa(9twu=^K+FTdHm^5e;Ssgkw}tncnHA@_~g9g3HcLuzzp@rk}|xAyN8b} z_`|X=K#V%_dLnJgOg`gzi|3hobSW9(eAzpmH~f3wTPur{598&Hy9=I!yD1$GdlWb@gD+;Ozq!gDdZZZAc0LdD!?9`z%WVZG@lIi1<7| z%THYv4z-Forfh%MVrSVw{t&k*VG;-e-AJE<9_+(-oj24_lrL-n?KXq2URVV zb$XFWSbLG@XTk}xymX8;8*E^Yz+I;_K1;WxuEh#_x#~znlvkPMdqOqaWS2Ba>T0be z%^gLl$zUSw6QD?Ii3{C#Y9P9Ht7#)c!$Aq|+{~=qx9e_u;cH*DP1=_RF)6Zy_V(Lv zFH1cD4L-5shBSmWi4HKNE#Ce}549dhhmge3PH|^a$3JZ~PTqDS@D-`%z~8gaK5NfE z|9r^DkACzc`>VhDt8ggdcYpVH!!j@FG6{3@1Yt=ZeRTb**GAt~OKMMBb7s<-(hpbF z3BjiHuVppS&i8MZ{;xsZxS$iOI;F}Cofp7EO$1;K^(4z}Xl4El@srn_6w%R^&~*o& zAkxMysMyfeU0$Y|q;U=^@B{VsrUaB9wP&9BT$s3j^{Zdm_rL%Bz-#slrt1SXrTi8K zbRb|!U|0296lhFmdvtA6k1dwxBps4|KE-ur>bzBS2xn|;Ebw+gb(CYTmZ-g7VMo53 z0vhPE3!p)p_1X7HerIQ=4KS&-VC$EZ68EwcCiA46Ddi)n4pT#UbDT$tm-=$zpbKFj zS9t%A~HYN;lk!Ogyhn&yhqr;yveL&@31bitCj$Je)edCZz zQcI`bePzEDHci+cedAf%suRbxx$^>7x}GiHBmIH{mZ)$dS@o}HK@#iPsdILC-)mAd zttIgKlx_kkTu@GLOA+tIf7NA0V6>q7RC%upBrZuIHSbyV9d2T2=->@MI+FU40HH9v zwGlwiX#B*!OKWq0_Tg=a_Cg!wdyT1X?TETAHx&o2I)GbikaPQnBnb?NHU0b#1EbzK zQCHVsM+2>+UR=aGjg~>m8!z@;!Gs&M{EQ92KG5La)UQ(p4^NvX$|VWM0K;9B#N_ew zWYArXqctfirsX&?+CSp)MQJc=@}^=aev~abxj&x}u;L4hg`MQ>RXay<1G298?$`9SsK$ z*rx`sk%;hQa%V}84g5&$Xd6gz*x$xJH}*yW=s2`M91{~0VPfZmDoam(2*SY-e2q`W zxc}iF{-J&Kt6vRieEZwq4(UGdzytQ=lTU`_RhM1>9_N(*z8;+b)pBUAN0K;6+%S#V zDfO3{6gT&U`(sP<3s#cuw}#qr8s)_Ty$OLEaVfNCZxiGNL;jZgi^>?!Z~WbX1$GWx zXp?b2l#%#}?};a#2nO)>>Z`BXkACno+jr!kou58uHC^#EFt#admS511j@gnn))%6D z5FV)`^+UPg6Hfpf^@6*Xfpol&E-jU19~}Z9ulNCwvpB@BQ%;Cy|A3b3&bKXlg0S1Wtn$7OK9`F|NfyFqR;4qOue=YtFl z&l{iHF^KW2lMas^6N67Od}~@*4#Pka;?RH%I0_Vg&8=T6#Dz%$(g16Ehu9SEZhRAe zowzXqlKg7KXE3cW_;YFqKt`^SO<3M)IpSTvyTcdpdYUcg-w&(n001BWNklO|IEaI9 zl%M=L`Fp&t0v5>&b&K?k_=q>oPY-{oPfy36gpa>BQ$6QAB zK-I$p&)q+t8V8*3pIU_7h;C>OTy+4~&Yk$+g4>LiP3ZXX0nL9YGYD{BB}6#BdB%;q z#ogT>ZVdbo4L^Dc1R{lN*(EfKczoVDe4^kRH^`qJkAJ7b^-sY|>(9zyjzx1>^J?Vm zX|+6S;9Ifh&Exf_r|16txoofGJWeJG032?ZR@Obpb@@yta#Cs_H5&TG&mEr?<$Ecq za%8lOC;*o)X>U(L=q;gdfw~?5HDFI0uS?QpmDh4nqMopa9@%YQk>qWlZvfG!%9^kt zfj1^gpL8yk0bc*{2{vwrsd>JY$zJ>M#-E~jUyUN9G7teRs(z^2hVXo-O_+jH+-L3bRR z&c*hPt`WS`ZPlMKq zr*CjTO`&c_&KB)&e)N)^o|>~4K7YUM+BT#U%91Ab_6hvg?D&a!d-09;?Vn!XZ?oD} zlGovul$P^Tg=mE!)UlSRSw@eO^OPR~^a;vFd!u~Rp_elrru%+*9H0*3#^;F3i>({# zX5he82XOI5*8WcCo{?@TCO-#S3~)XX;GYJ|6Tc4fc>2J=0D`-_5f;NY_6*ied}APg zR<-f>g1GrbD(TK@e&e0T<3IsE_K>^#J5Mhc@2gQlNB*IB9PST0$`W^rzvC|zmYAaQ zIDo@G%D>{}<2t5nQ{_{gRFmw5Wb=I4`s)=N*1e4x)y4uinByEw@ zb4q^CYxy*vAG2-u-)Xxa|AO^s88g6jxz#l(@x!2B6Igumgca1cw-W%bwEIVX2lMa;enC9l@EtER_F_qw zI&dJ)FW%uTCT`y$c-QGB=Ro40UwZSZb|D&?cjh=R8SJn>`q6&-=%bI8f3-0%$0vh~ zmO3DBusq#hU(67;1!Tna!B$dgq30)oj z6B0s??fQ78bQ?B%*{VXqNlDp8RF)m3s@+yB+n97zO_T)5bRoC4^lOizCcvuDi*9eK z2)Hiv7i{_)-?Td(+ikXW#EO#CsrIzLr(z$zf51M_(&Twv)D0N$36whV_T`f-oS>eO z$RMHN$%F)G*tTt3@XzFgJx{{7*9&#Sz)G7S4T$)O_q*Tyu5k(#Fom=YrNZc^V}i#o z{s2u7X<|^)f)R6AfVf}ePZhk|N`{{qNfA^pMqfMVo*rw7ZZMN^R za-JpLVhBfg@`dqs4v!nhvRV;) zY9Um#H03w1dPE8H$k3Kxzt$h}Ksuf$e|lcMJ$ReI9lp@s9Ps)0;bp^*hxho_N`F0j zX#ok;9*^^=ru%Bs(i4~xC}ZzvX=zbEZWg6#rYT^ZvPJQaeUlaO8Py?!{km;LKN_k6 z!M##FQdC)}UjQ3G5JNk5Nv1fu+!x3L<)$rDSE$RuFXZ`&=QHBR$`+B}vHRx&4$!yZ znU6O}m-*308>7u}^UlpoWo--Dv0YnJ?!4QwI`qV~ft=Q>YwvuLTSRn-?N+9hpUqd1 z3pBuZ2ljW8%&IbU{xBF$Qa1V4BnUAm>lW|u-kKBTQ?nEkRBN)zW>(ZakPg4VxsoV8 zP~errTH33-oR1Kx{xoanK4FI&9fo|82Re!m(AZ<#E~EW7_`{BTyYcW@EouYPO6iG0!Uic(F|kR?V5b=yVFJ<-(xl+X^M&|Xs(Aqxh9-KZ;x%* zvf1{0{&S(2US9wtCKl%r8?NCQ2L3TPV#hu=BzK$`B`gyd%Zx~(nD|*TLNY~KfIZ@) zeuxLYGl5}v|ARmHgJ1wefH_XX{{HX(evrxmE|C~9*&}K4$=>^bNkS=P8_H0U--e`d zv}eL$U(xAZz)7+uKGHR08ajcP(d3)e=}S%oQfBgr@iydj?_iN{fEPr*_w3md%pd>p zABX(D_~MH}kuPA5}#U9THG^)M1IN>Z7ECLXz6G`c8`m7{gRCJ1YK@#qo+E-3|8XD?X+YvAI!!N`mFx)pXWOu8M+kd%k_tU8?%ha@-*A&vn&E0)~ zS^^ceQGCFvHlkB#loR6RS=nsP(@!{qMckGy$pg52G9s3?Fjle6WUiiht64XEF zJLI*+C;VQIRLwQ4N0PRUGPjkRHlYpqTeSR{;k2c$Wbc{NUNeN0npi3VaKpa2YMJQ-w=X zr*iPn5lNR$*u0j-$Pd3l&+6JFq*Mvx*$*lce>ccmtlm%GRtN6p0+=AuQo&ceG=^OAF@(ici{7 z{^slctuj=y|Pz)kY)z8(SmY|_RyZm^A8w*-k@Pj7!v z2SR?yCwcZUhIhhebe}4`hrC?8$9ctfJ9!=zO_wf#1MuC=B?Rkwy-7KcZq!z;a*3DG zJ6Iic1nQ^|Pj5WlLAjNss>y@zj1B~_shEjKpJ5PdAD}!g;v=qfQp!7}@w=AL3=B|` ziAG&5bx9ic$tA!G5eX89PP8InZk3^h{5+Prq&mwai3b0ih#Co-(}k{@q!l)s?mP*k zksbvS#L|Bxz}QeqXkq$H^s>fZcm&VjW87eeVX|lPfaeUPc>&Uu$)vTswnp67gZ0RK z#YQCwxLuOO+r^s^ZP;gzTSZI4O)Y0ub>cLw2_(Oy>z)?0yuNjl4Sw|*vnL-@GZA>z zzoaC$0F|_Wn^zyT*a^H*c0kNpM03Job;Fa>n@?>=7` z5Y~4j7yPh#>x$iJz2G50nm)b5bCS0dM`^VTNmO8QZq1^>K1aoc%Q(&p-bBN zk+mrOcnb@&l12&;YuPlVcq;l)fP!Ll+~L>5@sy89)k<63A)#1Wg!A3Q+|@ZCPn z(S9Hgk30U|U?2LkfE4`}Uh|E;zXJksbD)Sl;rVud%|+@)`U6$>Y@49mysOwDzNUBs zh4xH-)RzG6z682u>(~VnHgB^bpZZnAiU#~s*IcF`5DrzM{!uF~t4czrUY-7{GB7Uk zV`8&u~ma`EI)S+-zn}J!43Xkyx;Jo#Ov|x zMkw2-k;im0oZ?z(1kNaNC@j^0IOu1AVK9^T@XaqSq(%%nk>rdG_4xC_ENX0>vw5pm zgb&W0xwPWSK~qabw8CS_GfC-xP57(n~J|ut)kVi?YuR zFvkSXlO?sRBr{I%1KM@hF8lL8|8tu@f7G(0+RvunUrE&+Q%a_$>zH_%oDzsTYDZ_@ zvf|tkTR5%d&65SomvzE5rTtU_-qR`7p8%JXfiOP_*eRUq9f=~ZbtW&B$H9%P!ne2e zR8o6D)ey4ToR+q?h^JY#1?k9BeP0hmKAk9slfNTLr9Qn*sY7^-J7K-t?jJk+xasTB z-KO%7G}i5^0$!-)K~)OvnYxYdVPomv0bHdj0H*NX-svO6_#|Mp0{%kRsJtNeLDN;u5)D zJEV!IrafFWEh#ny9`d?^VL`gA*n73*$uC$#hX7_Z*$3EG(q?omv7;7)WzF~Be?PQ0 z_G1B3m=sa;$|MG#95nf)1~3A^F}VR&nAiYO80>IoSrmx{lVF@2$RHu%ePUw5{`61( zG)PQPU>lU!YX95|FT4;=pK=HQe*ie7V?2?zkr&!P1U91-yneB#4CI}6H}QPL-*I1! z$Rq8-K>}ssR4nx6FMl~a4;?xbc*yc7{y8yAo<~PEg=OE2BxPP^WXN20&jE#zp`Brw zt**leId1=uWGk=wN(gA4n>=DiiZk}|=>vA6s6l0Jhou)(UM&kZbh$Qhyx1ZxYk6T z;l1}ue|kP>S6(lSrTBL~(?%#8?bhqw;UlSg*bAtAk15@Y+bfAE?Q5q_ znR+k{yUNou{5({9(w$#ZbIlynB8xChV>3$J_B*JYXJn-g+Ia<+p2p>v14W zNAnI%@x4KLqsav^cr;+rxgqz@v#OIzNZ^QvU&7Va%?bE(|Gck73=)LBRcSpQd40g2 zINzOLZs*@Ti4#NE>z%i3ah$J6m4~D^30?0qtLu)M0xem+FG^egkd_X%-*tyQp!+v> z=x$N%ij+`T(yPU)NsEY{=pCJ)YO7i zj%>8jDedVSR$WV?noJJbQ2LyfzO}@x`&?_? zyD4jr7iH!&szO>J->WvTRp2EbNv9k9z>NA%yf3+3aJ-6tydLA}c|LgRsK;_&g|C#0 z`fxwgG4&6>;Q_|m5OuhD^TzPwf*~}V5FH*+z30P^k-QH3G&ClY2TVvW76;$@skF>X zX9MwLNGqOycW-}s+;MyCC`Xq*Jq~!i5Mxv?wD~UG${a}i_~);NR^XkGMiQrl)EIbY z_Cb`6kADmkZb3>P89ca_hJiG4i|#XR@5H#psWLZX`}Xa%`3315(uB&8#vs?>)0+G^YTWMo^Ec?9-&JmKn%;9 zoW4Xl#a*d@IF>{?eTiZ7K2kd;`UlEh-OeXKp7aCi$^jUli@ITg2FSG&OQ$Rgv(GL% zups_uA}1Vf5b5wvoDSfS9qmi(B?I6*Eq@Z9 z*D*lZ-$@TYq>bUdef%cug+xC6fR~O#XdfJP(WBcQSjN|`nl4=d2arlfZ6Vs@NRuu`BMk_9ck_V&=1fWR`H(IWXY=;P4Vyz}ChWyBj==+StI~RWTFad} zfpB-@-(Ek#!*%{=zEQHAmXWHG!l4JFpv}*VQUlSK?6b%3x!>-2dbi!Vc^t8sF5H&1 zK<<%tcug>p^yI>QOi>{LH-H>~%gWN@TuEi&)4ScgPE*t-=vd_xr+5mf78a?fbE@mz~=K?ZO^W!ZO?&1-v#}Uo7CR5iYBMB_}3Je?Y)PQ*V22A)^LEa)B6~mKn zfJ;!bB4A1W*#ia<-pR}6-`DC%elSj+C(1+}IlsMJ{3!8#YP?f-03v=wu-s3*(Z1>> zf%;O>iaMEGp$|!-2VeLh%>T3`*c3k+FQPnxRcVWy&dLE?-aSmsK;Ic+5%H*e-ka*)LgktE6WfC6;|%Kj)Fs&P~qR;g1dp2+UYU zr?hByfE}bR&L_YOcDLO&9wriRyG({me1H|qh7F@Zg14HafytEi>7aoTgL=ZA36Z=Ir>E(8!wowO0FpTVz0LnJ00+(RBR-+*+6!qZeQ4C2`z;;j&HX2ROWH%fg9-EVjFfpZ5w)Y z5M=47B`S-yc1%nh9DpzRaK7=xz*Fjn{g3dtj>2PLi`<&Z zAJ?*>2kx^b`eWR{S8r21OOh}^ywg4aZ2&atgdYhUl%Y;&KeP+)*Tflq5U37l>q}D5 z3m=d`Qg$RW)Kgh~3nE-RZQhB4C;WBeenTMrAzz({IN*C!#%PR+?4mSpuF<>`Coa#; zd9_w(pqmqZsV69^KX>UqZ&ePY8`?BZW5A$4EU5`nBgL|v=FR1I@67HWrqwiH^6div zzw8)T8Soi&)@`5)3*oQz8os-KA`UPi!C$BLcX$oCef-J$di?izKdYx;igdWCy$B=} zTX#+F+4Gn^|NK`abr{seT3Tvb0>EisTz@{m`;Yg1Xs`VAf7*%p^WmTaDlwSk;02N` z%FR1K4duB^Y)HTWGDxoQ12~E%%xK9GsT7kZPk;>IrX3u^BicFr0N{f`LidYb{34t_ zMMvDd+NZ}}Jfw1@i+`S87fizBl{n(@Q%~6OB=5ZA*Xz&g)$0kjIC=lWKW>Eg_*|OE z!36f^LG1bCX3l0N=j@eV{VdcS(nLTgPo$1W8N()g^azo;kWnq?QEq8y$EqsH zo{rheZFOqr>FU0&%$EAVP(Ki9V!Vzvjt&Pt(k79xjgOCqWqRt2F#ITi&xCRC$~$hf zlbkdGzz5P$(FIzO=u!U2E|-fGo#Q{s3-&8zN{T<8AI~38_rKzE{WmWwK8X_(OKSZH zx;{E`0RBS$?C81c7&x#VuV|w;GD*U|vOg%^*+N^9g@%d?$`=(_4!EiCIsF1m>)--+ zR5m3Isp}MKD%_5sL0n-aBf21bJ3|{AX4Px6S`zaDK=uWEU*ui2wLZx7p-Uigyb z1=h;tc`dI>`Kb29S-MXXmh`Wwziof=Vfz=)?ACDxN$+e^&@HQ@;Z5g%z|NBID0Pd@o%aC`5)_rl3pmPi4zfK!%-x9zyshNQ=hEvYqu-jePf z%~y0-AwOcjK5q7Zza@3cSpjHu^Xjbf+SGWG7f}UXuK)lb07*naRL9Zlm_&)2_HEVF zj|)0%k(tq{VlC754cUTz8TN{gBe~Nym>ad`V%C;qS5RKFm86Y~_SyD{ElM}q2RJix zT1tA4>$;rGKY#;F`cnj~;6NF!a z;oeSeNBZ$PbKnEdF?H$Lq`va`=&ClPYP21AjFfF`qZC!EZH9748r`E?B^uhxw``}4w|2X6bx zXH$75ZHo~ReXA4&LFH zp}JQ`Wi&}^a*|ylArPb4hAEdD7_1T9gaF`R2G1&*K)Q-czcj)!Z9(yD?bW`uEgS8T z`<@QYv^li+a}w1hQ(Vb}J~!X*=F5!^-Ut()Adz5kl9O^$UO*S+#h?3SGWRfUk6#CL zEOYMH9j*)vNC}ZT@uX8DL1ZA~oiNyAh==f=FPG*363Dy9P1+uwFp%e!a$<=4_19ky zQaPk^58t_0U}Mmpc=jvO)~~@ts#_!qwU4!0{omfxMe=jH|5D1^8c1?j0_TU9e#o)? ztkD!;*41YTw0)x?t}4r9PAAv(Sufh{y-gd_RdacTVM(?j>D}bQywcNMw9@Bx>eNa5 z;SYakM~)m>KFk5{C^P(t51y1|Eg}s3V&KO>lpBH{&I|lNJiVRb-|GoC?A@JjfHUs! z4Z}NOXxluuY#t3#S@s+9P2Q1kk|&lxiHlVW!lHDTe0hHTi67oQPdv$Y)JCGad7US? z#mUPSw~N2G`;WU_%sbLP&lgf|4*rlY%5kM}UrhS9il6oB@mAo2_XBkl^&9nFUHIG- zh=bbs%qp z%Z`k%7EefnIp)IgXsu|v_SZ27XvE&oeL|$(spFFN=nQY#plhad$@>$#14xh(3N6uP ztRU4A37fHU?V!~c-j|t?bXO-AYihPSrHcBRlyq1$C4p#a>8Q@JB(5%NN*XMQa6-yV z1NxJ~5lidJtaQJipC)nvh_v==rF9P^lPF8Av_Y1zFx&%5-dLvl{`bEhKpp$Wn5UBU+6 z94HVE01u!@UI7iHg&zkfoSNkwAV=9)B4v*iM4pM;B{%Sau#Z3fcmQ)u$p7_w|JjyK z9ka2!@3-4F=%$8@_Ml}7_OnxF|9wWl4Mn^vn}P|vMeJq^7C0g)CnTQrEZ|0xdDUAp zDb*(0uQr^Xw=WFmZF|p9ICxOeKDlyr$#T6?Jgd{L2R_(u-}~P8!hsP$0sMiSmwc}_ zZUj%UKlmYxhjYGQPyO`v4KMT4` z_NV)4f6`w&Q9Pd2-o38etvxR9pI$~E+uc7~*gDa=0M0WIk7PBwxcjBNlW|NGXIn+A z)YGLz+4XxJaexNtzk=utywfcusC17@5ZAFrrI%+qh;^|@UhCV=gENKFu@DIT=e-9RG{PA>f1{|=t zA8^N^1@caQJS~76hcVcvM;={57mpgihxr%(`rq2Q>2tPCpf4qWRm=3+>sl)P_FHG{ z{Zm>x>l=*5(vV#`tR#fmm&P@C(gUJXl1VGWYf0epy84XmjM^k;clTHA^F!jXBzJQQ zOIk9lSdV}k%4pwyf3JP}zx-GG@ehAsWt~ced?2SB7zmzG?u#MH?f?p)L0EX}akR(d z-(FvQV+c$7{scJlPTRrW{rNzQL=^za-aYn4vTO?ArmX&4M^U!McsuGaT? zbNTRg#E(txBd=;Zfkt+vu{EfX#ETBb*{eEopUo&Ti`FZ_4QN$o@~ zaaK!rDgyhebp1~tK!dhgaZ$JWwLpR_G|Bn42QbiLPA4mK>gd`-XOhIFQ%KDaOEV#I ze`F+LCvSimC-RM90*3%Szx7+c6>e7GPEnNH{_WrXtv#fhA)bH!`Jj>mzaGXrE>ADF zr-dJgwvW5}^?ncsZ1MLHsP%_1@X+J*us8!ik-V{gkNa8i2hUHQJZXFP?hVR{0Tz^( zeQ+40iY}QW4v)Ve{@gL30}9&P)KK}3ip$@5zhUp3D(JpTNj4iAcv={WSH4m2QW0q5 zR+dbP`)n5#N*nB@@}($Ey+fHrd$6};6KS2CEG`B$BK-q887#%KZ@l$u`%i!U|JW~o z_M+m702ci6_5(jCtAm+%xyg4sQ4YeuYk-jx%b1jxcrf_$v4}VwFcyn*!QDX`zzgGm zjl6~WRQL<1H7IAa6byj==}&(e;z8jwl2!TvWs2HYYw(t6cxfq815=Vjk~#zMQJ)y< zntWoM$gA@J`}VTL{d$=Ab3OOC-__q&^5bci^A61NjhYJ;_l zO#AE@93!a-`J>Z7OvtoHzL}JGdO3JU@`m(^YqDN^@x|bmZ~z4SL-=E&XQF1}b)Xd- z^~dAmNqWv7+=+v@h{FkY&zDOG+vD`SdKlt%kih9$45ws?=jhR+c0_y2ICO!O4yht_ zf;-E^ge88BA=+;!{dE~F`=$Eql}YV=JFs9!8L z<4-HvVYxdcUh|$zmu-7u&hDtsXi0qDCX3qB*e`u%T1tQY<(KSl{^md1>o2{eICP+a z!%ZzU8MA%>c@|U4Lkh1dQ1v_S=5GMGFmcIG+{bWe*0DJ&WUq+`q zd%{< zH}nVEIw#)3fgbkS!VmpRsf|O<8-Kc8{QGkFwO$zFcRxJ+J!C5Or;|P9qaP9%PsV-k zyZNwxI2KXcYc#sFS;jx(42Zwur~Nw~?sDFv_*P_YQK7pa?s9l}y@a75QjZMiJ}EMJ zvP>A=$0_w5n#by>eBi`E^=&Jk{cl!V_@VVC59ykwyref;($qvz6WFS;{3%WQoK~dq zRy6Tz3y}^v=+{bJS5E1$LPa-&Bzm8fMCY5s#Mi_Cp+DQkECM4`s&i4j-I|lQi%TSO7?|hsET`{~6% z`*B0R3BTg?V+jddjcYvB#Nms#d4GBi;^PN)?tZbnyjXvpUOX?@d4F(so}LGP$B&cy zC*MdN%dH=V?%w{qYyjs4TY+2cQD54($498BfL#gPrE&23^i5qd`7oeU#{dlO3Pp;= zcSDmm>Oi#n#};OPt|hf^Te|Ykmam<#v{t+ty4XIY0}0yDCV;l2B~YnN;5seTRcKRu zqM&aYp-f7Wxn!{UYo26$kp7U>?~5b}Le_$NGR zkuUa2xs(O~M>^O8-U!QNkHn3=Zb)#*tCxc~h>QF}EVW_)jhsMz_0?CyiCn^O-8`r~ z_o{}>#sn&UYm;uEeY)R{iFv2aHSLftr=Ka7ZK_zcX(91>sQ_t8XJ3Qk?+i>?PRDAP zSmRmMP1!-kYjQv2%8X3klzXNw&>b;ACKPMf~JW3u1uWy?b|%Zozlz3;lTL4kR2)&b5{V5FsP!dp*=yx=}V# znn-x3F@^S|cE}A73Lc%GQ92HsiJv-yzko(m&k!GF3}sUrCmjCRTSk2W05Q}V0H0-F z4B_z?8~a0C#0QaojDH8qRsP`T$|y>YI6OVtqPNE@i@O`z`FiE`bmQ`pvd7EMJ3khx z=&1h_Y;4Qr|15BjH7(aBa^e!ac`e^PyFxy$6qKt zbz+J7!<}~Y#~}9C1fvnE2ekmLiOL5skA*~Q^2>n8UJai}h|dREbi;L`9_b6(_x`(f z{MZqBLnFT`OXEIyNof#cox4jnE(aQEfd!T-HPh_exxs$#_r7d{y*)O4wq&)EbeS#b zPR;bI!e@Ukfc6V*l>b-&PSQ9gN0|ie2W4^ER|WWLwl)Ps9akIV8yoeb?2J~TB(V_C zsMr%$$~|Y*{@qsX8M8j^t7G3=E-!T&g#qou(!MQ3L`;@y>lf@X(D6wWTZb!{mK``b z7)^5A0s+xoLYL8`PFts=v0Mt#?y+O?jrJ|AEWhH8n|ERW2>zLfz2o9%Eh4Ow$Dz&| zCUzuv=tx6ygw%#fAK(C(!!G~@H7662syR8Zz@0LYmXP(tj4V916p2&{Fq(#kcIi zg|}?GElA>8u;ZtWg#BUfzWZ)S4?Z{#Ngp8KK#g><^KabRzX{La=i?8DO*mBykcAhx zQ*QiFN6vTRgb(n5clHRf*O7xO0Bh$JyuqDxA@a)nz+7fXPwxRax{NPD?jI-$RW6TXFe_K2uUed)6Pr_p;qnDHXd0z2Tl|p9H zg80Utr|0<%j%)l$r6T=r7Dwa zKl7uFc1Rcx$C!9C6Z8MTfUW@4KHOY3I=mL~hRH#${Ia@%iT2NrwTA9=O-Uy&WlL!8 zsW-|R&rexxX`y53(yoIj-;>oZ(J>vX*GWDNG)!=sinRAA>iq44fXAB9UL!g>zjBuc z9d%r2rIESsPd@QO+&tM&fh46%HxCEWRVmq3-8R_|rDe34GskScId3!P&uQ#QNNvdb zI>2zqdYZqnLgR$xh1H~gG-?NG7vaYQI@|#AY8wGp;T}$sqConDW>H~;)UYyNiL`i?Z1hI_r+nVpi3;87fBJ|er12S%hJ>3WYn50nb zN6H=V~Na+q`tp zMluVEW6@3(XT#mH?7;(Qgm$8Y7{r{94odhYeV^FKlk=T2VJI`iJInMe1tWEHy=&AJ zaS)fs?@#QBk2v53;gN&_L|9hF_}#L^PhQEh=Ye=U|Lys7d-6_L!T_|9b^^p$)+J3Q zY1$0_G1yhK?o50bh_FZw`R2J{)5hSBaOAXQ!JaS<{(`3t ze*l2A7YN=F2SAiL!Rw<#@UGKEasa+MdENPU_j&VjAYSjQl`@^pXs?L|g}%N4+rDjw z4UdlLS6%Cut|V|xE)Z`G1~i=Z2%9ZU=GfEeeW39$?C)5Q+%IDkX(W6Jf=0W3@b#ka zx_^coSWJ{c`$;5pVYyUzeq_SwROCdg_`8bX45b{-R@x z+Ba3p2dQjQzqXP9IT{ILnZTb=gl07Dd#jAvT=F3;!aiih#O;#84YEy63#9^$c}d0+ zRV(VkZ{5(OO|S~5<-KfP>N6w(>g(C02`3-gf3I|sB{-$3wfTqAB2gQeTV=ZfCR+kO*--TL)sb(>bg&~9T3AlHqlu5@N5Bny@iI_G!tsPi z3sCCu5+ABRhzA~V(*`>F09sCQKKa;(o2TLL4y^bl3~2!ffBy5IhcW=-*x%-$$Mcp9 zOGLB*8UuB&gB7~cjEn1MbZ2Z$Cv{l?!I0lL56KVtAT5li9bSk{cIEPl8WQKJOLKr&GAD+r@Lh>&~ASAF}K7M&|(IaVL@lj$fV{#IzKXlSCq|S*xt? zAPrOJZx8{4fDdx5*l0{)Ac~z5mUWl;+L=d`CmlZhle4NY1#6vk>DwJE7hss-Ls zlKN;%Tv%EKz$NtKpq^N;a(&zu8~155{Z6$b0W$%%w1A`T9k3-`p3Xj|YE9A?+N|0$ z_djw%vQnP26AQp%1Qf zI3}>=KG5n4F(Kb_bfKHDG|Wq@4|rc#_SE_XgFSK6MM5``hgPr^uX=M3vEo1Krz~p$ z)-Wsy9y)X=Y}V%G1H@s6A3%kJ7=Q-hv8TQ;yhHc_+<6`VE`TZG zXU`cYM_Gmi#Bo&`2OU_d_IQYcuo%e8L0+*Ve(Xq(cMN$1RI?|JWl^MljEAI+JLz+< z0U{0uM!4aRv{|x57abrNNh5VhIXxaPpXb5z=lSN_<0c&Ml$pH35AxrMxQT)M;GeMg zcfRt(u1iX4q#(7{WS5oxa;xogX*yv%fZ=n-UrVSOQV{wO`VbP%=579|~GxS(>r^ z)dAgun=)yWkd835J?%Fu>lOy~{s8_{S_YNuNx%)m&AKuI5-I)i2kd3~hqMGMNm{zD z>zB^!_J)KNl%8a0+EJ-1muQ|+ACi-nU@f!>kg1(1jk@yD)S#H@o0nv1-ineUl`H23 zZnVUj(G^qza7d+xM(zn|DH27b{?GzY5`tJsT4_^Kui<@&36@D2LmQ@DS9MP??`a)< z_qj~g3IiYLGZEN}yWtLD#~p}-kNU)lef&GJjsAKc^gKCWz`uhD011*M413Sm>xET%i@7SGt>+B5uVRlCL^#r??C_xzC8WO*eggW4GrlBC{9U?o4!~Eh zH+YJ1yDp2boWIv|4D0owbV>sP8&R|RWn9y8R7s-wCEfNNCLy^=ED{=w7t$LJ-$dS! zbOeewF!w{pPNkxgZo$(kf3ix$2UK_Vxcs~Oym2{D)GZ0+%(PA0$2Qy4rp)pYJ20;{ zQD3yV$y0WCNt3M=ZKkQ^xW=^hOKGXAq5-R_NnA^+NaNV=#%52+U1S6%1g27&I0T8T z&^w~L81~y>ve!m6X$@)9{9t}iKyH(i$PU}qyd=(B647+uav+WV`ot z9FjReD1=|i5}ou|nZ&7wN^Mrlp=Y%$eZpRweA7-X&e~Y|Zriwczh$PmvP`!Oq$EX> zw6&ZOa+CC}kdoqGoi06b{J6dH)*E){*ijv^m3o-U%7jF^&PUHHJOxZRXu}Wt{U#<&bDdfYt2*d_lw^2n)UfE+-a`0-Cz40(fy7gLv>7s|>>Xe5CgULjrQXYkzN4|50Q zAU&j@eo%xsp?JM@h^Fh*fdkZ^n-1Q(PB$S3=Tg4Nl<{Triq`^Mi`oyoYn61 zqLZn#ltnGQF4m^)ync8blC+rv5d7}Qq_u3PTL5S!`` z$r}^4_Z4c42{V&fT?DQnIk?mIy|4Jwm(7S{eOdurq3@_q(r=u6!sgrK#~=2jO&*!7 z+2h5*1twmkIg|y0=XAjkr8*`6cfP2Tu5-u4ljHW@`B$``v0}S=?h$~Ks+Q^*tM_VI zTl~xD%CjXcix*U{IY~xOofqJH^VfDz(!N#|hKY$Z$s2j$N&a|;Jpbg!Pd6fUW6u~8 zH}Xn309b^hE--)^BvX`)_^~5y$kXz1$K7%Bbnycpk-h(^%gh@m}R3~1yBQA*iqe_O;shk$}dT;>lVS;D< zAub4a+(-*vv7E{~@d9Q6am0neAK^SK;dzHQfIiaZBr~T;iHk7gvlD>_;R*W=3GZp~ zbpCb<-*vlm4tU$S^pM>UHyQ_gJX$N?lEAUNgY)a4N?$cQblHq3G8R>eDXM3>?|{5)~BlgHsnWabKhp$+`mBp zuHT-`{*I+J39=;1kB#t?MChW4)I-vybWW1O;=F#`Oa?$OHau>Iycai1#`pPW4n z;v^oZJq?c^HwPN{fmXm<#AC5SY2l(JVF9?JmcHkU=d^@+)@G-4lDM+THs|lPq0(ka zQ?<`AyXJ!A=2cV`T+pKAHWb{ zhzoc80$h-I;RlHvzzYD!k|?KEk<1a6G^jhm5Ue%gNUEJQGW8pK^2xnSzac7z$WgH=Ye?019?Px_S?Vx+jjr`_uI=azZ{m< z0hR2j>qKe&(1+jwe#wXPlz8D;moA?J)DQghHWQC2a*Nw^-)}Y!(62gC;(z;#zi9I7 za_g4utpR{jrvh&p=#auOiG7+xql0LaVNlWlL`Oe!=5!b^+1tUO72E_WeW3a@^U#g! z+Hs(vQ-@yXq)NRyVb9(uZwu{D{4HhYgZFqG@%OS#YME8bRtZTwQc`%Ti_$B}qKvM! z5gpiP@hD_NkX?Gq+}AjOVl{1ys(ccm+jTQ z!h-zh8Y7;qA6^mjG-XhciQlrOLA%re!q&FcvuL7&<`{KG#i zgDyY@fC9b%hzJt_lL(msUKpY000xi>v9}Enf`pL4jByEn-c}sIgmQicf5Qe6x z##l~eS(-hDEN!wx8P9h-|L}ow5eM&2KmD|Q{p(*3cKCxr`%$?8*Tln^c>&N?Smz&c zVF*(w^ad#$px2jF@#pcSG{!scc>=%yZY=2{5&Yo5z5v2V3ou3=2}`;8uIon>-y9wp zA0H2O#y&pc3hr|2OzXLK4t=w^!rwS0^<$DB64VJ#>drwi@7_M*VQ!{(wbYwh58Qfn z#hlWK(lmhhAk@k8)pA>{5w2!;wbJj#d-XVwXb6BPdLNiBs8KI;@ZsxH9c=)9Kb)y<}&X zUb89vX!xk~Gy7F(i|y>c%kJovYK_8uwlRB;_Us*vz>jVrXd(?!{Mv0~GpU1?(q6F9 z{^20;SSU&=rBj*3MO}TQy>yb{1YnobjSmTx6L})qi76ZJ;48`^#R~#|%cYU~3LwCp zrDmZq+3S}$7scxUhE^;EGNXb1{E3gk53P(OoO$%yX|G?d&=)4|Y$h*h;ReMoDHXRN zC}joIQ@`kS^;KQUBLxjY+yO)dVF>_=xTB|FXV@^0T|?U~77{1zT<(}1JpZB1l_u@3 z%9w4f^jJUhFsFivA2mSwtSViA17HTJ6jC9|Eiq8(;?s8UPfj9OXwM#}X@2Ir1GR!T_9z3pY->0$7pi zu@?@4Pw)$OctINQBQEj6KGdW9@g!b=o-gSl(LSL5lQ#KHNF@*7o;L5EHhy^T(x=A(9~(ct7`riD&m7=~c_&KK!F+IF z5b_4XlkaOqo-XP6dzAk2>~^iP(oN@6g@HoAN&{96NE&F(EcEM3ByFfFGut=iCz`iw>W8crRxxrUa8 zr?sa~DoW7HRgshriFH!oDyjRu*p^VQvv(?#AV4B=il2rKK`>z^r6bLWGV*Vk^vWS0 zz?z(da0K3zYr=E0g%;ziub-tkmS*Q{ZZV-l7fJ!ZC%&SiYqa+c0XqS#e$=FlNP4Fw zu_nvC+AF5Gs{s(P9IN=*?4~$diG^%{>3|y=D6CPO*7Enqw!gN|UYmJOQp%#;Q+m#N zYg;7+?Uz3!1X`}te#V6IT2tMy^vFp~01WlPM9&k$1P=iy&_l;EDf{qv=dyRe0(-gu zEq*wGu?hphzt5T+xR4L>>4rQ4vREQ#e;A;Y0~ailatAAbi2Y`OA_qgnMH@iLFL$N_ z;sAjx(>l0vo_RR<=oH$I!ZW557hw`?D-fUkb`B(;95`SvvX!Q@GBc(%Qm%WyCG_44V=pVY=q*NqbOX||}ybefg(B3R2IlLrnAvbSJS}L8d zP1@|zX`P2XsXIE)OUdewEn8^V+mqwJMDalY1yBj!Hv3Q1Jy}^`~xg3#Vnw&g)9OOj?(=>j1|<-zMwtl>+0u zt`^fFk`)rT67Q&kr1r%^@NGfy35Hwa+zCsa-fv6i-?P%GV^YW~^)1!ARPGUhVoAs( zjcL|(BY^U%72Z${=T4mqk|&lCp&+$Ux!9iu2mssw*wBH-QY)YW5QO9i(7`)n6ozpE z<88#-LWuY?`a}Mxe+MxDH_GTh2Ji%sV-MQIM09eNa&g)dX`F*OfDvJwjvP4>fbZA7 z_O)OSfb}$plXv1JeaLwce@1?yeS7%Bu$1e2_W;QK1JZY>`XJx<4{cfbfd72s2WcDt z6i^9}BmZ8H?13X682n>T9Ml)_dR=+By3b4J0Q|&2UcX(wUOFFd#1L#T>O|_d(Jw_j z(I{BL(PO!xbPD`wxzQ-SVG^f*laDUl*c@nbkEtkXTMXz?{qh|RLZ7VU$UZ7}Q+wH< z_Vy9EY6E^kOFC*lP%1nlDN+PKq{c$~;u!myx<#NVwInGWqClROmShm=UsL-^`ja}; zkk~Fs-TgM#oV2ONaht85)Si<$`&scvHoUmOCKLCX4ez!cy|-DPRFhPh;4~rDwU;bR zSOPdr?f+tJls=WvWX5q=ZE*|kHKb-bgaNipaLFsEOaPMG9-LNq5=k{E^HNzNHBnQ` zr-D-oqCId4sh5y$JHTS2BG4tow#+k>?Ft8kGK`3CGbkctCM+5y0gGO>I~o+&HRFC=TIZ$SzNe*klUHl%M3 zu()cALk0LHUfLOP0^r~SamCB;Z6IzJ+GYy?V^3bm3w}wbp(Ss4jG-*}_xSO{NpJ|M z-BV9J6{K?P>q8G7OS1(XL_%6eUU(9R*9~#S^Ky-==B7!GdRVP)yS%+=s(8(UtXIcD z0!OEVLWkAp&67?TqydcPSDDCUJfr^Z`MJu;ccZ_m9EdI)CkZvHP|rLg;s?Wu)B(Hp zI+tcO_ZmHerN&s4vkPEbEQz#VHzWT6qiZWVAmjx)Kz?A?9 z2LSq-n{}<1^v6~2F)m4XweWx0N9T{&xtcbj&!4jg`ybYc%bmJOLVD$x7)vrp;ZSuV zK*mj7NaG~K2WQdRr$wB%aVfrgs$I8&MrJh`yVv-}!KoOTFY z0jvV()Zv7DTKn9x+UKT=osr~i%S-Q?CSl+VtV{?Yl5h5-QT}REhXq1hn(T$fI8afo z%-D?Xip9^26v6iO4rp)Gm<{xgsVq|4BAzD&K9xNyiCaln5J ztyS{nJ#gyhpBd3eR|cFY8|~kpS?0P4Uoi)K5W1L%yxy0eVOew~B!d~$dgyir=?D>c z3Td#+7zp5oKP_!lB7n!zC3oy%YC<^3q%e5_j=Gi_8$v%#Zaq-2w4`0BMj_nha7XrG z+h06rhfBIcbndJj(Ehm1J>#}fdgVrRDsnu(BgCl;=#~LVHx?IcdSS+97iOgtd&v%& z4nZ(!>n4hd+$#c56>g=Fp)5t6R3+~i25GXb*D&!h`He}24tzr)a8`gVC#hLJt=l5B zG@Q~p<(A}jy=Sa1*KY$-i!zWKkm;9-mOlB_u00)AU|F=T!w;1b-~ztXC2?bEEhPYV zK>OMXRxC>|-uy=04Z9&+Czi_$2*l}HJ*D0|bJ8kry=3VVdo3fWBxrFM#5jw7mLp6FJnl2-J$FS(SBsd^|{z0B$V9A$@}UWF7AeQWyY@gA>3CemHsRb&ebU z;FALk!he0B>$5;A`i{h`fxy9wi5>zns3-P{~NYe6SkK85OgU)*zODE@H`pET5NyS#=BzsgA^ zbZRpie5ltIpzihD?XnzV08!9rv}DH@cXl>f(zu?W zrXz|g#WJM8OeQQxMw4kNH=~24lJiNDm(|iF@l-fznyy$;`|l>|kJ_B15Yzd2n@yk7 zA%Vm8-t1xP6=)jC=WMjH)zaEWmewgxK{QF(bjYE!5F~DZG{Hxb4DmLkz5_hU6F^BB zh6HxJ+<+_$#Qm=<37_w0@RmqTU??FqD9QRvkgzFe0Go-@-T>x$C7J6_>Bb2uFCNrg zu7d({1?^FLBz1SV=XF4O@A{Bg15VS!5B3pPEgn=oe12OW3AgWGLn zc#D9Xz*c&|svn-R>TmX2RuaU@h=8j0_MwSHw}?qPr>qJ1vP4`FI9?Pl7R2*{z-mU| z`nl(x3zI!%1Sl}s0~R2b-2es-ZmCEcW8W5OkBC&1qD(GR0cWN4C74-wyCf&;o=~Wwwt)w7J#D2dq!F-&TNDKrQx1!D%RpJo?ha(~7huw}`%c zxwhpR&m&yA8&yr%rKF9<0Yl~l8EWomF z4awrU+<5^&0ZQq)D<^crfpN>hg8Ge4o@(hgHK66$hV(?$wFFn25*XFwtaVTJ_pzJp z*M&EvEVs&D|{JOFq=4rm;N!4CifhjyZ$2cd1BJ$=UJ1?E{& zWofsmc9hFU8#PIrvT%oQrP{FKxv2o+0HB;QrrdGm$zH#o%v0B9g#$iPMK-M}U3LyX zj&vZ3AF0s~foKd3`**`&y3*E`19e|+84hTyi1Z7ENkk382Lm5;t|cc(Tg~%YCfQA^ z%Ylv@n3s;Yl9nv3DZrx*Zuzoqi_po;jTPOESt{BCg&E1+BpnL>Bt25|&Ff}~LSw`V z%>n86U75hWPetuKnn3#yV~HZrhI9!q2Z)osK-^IIb^$m}xt67tBT`fhc$0=NoxrVW z+47Lyag_%Clpv-KeUwmYEZuiC0oKxjz=7t7eCeQ;NC$LZ?3iuKZL@8KExJ~0)E*kW zTUTA_FhYW*}){?P68fF-2ElBU%ZHZ0xwob18JUMA^4y0{kZJRBm9%*pATOJJ-GEn-1HDo|!VRf);VJF@5?B(zl2opi)5C(eNuhs9meK$Qgu=noKI;fw5Zs@DZfuKeto`Mgm z-m&9uSL2=ZJk9WIwaAeE)kv@#XO{z)z=4`>EkJ)9d(${jQ4yL#pIcp$3+@TEKIuaf zfa1EtP!O`fr$KwPosW9ht`vp3GXZTrt3 zw0*;O+JmF_*&`e8w>w5}v%TeG_IBy8os%SH%y!z2<~CiMm6yaZsU=emeEk3Ion31a zK@^5(({4zuSj4M>7ZEQ6|Nrk0y%oGtQ=!mmZ3s=8#OFD)Q&IW0z`FB>7Hmm0EqzSvr;ABh zfaX?Pdc_Ljj9nY2HO@78THJKLFr6XtAfNi1{`t>1><_~y{oX^FdX)6#-Y|W={=Xy; zUZ^%%<*)kQ?^8y9?J7$)HI4tWPG%V{ku2jZ6HXa{DmXpJ}7hBUe)H@tA!!S2!uK7Vp^#+gWo8Pun#86udQaoFQiH4||o)w`?i4 zz$xSA8y2_gbapjMZ&$C=7p8+hEI(4{QJSVV>BamsEf-K&0Nj?+nqb9~mw3b=6TsC$ zhW4zPLS^x z9heDyN6E9^tL@}_M{QzCjt;~@P{MT%mTf3K#PW_eI1Uhp7a^su0d0~ALrxbY#!IF& zodjm7dhpvdH_&sy`*zYCr>CS@B(@ft%+vGsWtvYe)A#K~I=}v$-hF+a&PJaYnV;a5 zIKydUiuLUkUb!dm-LW?p9;kB6HK5B|*1E--Jgj^H-lEP-r-dhNSLvvE{djB=PzTFV z-uqcEb4?u+oHBK-v}1u&sRB9=t#b0l3Ecd?j2|UG^|FSCNubEG#8svbljpzo^e@de Vl||K8re**D002ovPDHLkV1n&~wVMC{ literal 0 HcmV?d00001 diff --git a/src/modules/packagechooserq/images/no-selection.png.license b/src/modules/packagechooserq/images/no-selection.png.license new file mode 100644 index 0000000000..5f43e650d3 --- /dev/null +++ b/src/modules/packagechooserq/images/no-selection.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2020 demmm +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/modules/packagechooserq/images/plasma.png b/src/modules/packagechooserq/images/plasma.png new file mode 100644 index 0000000000000000000000000000000000000000..e9e35a5285e7a6b421ac0693181c957794c2b587 GIT binary patch literal 35256 zcmdSB2{e@N8$UcKT1cC0)ud8VsO-cjQ7O_lOZFs2$j)GFr3hJCkeyV@HZgX_RJN=W zvK#w8%vfh^W8PvQeb^UV0Fs$65)#kC6r0gsfA6%uu4M>^pPD_68|}incrTvIYHi+*!19 z)kfBSw;9P0!b~seqqFqQYa%X;#dMKKhP4DgTNmz{3qm%VZ;KS0~| z{`pC_ZRMvNi1zk>xx8i9|CHDo3tP@uyS(MB|8g0$h4KF>u{9R9oUwL!%US>B@>a(G zr^HrS*m}km&em@Km&;oiUt7K9^4~}c(XW`&G0#7iwd2^IpY%IcetLpvZ~vFeTXy|V ziLJ4)<&3q4UyoK?# z)mtwAjkNx@6;qM}J<`_H_qhGXzCJ2|_Q|bY-zT?f(|gx`kz2b7qPw~paL;$J(@5paJ5ImT^j9d}Mlkv3Y zj$^BaM*jkI9QbSH25^!3*UIn5HkPbh{u2+j+<);WOn9!4*i3MR#GlJssr~DLGz9;5 zJ2xcwo7K&-ZxwQr1b<=kudM!`9{6uy|2wPywiEP!TTOqG#Dgq`)cyp~4I!z)^S`3{zc}#!uWDLR%_dYgAp3W_*bL@Yu>arh z{J*ZI68V+Lv&r8#rK$gMV)+KvTCRI_Z%IS%Qc(};-E2L#4e6=6O+yr~4H*?w+ITmy zoGmM-%sAmxIdAdltC-|6MbcTtYYymrHiof0bzg?Q4XZXl+SF!!r=<)ILt&qNLm%fy z1ydv`1xsC1hzhhA1u{>mL0?-&O%cL92usj@$XQDGJf=35$0KwpdTZf_tZK&hH zINm7zAr5*0+Srt9zU;?A`BunraWZCD^r5cWEGO6F0$na>R%#$+Y5KV_k4Mu|_%sv) zkzdxD!o2m!UJ@RR6{S?;Wk7$TH8r5V%`+x|1FvbI$;fXulilfc@r#}Z(9iD(+9bsH z$4XMh=DC(cg8R+iB0@wNKpP2(_hAj*X!17>T#mYp@NFvq`xc$BeCensbXK=p;_iIJ zfO#0guqbpsB5hLV1PHX2C;|x2Nqb7i!o(~{q*o&iVC_Mxib5hO8!O{cl}QP7%Uf4=9RJ?0lVbcs7GF!zFX z7GmG-UB?LyozsP+JjP4A*CmzH(wUshne5)pZPZ^Q+$$s_$j%_a(|je(SC>0a@zU9i zg%vuv^9}E&e!U--u`dkD>ir-qc(z$7EnHVRhG!jwID6T)Q8cWygmXG!wBB&ftmKJ2 zZ(D(Zh$#y?(3%G*TTV9RzY{SxR3mZsbjK*ZGC$jVFHID4c$3}&2J>LV(ziabz7cc@ zhkrGEu&o(rs}dd7+V%$%Y8dQ(DX`dW-EonWH*7PIRrlT@q}VA!J?*=$f8Hs($1aL= ze^f(_AQF#oqoYQ(NjbfhHVyC97cKX6p1F}HW*0E1T_cKX-M)#arVM)g{;i0-^HQ^i zhdrY+UYmI28&$MVL<&i9%OAQ7$yQIzQ zE)s#Lxt4xBcfB^)D>MB(fNK7GO3q}uGEQktd>q;2B*qrAwFx%mg~m3Q3E%gidrnV< z|Ad~1-3Q;k!Mj}eJ>qgtu3_1d>D|V1L-D0RSH&r<3TRp9s)ANndLLSd5?Ab;x*vs2 zFDQO2v3#1?& z^+T*9ni?C+qi+iaW$Ot#%rWzxjID4Lo94{YTqpDGjMKx}_PVUD9X>UxKc+Zqpp7xx z*ZJ_cU(tl=^=s2PA}G&U0TqkYgLABc3IZ+t@H^6VbsTG#K((y5@c;~w7;D)oqR6^G z?!u5)_gtge5i;0$+Q?L8STt8TUBPZbFq`I zP1E5yq;*zR>rBqMiMBbQs(a2Kye>OEKi1B$YIJm<&k`6bX^t=hn1AtozONk&wnAS| z)30HrN}Tc!CcMizSBrB^XSm;8q8|)@Ds+Qs{csDJ=|MaYrlaHyx+xVX9?}jt@4B4E zMnGJ@@TlpBX=72@Wub{k+n}GQ<0NMI>GdVN6dkZ=m_eU4yTqeB=-gvq9JpE$DK$~y zx051T$L)^F=#aK$O%L1P>td*zwM5!yR3nd|b(yVDg-mJZt~K!GkP*nyRMW21STCKp z@BJ~a;r=p*HaynU*4&Z2w;3yWnhMzc-6FXiI<`R-sIr*df5fIXAR@krIb$!=$chpl zwsYy>Me~MQ;B*_lrRcEOCsf*c#O!c2z49qiR0n+Q`zD|9(gDIRkid@mq{|^IWcWzO z;TQjKNA;Fp$3iX0=aSs|*;MImg(_t#I+-^Pj(XK9WEBW8_|^XXtm;ME+m)z_qb!?l zXE->_Ua$eYu`a*z$yrrfTdPVLeiA=iY=ge_KU9lY2#OgEX5(|t(;SE~CNOTqHuvVI z;$IRKe@z`LtGTk~}tiuKVtuJ5Msg z;NdbyHc)+$RS;DAwSpuqv7KKL|0pk~wQplrT%5+(+^Gd!nYt%uRBddns$^>QSvQ2* zj+`-AOt{(Avq$NPUkF?m??80jh#Pz_=D8t$)OdJoJHI~OA#bR4aTDnuGBZjksGWt+VpXxkMADDAlL6md&Cu_rCU*TvHb< zpT)wi8TIrIB~+D$6@Vd?sEedq$kixB6;r7r>2{I7tmbX|uRD1^8%GMJKdNftdyZ>K zH#&W#I#$Y2XvwWYMwp}`yeTCs{hm5}2I+Tkc5B6_1k|_|&}e z2+>ulAdoUO#n!=xotUb-{W09*E|lUUb$M{~kIsS)BRhns-Fm!>_!)sM@6EXL2FMt` z=5_h}qq6PX1Fi$4r!!pVQ@)bUliE7$YL2ca1jTHisK|X!)bOcNWn|Qo5##S!Soryh zL(JuhA;Acrmq&`Yyv|0zLp?n==As@!rYhA_Q&lBr2NrsKj4n)m>cvCyNP|Z$4$-Ym zIz+B4amYI4%Nz5Zpt!=|YV{6FbCZCFeECWeCf(n+s=RHWxF-SO#IFp-e8P)F@C&7a zqWQu0T>I`9KRO#a{A*6G^T}vC9R)pdNKuzYs%*OoabA>ya>%%k-5swZX zjfQ81Z~qgF=t0)6sj*XVOt^&S;@k9PuWQ%tr0u**;2U$RMM;q?kh|A1UpH$?tJ^t2 zPOYap9k(bfuV~ebZUmn-X67TqDcrhBDtHrp+-^6a#bFF)+ z7>RiAn!>{g?EIdt?h~q+1z%x?0JWaHu*gU2$5OKIH=MS?8@NcE_uhrHEH=NBiTlWA zzRL|`Cxnr~S}?3NBfG5T15ecDHLLIOkEfS8KmCfYSJc|+aXbNzAIZy!v{|DlXPBCt z9JFj?Ni8%+d)?)CbIR#Ej|cqdTI^`I3lhhz0q%Jv-)4~Br$n^}Fk_vcJL=)zCa8=0 zYNXZ_7-xM{zo;}UMxO4R?$i|?hMyTB=DR%zc0m|aXY~eWMiuSwJ`DSeqXhHz^BIn| zz{1JC@`U_mw&!R{Uh`0l6>;5m*{rDEmPNVFRIIvp$T7v2P$aGWbH{5m`2mZr(*q0! z)y2GRO=kYKU)%(TV>`AZZEL)*Fa{@F3sUqE47~X91Pf&*0I3tPDWy{!q?)-t(Yz6Z4OE)21 z=vt)PF78@g0vw4blHCvVwb_jBQ*Os34^%6zV{`m>r%dyA@ZR=pk9$9N*fzevVJWdc z!|#i&A8Jf^)u@x8faCXZmwOp|F*TU3Km9a&9tHABmvo7RgFnW9aC%fAu3cIc1 zyO4DoXwAcY3E4B}X)xP6CHj2#G1LO99l=APc9-yhHSgf#_U}sax1-b-_Z*!_ZqsX# zmW4QdR;7Db;vk++LLY}J)G{MCRy&)M4hP{iUpjteT1soL7Im3!i}c zaPC?cCi4udfNdO8)LS<5W&L-csb3wZJEpr{A&Z%}ujy53Apuc~SM58`DskpW@?uH6 zP|>-oAZOz90sK7SXKPQw*L5R(-AIkh&fm^(%2=8KZi$!!Wh{pT;7Q=0oDV|Rq2?W` zJ*_G6jX|YKkAz8^15I`K6Mw#Wg)F(XacCK}aRGXATPLQd?9=SBI(2mYJ=cZ`FsFH- zH);3|KkiC9r4gNd3Ynsfj^R?sm z4p>p_bQBnam(mW9=K2RLE*PzwlnK(c{1vsohX9_@$AQxxa0IcM`scFiHSVWTeV!m?CXW2=P4vG&&X$)uo0B&lS14LavI1I zuaxzC$?5TC(K*7lslWOHoNj&QW4a$!W6*PdkLiAac6(n1OwqmU$(0%<*|8Bn!1*)W zh`5REVQT%@ra^MxV-oo?f*e!?il^4?!P_yH2+Ps&QIeAI>iZi-A6H`w{HVh*CK3P1 zH;JXba0r|JpW?jS5PfX!d2B1PkAd zyOwC7Jsz_TH%fwx$^%P(nV-rP3OEV9Q+pD*d5aCuiby&!C~3Fv77XNMl{v)3>Q-kl znP5pM%6%}Lg}-*9D*U0?h6L7Sp#+KjkCR;A?p8foJED3Zr%U*R)rA*2JyHtVCukIc02qK5Sm&(_w)^uy2>-*P?ws>d$p&8 zxi(~JAWr!hl*ZN)M!vG}nFB$>pUFgae`J^IVhPM%q-3@y@OCc(2@U{qCy7hkD@s{1 zq1tRii7HhsaInKKMzyB$(++q}BdbDz(4x$X)T*dF2n-n+PKR|ZzstFAqbp_otT|&_ z|I3TX8|EcpEM!SJUOUoK%)_lZ2@YulYA%lR537C8+mdE{dh1Td1OjGM79ifmrWtUU zUDS=S6ev+iE+K6s)RIJktwwn3pO{E(*rHyW6Xqfr#6U{gwfw@|8zR0TE@gY!IQnq; zn1kMCMyX38t1UN4Q2ANMMCu+x+`0bhiv=6J&BNTFJ@=Eis~kTDNbqgGJ(@CMN? zQP)v>CNt36kSIM9i48+SKbq8WSeYJ)fGU-0)1nMbBsbkPD^d1v2xgSis^l~Y-O%;~ zr7)N5FHs;LAP;Q&r}k@MPr_@YxMDZO^2(k;d(2J`X`^AEIm|an-IH)Sl+`AZ|+?V~Be{kRm+2i5j&uwjY-L z*24i}6M*W~UP6L5m_BAA)ZTxe+4IWJa42yD)q^FT=2kX*jB-5v)xwLLh;=`I%;YvN z33|S8aVE;GbJJ*9E%$~nyVPEWI8|F<5WLaiseYgGzb_5U4$lLpRJ0CN{n{YM-_oT~ zG;$2MQOP-sTAi%|K}D{#$T@0o@88$AyNr;9`cfSAjy$DPy)MaMcgO{JJz?$nfvTZp z1hRyV1N1x;`3p|Jfz7T4vR~aEG>9)V>UrmZ)kF_;Tx!9*Rs@HM?I1{H_%Ld9oCLdxN>T0yeV@dQ+KH?WNHLh+2~C6Ybffa# zs$w6bA$YhZHL7C}%HoW3BalmGvgU$N`Kv+XUu44Si2y+)yps zdvnUGJ*c_xONWmF&ALgA^Q9(q#swl+f+N7DaU9E@+>F}a0Idm#Z@xuMW-jFPWm65w z11Ry;Tn{`N{0zbr=9NETugg#lakuoGD)##5vMrH!WgV~zAazpC`&mDBpC0FMso6&ATtF_H zo|im<(%it1PkwjjTnnA%b_zEMjGsH{=k(ZZ2+JWcCWZS(UA|ZHEDE}5x$qk(WZXLW zhy7@ixJD{=uL61$hwB^R6;i}a!?oF)VrR=aE3`&r7}jHmT=)nuO)O5`W!sRs*f-IG z_%Z9zTtsG4SrU6XYe?4eh)RnJ=@j0u(YLSIq>Fr!Z5q-YNg%9X-bJ7QAI+SHrG=P_ zMa_+G!<7PzNvKPnwKH)cYy#_)$vLu*SL!Z_w~?~umaZi1ozvB)Z3e7P-$IdP&C98q zj3tFpuuak&pblbGlV3&~G>}Td1PWBh+LTJguA2K)wq8etcS>(!%Xbf!N#ZyET{2Tp zAel)P_S%)PIWPzk5FzW8avIP^--rI{8DNOM_RKks`CP}$7lzb}q667*YF3rLZ22PS zZxa`}xGaD1ok-Ia6Rqs~qxfO}3#-@v06elFz# z^@O1Qv6-Xv8z+>^a=LpJr(CQrN`e)p4+tcd1~>^AWXUf7PA`}>0fbok6cybmze$L% z>angXwb48EQ-Y(?63ad)xJ`~r8(3x;nr8ujv$xJ{L|^I3N#Fk05AN>BJBiixd%v4^ zKx5diW$E~FeqZ|#vs8SRcJi!bKpWc49d1=;Tq8Pkcv>`OX!g>O}qrPX7pXolG#Y?IpVz+`3X_9ipi<6FfYn|?>^;J(uCK?L)jl#$2s zZbDPd2gk(qfKyh-Bg4J*o%b)9aY)s2U)KlPwkci$QO~Vm{&zZbU@hPeY#Z-kQ9h)g4GJ`QzemI```* zd(2%}Zc6eZLt8x#!$b4$Zqj5hYmQjid>Bl$kpF^5-f-pILOVg(sp`JKy+V;%vpdEV zEuz8mo0$5UTMjv^*tzbYi@RDq*URpeynlw+F@LJSI5P%rlk|uDr+l4N^0LoBs>hE; zUc~%LD!C-%_}wf~hYES}{gLod%hjfSZZEx@Z*Iz6EBWO8bt9vZ4+ur%Q+dXP?$~S@ zK~#nhl^HgEnY&nlRZW7gfcWSLX{ev`7m7K7zo#2ey%QE{`gi7cm(Wel?fue4|wvL2|EH;D(`w>N~GP^eqOm z>ItSZqr$(Ikz?pxZ(~yN>oXkHhwdQMoVGeFD56d8R5oYYEVo#xflgKq<=i5MHJ)K@ zW>Ay55TV18>}OF?PC5Uj#z{GL{?m#qr(|@n7uM$hFG4LWU)Tv*Lhq?xC9!%`J`yH@$6V;QL>gAuoNiSq|vO6ATKW!Sz=|TdGBA$MLrWC9XoeoyW+(uhmS3k)Lk!`!0 zO|OZ5LTdBSC?%kkUd7OmYi4%+6`Zs~&=h;d%nTM@rqR7HnK)}heExVGlKg;Vz%^ z6VlRZ4`x4Yu8n9j@_24Y(F)0?@ZWK1%C}qBlrVgtuhILi!bIm&-cw&S3Pp^)$x!u< z<>ad)TDaPEsA?>Jr|^2;ts%QjxLF33l_@r8p51dK$zLqmr4SCtOlus_#G#v}*v^ha&f>_LBlXCp=yez(T8*P! zxK%{o7zW8ct~ZOe#){nkN`@L2Q26y|8PLucxE|Gz(Po{*8P)inzlpr$eciun;2af>zZy&Pu(uc{-&D5IWz1QS&`)MPjXQa zk08N10ALtNnWNMTH)A&>t3Vlj;#3m#BC)%gW|&3KL`;ox6JtYamis7MsJc;P>s6D! zB}o~uv#_vyN@}`+a9bpmKM#XtQ&IqYmkMU89Z0JY4CHB2pGCMY|AjtMc3Sy>I__=r zFw`L9KQ8>Ik!%7iG;>x6ld$fNdz9o*X}%a3Z38HV7^|MW7}PcIpOQc;qCh+G{9FFG zYcYq-UzB zs&BU2C}9keJVpec4vj(KkFA}qdjD={+J%?=aRy?R7iF?)o!ruwxPj9P$mPBtp$O?6 zf08Rb=wOT8bSS4H+jWF2gR)BMDXnW<+BqSLcQo7uS z*}?=h+Hk0YfVo6<$#1i%#@RM^0M@C+AV?UkSY+^FBVgh5ppckAR)i~RuG0KJFKq52 zzc5rgAf2qB{`)unB6YDF+9ee@erCC^{{syM_b_zwEC~_!f;w};-)e7P!QgeaCLmV@ zpaB(Hx%3>WP~LZxEyi}gQC3QQnhFQIb}S>694R)o^~mNU>%-<H%*xX^p(fG^~4Sl!s zi~7VLr{&Khmsi}x=)?A|IV0a!G3+9jqG&v)RiTlT8JlYWmpG6PlmPFZqGfX|qZUOy z9Vlj$ucbakV8Yyh(ttOIBH=vJirce3o!sttV^JTF=fmSL+%3ga6Dk@9qgMLFi%D4_)kFt^ z=(-QclTMKcfR@$K=>6SgwT9uAgdpF~jVZY6Mn+4i>P&!>EG+lUea>k{5J&Km3OlqCQ%TN=x)$WU^dqoe7$5Ot`_D224&n6rp#*#H>$UeXfX{`r8 z=J{}JU<7$fo^rnt-*yCp77<7*GL(z*&?<+x3h3z94Yb^M7=77l)9s0HSV)*{`Dyc? ziA)O>iLsEQvw)|p92aa|m$K9s8(j1n&bt7nXjERyB{WD#kt7sa0Tr=Amk01p-1=L{ z^w-NA$2*O<7QkLZ-&rp?j`_Gp_Rh)>dL1t;`Cg!wv;K=7O-Z8WK;4NLUSy?PwPN7K zC^=AtTBHi<))fjy$s@q}PNd~_=hS2=J#O=+wCUp%yT&83ha2_MNLN}s6xuz8GE<0$ zfzRu#4}G@<>#`hPin}okX--CVnq_$4mahT@tNgipg}?pDnAy3{P}B~hL7hgk`J(e4 zTAtHlxTdd^vR-CwZZ7u<3NUMGCb#j--1|bJym#Q|Ii4BzD$N!T;IyU#7@!w9=D8ZJfVszx zV|m)SA2QH;hMx4C@LyO+^f-Wi-7Lf{*1EF(t!CH6R=HAjvp(5+*!9fj_$@EQ0!jCf z+uV)PBBlZuA$^6jd4I@XU_9=+b2r`qHKPo~#r%_A|%l@d88oQ?bn0h^-LcMtwLbUp*0~l}fC7k!N z*Co~!ZLGfiNOw}a?{wimcf4xZ4V+WYb%xDo(uV>9i((cQyR1yO7R#lnL8$rgMOd9-5wmRW zEowMrk71xS>Y5+CH_tx!2DG5r5{o~wjb}S`ot%dxtS91Z?*k6BUH`7WTk-T3yF$)@ ztN8o7Cfu{mb;afpg#KY2103d?`QRArFJY@f5uabsL4ELUl~d#qSh?Hi6RLWhP@=G+ zp(nKJ9c(9PKp`Evd1lJ3MUWBmH`#>GclJ_gd*ZyFgZ~oLeQq*w%qKD^$R#_aE8z^H zMq}Tf#l;_E|6bghdj|L2L|$HAx1N}k;U1KhpN95Z5mGl+KnL%<#SdDE?ZgzONU+BO zM62*NWI0n`nQ8{~sR;CZ?O%wPlVX6y#Yf$w{7ED8VV}P2qz13JEVCNzzaWp7chF)L zlb#)mEM2t6>5-EEteu@+V2NQ`al$_z_V5I~jyw?%(7H#I^{@m7H0Lv*{`}me$cPoD zwIj1FX1AK-@5X^e_G49=Db=H>w!#5T_3wa{@0w&khPIg5x^}Gd4Z+IuR`dnwWYVaY z0{F`=D$AZ(3qD|(ttN|p-1TZ))$ZrleOf5Zgfe9{HY(5{9L@?&+Dg}=Ba^p1-lQPe z^5-ZjKb>;y4-;QyDZS=@VbSIQflB`BK*9{7LMm8QDF`4EyqgVb0_GG3=}p&SUH{UH z);u}l7P`ShFO<+67%e*bltBqV zjuoh~jmxvHs6W?*05a^C-BbrFF&~VA{e_0V?9$1qCxbxGcpwF6ZkMIMhz?}6{-ry> zGb(N4B%RxET15sxsiwhB1*mRbT{}lv= z^y+1+=w^PVAINY;f2w(xAV|$W2hyTNvtqW>T6{7vJ!oYSJ$=hvw2Cx3?z}q#j^N_r zq9SLCD^Q0xZOx7vsala(RXZT|WVj+iU6+E!I+JDKK$}iYaPL_mlZR zFm=Q(=deuDR)M2|q)Z&|ip5$ZDbXb8tSk%MLd}s-7ld1Jvpb|%C~cm7XzAguHfN(>E_P)T-JOh!6+xL`%j7mz-s zr(e*{#9REw`mXko))Am0Z)K5W+T(uSpETqPjj6(;T63L~0Z>CqmgQ+mq>Ci-=u%N1 zWmeJ->0~84KjuHy8TtHXDAjr@#vrunGD3E_3l;DTrD5T{9sWsG3vQ3pu`*m-Q;X#1 zHbR9|hIo-%C6HP8oqNv1C%yyiJzN2e!A!a3&896we8GM2`*v zw*HV5^8w8_hXKcB1MUU1!L=u5ad>Dd zJ5KmCmNnzBldMQ@c!n$FRMC=ID4`sAAd#x7it#PPjYyX!OhXwkLg=KWROzZb*y0_{VnJjQ&n^Nt3gG&uf5hAS8-xeoxziy9$bw{NM( z2Q{e9@_ooJB)M`>X0A#>lll?@(iJRwZ{`(MVPjhrCT2J_^V5OqO_jYePG;4+TZ@>A zk8&GR!7tbf{wyA*nO%$th|Dg@V^XqI^FEBGKB_|@Ry0&X={{sx-BA) zc*;sH%)fRg8^p+-ZEtqRV$f8eZVjZ&4Ks!T? zEK^%siI!l)6UT?LhKq0arW{h|osCFDC~5-@R1;z`%Z)${=CA+iT$bCC+{U^*j^PZ4 z=XN6A{x)A;h|1GKcXEqcWdR#9TDC$9G}^~-PljKWm2sRmHN8>TR2<83AP=$gO(Hc` z0HX?8Ycg_UVy908A{R4A-E?{l~J=*8IF$rNi9H~G{%$w zp=40KQul51956R|09AfWL`+ty1Ec;$M9Nl6&kIY$_$l23D*nU3C!Cs75RXYXtAJFr zW%7$=65z4G0}yn^R$D2{Cyug*WB^l?z(_`B%g|+4*H01@U zY|AcT*?9}CQdB5OX6_jkiSfUX7zvT-wRUqWWl^CPYYisVl0^AB=+uJ4Sl#JPSCUty z6HCxo(C02Ln_-^>p>9nZr{?;(?$m3&2_&$;5X7Bd!(;xI#ge=0@08fR4(+GFZ>}^q_vXSKr7h(p7SNO*sVyD6;EJiVU1s)}`%W9k_dQue;+k zv8iMJ&KK(Vk!lK3vtw{2gcdO1GMc;=TLzd#_3`p2FN$@J?@9HQm{2I`EZtYo<@Y)I z(4A=|!$uXzLhP(cNfB$%GE@k%fSKs46F1elY7|Y@JhMnR*yN8W99%lIxy9YPd~Ybm zEg}6W)0amdDa+jAk0ptsR~n#2oI${gCcw)`g!Jz-sW2?~w(PWPbre~}wP-B4WdWCc zYxyQP@H1rLvUKjn2Lzve1tx5=woz$%cE^bV0TP)D!;tAfH8bFOgT8|gD|itnI+R1x zH%uh*Pm&n;&5!t+wm2^dNfX^%mJm{ApWa$d%-wA`POSEC@v!e|BD>C@JC9n~Y)@^q zLJxJ&@~)y1+s+u7G?>k0c4Ch^I33nAi3sCwZ?VZRh!+)p&{e+A0dkbWFLbsY-8A|O z6=bJFlSd?+lbcdR^#n*=gwHzc>4Y~g^bkYfOUu>xoFGbIMNiGXfLY?TQ|7=k4{Lo| zH6@w=RrRN2<5|RyW-u6^$m799)O4AcYd};-cr1}r>NTHe85g9X=T(NXXvDTQt1bHa z*rIimDfFha%i+M!i)S7XUcYF2^rP$%KbgE{vtQf!uzOM73q-MeBwo*&x>#JAcSkiRObh9;$6X~-Q2L`UWyvK9S(bzDLS64 zYTguS7hS&Pv{B%xX!-KEIqqfBwUVBIeQ?Oj&*A)B{btQ6FBl9IM8>iQBCW^U(GcJ< z8SE&nh{}Y3oWbxPF-;`m;TIAU4kdyHHtIISLiRhP>B%lwdaY@In|p@cJsL*&Ud~t< z5V}0Rog_ZgBxm;-`1do_w9dMed}k{+dIt>haftTb!kcZ59dy6IZO z2A!C_CwyYhoJ&fV4lvwUn#iNE?O%n8fzhfJU3P4Das(fc+Pz64TE(|N) z;Y`b%2!dLlgc*3~81}WyEFLvK?pPz1lK8dWfK7dl@T}U+;}ueahAY0nY`rvp^5WTU zb2t}n#pQ7hUd|Dc&(6L0+@)bNY1D4jo-n|s7lowN@#LkYx#5?^*Yp60_hlhCOYZiA zZ+Sp^CkFj?9wXy(G4uSixOGuGOY?;Y_m>Ob!uDk~uymdgDCi0REEqR838e5^bsF!8 z7tw9PkG2#UK^c3DtV)(KC(IH#Gw=5D^pC&DkFAeAW6TC|UwY&gZB{RdSKpT< z%v@Vh)wz8i%K*v29tiY9O9wYE&Wy&s=MP;@Q1dv5y71mouOv;Jxw4|YC@6^XDF7^U zjYcV^QUcnrz}O}$zSJ|g9_4Zmi8kvfzYDW-R_!0Ua?jMw4rq3j0A?5+3Fu_?L$W)L zy$y22x|HK(;C>LpREod@%%XRXTG|Y^IFrUzk)|-UrIt)%b6wrW8s{^>Td99WDAo+#wCD0dbda7M zb8gSWG0L^8eeotiV7;`w);zuquIR7p8~CVy-C_IC3P{I{ZPt|r{_fkji>#eDC0gpm3gYw?Xd#qlz zh_-igDJ_|&JC3FJs?e?ri6aTX%41~Ux2JJw#H(X^4^>%=C$jDVjRw_=EAmcn=5@dn z*2ps1u)vZy<)*pMM`J$!tZ6o)G=jTM72Y=4m&|rH0jSA_qBnCAG6ak<9{_1kA`dLt zHC^;XM5N%+J|?ux0Gcs;cCbT&^xkYJie?86NFkFyK0K;xae7K;zQ7;THo{n^dJA4} z;5D|;FmcDAYcEjQ_E{WQw>u!fQ5>4xiYessx}Y)t7U8aLPNh-AWsR5##AV<`7)63R zOcDc>zpG9l2kL=1(Y@2Ww>i(te@RyMV42eU4UFi4=}wt5dybv=&SPs&0X;!K2+rM4bRJ;J*jYm3 zUoL%hb+sREs^O%eM;ZCiH2$EjAczC_%#hR!?t_zS31}#MGZssTqo}mNfUY3%tKQ7# zoS;s+)~zA6Vn6^{{rvl0IsWz&#a90LkKeEa@|@r<;s#?~h}LDBdHKh=7ClqxM5ys$ z@#pD7l(-DXFV{-b(6|@QMV3(D~QccBTPv$97x!_*wC6?bid_MaGU<`Hh7V&h)y-)$`nFFhS@t zO~3bSuwgnsCLPw`&zLFqot$B-tE+*nYo*Pr2Q^6gGE0L@zf#<_FNkTYJ6JQ)7A?=~ zW=HXN3f!MQIrnSKeaY;WZpSASlD0-M)s9XZJtPY82g^;SEKh}-IzQh5yh^+N!Gayf zL|!@S6_gPjggCy@E0D+;cWexCj`{djN@d2A%NJL7D0 z9Zh!rG4jaSxu9hZ>%^cL*Y7%6_r^x0iXZw{-E4V>4Zyx5j*U-CII)vZxTVCc`M}P| z{gs}V5bv`fjijxd-UtuJL^5kU$*`Wwsj$HYG)olFE`T%vkl5U>y2+R<*V;1Ku-nGD zK&952MwstGF$~UH^Yfo22))_0wtwGq2Ar|XxRePPD zK)85pdj@IdE<^M@jRgOkNs@;7%A-{-9^Re-1CYDZ2-vd$?HS(_cZ0<_w)2jgdAP|SBX83r0NKM8I3aP2&Q@UsN^h|J=pEjNu8#ZaakyVRoWiO!6) zPu|M10aG*NQ?;pY9pa>YG{mX1*l1d;8rS;)i4mrKGyyhyjQCn1R*p$j)B)99~ z*=Uy(L@=x6!{#>J7~9z zCuf2K>_2_{dx2%;2RMuJ6N?YRHLZd)d$0Nfsd?zO5Jwcfu~4+}$Su2U8dP_bUz)q` zQG7RU>?5)|oObV0m6kwT38_kvGmhT)Y_#FXIlE7^n<<0&+z8*YXz$N*^EaTHQpHgN zG)C})5Fx$DQ>+#TNL9s2OFc>z=NSEfnk|y#TCYPjqza;XXg7mLJ#+{X8GXiH>T&%a zk^IqGwU#tU_k4KC{EMZdU_iWjURpxJ`=56Yf5|a%b6nJakf>g#l)_IdQ$%N;r$l0=SP$P z<&3cFc0a*rh1!QSo8xcPM7f~p&Z&xwFxwuY)^iSlTXrlq> zZSG6nnE_qynNvypIdeVv_p%gX;F~MF>dD& zUr77hF4p>s<6^LE)rfGkYSOfI87VqXZBe5qcRDE*zL{4dKtp0g>@BP8D{v*QSvXQlXn>m({A2M(; zz65bsr51fWA_p%ojD5u1UpOcAW-~wWzIs57svk>~6S44URppAfypZw{qq{IB=|!{b zo0L87kpGa3nHm=7N!Rv+Q_r<)q4Ll@|?N^zdg2K{GLaG?aVlNhVy#tb}0QCYb%B66%(qd#kejJ zTk;1bW(Z+HC)`0~kj1;xCJrp5Cok@+#W>^s{RBuD;=awFdp!aD_FMt-#s+ zb~bOm?Vb2gJYf43-O=xr;OECnGf%sTZ9e>BhSOaX&q0NTsVT?FZZC3Q!}Fj;zjG0@ zXVdCqZo-AeFUKnQ@yd8%71m-`oLr|)LHS<4`WHMvrD<5aP!7QHg6H5#mk+2A;=ML= zS-ZDSXP6y~V(48adwtAx_=)j-v22wJw7YJ-qlEArG#(k-o&3I; zrMbk;h!BW?aB{M=8ysTbzv_Z$fX8$$W-`_5PlU%E-ojo>j;!dj?>emIgX$PRX5Le%(<7)GggY*XdbkPU zbph?>JmVHqc|QJslCzHlx<%LfV^{+*VVCy7#Zi1$Mc&M4CpKR~5l3XM6Q0Z5;8nuh zhwWQSEquYXZj78)zTcsifYJE|Y{lNQLE`#u$C_LvrGQ{uJPPGUd5>h>LOgPL++ZH1 zZw}wnb{I~h65V@^*uA?{x~)=^`l!VY6L<`KS3h5zs(PS11z&UAb%Mes69hmzvx~ zrAD)rD`o9JPy$EL<_m!6Fze*SbqAcdN z885Kuvg_5!3R*RfyqobLvZ<-Y)FWG>*MSAz`_>_dyV83eSHe7i?O#*A=@ox*@e=1$ zDK1$$xeJu{xM8G(%p0uoy7T+q(w~a{egO2=bLN(#_yz{HT`eQtDj-$*df`^=#wpjE zi%1+&baFedV;;iRzX-#Wez*AV(meJYVS9Sd{lPI6BdueB>+f7cO?#grSfW62&ptqr z((B)e5fy*=_H8i>V8iQ}8a&^c#Ma*0u)MmjJ3&geG7R zHof&Puuy4u%o-&85TNolrVh`)PKE1`RZ`IIv|*E<+d#a0G6@aHw&;ybbySDH4{QpJ zX~dsf-{hBunl>!v1@Recv3hF=cAsQ%a}WK# z9|Y6~)sC=r1mAqMmemb##dSplR>i4P9ftG_5xLFr*te~IW2)TM;EOz70NRbVK z>oA=hBhBT&i0K-H4Zd`oB>;4cVI({zW*jfE#<*Hx41+fp2c4W^Jra9l^;_BKJpII$ zqcO~WpkwkQoP@MBmgE$)=c?jO8+)YWkAr@yx|AhCQPQhlt40rEgZ}zi!FUxEoIaBR z8(M=Cc>OtdA`+R1Pf43B0E4L9Rcfvek{#0C1A4{nB761MzE*$;?~#bR}*Gjia@6t zSQFcO4MXQinNAqKMqnHX>`vRZ`Zz;QYr)#wsN=lTv&*cY34{70JXp4l@HNVO(m9ZY zLONEE^_7vd?%It_&fTryjMAWQu}UyT*y%OaD}NZ>9poGafldoxk95SZQJDw>gFMmO zR`CQ13e!C!*KUyqnLyT`&^vp5>gZNm89q*b@y2o%uWK9~AQ1E%_DntY$C2HC$}l?5 z_Yvsj`?|n~M;OIGa&K&D^eUxemBr%%+D{jI9?MV}T!+*LM>Ie9Hil)qz zAL}+^2yP&d!kk`k0xZ~`-R3mIItvkVXAwn{A(|k$ovyr1;&_ww&ELXx0K4N5vCTjf z(u0%+&!*R7Ph#(MH2#4Oc(m%-a1k)r_v$`4X5d4juixPLM$&p~8P{i>QJIomOI$Kc z%%Zx$7su)6BR>@UKh<3cSX0*$K7j}*vZzIrC}8!gSeJs>L`4Kd0T&Qk7ZkOCxF89O zq99NjTyQ}R`njV%6rr`YE{Ks;QH0R?icqVvi7!CaSd36NtXSX7xk(JGX!W)4`sL#| zXU_cpnVGZX-rRd*ZThHA>;{dC<(h7No}X=UXMRPceJ5hUk;%8qEoH;1-LzFk8ZU1j z>g)r9vN+?iUJN`JtaMW7-jJ^+hH^s3sCK*Gc;UR=84r(SifqhPO1`x)Z~5GPc>3_da?_X(;qePDq5lfe zo)p?IbesyQ;8*|S+-nk;5V!b0h#U#Oz!T_bkm=ur7*7g49KxFvIv{j{O4-8kL}cp6 z0TE$y=LSvSX&MmW%Q(4+*$>dkEm|DN#ute)o@u6I zQs$0Zx{6$5v4uWgow;^9W=~d4W?EqFBY0G3(Ef;E8_ljnXuU%|ectoR<+WRP%IC-m zf0cJuj6rwv2PeuoCnB?8i!X5KYBFk6ct!YE`)_=k*bg4a8l7Y_Dy($!2y& ze0rjWVkvE`{34M5t?21>`9|KXfY{!bubVxW%Q`dD|nHFSXjxn?vgK+74DJ;$nlc%xVP6*ZQQm@H1$M6 zf^U<#&8c=6@c(s;JL{mQ6mvTk71K2ql~+u$OiyIO761>bf={@DB&*c*3N zzJEt?#uTN1Pcaaj(xk{(Lt#|~xb}nx(xL_AL<_B0_-p1BG}__w3X*#7wR}{h)%^bc z%_|-I&+~Al3w4>wEv>||sbl|l!GCQmo90%PD>Iq2!Hm^v>_CliSk$P^$4a2dR@z`vN{Lh9SMebUo zVbO<`9;Zw?Z3TXpj4 zK56MWB{&9zZ3ypgZ4pNG>}Z)o&9ehFASDR%X__7CIizFWc6MR%DiXL2@PANhw=%Af zG!7AU^6EZO@41Ff+di$jMM$futro`DW+zRB4rXWT*@c5gk!9@;jrxAWTkp%e@CAMu zVf@*#{9?XBDCQ2pYdQknk>qx- za;%x>ZFu`)WSZfy_5M<)w7#Zm2TEs$8C}nvDK|4@5%=`(t9nMxsEC=m$+LcCu+99z z0YB*G2}aGT*q2#RiQTd9yDiaJKcJcTxE#5>a~H>3(2j%l3eVQStCZZ#EgL zZ+6u?FNjTqPLp{rQn$c^jWvXI^*5h>F8!=zIJ^ra!AQJ`^VN^H(L}Q*IVwhcX@8_|9k}IbW3RU7Di_-tH$@mo4sr zy>^W?bI#p2O`DKNhqA8D0t*cHzTXRuJ(M1>0x3T?)5kGv01a4azUWJ-wx&KIy~dSw zf6gC_y31nCBo_mn-~_tm>eNA7OFb}DHQntB*PY)C?-onY@blb%`V7W(Pe@~$PXg?- zK27skjzldt))gD@whRX?C%@&71eRzo-^eccVv3a(A)6h_Og|U*LY6BeB3tRHZYZ2q zW*)&Gj+*y2ncZ4@Cm*uMlI0g0xgZ{Gy02*5qkrCH9w9mGB-i1BL@J!o*uZTJfH&Wf z-Y(@eo}PN>kB_S)G21#3;_K@Om)8i(>lexVXK=ZR#Qnx|7^AO?I)|d_DgvVjA?Yta z+F<6SjcVof3#NtzOaWthapKFSp8BYGB2RR*u4ID-AtnO^dj`c*;gvj5ln3`9AwsQ5 zp2>mb$ffQmS#}k2jF{9W3$!8NIWMavMhhT~mP8NcnqqHX=8Kj)b%#iQc!zIGvUEt5 zc$AHI=Hp@{d~!*2K$>(4gmqWA zWqyNku}tkR9AYvGT={Z#suAu5_nF!0uXWV~hyTaUuYcc@@S`IT_O+Lr@IcEf-QOCU zjo?M?AF&h!V}CnxpOVUIuri9WT7sg%g5*J*?%2uMteWjsh&N+5-vue$z9f>JTvz~F zku%ENu8IdBS!<1gP2E82q+l>3__KaNVHh~VLQt5D>tF#ds#eF2GYpy~B@I23E2ctg z;ePHM5XG!4V+5Z>J-Ybq1qh;LYU!c-!2oZp+cT;zm*eeh30E@f@Zw}$*LtA zK=6zFkX{!EwdJ{nQ+8Rr@u;&~d?U&eemcqW8pHA}#ysg2KS3#|S;qoCmfTPHa3dO9 z_(!$GyBa*|RjXfq1QX=3R@|`|h-psAyfYIqqW5CWUex8+f#F`6sd;~h;U+l^ds~+8 z^}8V2vuAcWA|)IoDZW7Kj*$+F^; zXr^$2N^qGG3{?tJmU^Jw#n%?m7>tE1^2`Nqn%nptd(4O1TG>K)e~d#SiafOiN&OpQ3G!(LBxzrK`Au>cm(+3 zAKX0913Z978)5`juU2R`7r#$qN~~rWN^x`I%?P*Astxhm8B@0U8=NB~RTF4{2&4=> zU^9jXBr^RASx*l|bsJ*HYO1BIey7Hi6q;cu#m%tV5G$D}tKX@yztK4gXd(9*CwF+z V1#h=Y2QU&7C%BD2KF(|Pe*rwi%gO)% literal 0 HcmV?d00001 diff --git a/src/modules/packagechooserq/images/plasma.png.license b/src/modules/packagechooserq/images/plasma.png.license new file mode 100644 index 0000000000..16c11f0719 --- /dev/null +++ b/src/modules/packagechooserq/images/plasma.png.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2021 pngegg +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/modules/packagechooserq/packagechooserq.conf b/src/modules/packagechooserq/packagechooserq.conf new file mode 100644 index 0000000000..fc45e4fa9a --- /dev/null +++ b/src/modules/packagechooserq/packagechooserq.conf @@ -0,0 +1,48 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration for the low-density software chooser +--- +# Software selection mode, to set whether the software packages +# can be chosen singly, or multiply. +# +# Possible modes are "optional", "required" (for zero-or-one or exactly-one) +# or "optionalmultiple", "requiredmultiple" (for zero-or-more +# or one-or-more). +mode: required + +# Software installation method: +# +# - "legacy" or "custom" or "contextualprocess" +# When set to "legacy", writes a GlobalStorage value for the choice that +# has been made. The key is *packagechooser_*. Normally, the module's +# instance name is used; see the *instances* section of `settings.conf`. +# If there is just one packagechooser module, and no special instance is set, +# resulting GS key is probably *packagechooser@packagechooser*. +# You can set *id* to change that, but it is not recommended. +# +# The GS value is a comma-separated list of the IDs of the selected +# packages, or an empty string if none is selected. +# +# With "legacy" installation, you should have a contextualprocess or similar +# module somewhere in the `exec` phase to process the GlobalStorage key +# and actually **do** something for the packages. +# +# - "packages" +# When set to "packages", writes GlobalStorage values suitable for +# consumption by the *packages* module (which should appear later +# in the `exec` section. These package settings will then be handed +# off to whatever package manager is configured there. +# The *id* key is not used. +# +# There is no need to put this module in the `exec` section. There +# are no jobs that this module provides. You should put **other** +# modules, either *contextualprocess* or *packages* or some custom +# module, in the `exec` section to do the actual work. +method: legacy +# The *id* key is used only in "legacy" mode +# id: "" + +# The *pkgc* is used for setting the default selection in the QML view +pkgc: libreoffice + diff --git a/src/modules/packagechooserq/packagechooserq.qml b/src/modules/packagechooserq/packagechooserq.qml new file mode 100644 index 0000000000..cf7454fe9d --- /dev/null +++ b/src/modules/packagechooserq/packagechooserq.qml @@ -0,0 +1,254 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Anke Boersma + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +import io.calamares.core 1.0 +import io.calamares.ui 1.0 + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.3 + +Item { + width: parent.width + height: parent.height + + Rectangle { + anchors.fill: parent + color: "#f2f2f2" + + ButtonGroup { + id: switchGroup + } + + Column { + id: column + anchors.centerIn: parent + spacing: 5 + + Rectangle { + //id: rectangle + width: 700 + height: 150 + color: "#ffffff" + radius: 10 + border.width: 0 + Text { + width: 450 + height: 104 + anchors.centerIn: parent + text: qsTr("LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.
    + Default option.") + font.pointSize: 10 + anchors.verticalCenterOffset: -10 + anchors.horizontalCenterOffset: 100 + wrapMode: Text.WordWrap + } + + Switch { + id: element2 + x: 500 + y: 110 + width: 187 + height: 14 + text: qsTr("LibreOffice") + checked: true + hoverEnabled: true + ButtonGroup.group: switchGroup + + indicator: Rectangle { + implicitWidth: 40 + implicitHeight: 14 + radius: 10 + color: element2.checked ? "#3498db" : "#B9B9B9" + border.color: element2.checked ? "#3498db" : "#cccccc" + + Rectangle { + x: element2.checked ? parent.width - width : 0 + y: (parent.height - height) / 2 + width: 20 + height: 20 + radius: 10 + color: element2.down ? "#cccccc" : "#ffffff" + border.color: element2.checked ? (element1.down ? "#3498db" : "#3498db") : "#999999" + } + } + + onCheckedChanged: { + if ( ! checked ) { + print("L not used") + } + else { + config.pkgc = "libreoffice" + print( config.pkgc ) + } + } + } + + Image { + id: image2 + x: 8 + y: 25 + height: 100 + fillMode: Image.PreserveAspectFit + source: "images/libreoffice.jpg" + } + } + + Rectangle { + width: 700 + height: 150 + radius: 10 + border.width: 0 + Text { + width: 450 + height: 104 + anchors.centerIn: parent + text: qsTr("If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.") + font.pointSize: 10 + anchors.verticalCenterOffset: -10 + anchors.horizontalCenterOffset: 100 + wrapMode: Text.WordWrap + } + + Switch { + id: element1 + x: 500 + y: 110 + width: 187 + height: 14 + text: qsTr("No Office Suite") + checked: false + hoverEnabled: true + ButtonGroup.group: switchGroup + + indicator: Rectangle { + implicitWidth: 40 + implicitHeight: 14 + radius: 10 + color: element1.checked ? "#3498db" : "#B9B9B9" + border.color: element1.checked ? "#3498db" : "#cccccc" + + Rectangle { + x: element1.checked ? parent.width - width : 0 + y: (parent.height - height) / 2 + width: 20 + height: 20 + radius: 10 + color: element1.down ? "#cccccc" : "#ffffff" + border.color: element1.checked ? (element1.down ? "#3498db" : "#3498db") : "#999999" + } + } + + onCheckedChanged: { + if ( ! checked ) { + print("not used") + //console.log("removed") + } + else { + print("No Office Suite") + config.pkgc = "no_office_suite" + } + } + } + + Image { + id: image + x: 8 + y: 25 + height: 100 + fillMode: Image.PreserveAspectFit + source: "images/no-selection.png" + } + + } + + Rectangle { + width: 700 + height: 150 + color: "#ffffff" + radius: 10 + border.width: 0 + Text { + width: 450 + height: 104 + anchors.centerIn: parent + text: qsTr("Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser.") + font.pointSize: 10 + anchors.verticalCenterOffset: -10 + anchors.horizontalCenterOffset: 100 + wrapMode: Text.WordWrap + } + + Switch { + id: element3 + x: 500 + y: 110 + width: 187 + height: 14 + text: qsTr("Minimal Install") + checked: false + hoverEnabled: true + ButtonGroup.group: switchGroup + + indicator: Rectangle { + implicitWidth: 40 + implicitHeight: 14 + radius: 10 + color: element3.checked ? "#3498db" : "#B9B9B9" + border.color: element3.checked ? "#3498db" : "#cccccc" + + Rectangle { + x: element3.checked ? parent.width - width : 0 + y: (parent.height - height) / 2 + width: 20 + height: 20 + radius: 10 + color: element3.down ? "#cccccc" : "#ffffff" + border.color: element3.checked ? (element3.down ? "#3498db" : "#3498db") : "#999999" + } + } + + onCheckedChanged: { + if ( ! checked ) { + print("M not used") + } + else { + print("minimal") + config.pkgc = "minimal_install" + } + } + } + + Image { + id: image3 + x: 8 + y: 25 + height: 100 + fillMode: Image.PreserveAspectFit + source: "images/plasma.png" + } + } + + Rectangle { + width: 700 + height: 25 + color: "#f2f2f2" + border.width: 0 + Text { + height: 25 + anchors.centerIn: parent + text: qsTr("Please select an option for your install, or use the default: LibreOffice included.") + font.pointSize: 10 + wrapMode: Text.WordWrap + } + } + } + } + +} diff --git a/src/modules/packagechooserq/packagechooserq.qrc b/src/modules/packagechooserq/packagechooserq.qrc new file mode 100644 index 0000000000..1b892dce1b --- /dev/null +++ b/src/modules/packagechooserq/packagechooserq.qrc @@ -0,0 +1,8 @@ + + + packagechooserq.qml + images/libreoffice.jpg + images/no-selection.png + images/plasma.png + + From 373b94b96880d70774cbdaf50fca75df762c6df5 Mon Sep 17 00:00:00 2001 From: demmm Date: Tue, 6 Jul 2021 19:37:28 +0200 Subject: [PATCH 258/492] [packagechooser] Config files adjusted for new QML modules function added to store selections from packagechooserq line 103 in Config.cpp needs adjusting to restore working regular widget based packagechooser prettyStatus added, made visible in packagechooserq only, ViewStep not altered in packagechooser for this yet --- src/modules/packagechooser/Config.cpp | 17 ++++++++++++++++- src/modules/packagechooser/Config.h | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index 106ae4538f..f66f168245 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-FileCopyrightText: 2021 Anke Boersma * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -99,7 +100,8 @@ Config::updateGlobalStorage( const QStringList& selected ) const { if ( m_method == PackageChooserMethod::Legacy ) { - QString value = selected.join( ',' ); + //QString value = selected.join( ',' ); + QString value = ( m_pkgc ); Calamares::JobQueue::instance()->globalStorage()->insert( m_id, value ); cDebug() << m_id<< "selected" << value; } @@ -116,6 +118,18 @@ Config::updateGlobalStorage( const QStringList& selected ) const } } +void +Config::setPkgc( const QString& pkgc ) +{ + m_pkgc = pkgc; + emit pkgcChanged( m_pkgc ); +} + +QString +Config::prettyStatus() const +{ + return tr( "Install option: %1" ).arg( m_pkgc ); +} static void fillModel( PackageListModel* model, const QVariantList& items ) @@ -183,6 +197,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap ) PackageChooserMode::Required ); m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ), PackageChooserMethod::Legacy ); + m_pkgc = CalamaresUtils::getString( configurationMap, "pkgc" ); if ( m_method == PackageChooserMethod::Legacy ) { diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h index 5959e3ea4f..b343a8cb2b 100644 --- a/src/modules/packagechooser/Config.h +++ b/src/modules/packagechooser/Config.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-FileCopyrightText: 2021 Anke Boersma * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -39,6 +40,9 @@ class Config : public Calamares::ModuleSystem::Config { Q_OBJECT + Q_PROPERTY( QString pkgc READ pkgc WRITE setPkgc NOTIFY pkgcChanged ) + Q_PROPERTY( QString prettyStatus READ prettyStatus NOTIFY prettyStatusChanged FINAL ) + public: Config( QObject* parent = nullptr ); ~Config() override; @@ -74,6 +78,15 @@ class Config : public Calamares::ModuleSystem::Config /// As updateGlobalStorage() with an empty selection list void fillGSSecondaryConfiguration() const { updateGlobalStorage( QStringList() ); } + QString pkgc() const { return m_pkgc; } + void setPkgc( const QString& pkgc ); + + QString prettyStatus() const; + +signals: + void pkgcChanged( QString pkgc ); + void prettyStatusChanged(); + private: PackageListModel* m_model = nullptr; QModelIndex m_defaultModelIndex; @@ -86,6 +99,8 @@ class Config : public Calamares::ModuleSystem::Config QString m_id; /// Value to use for id if none is set in the config file Calamares::ModuleSystem::InstanceKey m_defaultId; + /// QML selection + QString m_pkgc; }; From 6ea73a8ca2b7448cd19688e2e2daeed0172795e1 Mon Sep 17 00:00:00 2001 From: Camilo Higuita Date: Tue, 6 Jul 2021 18:56:45 -0500 Subject: [PATCH 259/492] usersq: use system colorscheme instead of hardcoded colors --- src/modules/usersq/usersq.qml | 44 ++++++++++++++--------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index 2eb4be1e16..54c1bd1079 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -23,9 +23,6 @@ Kirigami.ScrollablePage { width: parent.width height: parent.height - Kirigami.Theme.backgroundColor: "#EFF0F1" - Kirigami.Theme.textColor: "#1F1F1F" - header: Kirigami.Heading { Layout.fillWidth: true height: 50 @@ -57,8 +54,8 @@ Kirigami.ScrollablePage { text: config.fullName onTextChanged: config.setFullName(text) - palette.base: _userNameField.text.length ? "#f0fff0" : "#FBFBFB" - palette.highlight : _userNameField.text.length ? "#dcffdc" : "#FBFBFB" + palette.base: _userNameField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.backgroundColor + palette.highlight : _userNameField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor } } @@ -89,8 +86,8 @@ Kirigami.ScrollablePage { palette.base: _userLoginField.text.length ? ( acceptableInput ? ( _userLoginField.text === "root" - ? "#ffdae0" : "#f0fff0" ) : "#ffdae0" ) : "#FBFBFB" - palette.highlight : _userLoginField.text.length ? "#dcffdc" : "#FBFBFB" + ? Kirigami.Theme.negativeBackgroundColor : Kirigami.Theme.backgroundColor ) : Kirigami.Theme.negativeBackgroundColor ) : Kirigami.Theme.backgroundColor + palette.highlight : _userLoginField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor } Label { @@ -98,7 +95,6 @@ Kirigami.ScrollablePage { text: qsTr("If more than one person will use this computer, you can create multiple accounts after installation.") font.weight: Font.Thin font.pointSize: 8 - color: "#6D6D6D" } } @@ -133,7 +129,7 @@ Kirigami.ScrollablePage { placeholderText: qsTr("Computer Name") text: config.hostName validator: RegularExpressionValidator { regularExpression: /[a-zA-Z0-9][-a-zA-Z0-9_]+/ } - + color: Kirigami.Theme.textColor onTextChanged: acceptableInput ? ( _hostName.text === "localhost" ? forbiddenHost.visible=true @@ -143,10 +139,10 @@ Kirigami.ScrollablePage { palette.base: _hostName.text.length ? ( acceptableInput - ? ( _hostName.text === "localhost" ? "#ffdae0" : "#f0fff0" ) - : "#ffdae0") - : "#FBFBFB" - palette.highlight : _hostName.text.length ? "#dcffdc" : "#FBFBFB" + ? ( _hostName.text === "localhost" ? Kirigami.Theme.negativeBackgroundColor : Kirigami.Theme.backgroundColor ) + : Kirigami.Theme.negativeBackgroundColor) + : Kirigami.Theme.backgroundColor + palette.highlight : _hostName.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor } Label { @@ -154,7 +150,6 @@ Kirigami.ScrollablePage { text: qsTr("This name will be used if you make the computer visible to others on a network.") font.weight: Font.Thin font.pointSize: 8 - color: "#6D6D6D" } } @@ -194,8 +189,8 @@ Kirigami.ScrollablePage { text: config.userPassword onTextChanged: config.setUserPassword(text) - palette.base: _passwordField.text.length ? "#f0fff0" : "#FBFBFB" - palette.highlight : _passwordField.text.length ? "#dcffdc" : "#FBFBFB" + palette.base: _passwordField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.neutralBackgroundColor + palette.highlight : _passwordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor echoMode: TextInput.Password passwordMaskDelay: 300 @@ -217,9 +212,9 @@ Kirigami.ScrollablePage { palette.base: _verificationPasswordField.text.length ? ( _passwordField.text === _verificationPasswordField.text - ? "#f0fff0" : "#ffdae0" ) - : "#FBFBFB" - palette.highlight : _verificationPasswordField.text.length ? "#dcffdc" : "#FBFBFB" + ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeBackgroundColor ) + : Kirigami.Theme.backgroundColor + palette.highlight : _verificationPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor echoMode: TextInput.Password passwordMaskDelay: 300 @@ -233,7 +228,6 @@ Kirigami.ScrollablePage { font.weight: Font.Thin font.pointSize: 8 wrapMode: Text.WordWrap - color: "#6D6D6D" } } @@ -272,7 +266,6 @@ Kirigami.ScrollablePage { text: qsTr("Use the same password for the administrator account.") font.weight: Font.Thin font.pointSize: 8 - color: "#6D6D6D" } Column { @@ -297,8 +290,8 @@ Kirigami.ScrollablePage { onTextChanged: config.setRootPassword(text) - palette.base: _rootPasswordField.text.length ? "#f0fff0" : "#FBFBFB" - palette.highlight : _rootPasswordField.text.length ? "#dcffdc" : "#FBFBFB" + palette.base: _rootPasswordField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.neutralBackgroundColor + palette.highlight : _rootPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor echoMode: TextInput.Password passwordMaskDelay: 300 @@ -320,8 +313,8 @@ Kirigami.ScrollablePage { palette.base: _verificationRootPasswordField.text.length ? ( _rootPasswordField.text === _verificationRootPasswordField.text - ? "#f0fff0" : "#ffdae0") : "#FBFBFB" - palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : "#FBFBFB" + ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeBackgroundColor) : Kirigami.Theme.backgroundColor + palette.highlight : _verificationRootPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor echoMode: TextInput.Password passwordMaskDelay: 300 @@ -383,7 +376,6 @@ Kirigami.ScrollablePage { text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password.") font.weight: Font.Thin font.pointSize: 8 - color: "#6D6D6D" } } } From 995646936ff357bdaeab1d3f297c40b607823ddc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 7 Jul 2021 12:38:41 +0200 Subject: [PATCH 260/492] [mount] Add test exercising refactored btrfs code --- src/modules/mount/tests/3.global | 8 ++++++++ src/modules/mount/tests/3.job | 6 ++++++ 2 files changed, 14 insertions(+) create mode 100644 src/modules/mount/tests/3.global create mode 100644 src/modules/mount/tests/3.job diff --git a/src/modules/mount/tests/3.global b/src/modules/mount/tests/3.global new file mode 100644 index 0000000000..9dae421dfb --- /dev/null +++ b/src/modules/mount/tests/3.global @@ -0,0 +1,8 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +partitions: + - device: "/dev/sdb1" + mountPoint: "/" + fs: "btrfs" +partitionChoices: + swap: file diff --git a/src/modules/mount/tests/3.job b/src/modules/mount/tests/3.job new file mode 100644 index 0000000000..94b3a14928 --- /dev/null +++ b/src/modules/mount/tests/3.job @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +bogus: true + +# No configuration needed because the partitions are +# all filesystems that require no special handling. From eb4ffe737e55240759ff69c2ffb0108bb4a52d47 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 7 Jul 2021 12:57:08 +0200 Subject: [PATCH 261/492] [mount] Fix logic - filter() returns the items for which the predicate is True; we want to keep the subvolumes that do not have an explicit partition already associated. - need list() to hammer it back into a list for appending swap subvol. --- src/modules/mount/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index f5faad7d1f..2e96b60361 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -51,7 +51,7 @@ def get_btrfs_subvolumes(partitions): # Filter out the subvolumes which have a dedicated partition non_root_partition_mounts = [ m for m in [ p.get("mountPoint", None) for p in partitions ] if m is not None and m != '/' ] - btrfs_subvolumes = filter(lambda s : s["mountPoint"] in non_root_partition_mounts, btrfs_subvolumes) + btrfs_subvolumes = list(filter(lambda s : s["mountPoint"] not in non_root_partition_mounts, btrfs_subvolumes)) # If we have a swap **file**, give it a separate subvolume. swap_choice = libcalamares.globalstorage.value( "partitionChoices" ) From 6b9a1530f82f2be9477ba9e4fe63c6daa4c35d8f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 7 Jul 2021 13:08:06 +0200 Subject: [PATCH 262/492] [mount] Add test exercising partial-filtering --- src/modules/mount/tests/4.global | 11 +++++++++++ src/modules/mount/tests/4.job | 12 ++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/modules/mount/tests/4.global create mode 100644 src/modules/mount/tests/4.job diff --git a/src/modules/mount/tests/4.global b/src/modules/mount/tests/4.global new file mode 100644 index 0000000000..1856c9dc39 --- /dev/null +++ b/src/modules/mount/tests/4.global @@ -0,0 +1,11 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +partitions: + - device: "/dev/sdb1" + mountPoint: "/" + fs: "btrfs" + - device: "/dev/sdb2" + mountPoint: "/home" + fs: "ext4" +partitionChoices: + swap: file diff --git a/src/modules/mount/tests/4.job b/src/modules/mount/tests/4.job new file mode 100644 index 0000000000..dac7582278 --- /dev/null +++ b/src/modules/mount/tests/4.job @@ -0,0 +1,12 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 + +btrfsSubvolumes: + - mountPoint: / + subvolume: /@ + - mountPoint: /home + subvolume: /@home + - mountPoint: /var/cache + subvolume: /@cache + - mountPoint: /var/log + subvolume: /@log From c2585749ac1912bfd7e7e5835eb1b99c1c008295 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 12 Jul 2021 14:13:49 +0200 Subject: [PATCH 263/492] i18n: [python] Automatic merge of Transifex translations --- lang/python/az/LC_MESSAGES/python.po | 4 ++-- lang/python/az_AZ/LC_MESSAGES/python.po | 4 ++-- lang/python/es/LC_MESSAGES/python.po | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index c0f992eedd..7c06bf7291 100644 --- a/lang/python/az/LC_MESSAGES/python.po +++ b/lang/python/az/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Xəyyam Qocayev , 2020 +# xxmn77 , 2020 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Xəyyam Qocayev , 2020\n" +"Last-Translator: xxmn77 , 2020\n" "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index a62ed8b68e..0c13ae5c41 100644 --- a/lang/python/az_AZ/LC_MESSAGES/python.po +++ b/lang/python/az_AZ/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Xəyyam Qocayev , 2020 +# xxmn77 , 2020 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-19 14:27+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Xəyyam Qocayev , 2020\n" +"Last-Translator: xxmn77 , 2020\n" "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po index 02345b5e70..898221725f 100644 --- a/lang/python/es/LC_MESSAGES/python.po +++ b/lang/python/es/LC_MESSAGES/python.po @@ -7,7 +7,7 @@ # strel, 2017 # Francisco Sánchez López de Lerma , 2018 # Guido Grasso , 2018 -# Adolfo Jayme-Barrientos, 2019 +# Adolfo Jayme Barrientos, 2019 # Miguel Mayol , 2020 # Pier Jose Gotta Perez , 2020 # From fedfed561952707c539f32074e10c580fb699dc6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 12 Jul 2021 14:31:04 +0200 Subject: [PATCH 264/492] i18n: update english originals --- lang/calamares_en.ts | 476 +++++++++++++++++++++++----------------- lang/python.pot | 500 ++++++++++++++++++++++--------------------- 2 files changed, 541 insertions(+), 435 deletions(-) diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index dfb3ddb95a..6c6a8122c1 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -30,27 +30,27 @@ BootLoaderModel - + Master Boot Record of %1 Master Boot Record of %1 - + Boot Partition Boot Partition - + System Partition System Partition - + Do not install a boot loader Do not install a boot loader - + %1 (%2) %1 (%2) @@ -205,32 +205,32 @@ Calamares::PythonJob - + Running %1 operation. Running %1 operation. - + Bad working directory path Bad working directory path - + Working directory %1 for python job %2 is not readable. Working directory %1 for python job %2 is not readable. - + Bad main script file Bad main script file - + Main script file %1 for python job %2 is not readable. Main script file %1 for python job %2 is not readable. - + Boost.Python error in job "%1". Boost.Python error in job "%1". @@ -285,54 +285,54 @@ Calamares::ViewManager - + Setup Failed Setup Failed - + Installation Failed Installation Failed - + Would you like to paste the install log to the web? Would you like to paste the install log to the web? - + Error Error - - + + &Yes &Yes - - + + &No &No - + &Close &Close - + Install Log Paste URL Install Log Paste URL - + The upload was unsuccessful. No web-paste was done. The upload was unsuccessful. No web-paste was done. - + Install log posted to %1 @@ -345,124 +345,124 @@ Link copied to clipboard Link copied to clipboard - + Calamares Initialization Failed Calamares Initialization Failed - + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. - + <br/>The following modules could not be loaded: <br/>The following modules could not be loaded: - + Continue with setup? Continue with setup? - + Continue with installation? Continue with installation? - + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> - + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> - + &Set up now &Set up now - + &Install now &Install now - + Go &back Go &back - + &Set up &Set up - + &Install &Install - + Setup is complete. Close the setup program. Setup is complete. Close the setup program. - + The installation is complete. Close the installer. The installation is complete. Close the installer. - + Cancel setup without changing the system. Cancel setup without changing the system. - + Cancel installation without changing the system. Cancel installation without changing the system. - + &Next &Next - + &Back &Back - + &Done &Done - + &Cancel &Cancel - + Cancel setup? Cancel setup? - + Cancel installation? Cancel installation? - + Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. Do you really want to cancel the current setup process? The setup program will quit and all changes will be lost. - + Do you really want to cancel the current install process? The installer will quit and all changes will be lost. Do you really want to cancel the current install process? @@ -472,22 +472,22 @@ The installer will quit and all changes will be lost. CalamaresPython::Helper - + Unknown exception type Unknown exception type - + unparseable Python error unparseable Python error - + unparseable Python traceback unparseable Python traceback - + Unfetchable Python error. Unfetchable Python error. @@ -505,6 +505,24 @@ The installer will quit and all changes will be lost. %1 Installer + + ChangeFilesystemLabelJob + + + Set filesystem label on %1. + + + + + Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>. + + + + + The installer failed to update partition table on disk '%1'. + + + CheckerContainer @@ -521,149 +539,149 @@ The installer will quit and all changes will be lost. Form - + Select storage de&vice: Select storage de&vice: - - - - + + + + Current: Current: - + After: After: - + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. - + Reuse %1 as home partition for %2. Reuse %1 as home partition for %2. - + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> - + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. - + Boot loader location: Boot loader location: - + <strong>Select a partition to install on</strong> <strong>Select a partition to install on</strong> - + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. - + The EFI system partition at %1 will be used for starting %2. The EFI system partition at %1 will be used for starting %2. - + EFI system partition: EFI system partition: - + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - - - - + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. - - - - + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. - - - + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. <strong>Replace a partition</strong><br/>Replaces a partition with %1. - + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. - + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> - + This storage device has one of its partitions <strong>mounted</strong>. This storage device has one of its partitions <strong>mounted</strong>. - + This storage device is a part of an <strong>inactive RAID</strong> device. This storage device is a part of an <strong>inactive RAID</strong> device. - + No Swap No Swap - + Reuse Swap Reuse Swap - + Swap (no Hibernate) Swap (no Hibernate) - + Swap (with Hibernate) Swap (with Hibernate) - + Swap to file Swap to file @@ -699,12 +717,12 @@ The installer will quit and all changes will be lost. Clearing all temporary mounts. - + Cannot get list of temporary mounts. Cannot get list of temporary mounts. - + Cleared all temporary mounts. Cleared all temporary mounts. @@ -731,27 +749,27 @@ The installer will quit and all changes will be lost. Config - + Set keyboard model to %1.<br/> Set keyboard model to %1.<br/> - + Set keyboard layout to %1/%2. Set keyboard layout to %1/%2. - + Set timezone to %1/%2. Set timezone to %1/%2. - + The system language will be set to %1. The system language will be set to %1. - + The numbers and dates locale will be set to %1. The numbers and dates locale will be set to %1. @@ -875,6 +893,11 @@ The installer will quit and all changes will be lost. Your passwords do not match! Your passwords do not match! + + + OK! + + Setup Failed @@ -915,6 +938,16 @@ The installer will quit and all changes will be lost. The installation of %1 is complete. The installation of %1 is complete. + + + Package Selection + Package Selection + + + + Please pick a product from the list. The selected product will be installed. + Please pick a product from the list. The selected product will be installed. + ContextualProcessJob @@ -977,27 +1010,37 @@ The installer will quit and all changes will be lost. Flags: - + + Label for the filesystem + + + + + FS Label: + + + + En&crypt En&crypt - + Logical Logical - + Primary Primary - + GPT GPT - + Mountpoint already in use. Please select another one. Mountpoint already in use. Please select another one. @@ -1005,43 +1048,43 @@ The installer will quit and all changes will be lost. CreatePartitionJob - + Create new %1MiB partition on %3 (%2) with entries %4. Create new %1MiB partition on %3 (%2) with entries %4. - + Create new %1MiB partition on %3 (%2). Create new %1MiB partition on %3 (%2). - + Create new %2MiB partition on %4 (%3) with file system %1. Create new %2MiB partition on %4 (%3) with file system %1. - + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. - + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). - + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. + - Creating new %1 partition on %2. Creating new %1 partition on %2. - + The installer failed to create partition on disk '%1'. The installer failed to create partition on disk '%1'. @@ -1092,7 +1135,7 @@ The installer will quit and all changes will be lost. Creating new %1 partition table on %2. - + The installer failed to create a partition table on %1. The installer failed to create a partition table on %1. @@ -1331,7 +1374,17 @@ The installer will quit and all changes will be lost. Flags: - + + Label for the filesystem + + + + + FS Label: + + + + Mountpoint already in use. Please select another one. Mountpoint already in use. Please select another one. @@ -1368,57 +1421,57 @@ The installer will quit and all changes will be lost. FillGlobalStorageJob - + Set partition information Set partition information - + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> - + Install %1 on <strong>new</strong> %2 system partition. Install %1 on <strong>new</strong> %2 system partition. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. - + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. - + Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. - + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. - + Install %2 on %3 system partition <strong>%1</strong>. Install %2 on %3 system partition <strong>%1</strong>. - + Install boot loader on <strong>%1</strong>. Install boot loader on <strong>%1</strong>. - + Setting up mount points. Setting up mount points. @@ -1831,6 +1884,14 @@ The installer will quit and all changes will be lost. Location + + LocaleTests + + + Quit + + + LocaleViewStep @@ -2050,29 +2111,29 @@ The installer will quit and all changes will be lost. Offline - - Select your preferred Region, or use the default one based on your current location. - Select your preferred Region, or use the default one based on your current location. + + Select your preferred Region, or use the default settings. + - - - + + + Timezone: %1 Timezone: %1 - + Select your preferred Zone within your Region. Select your preferred Zone within your Region. - + Zones Zones - + You can fine-tune Language and Locale settings below. You can fine-tune Language and Locale settings below. @@ -2388,7 +2449,7 @@ The installer will quit and all changes will be lost. PackageChooserViewStep - + Packages Packages @@ -2569,33 +2630,38 @@ The installer will quit and all changes will be lost. PartitionModel - + Free Space Free Space - + New partition New partition - + Name Name - + File System File System - + + File System Label + + + + Mount Point Mount Point - + Size Size @@ -2681,117 +2747,117 @@ The installer will quit and all changes will be lost. PartitionViewStep - + Gathering system information... Gathering system information... - + Partitions Partitions - + Install %1 <strong>alongside</strong> another operating system. Install %1 <strong>alongside</strong> another operating system. - + <strong>Erase</strong> disk and install %1. <strong>Erase</strong> disk and install %1. - + <strong>Replace</strong> a partition with %1. <strong>Replace</strong> a partition with %1. - + <strong>Manual</strong> partitioning. <strong>Manual</strong> partitioning. - + Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3). - + <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1. - + <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1. - + <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2). - + Disk <strong>%1</strong> (%2) Disk <strong>%1</strong> (%2) - + Current: Current: - + After: After: - + No EFI system partition configured No EFI system partition configured - + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start. - + An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start. - + EFI system partition flag not set EFI system partition flag not set - + Option to use GPT on BIOS Option to use GPT on BIOS - + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. - + Boot partition not encrypted Boot partition not encrypted - + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. - + has at least one disk device available. has at least one disk device available. - + There are no partitions to install on. There are no partitions to install on. @@ -2981,17 +3047,17 @@ Output: Could not create new random file <pre>%1</pre>. - + No product No product - + No description provided. No description provided. - + (no mount point) (no mount point) @@ -3252,12 +3318,12 @@ Output: ResultsListDialog - + For best results, please ensure that this computer: For best results, please ensure that this computer: - + System requirements System requirements @@ -3265,27 +3331,27 @@ Output: ResultsListWidget - + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> - + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. - + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. - + This program will ask you some questions and set up %2 on your computer. This program will ask you some questions and set up %2 on your computer. @@ -3441,7 +3507,7 @@ Output: Setting flags <strong>%1</strong> on new partition. - + The installer failed to set flags on partition %1. The installer failed to set flags on partition %1. @@ -3584,12 +3650,12 @@ Output: SummaryPage - + This is an overview of what will happen once you start the setup procedure. This is an overview of what will happen once you start the setup procedure. - + This is an overview of what will happen once you start the install procedure. This is an overview of what will happen once you start the install procedure. @@ -4165,107 +4231,127 @@ Output: Pick your user name and credentials to login and perform admin tasks - + What is your name? What is your name? - + Your Full Name Your Full Name - + What name do you want to use to log in? What name do you want to use to log in? - + Login Name Login Name - + If more than one person will use this computer, you can create multiple accounts after installation. If more than one person will use this computer, you can create multiple accounts after installation. - + + Only lowercase letters, numbers, underscore and hyphen are allowed. + Only lowercase letters, numbers, underscore and hyphen are allowed. + + + + root is not allowed as username. + + + + What is the name of this computer? What is the name of this computer? - + Computer Name Computer Name - + This name will be used if you make the computer visible to others on a network. This name will be used if you make the computer visible to others on a network. - + + Only letter, numbers, underscore and hyphen are allowed, minimal of two characters. + + + + + localhost is not allowed as hostname. + + + + Choose a password to keep your account safe. Choose a password to keep your account safe. - + Password Password - + Repeat Password Repeat Password - + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Validate passwords quality Validate passwords quality - + When this box is checked, password-strength checking is done and you will not be able to use a weak password. When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Log in automatically without asking for the password Log in automatically without asking for the password - + Reuse user password as root password Reuse user password as root password - + Use the same password for the administrator account. Use the same password for the administrator account. - + Choose a root password to keep your account safe. Choose a root password to keep your account safe. - + Root Password Root Password - + Repeat Root Password Repeat Root Password - + Enter the same password twice, so that it can be checked for typing errors. Enter the same password twice, so that it can be checked for typing errors. diff --git a/lang/python.pot b/lang/python.pot index 7b88670663..d2ae8b0346 100644 --- a/lang/python.pot +++ b/lang/python.pot @@ -2,361 +2,381 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-19 14:27+0100\n" +"POT-Creation-Date: 2021-07-12 14:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: src/modules/grubcfg/main.py:28 -msgid "Configure GRUB." -msgstr "Configure GRUB." +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "" -#: src/modules/mount/main.py:30 -msgid "Mounting partitions." -msgstr "Mounting partitions." +#: src/modules/bootloader/main.py:502 +msgid "Bootloader installation error" +msgstr "" -#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198 -#: src/modules/initcpiocfg/main.py:202 -#: src/modules/luksopenswaphookcfg/main.py:86 -#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164 -#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 -#: src/modules/openrcdmcryptcfg/main.py:72 -#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355 -#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135 -#: src/modules/networkcfg/main.py:39 -msgid "Configuration Error" -msgstr "Configuration Error" +#: src/modules/bootloader/main.py:503 +msgid "" +"The bootloader could not be installed. The installation command 

    {!s} returned error code {!s}."
+msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount file systems."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Filling up filesystems."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync failed with error code {}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Unpacking image {}/{}, file {}/{}"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Starting to unpack {}"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Failed to unpack image \"{}\""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No mount point for root partition"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Bad mount point for root partition"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91 src/modules/networkcfg/main.py:40
+#: src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "The source filesystem \"{}\" does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "The destination \"{}\" in the target system is not a directory"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
-msgstr "Cannot write KDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
-msgstr "Cannot write LXDM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
-msgstr "Cannot write LightDM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
-msgstr "Cannot configure LightDM"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
-msgstr "No LightDM greeter installed."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
-msgstr "Cannot write SLIM configuration file"
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM config file {!s} does not exist"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
-msgstr "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
-msgstr "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
-msgstr "Installing data."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
-msgstr "Configure OpenRC services"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:57
 msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:59
 msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:61
 msgid ""
 "Unknown service-action {arg!s} for service {name!s} in run-"
 "level {level!s}."
 msgstr ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
 
 #: src/modules/services-openrc/main.py:101
 msgid "Target runlevel does not exist"
-msgstr "Target runlevel does not exist"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:102
 msgid ""
 "The path for runlevel {level!s} is {path!s}, which does not "
 "exist."
 msgstr ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
 
 #: src/modules/services-openrc/main.py:110
 msgid "Target service does not exist"
-msgstr "Target service does not exist"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:111
 msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+"The path for service {name!s} is {path!s}, which does not exist."
 msgstr ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""

From 7094c7bf39a1f6d625fb3db8344da5e60002807a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 12 Jul 2021 14:56:04 +0200
Subject: [PATCH 265/492] [partition] Minor stylistic bits

---
 src/modules/partition/PartitionViewStep.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 8881d45693..5b225811ef 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -112,7 +112,6 @@ PartitionViewStep::prettyName() const
 QString
 PartitionViewStep::prettyStatus() const
 {
-    //return tr( "Create new GPT partition table on /dev/sdb" ); //includes %1" ); .arg ( m_pkgc );
     QString jobsLabel, modeText, diskInfoLabel;
 
     Config::InstallChoice choice = m_config->installChoice();
@@ -123,8 +122,8 @@ PartitionViewStep::prettyStatus() const
     cDebug() << "Summary for Partition" << list.length() << choice;
     if ( list.length() > 1 )  // There are changes on more than one disk
     {
-//         NOTE: all of this should only happen when Manual partitioning is active.
-//         Any other choice should result in a list.length() == 1.
+        // NOTE: all of this should only happen when Manual partitioning is active.
+        //       Any other choice should result in a list.length() == 1.
         switch ( choice )
         {
             case Config::Alongside:
@@ -199,14 +198,6 @@ PartitionViewStep::prettyStatus() const
     return diskInfoLabel + "
    " + jobsLabel;
 }
 
-
-QWidget*
-PartitionViewStep::widget()
-{
-    return m_widget;
-}
-
-
 QWidget*
 PartitionViewStep::createSummaryWidget() const
 {
@@ -355,6 +346,11 @@ PartitionViewStep::createSummaryWidget() const
     return widget;
 }
 
+QWidget*
+PartitionViewStep::widget()
+{
+    return m_widget;
+}
 
 void
 PartitionViewStep::next()

From 535f81ba8a8086c2ef4b9cf91cdda5c265459276 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 12 Jul 2021 15:02:24 +0200
Subject: [PATCH 266/492] [partition] Factor out gather job-descriptions

Since prettyStatus() and the summaryWidget share a lot of
strings and code, start factoring that out.
---
 src/modules/partition/PartitionViewStep.cpp | 31 ++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 5b225811ef..d4a0326739 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -109,6 +109,19 @@ PartitionViewStep::prettyName() const
     return tr( "Partitions" );
 }
 
+static QStringList jobDescriptions( const Calamares::JobList& jobs )
+{
+    QStringList jobsLines;
+    for( const Calamares::job_ptr& job : qAsConst( jobs ) )
+    {
+        if ( !job->prettyDescription().isEmpty() )
+        {
+            jobsLines.append( job->prettyDescription() );
+        }
+    }
+    return jobsLines;
+}
+
 QString
 PartitionViewStep::prettyStatus() const
 {
@@ -182,14 +195,7 @@ PartitionViewStep::prettyStatus() const
         }
     }
 
-    QStringList jobsLines;
-    foreach ( const Calamares::job_ptr& job, jobs() )
-    {
-        if ( !job->prettyDescription().isEmpty() )
-        {
-            jobsLines.append( job->prettyDescription() );
-        }
-    }
+    const QStringList jobsLines = jobDescriptions( jobs() );
     if ( !jobsLines.isEmpty() )
     {
         jobsLabel = jobsLines.join( "
    " );
@@ -324,14 +330,7 @@ PartitionViewStep::createSummaryWidget() const
         field->addWidget( previewLabels );
         formLayout->addRow( tr( "After:" ), field );
     }
-    QStringList jobsLines;
-    foreach ( const Calamares::job_ptr& job, jobs() )
-    {
-        if ( !job->prettyDescription().isEmpty() )
-        {
-            jobsLines.append( job->prettyDescription() );
-        }
-    }
+    const QStringList jobsLines = jobDescriptions( jobs() );
     if ( !jobsLines.isEmpty() )
     {
         QLabel* jobsLabel = new QLabel( widget );

From 400a5751f916302762d1c3ed16ec9fd8c625b10c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 12 Jul 2021 15:17:34 +0200
Subject: [PATCH 267/492] [partition] Factor out description of action in
 status and widget

---
 src/modules/partition/PartitionViewStep.cpp | 64 +++++++++------------
 1 file changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index d4a0326739..7576c7a054 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -122,6 +122,30 @@ static QStringList jobDescriptions( const Calamares::JobList& jobs )
     return jobsLines;
 }
 
+static QString modeDescription( Config::InstallChoice choice )
+{
+    const auto* branding = Calamares::Branding::instance();
+    static const char context[] = "PartitionViewStep";
+
+    switch ( choice )
+    {
+    case Config::InstallChoice::Alongside:
+        return QCoreApplication::translate( context, "Install %1 alongside another operating system." )
+                        .arg( branding->shortVersionedName() );
+        break;
+    case Config::InstallChoice::Erase:
+        return QCoreApplication::translate( context, "Erase disk and install %1." ).arg( branding->shortVersionedName() );
+        break;
+    case Config::InstallChoice::Replace:
+        return QCoreApplication::translate( context, "Replace a partition with %1." ).arg( branding->shortVersionedName() );
+        break;
+    case Config::InstallChoice::NoChoice:
+    case Config::InstallChoice::Manual:
+        return QCoreApplication::translate( context, "Manual partitioning." );
+    }
+    return QString();
+}
+
 QString
 PartitionViewStep::prettyStatus() const
 {
@@ -135,26 +159,7 @@ PartitionViewStep::prettyStatus() const
     cDebug() << "Summary for Partition" << list.length() << choice;
     if ( list.length() > 1 )  // There are changes on more than one disk
     {
-        // NOTE: all of this should only happen when Manual partitioning is active.
-        //       Any other choice should result in a list.length() == 1.
-        switch ( choice )
-        {
-            case Config::Alongside:
-                modeText = tr( "Install %1 alongside another operating system." )
-                .arg( branding->shortVersionedName() );
-                break;
-            case Config::Erase:
-                modeText
-                = tr( "Erase disk and install %1." ).arg( branding->shortVersionedName() );
-                break;
-            case Config::Replace:
-                modeText
-                = tr( "Replace a partition with %1." ).arg( branding->shortVersionedName() );
-                break;
-            case Config::NoChoice:
-            case Config::Manual:
-                modeText = tr( "Manual partitioning." );
-        }
+        modeText = modeDescription(choice);
     }
 
     for ( const auto& info : list )
@@ -227,24 +232,7 @@ PartitionViewStep::createSummaryWidget() const
         //      Any other choice should result in a list.length() == 1.
         QLabel* modeLabel = new QLabel;
         formLayout->addRow( modeLabel );
-        QString modeText;
-        switch ( choice )
-        {
-        case Config::InstallChoice::Alongside:
-            modeText = tr( "Install %1 alongside another operating system." )
-                           .arg( branding->shortVersionedName() );
-            break;
-        case Config::InstallChoice::Erase:
-            modeText = tr( "Erase disk and install %1." ).arg( branding->shortVersionedName() );
-            break;
-        case Config::InstallChoice::Replace:
-            modeText = tr( "Replace a partition with %1." ).arg( branding->shortVersionedName() );
-            break;
-        case Config::InstallChoice::NoChoice:
-        case Config::InstallChoice::Manual:
-            modeText = tr( "Manual partitioning." );
-        }
-        modeLabel->setText( modeText );
+        modeLabel->setText( modeDescription( choice ) );
     }
     for ( const auto& info : list )
     {

From e8b17b9878f8ead237aa76e92be31fd99a598fd4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 12 Jul 2021 15:39:12 +0200
Subject: [PATCH 268/492] [partition] Factor out the descriptions per-disk

---
 src/modules/partition/PartitionViewStep.cpp | 142 +++++++++-----------
 1 file changed, 65 insertions(+), 77 deletions(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 7576c7a054..69ea4cb2e1 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -109,6 +109,12 @@ PartitionViewStep::prettyName() const
     return tr( "Partitions" );
 }
 
+/** @brief Gather the pretty descriptions of all the partitioning jobs
+ *
+ * Returns a QStringList of each job's pretty description, including
+ * empty strings and duplicates. The list is in-order of how the
+ * jobs will be run.
+ */
 static QStringList jobDescriptions( const Calamares::JobList& jobs )
 {
     QStringList jobsLines;
@@ -122,6 +128,10 @@ static QStringList jobDescriptions( const Calamares::JobList& jobs )
     return jobsLines;
 }
 
+/** @brief A top-level description of what @p choice does
+ *
+ * Returns a (branded) string describing what @p choice will do.
+ */
 static QString modeDescription( Config::InstallChoice choice )
 {
     const auto* branding = Calamares::Branding::instance();
@@ -146,15 +156,62 @@ static QString modeDescription( Config::InstallChoice choice )
     return QString();
 }
 
+/** @brief A top-level description of what @p choice does to disk @p info
+ *
+ * Returns a (branded, and device-specific) string describing what
+ * will be done to device @p info when @p choice is made. The @p listLength
+ * is used to provide context; when more than one disk is in use, the description
+ * works differently.
+ */
+static QString diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, Config::InstallChoice choice )
+{
+    const auto* branding = Calamares::Branding::instance();
+    static const char context[] = "PartitionViewStep";
+
+    if ( listLength == 1 )  // this is the only disk preview
+    {
+        switch ( choice )
+        {
+            case Config::Alongside:
+                return QCoreApplication::translate( context, "Install %1 alongside another operating system on disk "
+                "%2 (%3)." )
+                .arg( branding->shortVersionedName() )
+                .arg( info.deviceNode )
+                .arg( info.deviceName );
+                break;
+            case Config::Erase:
+                return QCoreApplication::translate( context, "Erase disk %2 (%3) and install %1." )
+                .arg( branding->shortVersionedName() )
+                .arg( info.deviceNode )
+                .arg( info.deviceName );
+                break;
+            case Config::Replace:
+                return QCoreApplication::translate( context, "Replace a partition on disk %2 (%3) with %1." )
+                .arg( branding->shortVersionedName() )
+                .arg( info.deviceNode )
+                .arg( info.deviceName );
+                break;
+            case Config::NoChoice:
+            case Config::Manual:
+                return QCoreApplication::translate( context, "Manual partitioning on disk %1 (%2)." )
+                .arg( info.deviceNode )
+                .arg( info.deviceName );
+        }
+        return QString();
+    }
+    else  // multiple disk previews!
+    {
+        return QCoreApplication::translate( context, "Disk %1 (%2)" ).arg( info.deviceNode ).arg( info.deviceName ) ;
+    }
+}
+
 QString
 PartitionViewStep::prettyStatus() const
 {
     QString jobsLabel, modeText, diskInfoLabel;
 
-    Config::InstallChoice choice = m_config->installChoice();
-    const auto* branding = Calamares::Branding::instance();
-
-    QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
+    const Config::InstallChoice choice = m_config->installChoice();
+    const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
 
     cDebug() << "Summary for Partition" << list.length() << choice;
     if ( list.length() > 1 )  // There are changes on more than one disk
@@ -164,40 +221,8 @@ PartitionViewStep::prettyStatus() const
 
     for ( const auto& info : list )
     {
-        if ( list.length() == 1 )  // this is the only disk preview
-        {
-            switch ( choice )
-            {
-                case Config::Alongside:
-                    diskInfoLabel = tr( "Install %1 alongside another operating system on disk "
-                    "%2 (%3)." )
-                    .arg( branding->shortVersionedName() )
-                    .arg( info.deviceNode )
-                    .arg( info.deviceName );
-                    break;
-                case Config::Erase:
-                    diskInfoLabel = tr( "Erase disk %2 (%3) and install %1." )
-                    .arg( branding->shortVersionedName() )
-                    .arg( info.deviceNode )
-                    .arg( info.deviceName );
-                    break;
-                case Config::Replace:
-                    diskInfoLabel = tr( "Replace a partition on disk %2 (%3) with %1." )
-                    .arg( branding->shortVersionedName() )
-                    .arg( info.deviceNode )
-                    .arg( info.deviceName );
-                    break;
-                case Config::NoChoice:
-                case Config::Manual:
-                    diskInfoLabel = tr( "Manual partitioning on disk %1 (%2)." )
-                    .arg( info.deviceNode )
-                    .arg( info.deviceName );
-            }
-        }
-        else  // multiple disk previews!
-        {
-            diskInfoLabel =  tr( "Disk %1 (%2)" ).arg( info.deviceNode ).arg( info.deviceName ) ;
-        }
+        // TODO: this overwrites each iteration
+        diskInfoLabel = diskDescription( list.length(), info, choice );
     }
 
     const QStringList jobsLines = jobDescriptions( jobs() );
@@ -224,8 +249,7 @@ PartitionViewStep::createSummaryWidget() const
     formLayout->setContentsMargins( MARGIN, 0, MARGIN, MARGIN );
     mainLayout->addLayout( formLayout );
 
-    const auto* branding = Calamares::Branding::instance();
-    QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
+    const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo();
     if ( list.length() > 1 )  // There are changes on more than one disk
     {
         //NOTE: all of this should only happen when Manual partitioning is active.
@@ -237,43 +261,7 @@ PartitionViewStep::createSummaryWidget() const
     for ( const auto& info : list )
     {
         QLabel* diskInfoLabel = new QLabel;
-        if ( list.length() == 1 )  // this is the only disk preview
-        {
-            QString modeText;
-            switch ( choice )
-            {
-            case Config::InstallChoice::Alongside:
-                modeText = tr( "Install %1 alongside another operating system on disk "
-                               "%2 (%3)." )
-                               .arg( branding->shortVersionedName() )
-                               .arg( info.deviceNode )
-                               .arg( info.deviceName );
-                break;
-            case Config::InstallChoice::Erase:
-                modeText = tr( "Erase disk %2 (%3) and install %1." )
-                               .arg( branding->shortVersionedName() )
-                               .arg( info.deviceNode )
-                               .arg( info.deviceName );
-                break;
-            case Config::InstallChoice::Replace:
-                modeText = tr( "Replace a partition on disk %2 (%3) with %1." )
-                               .arg( branding->shortVersionedName() )
-                               .arg( info.deviceNode )
-                               .arg( info.deviceName );
-                break;
-            case Config::InstallChoice::NoChoice:
-            case Config::InstallChoice::Manual:
-                modeText = tr( "Manual partitioning on disk %1 (%2)." )
-                               .arg( info.deviceNode )
-                               .arg( info.deviceName );
-            }
-            diskInfoLabel->setText( modeText );
-        }
-        else  // multiple disk previews!
-        {
-            diskInfoLabel->setText(
-                tr( "Disk %1 (%2)" ).arg( info.deviceNode ).arg( info.deviceName ) );
-        }
+        diskInfoLabel->setText( diskDescription( list.length(), info, choice ) );
         formLayout->addRow( diskInfoLabel );
 
         PartitionBarsView* preview;

From b43759c6a5eaa93e2711988e21a57a2091574a69 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 12 Jul 2021 15:42:54 +0200
Subject: [PATCH 269/492] [partition] Apply coding style

---
 src/modules/partition/Config.cpp              | 14 +--
 src/modules/partition/Config.h                |  5 +-
 src/modules/partition/PartitionViewStep.cpp   | 61 +++++++-----
 src/modules/partition/core/PartUtils.cpp      | 32 +++---
 .../partition/core/PartitionLayout.cpp        | 98 ++++++++++---------
 src/modules/partition/gui/ChoicePage.cpp      |  7 +-
 6 files changed, 117 insertions(+), 100 deletions(-)

diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp
index 82c0ad846f..508231a75f 100644
--- a/src/modules/partition/Config.cpp
+++ b/src/modules/partition/Config.cpp
@@ -227,7 +227,8 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
     QString firmwareType( PartUtils::isEfiSystem() ? QStringLiteral( "efi" ) : QStringLiteral( "bios" ) );
     gs->insert( "firmwareType", firmwareType );
 
-    gs->insert( "efiSystemPartition", CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) );
+    gs->insert( "efiSystemPartition",
+                CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) ) );
 
     // Read and parse key efiSystemPartitionSize
     if ( configurationMap.contains( "efiSystemPartitionSize" ) )
@@ -243,7 +244,7 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
 }
 
 void
-Config::fillConfigurationFSTypes(const QVariantMap& configurationMap)
+Config::fillConfigurationFSTypes( const QVariantMap& configurationMap )
 {
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
 
@@ -256,15 +257,16 @@ Config::fillConfigurationFSTypes(const QVariantMap& configurationMap)
     if ( fsName.isEmpty() )
     {
         cWarning() << "Partition-module setting *defaultFileSystemType* is missing, will use ext4";
-        fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral("ext4"), &fsType );
+        fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral( "ext4" ), &fsType );
     }
     else
     {
         fsRealName = PartUtils::canonicalFilesystemName( fsName, &fsType );
         if ( fsType == FileSystem::Type::Unknown )
         {
-            cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName << ") using ext4 instead";
-            fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral("ext4"), &fsType );
+            cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << fsName
+                       << ") using ext4 instead";
+            fsRealName = PartUtils::canonicalFilesystemName( QStringLiteral( "ext4" ), &fsType );
         }
         else if ( fsRealName != fsName )
         {
@@ -326,7 +328,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     m_requiredPartitionTableType = CalamaresUtils::getStringList( configurationMap, "requiredPartitionTableType" );
     gs->insert( "requiredPartitionTableType", m_requiredPartitionTableType );
 
-    fillGSConfigurationEFI(gs, configurationMap);
+    fillGSConfigurationEFI( gs, configurationMap );
     fillConfigurationFSTypes( configurationMap );
 }
 
diff --git a/src/modules/partition/Config.h b/src/modules/partition/Config.h
index 3365403fab..5f7e46821d 100644
--- a/src/modules/partition/Config.h
+++ b/src/modules/partition/Config.h
@@ -27,7 +27,8 @@ class Config : public QObject
     Q_PROPERTY( SwapChoice swapChoice READ swapChoice WRITE setSwapChoice NOTIFY swapChoiceChanged )
 
     ///@brief Name of the FS that will be used when erasing type disk (e.g. "default filesystem")
-    Q_PROPERTY( QString eraseModeFilesystem READ eraseFsType WRITE setEraseFsTypeChoice NOTIFY eraseModeFilesystemChanged )
+    Q_PROPERTY(
+        QString eraseModeFilesystem READ eraseFsType WRITE setEraseFsTypeChoice NOTIFY eraseModeFilesystemChanged )
 
     Q_PROPERTY( bool allowManualPartitioning READ allowManualPartitioning CONSTANT FINAL )
 
@@ -134,7 +135,7 @@ public Q_SLOTS:
     void setInstallChoice( InstallChoice );
     void setSwapChoice( int );  ///< Translates a button ID or so to SwapChoice
     void setSwapChoice( SwapChoice );
-    void setEraseFsTypeChoice( const QString& filesystemName ); ///< See property eraseModeFilesystem
+    void setEraseFsTypeChoice( const QString& filesystemName );  ///< See property eraseModeFilesystem
 
 Q_SIGNALS:
     void installChoiceChanged( InstallChoice );
diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 69ea4cb2e1..a3d6e2db57 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -115,10 +115,11 @@ PartitionViewStep::prettyName() const
  * empty strings and duplicates. The list is in-order of how the
  * jobs will be run.
  */
-static QStringList jobDescriptions( const Calamares::JobList& jobs )
+static QStringList
+jobDescriptions( const Calamares::JobList& jobs )
 {
     QStringList jobsLines;
-    for( const Calamares::job_ptr& job : qAsConst( jobs ) )
+    for ( const Calamares::job_ptr& job : qAsConst( jobs ) )
     {
         if ( !job->prettyDescription().isEmpty() )
         {
@@ -132,7 +133,8 @@ static QStringList jobDescriptions( const Calamares::JobList& jobs )
  *
  * Returns a (branded) string describing what @p choice will do.
  */
-static QString modeDescription( Config::InstallChoice choice )
+static QString
+modeDescription( Config::InstallChoice choice )
 {
     const auto* branding = Calamares::Branding::instance();
     static const char context[] = "PartitionViewStep";
@@ -141,13 +143,15 @@ static QString modeDescription( Config::InstallChoice choice )
     {
     case Config::InstallChoice::Alongside:
         return QCoreApplication::translate( context, "Install %1 alongside another operating system." )
-                        .arg( branding->shortVersionedName() );
+            .arg( branding->shortVersionedName() );
         break;
     case Config::InstallChoice::Erase:
-        return QCoreApplication::translate( context, "Erase disk and install %1." ).arg( branding->shortVersionedName() );
+        return QCoreApplication::translate( context, "Erase disk and install %1." )
+            .arg( branding->shortVersionedName() );
         break;
     case Config::InstallChoice::Replace:
-        return QCoreApplication::translate( context, "Replace a partition with %1." ).arg( branding->shortVersionedName() );
+        return QCoreApplication::translate( context, "Replace a partition with %1." )
+            .arg( branding->shortVersionedName() );
         break;
     case Config::InstallChoice::NoChoice:
     case Config::InstallChoice::Manual:
@@ -163,7 +167,8 @@ static QString modeDescription( Config::InstallChoice choice )
  * is used to provide context; when more than one disk is in use, the description
  * works differently.
  */
-static QString diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, Config::InstallChoice choice )
+static QString
+diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, Config::InstallChoice choice )
 {
     const auto* branding = Calamares::Branding::instance();
     static const char context[] = "PartitionViewStep";
@@ -172,28 +177,33 @@ static QString diskDescription( int listLength, const PartitionCoreModule::Summa
     {
         switch ( choice )
         {
-            case Config::Alongside:
-                return QCoreApplication::translate( context, "Install %1 alongside another operating system on disk "
-                "%2 (%3)." )
+        case Config::Alongside:
+            return QCoreApplication::translate(
+                       context,
+                       "Install %1 alongside another operating system on disk "
+                       "%2 (%3)." )
                 .arg( branding->shortVersionedName() )
                 .arg( info.deviceNode )
                 .arg( info.deviceName );
-                break;
-            case Config::Erase:
-                return QCoreApplication::translate( context, "Erase disk %2 (%3) and install %1." )
+            break;
+        case Config::Erase:
+            return QCoreApplication::translate( context,
+                                                "Erase disk %2 (%3) and install %1." )
                 .arg( branding->shortVersionedName() )
                 .arg( info.deviceNode )
                 .arg( info.deviceName );
-                break;
-            case Config::Replace:
-                return QCoreApplication::translate( context, "Replace a partition on disk %2 (%3) with %1." )
+            break;
+        case Config::Replace:
+            return QCoreApplication::translate(
+                       context, "Replace a partition on disk %2 (%3) with %1." )
                 .arg( branding->shortVersionedName() )
                 .arg( info.deviceNode )
                 .arg( info.deviceName );
-                break;
-            case Config::NoChoice:
-            case Config::Manual:
-                return QCoreApplication::translate( context, "Manual partitioning on disk %1 (%2)." )
+            break;
+        case Config::NoChoice:
+        case Config::Manual:
+            return QCoreApplication::translate(
+                       context, "Manual partitioning on disk %1 (%2)." )
                 .arg( info.deviceNode )
                 .arg( info.deviceName );
         }
@@ -201,7 +211,9 @@ static QString diskDescription( int listLength, const PartitionCoreModule::Summa
     }
     else  // multiple disk previews!
     {
-        return QCoreApplication::translate( context, "Disk %1 (%2)" ).arg( info.deviceNode ).arg( info.deviceName ) ;
+        return QCoreApplication::translate( context, "Disk %1 (%2)" )
+            .arg( info.deviceNode )
+            .arg( info.deviceName );
     }
 }
 
@@ -216,7 +228,7 @@ PartitionViewStep::prettyStatus() const
     cDebug() << "Summary for Partition" << list.length() << choice;
     if ( list.length() > 1 )  // There are changes on more than one disk
     {
-        modeText = modeDescription(choice);
+        modeText = modeDescription( choice );
     }
 
     for ( const auto& info : list )
@@ -501,7 +513,7 @@ PartitionViewStep::onLeave()
 #else
                 PartitionTable::FlagEsp
 #endif
-                                                        );
+            );
             Partition* esp = m_core->findPartitionByMountPoint( espMountPoint );
 
             QString message;
@@ -644,8 +656,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     QFuture< void > future = QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
     m_future->setFuture( future );
 
-    m_core->initLayout( m_config->defaultFsType(),
-                        configurationMap.value( "partitionLayout" ).toList() );
+    m_core->initLayout( m_config->defaultFsType(), configurationMap.value( "partitionLayout" ).toList() );
 }
 
 
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 4beac0db8a..8792cb7870 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -447,31 +447,31 @@ isEfiSystem()
 }
 
 bool
-isEfiFilesystemSuitable(const Partition* candidate)
+isEfiFilesystemSuitable( const Partition* candidate )
 {
     auto type = candidate->fileSystem().type();
     auto size = candidate->capacity();  // bytes
 
     using CalamaresUtils::Units::operator""_MiB;
 
-    switch( type )
+    switch ( type )
     {
-        case FileSystem::Type::Fat32:
-            if ( size >= 300_MiB )
-            {
-                return true;
-            }
-            cWarning() << "FAT32 filesystem is too small (" << size << "bytes)";
-            return false;
+    case FileSystem::Type::Fat32:
+        if ( size >= 300_MiB )
+        {
+            return true;
+        }
+        cWarning() << "FAT32 filesystem is too small (" << size << "bytes)";
+        return false;
 #ifdef WITH_KPMCORE4API
-        case FileSystem::Type::Fat12:
+    case FileSystem::Type::Fat12:
 #endif
-        case FileSystem::Type::Fat16:
-            cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
-            return false;
-        default:
-            cWarning() << "EFI boot partition must be FAT32";
-            return false;
+    case FileSystem::Type::Fat16:
+        cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
+        return false;
+    default:
+        cWarning() << "EFI boot partition must be FAT32";
+        return false;
     }
 }
 
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 233f5117a3..8ae904e92e 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -138,61 +138,63 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi
 }
 
 void
-PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
+PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
 {
     using FileSystem = FileSystem::Type;
     switch ( defaultFsType )
     {
-        case FileSystem::Unknown:
-        case FileSystem::Unformatted:
-        case FileSystem::Extended:
-        case FileSystem::LinuxSwap:
-        case FileSystem::Luks:
-        case FileSystem::Ocfs2:
-        case FileSystem::Lvm2_PV:
-        case FileSystem::Udf:
-        case FileSystem::Iso9660:
+    case FileSystem::Unknown:
+    case FileSystem::Unformatted:
+    case FileSystem::Extended:
+    case FileSystem::LinuxSwap:
+    case FileSystem::Luks:
+    case FileSystem::Ocfs2:
+    case FileSystem::Lvm2_PV:
+    case FileSystem::Udf:
+    case FileSystem::Iso9660:
 #ifdef WITH_KPMCORE4API
-        case FileSystem::Luks2:
-        case FileSystem::LinuxRaidMember:
-        case FileSystem::BitLocker:
+    case FileSystem::Luks2:
+    case FileSystem::LinuxRaidMember:
+    case FileSystem::BitLocker:
 #endif
-            // bad bad
-            cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead.";
-            defaultFsType = FileSystem::Ext4;
-            break;
-        case FileSystem::Ext2:
-        case FileSystem::Ext3:
-        case FileSystem::Ext4:
-        case FileSystem::Fat32:
-        case FileSystem::Ntfs:
-        case FileSystem::Reiser4:
-        case FileSystem::ReiserFS:
-        case FileSystem::Xfs:
-        case FileSystem::Jfs:
-        case FileSystem::Btrfs:
-        case FileSystem::Exfat:
-        case FileSystem::F2fs:
-            // ok
-            break;
-        case FileSystem::Fat16:
-        case FileSystem::Hfs:
-        case FileSystem::HfsPlus:
-        case FileSystem::Ufs:
-        case FileSystem::Hpfs:
-        case FileSystem::Zfs:
-        case FileSystem::Nilfs2:
+        // bad bad
+        cWarning() << "The selected default FS" << defaultFsType << "is not suitable."
+                   << "Using ext4 instead.";
+        defaultFsType = FileSystem::Ext4;
+        break;
+    case FileSystem::Ext2:
+    case FileSystem::Ext3:
+    case FileSystem::Ext4:
+    case FileSystem::Fat32:
+    case FileSystem::Ntfs:
+    case FileSystem::Reiser4:
+    case FileSystem::ReiserFS:
+    case FileSystem::Xfs:
+    case FileSystem::Jfs:
+    case FileSystem::Btrfs:
+    case FileSystem::Exfat:
+    case FileSystem::F2fs:
+        // ok
+        break;
+    case FileSystem::Fat16:
+    case FileSystem::Hfs:
+    case FileSystem::HfsPlus:
+    case FileSystem::Ufs:
+    case FileSystem::Hpfs:
+    case FileSystem::Zfs:
+    case FileSystem::Nilfs2:
 #ifdef WITH_KPMCORE4API
-        case FileSystem::Fat12:
-        case FileSystem::Apfs:
-        case FileSystem::Minix:
+    case FileSystem::Fat12:
+    case FileSystem::Apfs:
+    case FileSystem::Minix:
 #endif
-            // weird
-            cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
-            break;
-        default:
-            cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares." << "Using ext4 instead.";
-            defaultFsType = FileSystem::Ext4;
+        // weird
+        cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
+        break;
+    default:
+        cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares."
+                   << "Using ext4 instead.";
+        defaultFsType = FileSystem::Ext4;
     }
 
     m_defaultFsType = defaultFsType;
@@ -278,7 +280,7 @@ PartitionLayout::createPartitions( Device* dev,
         }
     }
 
-    auto correctFS = [d=m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
+    auto correctFS = [d = m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
 
     // Create the partitions.
     currentSector = firstSector;
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 6438724e8d..27c2cd7109 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -270,11 +270,12 @@ ChoicePage::setupChoices()
         m_eraseButton->addOptionsComboBox( m_eraseSwapChoiceComboBox );
     }
 
-    if ( m_config->eraseFsTypes().count() > 1)
+    if ( m_config->eraseFsTypes().count() > 1 )
     {
         m_eraseFsTypesChoiceComboBox = new QComboBox;
-        m_eraseFsTypesChoiceComboBox->addItems(m_config->eraseFsTypes());
-        connect( m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, m_config, &Config::setEraseFsTypeChoice );
+        m_eraseFsTypesChoiceComboBox->addItems( m_config->eraseFsTypes() );
+        connect(
+            m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, m_config, &Config::setEraseFsTypeChoice );
         connect( m_config, &Config::eraseModeFilesystemChanged, this, &ChoicePage::onActionChanged );
         m_eraseButton->addOptionsComboBox( m_eraseFsTypesChoiceComboBox );
     }

From c2d0a247a3c851359b80849685bb1485dcd4810c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 12 Jul 2021 16:52:24 +0200
Subject: [PATCH 270/492] [partition] Simplify code for overloads

---
 src/modules/partition/gui/ChoicePage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 6438724e8d..4eac761e69 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -175,7 +175,7 @@ ChoicePage::init( PartitionCoreModule* core )
     setModelToComboBox( m_drivesCombo, core->deviceModel() );
 
     connect( m_drivesCombo,
-             static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),
+             qOverload( &QComboBox::currentIndexChanged ),
              this,
              &ChoicePage::applyDeviceChoice );
 

From d2e11dd5d1f1fac9560426f9eb94d7f0a673284f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 13 Jul 2021 10:36:05 +0200
Subject: [PATCH 271/492] [summaryq] Apply coding style

---
 src/modules/summaryq/Config.cpp             | 54 +++++++++++++--------
 src/modules/summaryq/Config.h               | 28 +++++------
 src/modules/summaryq/SummaryQmlViewStep.cpp |  8 +--
 src/modules/summaryq/SummaryQmlViewStep.h   | 11 ++---
 4 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/src/modules/summaryq/Config.cpp b/src/modules/summaryq/Config.cpp
index 64e43a0ba6..8314802a98 100644
--- a/src/modules/summaryq/Config.cpp
+++ b/src/modules/summaryq/Config.cpp
@@ -20,15 +20,19 @@
 #include "utils/Retranslator.h"
 #include "viewpages/ExecutionViewStep.h"
 
-SummaryModel::SummaryModel(QObject* parent) : QAbstractListModel(parent)
-{}
+SummaryModel::SummaryModel( QObject* parent )
+    : QAbstractListModel( parent )
+{
+}
 
-QHash SummaryModel::roleNames() const
+QHash< int, QByteArray >
+SummaryModel::roleNames() const
 {
     return { { Qt::DisplayRole, "title" }, { Qt::UserRole, "message" } };
 }
 
-QVariant SummaryModel::data(const QModelIndex& index, int role) const
+QVariant
+SummaryModel::data( const QModelIndex& index, int role ) const
 {
     if ( !index.isValid() )
     {
@@ -38,12 +42,14 @@ QVariant SummaryModel::data(const QModelIndex& index, int role) const
     return role == Qt::DisplayRole ? item->title : item->message;
 }
 
-int SummaryModel::rowCount(const QModelIndex&) const
+int
+SummaryModel::rowCount( const QModelIndex& ) const
 {
     return m_summary.count();
 }
 
-void SummaryModel::setSummary(const Calamares::ViewStepList& steps)
+void
+SummaryModel::setSummary( const Calamares::ViewStepList& steps )
 {
     m_summary.clear();
     Q_EMIT beginResetModel();
@@ -54,44 +60,50 @@ void SummaryModel::setSummary(const Calamares::ViewStepList& steps)
         QWidget* widget = step->createSummaryWidget();
 
         if ( text.isEmpty() && !widget )
+        {
             continue;
+        }
 
-        m_summary << new StepSummary {step->prettyName(), text};
-
+        m_summary << new StepSummary { step->prettyName(), text };
     }
     Q_EMIT endResetModel();
 }
 
-Config::Config(QObject *parent) : QObject(parent)
-, m_thisViewStep(static_cast(parent))
-, m_summary( new SummaryModel(this) )
+Config::Config( QObject* parent )
+    : QObject( parent )
+    , m_thisViewStep( static_cast< SummaryQmlViewStep* >( parent ) )
+    , m_summary( new SummaryModel( this ) )
 {
     m_title = m_thisViewStep->prettyName();
 
     if ( Calamares::Settings::instance()->isSetupMode() )
-        m_message =( tr( "This is an overview of what will happen once you start "
-        "the setup procedure." ) );
+        m_message = ( tr( "This is an overview of what will happen once you start "
+                          "the setup procedure." ) );
     else
         m_message = ( tr( "This is an overview of what will happen once you start "
-        "the install procedure." ) );
+                          "the install procedure." ) );
 }
 
-void Config::componentComplete()
+void
+Config::componentComplete()
 {
     refresh();
 }
 
-void Config::refresh()
+void
+Config::refresh()
 {
-    m_summary->setSummary( stepsForSummary( Calamares::ViewManager::instance()->viewSteps() ));
+    m_summary->setSummary( stepsForSummary( Calamares::ViewManager::instance()->viewSteps() ) );
 }
 
-void Config::init()
+void
+Config::init()
 {
     refresh();
 }
 
-Calamares::ViewStepList Config::stepsForSummary( const Calamares::ViewStepList& allSteps ) const
+Calamares::ViewStepList
+Config::stepsForSummary( const Calamares::ViewStepList& allSteps ) const
 {
     Calamares::ViewStepList steps;
     for ( Calamares::ViewStep* step : allSteps )
@@ -103,12 +115,12 @@ Calamares::ViewStepList Config::stepsForSummary( const Calamares::ViewStepList&
         }
 
         if ( m_thisViewStep == step )
+        {
             break;
+        }
 
         steps.append( step );
     }
 
     return steps;
 }
-
-
diff --git a/src/modules/summaryq/Config.h b/src/modules/summaryq/Config.h
index 162ff2c5f6..39732a9e51 100644
--- a/src/modules/summaryq/Config.h
+++ b/src/modules/summaryq/Config.h
@@ -11,10 +11,10 @@
 #ifndef SUMMARY_CONFIG_H
 #define SUMMARY_CONFIG_H
 
-#include 
+#include "viewpages/ViewStep.h"
 #include 
+#include 
 #include 
-#include "viewpages/ViewStep.h"
 
 class SummaryQmlViewStep;
 
@@ -26,44 +26,42 @@ struct StepSummary
 
 class SummaryModel : public QAbstractListModel
 {
-  Q_OBJECT
+    Q_OBJECT
 public:
-    explicit SummaryModel(QObject *parent = nullptr);
+    explicit SummaryModel( QObject* parent = nullptr );
     int rowCount( const QModelIndex& = QModelIndex() ) const override;
     QVariant data( const QModelIndex& index, int role ) const override;
 
-    void setSummary(const Calamares::ViewStepList &steps);
+    void setSummary( const Calamares::ViewStepList& steps );
 
 protected:
     QHash< int, QByteArray > roleNames() const override;
+
 private:
-    QVector m_summary;
+    QVector< StepSummary* > m_summary;
 };
 
 class Config : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_PROPERTY(QString message MEMBER m_message NOTIFY messageChanged CONSTANT)
-    Q_PROPERTY(QString title MEMBER m_title NOTIFY titleChanged CONSTANT)
-    Q_PROPERTY(SummaryModel * summaryModel READ summaryModel CONSTANT FINAL)
+    Q_PROPERTY( QString message MEMBER m_message NOTIFY messageChanged CONSTANT )
+    Q_PROPERTY( QString title MEMBER m_title NOTIFY titleChanged CONSTANT )
+    Q_PROPERTY( SummaryModel* summaryModel READ summaryModel CONSTANT FINAL )
 
 public:
-    explicit Config(QObject *parent = nullptr);
+    explicit Config( QObject* parent = nullptr );
     virtual void componentComplete() override;
     virtual void classBegin() override {}
 
     void refresh();
     void init();
 
-    SummaryModel * summaryModel() const
-    {
-        return m_summary;
-    }
+    SummaryModel* summaryModel() const { return m_summary; }
 
 private:
     Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
     const SummaryQmlViewStep* m_thisViewStep;
-    SummaryModel *m_summary;
+    SummaryModel* m_summary;
 
     QString m_message;
     QString m_title;
diff --git a/src/modules/summaryq/SummaryQmlViewStep.cpp b/src/modules/summaryq/SummaryQmlViewStep.cpp
index 8f73602128..2ea1599841 100644
--- a/src/modules/summaryq/SummaryQmlViewStep.cpp
+++ b/src/modules/summaryq/SummaryQmlViewStep.cpp
@@ -10,7 +10,7 @@
 
 #include "SummaryQmlViewStep.h"
 
-CALAMARES_PLUGIN_FACTORY_DEFINITION( SummaryQmlViewStepFactory, registerPlugin(); )
+CALAMARES_PLUGIN_FACTORY_DEFINITION( SummaryQmlViewStepFactory, registerPlugin< SummaryQmlViewStep >(); )
 
 SummaryQmlViewStep::SummaryQmlViewStep( QObject* parent )
     : Calamares::QmlViewStep( parent )
@@ -20,10 +20,7 @@ SummaryQmlViewStep::SummaryQmlViewStep( QObject* parent )
 }
 
 
-SummaryQmlViewStep::~SummaryQmlViewStep()
-{
-
-}
+SummaryQmlViewStep::~SummaryQmlViewStep() {}
 
 QString
 SummaryQmlViewStep::prettyName() const
@@ -72,4 +69,3 @@ SummaryQmlViewStep::onActivate()
 {
     m_config->init();
 }
-
diff --git a/src/modules/summaryq/SummaryQmlViewStep.h b/src/modules/summaryq/SummaryQmlViewStep.h
index f42ec9f5c7..42febd145d 100644
--- a/src/modules/summaryq/SummaryQmlViewStep.h
+++ b/src/modules/summaryq/SummaryQmlViewStep.h
@@ -12,9 +12,9 @@
 #define SUMMARYQMLVIEWSTEP_H
 
 #include "Config.h"
+#include "DllMacro.h"
 #include "utils/PluginFactory.h"
 #include "viewpages/QmlViewStep.h"
-#include "DllMacro.h"
 
 #include 
 
@@ -41,15 +41,12 @@ class PLUGINDLLEXPORT SummaryQmlViewStep : public Calamares::QmlViewStep
 
     void onActivate() override;
 
-    QObject * getConfig() override
-    {
-        return m_config;
-    }
+    QObject* getConfig() override { return m_config; }
 
 private:
-    Config *m_config;
+    Config* m_config;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( SummaryQmlViewStepFactory )
 
-#endif // SUMMARYQMLVIEWSTEP_H
+#endif  // SUMMARYQMLVIEWSTEP_H

From 3b7c2b2221e2981f39a7aa363d31ae01d0d72169 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 13 Jul 2021 11:02:24 +0200
Subject: [PATCH 272/492] [summaryq] Remove memory leak

Don't use a vector of pointers, it is too easy (like when calling clear())
to leak memory.
---
 src/modules/summaryq/Config.cpp | 10 +++++-----
 src/modules/summaryq/Config.h   | 12 ++++++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/modules/summaryq/Config.cpp b/src/modules/summaryq/Config.cpp
index 8314802a98..e356f05899 100644
--- a/src/modules/summaryq/Config.cpp
+++ b/src/modules/summaryq/Config.cpp
@@ -39,7 +39,7 @@ SummaryModel::data( const QModelIndex& index, int role ) const
         return QVariant();
     }
     const auto item = m_summary.at( index.row() );
-    return role == Qt::DisplayRole ? item->title : item->message;
+    return role == Qt::DisplayRole ? item.title : item.message;
 }
 
 int
@@ -49,22 +49,22 @@ SummaryModel::rowCount( const QModelIndex& ) const
 }
 
 void
-SummaryModel::setSummary( const Calamares::ViewStepList& steps )
+SummaryModel::setSummary( const Calamares::ViewStepList& steps, bool withWidgets )
 {
-    m_summary.clear();
     Q_EMIT beginResetModel();
+    m_summary.clear();
 
     for ( Calamares::ViewStep* step : steps )
     {
         QString text = step->prettyStatus();
-        QWidget* widget = step->createSummaryWidget();
+        QWidget* widget = withWidgets ? step->createSummaryWidget() : nullptr;
 
         if ( text.isEmpty() && !widget )
         {
             continue;
         }
 
-        m_summary << new StepSummary { step->prettyName(), text };
+        m_summary << StepSummary { step->prettyName(), text, widget };
     }
     Q_EMIT endResetModel();
 }
diff --git a/src/modules/summaryq/Config.h b/src/modules/summaryq/Config.h
index 39732a9e51..acce67e181 100644
--- a/src/modules/summaryq/Config.h
+++ b/src/modules/summaryq/Config.h
@@ -18,10 +18,18 @@
 
 class SummaryQmlViewStep;
 
+
+/** @brief Data for one step
+ *
+ * A step generally has a text description, but **may** have a
+ * QWidget. There is no ownership of the QWidget, that is assumed
+ * to be handed off to some owning parent-widget.
+ */
 struct StepSummary
 {
     QString title;
     QString message;
+    QWidget* widget = nullptr;
 };
 
 class SummaryModel : public QAbstractListModel
@@ -32,13 +40,13 @@ class SummaryModel : public QAbstractListModel
     int rowCount( const QModelIndex& = QModelIndex() ) const override;
     QVariant data( const QModelIndex& index, int role ) const override;
 
-    void setSummary( const Calamares::ViewStepList& steps );
+    void setSummary( const Calamares::ViewStepList& steps, bool withWidgets = false );
 
 protected:
     QHash< int, QByteArray > roleNames() const override;
 
 private:
-    QVector< StepSummary* > m_summary;
+    QVector< StepSummary > m_summary;
 };
 
 class Config : public QObject, public QQmlParserStatus

From 1570105ddb61af27a20aadd5863e247e51c8b81b Mon Sep 17 00:00:00 2001
From: demmm 
Date: Tue, 13 Jul 2021 12:46:04 +0200
Subject: [PATCH 273/492] [usersq] correct plural form as reported in IRC

---
 src/modules/usersq/usersq.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml
index 2eb4be1e16..8b4ec92cf9 100644
--- a/src/modules/usersq/usersq.qml
+++ b/src/modules/usersq/usersq.qml
@@ -163,7 +163,7 @@ Kirigami.ScrollablePage {
             Layout.fillWidth: true
             visible: false
             type: Kirigami.MessageType.Error
-            text: qsTr("Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.")
+            text: qsTr("Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.")
         }
 
         Kirigami.InlineMessage {

From a316f1b40df48bd3b35574b050940889730f6955 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 13 Jul 2021 20:42:19 +0200
Subject: [PATCH 274/492] [summaryq] Repair translatable properties

- doesn't make sense to have NOTIFY and CONSTANT
- connect to translation signals
- document the properties
---
 src/modules/summaryq/Config.cpp | 15 ++++++++++++++-
 src/modules/summaryq/Config.h   | 10 ++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/modules/summaryq/Config.cpp b/src/modules/summaryq/Config.cpp
index e356f05899..603ed460db 100644
--- a/src/modules/summaryq/Config.cpp
+++ b/src/modules/summaryq/Config.cpp
@@ -14,7 +14,6 @@
 #include "Branding.h"
 #include "Settings.h"
 #include "ViewManager.h"
-
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
@@ -73,15 +72,29 @@ Config::Config( QObject* parent )
     : QObject( parent )
     , m_thisViewStep( static_cast< SummaryQmlViewStep* >( parent ) )
     , m_summary( new SummaryModel( this ) )
+
+{
+    CALAMARES_RETRANSLATE_SLOT( &Config::retranslate );
+    retranslate();
+}
+
+void
+Config::retranslate()
 {
     m_title = m_thisViewStep->prettyName();
 
     if ( Calamares::Settings::instance()->isSetupMode() )
+    {
         m_message = ( tr( "This is an overview of what will happen once you start "
                           "the setup procedure." ) );
+    }
     else
+    {
         m_message = ( tr( "This is an overview of what will happen once you start "
                           "the install procedure." ) );
+    }
+    Q_EMIT titleChanged();
+    Q_EMIT messageChanged();
 }
 
 void
diff --git a/src/modules/summaryq/Config.h b/src/modules/summaryq/Config.h
index acce67e181..f8c00173df 100644
--- a/src/modules/summaryq/Config.h
+++ b/src/modules/summaryq/Config.h
@@ -52,8 +52,12 @@ class SummaryModel : public QAbstractListModel
 class Config : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_PROPERTY( QString message MEMBER m_message NOTIFY messageChanged CONSTANT )
-    Q_PROPERTY( QString title MEMBER m_title NOTIFY titleChanged CONSTANT )
+
+    ///@brief Name of this summary (generally, "Summary")
+    Q_PROPERTY( QString title MEMBER m_title NOTIFY titleChanged )
+    ///@brief Description of what the summary means
+    Q_PROPERTY( QString message MEMBER m_message NOTIFY messageChanged )
+
     Q_PROPERTY( SummaryModel* summaryModel READ summaryModel CONSTANT FINAL )
 
 public:
@@ -68,6 +72,8 @@ class Config : public QObject, public QQmlParserStatus
 
 private:
     Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
+    void retranslate();
+
     const SummaryQmlViewStep* m_thisViewStep;
     SummaryModel* m_summary;
 

From a658e885755d1ef8f09a556bb321427b95272ec6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 13 Jul 2021 21:25:57 +0200
Subject: [PATCH 275/492] [summaryq] Nothing in the Config is specific to this
 QML view-step

---
 src/modules/summaryq/Config.cpp | 2 +-
 src/modules/summaryq/Config.h   | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/modules/summaryq/Config.cpp b/src/modules/summaryq/Config.cpp
index 603ed460db..e0f855ab53 100644
--- a/src/modules/summaryq/Config.cpp
+++ b/src/modules/summaryq/Config.cpp
@@ -68,7 +68,7 @@ SummaryModel::setSummary( const Calamares::ViewStepList& steps, bool withWidgets
     Q_EMIT endResetModel();
 }
 
-Config::Config( QObject* parent )
+Config::Config( Calamares::ViewStep* parent )
     : QObject( parent )
     , m_thisViewStep( static_cast< SummaryQmlViewStep* >( parent ) )
     , m_summary( new SummaryModel( this ) )
diff --git a/src/modules/summaryq/Config.h b/src/modules/summaryq/Config.h
index f8c00173df..97eaeadd51 100644
--- a/src/modules/summaryq/Config.h
+++ b/src/modules/summaryq/Config.h
@@ -12,13 +12,11 @@
 #define SUMMARY_CONFIG_H
 
 #include "viewpages/ViewStep.h"
+
 #include 
 #include 
 #include 
 
-class SummaryQmlViewStep;
-
-
 /** @brief Data for one step
  *
  * A step generally has a text description, but **may** have a
@@ -61,7 +59,7 @@ class Config : public QObject, public QQmlParserStatus
     Q_PROPERTY( SummaryModel* summaryModel READ summaryModel CONSTANT FINAL )
 
 public:
-    explicit Config( QObject* parent = nullptr );
+    explicit Config( Calamares::ViewStep* parent = nullptr );
     virtual void componentComplete() override;
     virtual void classBegin() override {}
 
@@ -74,7 +72,7 @@ class Config : public QObject, public QQmlParserStatus
     Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
     void retranslate();
 
-    const SummaryQmlViewStep* m_thisViewStep;
+    const Calamares::ViewStep* m_thisViewStep;
     SummaryModel* m_summary;
 
     QString m_message;

From 792ba8c0af3faaabf8bd022ee232e01f54ff2f66 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 13 Jul 2021 21:28:46 +0200
Subject: [PATCH 276/492] [summaryq] Nothing uses the derived type of the model

(This assertion may be dialed back if the Config object is used
in the summary ViewStep, which will want to get at the widget
pointers, but that's for later)
---
 src/modules/summaryq/Config.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/summaryq/Config.h b/src/modules/summaryq/Config.h
index 97eaeadd51..ec804321b5 100644
--- a/src/modules/summaryq/Config.h
+++ b/src/modules/summaryq/Config.h
@@ -56,7 +56,7 @@ class Config : public QObject, public QQmlParserStatus
     ///@brief Description of what the summary means
     Q_PROPERTY( QString message MEMBER m_message NOTIFY messageChanged )
 
-    Q_PROPERTY( SummaryModel* summaryModel READ summaryModel CONSTANT FINAL )
+    Q_PROPERTY( QAbstractListModel* summaryModel READ summaryModel CONSTANT FINAL )
 
 public:
     explicit Config( Calamares::ViewStep* parent = nullptr );
@@ -66,7 +66,7 @@ class Config : public QObject, public QQmlParserStatus
     void refresh();
     void init();
 
-    SummaryModel* summaryModel() const { return m_summary; }
+    QAbstractListModel* summaryModel() const { return m_summary; }
 
 private:
     Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;

From 768760793ab822d68ff844ff9fccf1d364f57c53 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 13 Jul 2021 22:04:01 +0200
Subject: [PATCH 277/492] [summaryq] Hide internals of building the summary
 model

---
 src/modules/summaryq/Config.cpp | 32 +++++++++++++++++---------------
 src/modules/summaryq/Config.h   | 15 +++++++++++++--
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/modules/summaryq/Config.cpp b/src/modules/summaryq/Config.cpp
index e0f855ab53..e404c1f62e 100644
--- a/src/modules/summaryq/Config.cpp
+++ b/src/modules/summaryq/Config.cpp
@@ -48,7 +48,7 @@ SummaryModel::rowCount( const QModelIndex& ) const
 }
 
 void
-SummaryModel::setSummary( const Calamares::ViewStepList& steps, bool withWidgets )
+SummaryModel::setSummaryList( const Calamares::ViewStepList& steps, bool withWidgets )
 {
     Q_EMIT beginResetModel();
     m_summary.clear();
@@ -105,28 +105,24 @@ Config::componentComplete()
 
 void
 Config::refresh()
-{
-    m_summary->setSummary( stepsForSummary( Calamares::ViewManager::instance()->viewSteps() ) );
-}
-
-void
-Config::init()
-{
-    refresh();
-}
-
-Calamares::ViewStepList
-Config::stepsForSummary( const Calamares::ViewStepList& allSteps ) const
 {
     Calamares::ViewStepList steps;
-    for ( Calamares::ViewStep* step : allSteps )
+    for ( Calamares::ViewStep* step : Calamares::ViewManager::instance()->viewSteps() )
     {
+        // *Assume* that if there's an exec step in the sequence,
+        // we don't need a summary for steps before it. This works in
+        // practice if there's a summary step before each exec --
+        // and in practice, there's only one of each.
         if ( qobject_cast< Calamares::ExecutionViewStep* >( step ) )
         {
             steps.clear();
             continue;
         }
 
+        // Having reached the parent view-step of the Config object,
+        // we know we're providing a summary of steps up until this
+        // view step, so we now have steps since the previous exec, up
+        // to this summary.
         if ( m_thisViewStep == step )
         {
             break;
@@ -135,5 +131,11 @@ Config::stepsForSummary( const Calamares::ViewStepList& allSteps ) const
         steps.append( step );
     }
 
-    return steps;
+    m_summary->setSummaryList( steps );
+}
+
+void
+Config::init()
+{
+    refresh();
 }
diff --git a/src/modules/summaryq/Config.h b/src/modules/summaryq/Config.h
index ec804321b5..08f2c0f162 100644
--- a/src/modules/summaryq/Config.h
+++ b/src/modules/summaryq/Config.h
@@ -17,6 +17,8 @@
 #include 
 #include 
 
+class Config;
+
 /** @brief Data for one step
  *
  * A step generally has a text description, but **may** have a
@@ -33,17 +35,26 @@ struct StepSummary
 class SummaryModel : public QAbstractListModel
 {
     Q_OBJECT
+    friend class Config;
+
 public:
     explicit SummaryModel( QObject* parent = nullptr );
     int rowCount( const QModelIndex& = QModelIndex() ) const override;
     QVariant data( const QModelIndex& index, int role ) const override;
 
-    void setSummary( const Calamares::ViewStepList& steps, bool withWidgets = false );
-
 protected:
     QHash< int, QByteArray > roleNames() const override;
 
 private:
+    /** @brief Sets the model data from @p steps
+     *
+     * Replaces the list of summaries with summaries given by
+     * the jobs and ViewSteps objects in @p steps. If @p withWidgets
+     * is @c true, then also queries for widget summaries alongside
+     * the text summaries for each step.
+     */
+    void setSummaryList( const Calamares::ViewStepList& steps, bool withWidgets = false );
+
     QVector< StepSummary > m_summary;
 };
 

From 235db9f9619309cafa0087e4281bcb7f9c89606a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 13 Jul 2021 22:07:06 +0200
Subject: [PATCH 278/492] [summaryq] No need to be a ParserStatus object

Config classes, which intend to be shared between widgets-
and QML-based view-steps, should not tie closely to internals.
None of the ParserStatus methods are used in a meaningful
way (init() can be called by the view step).
---
 src/modules/summaryq/Config.cpp | 14 +-------------
 src/modules/summaryq/Config.h   |  6 ++----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/modules/summaryq/Config.cpp b/src/modules/summaryq/Config.cpp
index e404c1f62e..0f98891a64 100644
--- a/src/modules/summaryq/Config.cpp
+++ b/src/modules/summaryq/Config.cpp
@@ -98,13 +98,7 @@ Config::retranslate()
 }
 
 void
-Config::componentComplete()
-{
-    refresh();
-}
-
-void
-Config::refresh()
+Config::init()
 {
     Calamares::ViewStepList steps;
     for ( Calamares::ViewStep* step : Calamares::ViewManager::instance()->viewSteps() )
@@ -133,9 +127,3 @@ Config::refresh()
 
     m_summary->setSummaryList( steps );
 }
-
-void
-Config::init()
-{
-    refresh();
-}
diff --git a/src/modules/summaryq/Config.h b/src/modules/summaryq/Config.h
index 08f2c0f162..524aeee8ee 100644
--- a/src/modules/summaryq/Config.h
+++ b/src/modules/summaryq/Config.h
@@ -58,7 +58,7 @@ class SummaryModel : public QAbstractListModel
     QVector< StepSummary > m_summary;
 };
 
-class Config : public QObject, public QQmlParserStatus
+class Config : public QObject
 {
     Q_OBJECT
 
@@ -71,10 +71,8 @@ class Config : public QObject, public QQmlParserStatus
 
 public:
     explicit Config( Calamares::ViewStep* parent = nullptr );
-    virtual void componentComplete() override;
-    virtual void classBegin() override {}
 
-    void refresh();
+    ///@brief Called later, to load the model once all viewsteps are there
     void init();
 
     QAbstractListModel* summaryModel() const { return m_summary; }

From 293844072dd49b9b1e63b556fd6b057a46bef874 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Wed, 14 Jul 2021 00:06:30 +0200
Subject: [PATCH 279/492] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_ar.ts          | 474 ++++++++++++++++++------------
 lang/calamares_as.ts          | 474 ++++++++++++++++++------------
 lang/calamares_ast.ts         | 474 ++++++++++++++++++------------
 lang/calamares_az.ts          | 476 +++++++++++++++++-------------
 lang/calamares_az_AZ.ts       | 476 +++++++++++++++++-------------
 lang/calamares_be.ts          | 476 +++++++++++++++++-------------
 lang/calamares_bg.ts          | 474 ++++++++++++++++++------------
 lang/calamares_bn.ts          | 474 ++++++++++++++++++------------
 lang/calamares_ca.ts          | 478 +++++++++++++++++-------------
 lang/calamares_ca@valencia.ts | 476 +++++++++++++++++-------------
 lang/calamares_cs_CZ.ts       | 476 +++++++++++++++++-------------
 lang/calamares_da.ts          | 476 +++++++++++++++++-------------
 lang/calamares_de.ts          | 476 +++++++++++++++++-------------
 lang/calamares_el.ts          | 474 ++++++++++++++++++------------
 lang/calamares_en.ts          |  34 +--
 lang/calamares_en_GB.ts       | 474 ++++++++++++++++++------------
 lang/calamares_eo.ts          | 474 ++++++++++++++++++------------
 lang/calamares_es.ts          | 474 ++++++++++++++++++------------
 lang/calamares_es_MX.ts       | 474 ++++++++++++++++++------------
 lang/calamares_es_PE.ts       | 474 ++++++++++++++++++------------
 lang/calamares_es_PR.ts       | 474 ++++++++++++++++++------------
 lang/calamares_et.ts          | 474 ++++++++++++++++++------------
 lang/calamares_eu.ts          | 474 ++++++++++++++++++------------
 lang/calamares_fa.ts          | 476 +++++++++++++++++-------------
 lang/calamares_fi_FI.ts       | 476 +++++++++++++++++-------------
 lang/calamares_fr.ts          | 476 +++++++++++++++++-------------
 lang/calamares_fr_CH.ts       | 474 ++++++++++++++++++------------
 lang/calamares_fur.ts         | 476 +++++++++++++++++-------------
 lang/calamares_gl.ts          | 474 ++++++++++++++++++------------
 lang/calamares_gu.ts          | 474 ++++++++++++++++++------------
 lang/calamares_he.ts          | 503 +++++++++++++++++++-------------
 lang/calamares_hi.ts          | 476 +++++++++++++++++-------------
 lang/calamares_hr.ts          | 476 +++++++++++++++++-------------
 lang/calamares_hu.ts          | 474 ++++++++++++++++++------------
 lang/calamares_id.ts          | 474 ++++++++++++++++++------------
 lang/calamares_id_ID.ts       | 474 ++++++++++++++++++------------
 lang/calamares_ie.ts          | 474 ++++++++++++++++++------------
 lang/calamares_is.ts          | 474 ++++++++++++++++++------------
 lang/calamares_it_IT.ts       | 474 ++++++++++++++++++------------
 lang/calamares_ja.ts          | 476 +++++++++++++++++-------------
 lang/calamares_kk.ts          | 474 ++++++++++++++++++------------
 lang/calamares_kn.ts          | 474 ++++++++++++++++++------------
 lang/calamares_ko.ts          | 476 +++++++++++++++++-------------
 lang/calamares_lo.ts          | 474 ++++++++++++++++++------------
 lang/calamares_lt.ts          | 476 +++++++++++++++++-------------
 lang/calamares_lv.ts          | 474 ++++++++++++++++++------------
 lang/calamares_mk.ts          | 474 ++++++++++++++++++------------
 lang/calamares_ml.ts          | 474 ++++++++++++++++++------------
 lang/calamares_mr.ts          | 474 ++++++++++++++++++------------
 lang/calamares_nb.ts          | 474 ++++++++++++++++++------------
 lang/calamares_ne.ts          | 474 ++++++++++++++++++------------
 lang/calamares_ne_NP.ts       | 474 ++++++++++++++++++------------
 lang/calamares_nl.ts          | 476 +++++++++++++++++-------------
 lang/calamares_pl.ts          | 474 ++++++++++++++++++------------
 lang/calamares_pt_BR.ts       | 476 +++++++++++++++++-------------
 lang/calamares_pt_PT.ts       | 476 +++++++++++++++++-------------
 lang/calamares_ro.ts          | 474 ++++++++++++++++++------------
 lang/calamares_ru.ts          | 476 +++++++++++++++++-------------
 lang/calamares_ru_RU.ts       | 474 ++++++++++++++++++------------
 lang/calamares_si.ts          | 474 ++++++++++++++++++------------
 lang/calamares_sk.ts          | 476 +++++++++++++++++-------------
 lang/calamares_sl.ts          | 474 ++++++++++++++++++------------
 lang/calamares_sq.ts          | 534 ++++++++++++++++++++--------------
 lang/calamares_sr.ts          | 474 ++++++++++++++++++------------
 lang/calamares_sr@latin.ts    | 474 ++++++++++++++++++------------
 lang/calamares_sv.ts          | 476 +++++++++++++++++-------------
 lang/calamares_te.ts          | 474 ++++++++++++++++++------------
 lang/calamares_tg.ts          | 476 +++++++++++++++++-------------
 lang/calamares_th.ts          | 474 ++++++++++++++++++------------
 lang/calamares_tr_TR.ts       | 476 +++++++++++++++++-------------
 lang/calamares_uk.ts          | 476 +++++++++++++++++-------------
 lang/calamares_ur.ts          | 474 ++++++++++++++++++------------
 lang/calamares_uz.ts          | 474 ++++++++++++++++++------------
 lang/calamares_vi.ts          | 476 +++++++++++++++++-------------
 lang/calamares_zh.ts          | 474 ++++++++++++++++++------------
 lang/calamares_zh_CN.ts       | 476 +++++++++++++++++-------------
 lang/calamares_zh_TW.ts       | 490 ++++++++++++++++++-------------
 77 files changed, 21384 insertions(+), 14837 deletions(-)

diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts
index 8b8a094191..07d107472b 100644
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       قطاع الإقلاع الرئيسي ل %1
     
     
-      
+      
       Boot Partition
       قسم الإقلاع
     
     
-      
+      
       System Partition
       قسم النظام
     
     
-      
+      
       Do not install a boot loader
       لا تثبّت محمّل إقلاع
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       يشغّل عمليّة %1.
     
     
-      
+      
       Bad working directory path
       مسار سيء لمجلد العمل
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       لا يمكن القراءة من مجلد العمل %1 الخاص بعملية بايثون %2.
     
     
-      
+      
       Bad main script file
       ملفّ السّكربت الرّئيس سيّء.
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       ملفّ السّكربت الرّئيس %1 لمهمّة بايثون %2 لا يمكن قراءته.
     
     
-      
+      
       Boost.Python error in job "%1".
       خطأ Boost.Python في العمل "%1".
     
@@ -293,54 +293,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       فشل التثبيت
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       خطأ
     
     
-      
-      
+      
+      
       &Yes
       &نعم
     
     
-      
-      
+      
+      
       &No
       &لا
     
     
-      
+      
       &Close
       &اغلاق
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -349,124 +349,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       الإستمرار في التثبيت؟
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       مثبّت %1 على وشك بإجراء تعديلات على قرصك لتثبيت %2.<br/><strong>لن تستطيع التّراجع عن هذا.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &ثبت الأن
     
     
-      
+      
       Go &back
       &إرجع
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &ثبت
     
     
-      
+      
       Setup is complete. Close the setup program.
       اكتمل الإعداد. أغلق برنامج الإعداد.
     
     
-      
+      
       The installation is complete. Close the installer.
       اكتمل التثبيت , اغلق المثبِت
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       الغاء الـ تثبيت من دون احداث تغيير في النظام
     
     
-      
+      
       &Next
       &التالي
     
     
-      
+      
       &Back
       &رجوع
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       &إلغاء
     
     
-      
+      
       Cancel setup?
       إلغاء الإعداد؟
     
     
-      
+      
       Cancel installation?
       إلغاء التثبيت؟
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       هل تريد حقًا إلغاء عملية الإعداد الحالية؟
 سيتم إنهاء برنامج الإعداد وسيتم فقد جميع التغييرات.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       أتريد إلغاء عمليّة التّثبيت الحاليّة؟
@@ -476,22 +476,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       نوع الاستثناء غير معروف
     
     
-      
+      
       unparseable Python error
       خطأ بايثون لا يمكن تحليله
     
     
-      
+      
       unparseable Python traceback
       تتبّع بايثون خلفيّ لا يمكن تحليله
     
     
-      
+      
       Unfetchable Python error.
       خطأ لا يمكن الحصول علية في بايثون.
     
@@ -509,6 +509,24 @@ The installer will quit and all changes will be lost.
       %1 المثبت
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      فشل المثبّت في تحديث جدول التّقسيم على القرص '%1'.
+    
+  
   
     CheckerContainer
     
@@ -525,149 +543,149 @@ The installer will quit and all changes will be lost.
       نموذج
     
     
-      
+      
       Select storage de&vice:
       اختر &جهاز التّخزين:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       الحاليّ:
     
     
-      
+      
       After:
       بعد:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>تقسيم يدويّ</strong><br/>يمكنك إنشاء أو تغيير حجم الأقسام بنفسك.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>اختر قسمًا لتقليصه، ثمّ اسحب الشّريط السّفليّ لتغيير حجمه </strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       مكان محمّل الإقلاع:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>اختر القسم حيث سيكون التّثبيت عليه</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       تعذّر إيجاد قسم النّظام EFI في أيّ مكان. فضلًا ارجع واستخدم التّقسيم اليدويّ لإعداد %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       قسم النّظام EFI على %1 سيُستخدم لبدء %2.
     
     
-      
+      
       EFI system partition:
       قسم نظام EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       لا يبدو أن في جهاز التّخزين أيّ نظام تشغيل. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>مسح القرص</strong><br/>هذا س<font color="red">يمسح</font> كلّ البيانات الموجودة في جهاز التّخزين المحدّد.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>ثبّت جنبًا إلى جنب</strong><br/>سيقلّص المثبّت قسمًا لتفريغ مساحة لِ‍ %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>استبدل قسمًا</strong><br/>يستبدل قسمًا مع %1 .
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       على جهاز التّخزين %1. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       على جهاز التّخزين هذا نظام تشغيل ذأصلًا. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       على جهاز التّخزين هذا عدّة أنظمة تشغيل. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -703,12 +721,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -735,27 +753,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       اضبط طراز لوحة المفتاتيح ليكون %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       اضبط تخطيط لوحة المفاتيح إلى %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -879,6 +897,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       لا يوجد تطابق في كلمات السر!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -919,6 +942,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -981,27 +1014,37 @@ The installer will quit and all changes will be lost.
       الشّارات:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       تشفير
     
     
-      
+      
       Logical
       منطقيّ
     
     
-      
+      
       Primary
       أساسيّ
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1009,43 +1052,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       ينشئ قسم %1 جديد على %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       فشل المثبّت في إنشاء قسم على القرص '%1'.
     
@@ -1096,7 +1139,7 @@ The installer will quit and all changes will be lost.
       ينشئ جدول التّقسيم %1 الجديد على %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       فشل المثبّت في إنشاء جدول تقسيم على %1.
     
@@ -1335,7 +1378,17 @@ The installer will quit and all changes will be lost.
       الشّارات:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1372,57 +1425,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       اضبط معلومات القسم
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       ثبّت %1 على قسم نظام %2 <strong>جديد</strong>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       ثبّت %2 على قسم النّظام %3 ‏<strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       ثبّت محمّل الإقلاع على <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       يضبط نقاط الضّمّ.
     
@@ -1835,6 +1888,14 @@ The installer will quit and all changes will be lost.
       الموقع
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2052,29 +2113,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2426,7 +2487,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2607,33 +2668,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       المساحة الحرّة
     
     
       
-      
+      
       New partition
       قسم جديد
     
     
-      
+      
       Name
       الاسم
     
     
-      
+      
       File System
       نظام الملفّات
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       نقطة الضّمّ
     
     
-      
+      
       Size
       الحجم
     
@@ -2719,117 +2785,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       جاري جمع معلومات عن النظام...
     
     
-      
+      
       Partitions
       الأقسام
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       ثبّت %1 <strong>جنبًا إلى جنب</strong> مع نظام تشغيل آخر.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>امسح</strong> القرص وثبّت %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>استبدل</strong> قسمًا ب‍ %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       تقسيم <strong>يدويّ</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>امسح</strong> القرص <strong>%2</strong> (%3) وثبّت %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>استبدل</strong> قسمًا على القرص <strong>%2</strong> (%3) ب‍ %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       الحاليّ:
     
     
-      
+      
       After:
       بعد:
     
     
-      
+      
       No EFI system partition configured
       لم يُضبط أيّ قسم نظام EFI
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       راية قسم نظام EFI غير مضبوطة
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3016,17 +3082,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3284,12 +3350,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       لأفضل النّتائج، تحقّق من أن الحاسوب:
     
     
-      
+      
       System requirements
       متطلّبات النّظام
     
@@ -3297,27 +3363,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       لا يستوفِ هذا الحاسوب أدنى متطلّبات تثبيت %1.<br/>لا يمكن متابعة التّثبيت. <a href="#details">التّفاصيل...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       لا يستوفِ هذا الحاسوب بعض المتطلّبات المستحسنة لتثبيت %1.<br/>يمكن للمثبّت المتابعة، ولكن قد تكون بعض الميزات معطّلة.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       سيطرح البرنامج بعض الأسئلة عليك ويعدّ %2 على حاسوبك.
     
@@ -3473,7 +3539,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       فشل المثبّت في ضبط رايات القسم %1.
     
@@ -3616,12 +3682,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       هذه نظرة عامّة عمّا سيحصل ما إن تبدأ عمليّة التّثبيت.
     
@@ -4161,107 +4227,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       ما اسمك؟
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       ما الاسم الذي تريده لتلج به؟
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       ما اسم هذا الحاسوب؟
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       اختر كلمة مرور لإبقاء حسابك آمنًا.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       استخدم نفس كلمة المرور لحساب المدير.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts
index 721d21d2ed..9b2e7f70d6 100644
--- a/lang/calamares_as.ts
+++ b/lang/calamares_as.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1ৰ প্ৰধান বুত্ নথি
     
     
-      
+      
       Boot Partition
       বুত্ বিভাজন
     
     
-      
+      
       System Partition
       চিছ্তেম বিভাজন
     
     
-      
+      
       Do not install a boot loader
       বুত্ লোডাৰ ইনস্তল কৰিব নালাগে
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 কাৰ্য চলি আছে।
     
     
-      
+      
       Bad working directory path
       বেয়া কৰ্মৰত ডাইৰেক্টৰী পথ
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       %2 পাইথন কাৰ্য্যৰ %1 কৰ্মৰত ডাইৰেক্টৰী পঢ়িব নোৱাৰি।​
     
     
-      
+      
       Bad main script file
       বেয়া মুখ্য লিপি ফাইল
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       %2 পাইথন কাৰ্য্যৰ %1 মূখ্য লিপি ফাইল পঢ়িব নোৱাৰি।
     
     
-      
+      
       Boost.Python error in job "%1".
       "%1"  কাৰ্য্যত Boost.Python ত্ৰুটি।
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       চেত্ আপ বিফল হ'ল
     
     
-      
+      
       Installation Failed
       ইনস্তলেচন বিফল হ'ল
     
     
-      
+      
       Would you like to paste the install log to the web?
       আপুনি ৱেবত ইণ্স্টল ল'গ পেস্ট কৰিব বিচাৰে নেকি?
     
     
-      
+      
       Error
       ত্ৰুটি
     
     
-      
-      
+      
+      
       &Yes
       হয় (&Y)
     
     
-      
-      
+      
+      
       &No
       নহয় (&N)
     
     
-      
+      
       &Close
       বন্ধ (&C)
     
     
-      
+      
       Install Log Paste URL
       ইনস্তল​ ল'গ পেস্ট URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       আপলোড বিফল হৈছিল। কোনো ৱেব-পেস্ট কৰা হোৱা নাছিল।
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       কেলামাৰেচৰ আৰম্ভণি বিফল হ'ল
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ইনস্তল কৰিব পৰা নগ'ল। কেলামাৰেচে সকলোবোৰ সংৰূপ দিয়া মডিউল লোড্ কৰাত সফল নহ'ল। এইটো এটা আপোনাৰ ডিষ্ট্ৰিবিউচনে কি ধৰণে কেলামাৰেচ ব্যৱহাৰ কৰিছে, সেই সম্বন্ধীয় সমস্যা।
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>নিম্নোক্ত মডিউলবোৰ লোড্ কৰিৱ পৰা নগ'ল:
     
     
-      
+      
       Continue with setup?
       চেত্ আপ অব্যাহত ৰাখিব?
     
     
-      
+      
       Continue with installation?
       ইন্স্তলেচন অব্যাহত ৰাখিব?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 চেত্ আপ প্ৰগ্ৰেমটোৱে %2 চেত্ আপ কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 ইনস্তলাৰটোৱে %2 ইনস্তল কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</strong>
     
     
-      
+      
       &Set up now
       এতিয়া চেত্ আপ কৰক (&S)
     
     
-      
+      
       &Install now
       এতিয়া ইনস্তল কৰক (&I)
     
     
-      
+      
       Go &back
       উভতি যাওক (&b)
     
     
-      
+      
       &Set up
       চেত্ আপ কৰক (&S)
     
     
-      
+      
       &Install
       ইনস্তল (&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       চেত্ আপ সম্পূৰ্ণ হ'ল। প্ৰোগ্ৰেম বন্ধ কৰক।
     
     
-      
+      
       The installation is complete. Close the installer.
       ইনস্তলেচন সম্পূৰ্ণ হ'ল। ইন্স্তলাৰ বন্ধ কৰক।
     
     
-      
+      
       Cancel setup without changing the system.
       চিছ্তেম সলনি নকৰাকৈ চেত্ আপ বাতিল কৰক।
     
     
-      
+      
       Cancel installation without changing the system.
       চিছ্তেম সলনি নকৰাকৈ ইনস্তলেচন বাতিল কৰক।
     
     
-      
+      
       &Next
       পৰবর্তী (&N)
     
     
-      
+      
       &Back
       পাছলৈ (&B)
     
     
-      
+      
       &Done
       হৈ গ'ল (&D)
     
     
-      
+      
       &Cancel
       বাতিল কৰক (&C)
     
     
-      
+      
       Cancel setup?
       চেত্ আপ বাতিল কৰিব?
     
     
-      
+      
       Cancel installation?
       ইনস্তলেছন বাতিল কৰিব?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       সচাকৈয়ে চলিত চেত্ আপ প্ৰক্ৰিয়া বাতিল কৰিব বিচাৰে নেকি?
 চেত্ আপ প্ৰোগ্ৰেম বন্ধ হ'ব আৰু গোটেই সলনিবোৰ নোহোৱা হৈ যাব।
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       সচাকৈয়ে চলিত ইনস্তল প্ৰক্ৰিয়া বাতিল কৰিব বিচাৰে নেকি?
@@ -468,22 +468,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       অপৰিচিত প্ৰকাৰৰ ব্যতিক্রম
     
     
-      
+      
       unparseable Python error
       অপ্ৰাপ্য পাইথন ত্ৰুটি
     
     
-      
+      
       unparseable Python traceback
       অপ্ৰাপ্য পাইথন ত্ৰেচবেক
     
     
-      
+      
       Unfetchable Python error.
       ঢুকি নোপোৱা পাইথন ক্ৰুটি।
     
@@ -501,6 +501,24 @@ The installer will quit and all changes will be lost.
       %1 ইনস্তলাৰ
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ The installer will quit and all changes will be lost.
       ৰূপ
     
     
-      
+      
       Select storage de&vice:
       স্তোৰেজ ডিভাইচ চয়ণ কৰক (&v):
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       বর্তমান:
     
     
-      
+      
       After:
       পিছত:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>মেনুৱেল  বিভাজন</strong><br/>আপুনি নিজে বিভাজন বনাব বা বিভজনৰ আয়তন সলনি কৰিব পাৰে।
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1ক %2ৰ গৃহ বিভাজন হিচাপে পুনৰ ব্যৱহাৰ কৰক।
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>আয়তন সলনি কৰিবলৈ বিভাজন বাচনি কৰক, তাৰ পিছত তলৰ "বাৰ্" ডালৰ সহায়ত আয়তন চেত্ কৰক</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 বিভজনক সৰু কৰি %2MiB কৰা হ'ব আৰু %4ৰ বাবে %3MiBৰ নতুন বিভজন বনোৱা হ'ব।
     
     
-      
+      
       Boot loader location:
       বুত্ লোডাৰৰ অৱস্থান:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>ইনস্তল​ কৰিবলৈ এখন বিভাজন চয়ন কৰক</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       এই চিছটেমত এখনো EFI চিছটেম বিভাজন কতো পোৱা নগ'ল। অনুগ্ৰহ কৰি উভতি যাওক আৰু মেনুৱেল বিভাজন প্ৰক্ৰিয়া দ্বাৰা %1 চেত্ আপ কৰক।
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1ত থকা EFI চিছটেম বিভাজনটো %2ক আৰম্ভ কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব।
     
     
-      
+      
       EFI system partition:
       EFI চিছটেম বিভাজন:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এইটো ষ্টোৰেজ ডিভাইচত কোনো অপাৰেটিং চিছটেম নাই যেন লাগে। আপুনি কি কৰিব বিচাৰে?<br/>আপুনি ষ্টোৰেজ ডিভাইচটোত কিবা সলনি কৰাৰ আগতে পুনৰীক্ষণ আৰু চয়ন নিশ্চিত কৰিব পাৰিব।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>ডিস্কত থকা গোটেই ডাটা আতৰাওক।</strong><br/> ইয়াৰ দ্ৱাৰা ষ্টোৰেজ ডিভাইছত বৰ্তমান থকা সকলো ডাটা <font color="red">বিলোপ</font> কৰা হ'ব।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>সমান্তৰালভাৱে ইনস্তল কৰক</strong><br/> ইনস্তলাৰটোৱে %1ক ইনস্তল​ কৰাৰ বাবে এখন বিভাজন সৰু কৰি দিব।
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>বিভাজন সলনি কৰক</strong> <br/>এখন বিভাজনক % ৰ্ সৈতে সলনি কৰক।
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এইটো ষ্টোৰেজ ডিভাইচত %1 আছে। <br/> আপুনি কি কৰিব বিচাৰে? ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব।
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এইটো ষ্টোৰেজ ডিভাইচত ইতিমধ্যে এটা অপাৰেটিং চিছটেম আছে। আপুনি কি কৰিব বিচাৰে? <br/>ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব।
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এইটো ষ্টোৰেজ ডিভাইচত একাধিক এটা অপাৰেটিং চিছটেম আছে। আপুনি কি কৰিব বিচাৰে? 1ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব।
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       কোনো স্ৱেপ নাই
     
     
-      
+      
       Reuse Swap
       স্ৱেপ পুনৰ ব্যৱহাৰ কৰক
     
     
-      
+      
       Swap (no Hibernate)
       স্ৱেপ (হাইবাৰনেট নোহোৱাকৈ)
     
     
-      
+      
       Swap (with Hibernate)
       স্ৱোআপ (হাইবাৰনেটৰ সৈতে)
     
     
-      
+      
       Swap to file
       ফাইললৈ স্ৱোআপ কৰক।
     
@@ -695,12 +713,12 @@ The installer will quit and all changes will be lost.
       গোটেই অস্থায়ী মাউন্ত আঁতৰোৱা হৈ আছে।
     
     
-      
+      
       Cannot get list of temporary mounts.
       অস্থায়ী মাউন্তৰ সূচী পোৱা নগ'ল।
     
     
-      
+      
       Cleared all temporary mounts.
       গোটেই অস্থায়ী মাউন্ত আঁতৰোৱা হ'ল।
     
@@ -727,27 +745,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       কিবোৰ্ডৰ মডেল %1ত চেট্ কৰক।<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       কিবোৰ্ডৰ লেআউট %1/%2 চেট্ কৰক।
     
     
-      
+      
       Set timezone to %1/%2.
       সময় অঞ্চলৰ সিদ্ধান্ত কৰক %`1%2
     
     
-      
+      
       The system language will be set to %1.
       চিছটেমৰ ভাষা %1লৈ সলনি কৰা হ'ব।
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       সংখ্যা আৰু তাৰিখ স্থানীয় %1লৈ সলনি কৰা হ'ব।
     
@@ -871,6 +889,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       আপোনাৰ পাছৱৰ্ডকেইটাৰ মিল নাই!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       %1ৰ ইনস্তলচেন সম্পুৰ্ণ হ'ল।
     
+    
+      
+      Package Selection
+      পেকেজ নিৰ্বাচন
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      সুচীৰ পৰা পণ্য এটা বাচনি কৰক। বাচনি কৰা পণ্যটো ইনস্তল হ'ব।
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ The installer will quit and all changes will be lost.
       ফ্লেগ সমূহ:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       এনক্ৰিপ্ত্ (&c)
     
     
-      
+      
       Logical
       যুক্তিসম্মত
     
     
-      
+      
       Primary
       মূখ্য
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       এইটো মাওন্ট্ পইন্ট্ ইতিমধ্যে ব্যৱহাৰ হৈ আছে। অনুগ্ৰহ কৰি বেলেগ এটা বাচনি কৰক।
     
@@ -1001,43 +1044,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       %1 ফাইল চিছটেমৰ সৈতে %4 (%3) ত %2MiBৰ নতুন বিভাজন বনাওক।
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       <strong>%4</strong>ত নতুন (%3) <strong>%1</strong> ফাইল চিছটেমৰ <strong>%2MiB</strong> বিভাজন কৰক। 
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2ত নতুন %1 বিভজন বনাই আছে।
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       '%1' ডিস্কত নতুন বিভাজন বনোৱাত ইনস্তলাৰটো বিফল হ'ল।
     
@@ -1088,7 +1131,7 @@ The installer will quit and all changes will be lost.
       %2ত নতুন %1 বিভাজন তালিকা বনোৱা হৈ আছে।
     
     
-      
+      
       The installer failed to create a partition table on %1.
       ইন্স্তলাৰটো %1ত বিভাজন তালিকা বনোৱাত বিফল হ'ল।
     
@@ -1327,7 +1370,17 @@ The installer will quit and all changes will be lost.
       ফ্লেগ সমূহ:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       এইটো মাওন্ট্ পইন্ট্ ইতিমধ্যে ব্যৱহাৰ হৈ আছে। অনুগ্ৰহ কৰি বেলেগ এটা বাচনি কৰক।
     
@@ -1364,57 +1417,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       বিভাজন তথ্য চেত্ কৰক
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       <strong>নতুন</strong> %2 চিছটেম বিভাজনত %1  ইনস্তল কৰক।
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       %3 চিছটেম বিভাজনত <strong>%1</strong>ত %2 ইনস্তল কৰক।
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       <strong>1%ত</strong> বুত্ লোডাৰ ইনস্তল কৰক।
     
     
-      
+      
       Setting up mount points.
       মাউন্ট পইন্ট চেত্ আপ হৈ আছে।
     
@@ -1827,6 +1880,14 @@ The installer will quit and all changes will be lost.
       অৱস্থান
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2046,29 +2107,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       সময় অঞ্চল: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2384,7 +2445,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       পেকেজ
     
@@ -2565,33 +2626,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       খালী ঠাই
     
     
       
-      
+      
       New partition
       নতুন বিভাজন
     
     
-      
+      
       Name
       নাম
     
     
-      
+      
       File System
       ফাইল চিছটেম
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       মাউন্ট পইন্ট
     
     
-      
+      
       Size
       আয়তন
     
@@ -2677,117 +2743,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       চিছটেম তথ্য সংগ্ৰহ কৰা হৈ আছে।
     
     
-      
+      
       Partitions
       বিভাজনসমুহ
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       %1ক বেলেগ এটা অপাৰেটিং চিছটেমৰ <strong>লগত </strong>ইনস্তল কৰক।
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       ডিস্কত থকা সকলো ডাটা <strong>আতৰাওক</strong> আৰু %1 ইনস্তল কৰক।
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       এখন বিভাজন %1ৰ লগত <strong>সলনি</strong> কৰক।
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>মেনুৱেল</strong> বিভাজন।
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       %1ক <strong>%2</strong>(%3)ত ডিস্কত থকা বেলেগ অপাৰেটিং চিছটেমৰ <strong>লগত</strong> ইনস্তল কৰক।
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>%2</strong> (%3)ডিস্কত থকা সকলো ডাটা <strong>আতৰাওক</strong> আৰু %1 ইনস্তল কৰক।
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>%2</strong> (%3) ডিস্কত এখন বিভাজন %1ৰ লগত <strong>সলনি</strong> কৰক।
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>%1</strong> (%2) ডিস্কত <strong>মেনুৱেল</strong> বিভাজন।
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       ডিস্ক্ <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       বর্তমান:
     
     
-      
+      
       After:
       পিছত:
     
     
-      
+      
       No EFI system partition configured
       কোনো EFI চিছটেম বিভাজন কনফিগাৰ কৰা হোৱা নাই
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       %1 আৰম্ভ কৰিবলৈ এটা EFI চিছটেম থকাটো আৱশ্যক। <br/><br/>এটা EFI চিছটেম কন্ফিগাৰ কৰিবলৈ উভতি যাওক আৰু FAT32 ফাইল চিছটেম এটা বাচনি কৰক যিটোত <strong>%3</strong> ফ্লেগ  সক্ষম হৈ আছে আৰু <strong>%2</strong> মাউন্ট্ পইণ্ট্ আছে।<br/><br/>আপুনি EFI চিছটেমবিভাজন কন্ফিগাৰ নকৰাকৈ অগ্ৰসৰ হ'ব পাৰে কিন্তু ইয়াৰ ফলত চিছটেম বিফল হ'ব পাৰে।
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       %1 আৰম্ভ কৰিবলৈ এটা EFI চিছটেম থকাটো আৱশ্যক। %2 মাউন্ট্ পইন্ট্ নোহোৱকৈ কন্ফিগাৰ কৰা হৈছিল, কিন্তু ইয়াৰ esp ফ্লেগ ছেট কৰা হোৱা নাই। ফ্লেগ্ ছেট কৰিবলৈ উভতি যাওক আৰু বিভাজন সলনি কৰক। আপুনি     ফ্লেগ ছেট নকৰাকৈ অগ্ৰসৰ হ'ব পাৰে কিন্তু ইয়াৰ ফলত চিছটেম বিফল হ'ব পাৰে। 
     
     
-      
+      
       EFI system partition flag not set
       EFI চিছটেম বিভাজনত ফ্লেগ চেট কৰা নাই
     
     
-      
+      
       Option to use GPT on BIOS
       GPTৰ BIOSত ব্যৱহাৰৰ বাবে বিকল্প
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       এটা GPT পৰ্তিসোন টেবুল সকলো স্যস্তেমৰ বাবে উত্তম বিকল্প হয় | এই ইন্সালাৰতোৱে তেনে স্থাপনকৰণ BIOS স্যস্তেমতো কৰে |<br/><br/>এটা GPT পৰ্তিসোন টেবুল কনফিগাৰ কৰিবলৈ ( যদি আগতে কৰা নাই ) পাছলৈ গৈ  পৰ্তিসোন টেবুলখনক GPTলৈ পৰিৱৰ্তন কৰক,  তাৰপাচত 8 MBৰ উনফোৰমেতেট পৰ্তিতিওন এটা বনাব | <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
     
     
-      
+      
       Boot partition not encrypted
       বুত্ বিভাজন এনক্ৰিপ্ত্ নহয়
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       এনক্ৰিপ্তেড ৰুট বিভাজনৰ সৈতে এটা বেলেগ বুট বিভাজন চেত্ আপ কৰা হৈছিল, কিন্তু বুট বিভাজন এনক্ৰিপ্তেড কৰা হোৱা নাই। <br/><br/>এইধৰণৰ চেত্ আপ সুৰক্ষিত নহয় কাৰণ গুৰুত্ব্পুৰ্ণ চিছটেম ফাইল আন্এনক্ৰিপ্তেড বিভাজনত ৰখা হয়। <br/>আপুনি বিচাৰিলে চলাই থাকিব পাৰে কিন্তু পিছ্ত চিছটেম আৰম্ভৰ সময়ত ফাইল চিছটেম খোলা যাব। <br/>বুট বিভাজন এনক্ৰিপ্ত্ কৰিবলৈ উভতি যাওক আৰু বিভাজন বনোৱা windowত <strong>Encrypt</strong> বাচনি কৰি আকৌ বনাওক।
     
     
-      
+      
       has at least one disk device available.
       অতি কমেও এখন ডিস্ক্ উপলব্ধ আছে।
     
     
-      
+      
       There are no partitions to install on.
       ইনস্তল কৰিবলৈ কোনো বিভাজন নাই।
     
@@ -2977,17 +3043,17 @@ Output:
       <pre>%1</pre> ৰেন্ডম ফাইল বনাব পৰা নগ'ল।
     
     
-      
+      
       No product
       কোনো পণ্য নাই
     
     
-      
+      
       No description provided.
       একো বিৱৰণি দিয়া হোৱা নাই।
     
     
-      
+      
       (no mount point)
       (কোনো মাউন্ট পইন্ট নাই)
     
@@ -3246,12 +3312,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       উত্কৃষ্ট ফলাফলৰ বাবে অনুগ্ৰহ কৰি নিশ্চিত কৰক যে এইটো কম্পিউটাৰ হয়:
     
     
-      
+      
       System requirements
       চিছটেমৰ আৱশ্যকতাবোৰ
     
@@ -3259,27 +3325,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       %1 চেত্ আপৰ বাবে নিম্নতম আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>স্থাপন প্ৰক্ৰিয়া অবিৰত ৰাখিব নোৱাৰিব। <a href="#details">বিৱৰণ...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       %1 ইনস্তলচেন​ৰ বাবে নিম্নতম আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>ইনস্তলচেন​ প্ৰক্ৰিয়া অবিৰত ৰাখিব নোৱাৰিব। <a href="#details">বিৱৰণ...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       %1 চেত্ আপৰ বাবে পৰামৰ্শ দিয়া আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>স্থাপন প্ৰক্ৰিয়া অবিৰত ৰাখিব পাৰিব, কিন্তু কিছুমান সুবিধা নিষ্ক্রিয় হৈ থাকিব। 
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       %1 ইনস্তলচেন​ৰ বাবে পৰামৰ্শ দিয়া আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। ইনস্তলচেন​ অবিৰত ৰাখিব পাৰিব, কিন্তু কিছুমান সুবিধা নিষ্ক্রিয় হৈ থাকিব। 
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       এইটো প্ৰগ্ৰেমে অপোনাক কিছুমান প্ৰশ্ন সুধিব আৰু অপোনাৰ কম্পিউটাৰত %2 স্থাপন কৰিব।
     
@@ -3435,7 +3501,7 @@ Output:
       নতুন বিভাজনত <strong>%1</strong> ফ্লেগ লগাই আছে।
     
     
-      
+      
       The installer failed to set flags on partition %1.
       ইনস্তলাৰটো​ %1 বিভাজনত ফ্লেগ লগোৱাত বিফল হ'ল।
     
@@ -3578,12 +3644,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       চেত্ আপ প্ৰক্ৰিয়া হ'লে কি হ'ব এয়া এটা অৱলোকন।
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       ইনস্তল প্ৰক্ৰিয়া হ'লে কি হ'ব এয়া এটা অৱলোকন।
     
@@ -4126,107 +4192,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       আপোনাৰ নাম কি?
     
     
-      
+      
       Your Full Name
       আপোনাৰ সম্পূৰ্ণ নাম
     
     
-      
+      
       What name do you want to use to log in?
       লগইনত আপোনি কি নাম ব্যৱহাৰ কৰিব বিচাৰে?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      কেৱল lowercase বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে।
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       এইটো কম্পিউটাৰৰ নাম কি?
     
     
-      
+      
       Computer Name
       কম্পিউটাৰৰ নাম
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       আপোনাৰ একাউণ্ট সুৰক্ষিত ৰাখিবলৈ পাছৱৰ্ড এটা বাছনি কৰক।
     
     
-      
+      
       Password
       পাছৱৰ্ড
     
     
-      
+      
       Repeat Password
       পাছৱৰ্ড পুনৰ লিখক।
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       এই বাকচটো চিহ্নিত কৰিলে পাছ্ৱৰ্ডৰ প্ৰৱলতা কৰা হ'ব আৰু আপুনি দুৰ্বল পাছৱৰ্ড ব্যৱহাৰ কৰিব নোৱাৰিব।
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       প্ৰশাসনীয় একাউন্টৰ বাবে একে পাছৱৰ্ড্ ব্যৱহাৰ কৰক।
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts
index a005105ab2..af0b90cbc3 100644
--- a/lang/calamares_ast.ts
+++ b/lang/calamares_ast.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record de %1
     
     
-      
+      
       Boot Partition
       Partición d'arrinque
     
     
-      
+      
       System Partition
       Partición del sistema
     
     
-      
+      
       Do not install a boot loader
       Nenyures
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Executando la operación %1.
     
     
-      
+      
       Bad working directory path
       El camín del direutoriu de trabayu ye incorreutu
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       El direutoriu de trabayu %1 pal trabayu en Python %2 nun ye lleibe.
     
     
-      
+      
       Bad main script file
       El ficheru del script principal ye incorreutu
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       El ficheru del script principal %1 pal trabayu en Python %2 nun ye lleibe.
     
     
-      
+      
       Boost.Python error in job "%1".
       Fallu de Boost.Python nel trabayu «%1».
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Falló la configuración
     
     
-      
+      
       Installation Failed
       Falló la instalación
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Fallu
     
     
-      
-      
+      
+      
       &Yes
       &Sí
     
     
-      
-      
+      
+      
       &No
       &Non
     
     
-      
+      
       &Close
       &Zarrar
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Falló l'aniciu de Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 nun pue instalase. Calamares nun foi a cargar tolos módulos configuraos. Esto ye un problema col mou nel que la distribución usa Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Nun pudieron cargase los módulos de darréu:
     
     
-      
+      
       Continue with setup?
       ¿Siguir cola instalación?
     
     
-      
+      
       Continue with installation?
       ¿Siguir cola instalación?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El programa d'instalación de %1 ta a piques de facer cambeos nel discu pa configurar %2.<br/><strong>Nun vas ser a desfacer estos cambeos.<strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       L'instalador de %1 ta a piques de facer cambeos nel discu pa instalar %2.<br/><strong>Nun vas ser a desfacer esos cambeos.</strong>
     
     
-      
+      
       &Set up now
       &Configurar agora
     
     
-      
+      
       &Install now
       &Instalar agora
     
     
-      
+      
       Go &back
       Dir p'&atrás
     
     
-      
+      
       &Set up
       &Configurar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       Completóse la configuración. Zarra'l programa de configuración.
     
     
-      
+      
       The installation is complete. Close the installer.
       Completóse la instalación. Zarra l'instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Encaboxa la configuración ensin camudar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Encaboxa la instalación ensin camudar el sistema.
     
     
-      
+      
       &Next
       &Siguiente
     
     
-      
+      
       &Back
       &Atrás
     
     
-      
+      
       &Done
       &Fecho
     
     
-      
+      
       &Cancel
       &Encaboxar
     
     
-      
+      
       Cancel setup?
       ¿Encaboxar la configuración?
     
     
-      
+      
       Cancel installation?
       ¿Encaboxar la instalación?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       ¿De xuru que quies encaboxar el procesu actual de configuración?
 El programa de configuración va colar y van perdese tolos cambeos.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       ¿De xuru que quies encaboxar el procesu actual d'instalación?
@@ -468,22 +468,22 @@ L'instalador va colar y van perdese tolos cambeos.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Desconozse la triba de la esceición
     
     
-      
+      
       unparseable Python error
       Fallu de Python que nun pue analizase
     
     
-      
+      
       unparseable Python traceback
       Traza inversa de Python que nun pue analizase
     
     
-      
+      
       Unfetchable Python error.
       Fallu de Python al que nun pue dise en cata.
     
@@ -501,6 +501,24 @@ L'instalador va colar y van perdese tolos cambeos.
       Instalador de %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      L'instalador falló al anovar la tabla particiones nel discu «%1».
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ L'instalador va colar y van perdese tolos cambeos.
       Formulariu
     
     
-      
+      
       Select storage de&vice:
       Esbilla un preséu d'al&macenamientu:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Anguaño:
     
     
-      
+      
       After:
       Dempués:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionáu manual</strong><br/>Vas poder crear o redimensionar particiones.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reusu de %s como partición d'aniciu pa %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Esbilla una partición a redimensionar, dempués arrastra la barra baxera pa facelo</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 va redimensionase a %2MB y va crease una partición de %3MB pa %4.
     
     
-      
+      
       Boot loader location:
       Allugamientu del xestor d'arrinque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Esbilla una partición na qu'instalar</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nun pudo alcontrase per nenyures una partición del sistema EFI. Volvi p'atrás y usa'l particionáu manual pa configurar %1, por favor.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partición del sistema EFI en %1 va usase p'aniciar %2.
     
     
-      
+      
       EFI system partition:
       Partición del sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esti preséu d'almacenamientu nun paez que tenga un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Desaniciu d'un discu</strong><br/>Esto va <font color="red">desaniciar</font> tolos datos presentes nel preséu d'almacenamientu esbilláu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalación anexa</strong><br/>L'instalador va redimensionar una partición pa dexar sitiu a %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Troquéu d'una partición</strong><br/>Troca una parción con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esti preséu d'almacenamientu tien %1 nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esti preséu d'almacenamientu yá tien un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esti preséu d'almacenamientu tien varios sistemes operativos nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Ensin intercambéu
     
     
-      
+      
       Reuse Swap
       Reusar un intercambéu
     
     
-      
+      
       Swap (no Hibernate)
       Intercambéu (ensin ivernación)
     
     
-      
+      
       Swap (with Hibernate)
       Intercambéu (con ivernación)
     
     
-      
+      
       Swap to file
       Intercambéu nun ficheru
     
@@ -695,12 +713,12 @@ L'instalador va colar y van perdese tolos cambeos.
       Llimpiando tolos montaxes temporales.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Nun pue consiguise la llista de montaxes temporales.
     
     
-      
+      
       Cleared all temporary mounts.
       Llimpiáronse tolos puntos de montaxe.
     
@@ -727,27 +745,27 @@ L'instalador va colar y van perdese tolos cambeos.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Va afitase'l modelu del tecláu a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Va afitase la distrubución del tecláu a %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       La llingua del sistema va afitase a %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       La númberación y data van afitase en %1.
     
@@ -871,6 +889,11 @@ L'instalador va colar y van perdese tolos cambeos.
       Your passwords do not match!
       ¡Les contraseñes nun concasen!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ L'instalador va colar y van perdese tolos cambeos.
       The installation of %1 is complete.
       Completóse la instalación de %1.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ L'instalador va colar y van perdese tolos cambeos.
       Banderes:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Cifrar
     
     
-      
+      
       Logical
       Llóxica
     
     
-      
+      
       Primary
       Primaria
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       El puntu de montaxe yá ta n'usu. Esbilla otru, por favor.
     
@@ -1001,43 +1044,43 @@ L'instalador va colar y van perdese tolos cambeos.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Creando una partición %1 en %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       L'instalador falló al crear la partición nel discu «%1».
     
@@ -1088,7 +1131,7 @@ L'instalador va colar y van perdese tolos cambeos.
       Creando una tabla de particiones %1 en %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       L'instalador falló al crear la tabla de particiones en %1.
     
@@ -1327,7 +1370,17 @@ L'instalador va colar y van perdese tolos cambeos.
       Banderes:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       El puntu de montaxe yá ta n'usu. Esbilla otru, por favor.
     
@@ -1364,57 +1417,57 @@ L'instalador va colar y van perdese tolos cambeos.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Afitamientu de la información de les particiones
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Va instalase %1 na partición %2 <strong>nueva</strong> del sistema.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Va instalase %2 na partición %3 del sistema de <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Va instalase'l xestor d'arrinque en <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Configurando los puntos de montaxe.
     
@@ -1827,6 +1880,14 @@ L'instalador va colar y van perdese tolos cambeos.
       Allugamientu
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2105,29 @@ L'instalador va colar y van perdese tolos cambeos.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2382,7 +2443,7 @@ L'instalador va colar y van perdese tolos cambeos.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paquetes
     
@@ -2563,33 +2624,38 @@ L'instalador va colar y van perdese tolos cambeos.
     PartitionModel
     
       
-      
+      
       Free Space
       Espaciu llibre
     
     
       
-      
+      
       New partition
       Partición nueva
     
     
-      
+      
       Name
       Nome
     
     
-      
+      
       File System
       Sistema de ficheros
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Puntu de montaxe
     
     
-      
+      
       Size
       Tamañu
     
@@ -2675,117 +2741,117 @@ L'instalador va colar y van perdese tolos cambeos.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Recoyendo la información del sistema...
     
     
-      
+      
       Partitions
       Particiones
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Va instalase %1 <strong>xunto a</strong> otru sistema operativu.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Va desaniciase</strong>'l discu y va instalase %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Va trocase</strong> una partición con %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Particionáu <strong>manual</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Va instalase %1 <strong>xunto a</strong> otru sistema operativu nel discu <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Va desaniciase</strong>'l discu <strong>%2</strong> (%3) y va instalase %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Va trocase</strong> una partición nel discu <strong>%2</strong> (%3) con %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Particionáu <strong>manual</strong> nel discu <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Discu <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Anguaño:
     
     
-      
+      
       After:
       Dempués:
     
     
-      
+      
       No EFI system partition configured
       Nun se configuró nenguna partición del sistema EFI
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       Nun s'afitó la bandera del sistema EFI
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       La partición d'arrinque nun ta cifrada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Configuróse una partición d'arrinque xunto con una partición raigañu cifrada pero la partición d'arrinque nun ta cifrada.<br/><br/>Hai problemes de seguranza con esta triba de configuración porque los ficheros importantes del sistema caltiénense nuna partición ensin cifrar.<br/>Podríes siguir si quixeres pero'l desbloquéu del sistema de ficheros va asoceder más sero nel aniciu del sistema.<br/>Pa cifrar la partición raigañu, volvi p'atrás y recreala esbillando <strong>Cifrar</strong> na ventana de creación de particiones.
     
     
-      
+      
       has at least one disk device available.
       tien polo menos un preséu disponible d'almacenamientu
     
     
-      
+      
       There are no partitions to install on.
       Nun hai particiones nes qu'instalar.
     
@@ -2975,17 +3041,17 @@ Salida:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3246,12 +3312,12 @@ Salida:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Pa los meyores resultaos, asegúrate qu'esti ordenador:
     
     
-      
+      
       System requirements
       Requirimientos del sistema
     
@@ -3259,27 +3325,27 @@ Salida:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Esti ordenador nun satisfaz dalgún de los requirimientos mínimos pa configurar %1.<br/>La configuración nun pue siguir. <a href="#details">Detalles...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Esti ordenador nun satisfaz los requirimientos mínimos pa instalar %1.<br/>La instalación nun pue siguir. <a href="#details">Detalles...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Esti ordenador nun satisfaz dalgún de los requirimientos aconseyaos pa configurar %1.<br/>La configuración pue siguir pero dalgunes carauterístiques podríen desactivase.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Esti ordenador nun satisfaz dalgún requirimientu aconseyáu pa instalar %1.<br/>La instalación pue siguir pero podríen desactivase dalgunes carauterístiques.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Esti programa va facete dalgunes entrugues y va configurar %2 nel ordenador.
     
@@ -3435,7 +3501,7 @@ Salida:
       Afitando les banderes <strong>%1</strong> na partición nueva.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       L'instalador falló al afitar les banderes na partición %1.
     
@@ -3578,12 +3644,12 @@ Salida:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Esto ye una previsualización de lo que va asoceder nel momentu qu'anicies el procesu de configuración.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Esto ye una previsualización de lo que va asoceder nel momentu qu'anicies el procesu d'instalación.
     
@@ -4123,107 +4189,127 @@ Salida:
       
     
     
-      
+      
       What is your name?
       ¿Cómo te llames?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       ¿Qué nome quies usar p'aniciar sesión?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       ¿Cómo va llamase esti ordenador?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Escueyi una contraseña pa caltener segura la cuenta.
     
     
-      
+      
       Password
       Contraseña
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Usar la mesma contraseña pa la cuenta d'alministrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts
index 068d6a9e41..691bf9a9e8 100644
--- a/lang/calamares_az.ts
+++ b/lang/calamares_az.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 əsas Ön yükləyici qurmaq
     
     
-      
+      
       Boot Partition
       Ön yükləyici bölməsi
     
     
-      
+      
       System Partition
       Sistem bölməsi
     
     
-      
+      
       Do not install a boot loader
       Ön yükləyicini qurmamaq
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 əməliyyatı icra olunur.
     
     
-      
+      
       Bad working directory path
       İş qovluğuna səhv yol
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       %1 qovluğu %2 python işləri üçün açıla bilmir.
     
     
-      
+      
       Bad main script file
       Korlanmış əsas əmrlər faylı
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       %1 əsas əmrlər faylı %2 python işləri üçün açıla bilmir.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python iş xətası "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Quraşdırılma xətası
     
     
-      
+      
       Installation Failed
       Quraşdırılma alınmadı
     
     
-      
+      
       Would you like to paste the install log to the web?
       Quraşdırma jurnalını vebdə yerləşdirmək istəyirsinizmi?
     
     
-      
+      
       Error
       Xəta
     
     
-      
-      
+      
+      
       &Yes
       &Bəli
     
     
-      
-      
+      
+      
       &No
       &Xeyr
     
     
-      
+      
       &Close
       &Bağlamaq
     
     
-      
+      
       Install Log Paste URL
       Jurnal yerləşdirmə URL-nu daxil etmək
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 Keçid mübadilə yaddaşına kopyalandı
     
     
-      
+      
       Calamares Initialization Failed
       Calamares işə salına bilmədi
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Yüklənə bilməyən modullar aşağıdakılardır:
     
     
-      
+      
       Continue with setup?
       Quraşdırılma davam etdirilsin?
     
     
-      
+      
       Continue with installation?
       Quraşdırılma davam etdirilsin?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong>
     
     
-      
+      
       &Set up now
       &İndi ayarlamaq
     
     
-      
+      
       &Install now
       Q&uraşdırmağa başlamaq
     
     
-      
+      
       Go &back
       &Geriyə
     
     
-      
+      
       &Set up
       A&yarlamaq
     
     
-      
+      
       &Install
       Qu&raşdırmaq
     
     
-      
+      
       Setup is complete. Close the setup program.
       Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın.
     
     
-      
+      
       The installation is complete. Close the installer.
       Quraşdırma başa çatdı. Quraşdırıcını bağlayın.
     
     
-      
+      
       Cancel setup without changing the system.
       Sistemi dəyişdirmədən quraşdırmanı ləğv etmək.
     
     
-      
+      
       Cancel installation without changing the system.
       Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək.
     
     
-      
+      
       &Next
       İ&rəli
     
     
-      
+      
       &Back
       &Geriyə
     
     
-      
+      
       &Done
       &Hazır
     
     
-      
+      
       &Cancel
       İm&tina etmək
     
     
-      
+      
       Cancel setup?
       Quraşdırılmadan imtina edilsin?
     
     
-      
+      
       Cancel installation?
       Yüklənmədən imtina edilsin?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz?
 Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz?
@@ -472,22 +472,22 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Naməlum istisna hal
     
     
-      
+      
       unparseable Python error
       görünməmiş Python xətası
     
     
-      
+      
       unparseable Python traceback
       görünməmiş Python izi
     
     
-      
+      
       Unfetchable Python error.
       Oxunmayan Python xətası.
     
@@ -505,6 +505,24 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.%1 Quraşdırıcı
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Format
     
     
-      
+      
       Select storage de&vice:
       Yaddaş ci&hazını seçmək:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Cari:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Əl ilə bölmək</strong><br/>Siz bölməni özünüz yarada və ölçüsünü dəyişə bilərsiniz.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 Ev bölməsi olaraq %2 üçün istifadə edilsin.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Kiçiltmək üçün bir bölmə seçərək altdakı çübüğü sürüşdürərək ölçüsünü verin</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 %2MB-a qədər azalacaq və %4 üçün yeni bölmə %3MB disk bölməsi yaradılacaq.
     
     
-      
+      
       Boot loader location:
       Ön yükləyici (boot) yeri:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Quraşdırılacaq disk bölməsini seçin</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI sistem bölməsi tapılmadı. Geriyə qayıdın və %1 bölməsini əllə yaradın.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 EFI sistemi %2 başlatmaq üçün istifadə olunacaqdır.
     
     
-      
+      
       EFI system partition:
       EFI sistem bölməsi:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazıda əməliyyat sistemi görünmür. Nə etmək istəyərdiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font>seçimi hal-hazırda, seçilmiş diskdəki bütün verilənləri siləcəkdir.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Yanına quraşdırın</strong><br/>Quraşdırıcı, bölməni kiçildərək %1 üçün boş disk sahəsi yaradacaqdır.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Bölməni başqası ilə əvəzləmək</strong><br/>Bölməni %1 ilə əvəzləyir.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda %1 var. Nə etmək istəyirsiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda artıq bir əməliyyat sistemi var. Nə etmək istərdiniz?.<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda bir neçə əməliyyat sistemi mövcuddur. Nə etmək istərdiniz? Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Bu yaddaş qurğusunda artıq əməliyyat sistemi var, lakin, bölmə cədvəli <strong>%1</strong>, lazım olan <strong>%2</strong> ilə fərqlidir.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Bu yaddaş qurğusunda bölmələrdən biri <strong>quraşdırılmışdır</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Bu yaddaş qurğusu <strong>qeyri-aktiv RAİD</strong> qurğusunun bir hissəsidir.
     
     
-      
+      
       No Swap
       Mübadilə bölməsi olmadan
     
     
-      
+      
       Reuse Swap
       Mövcud mübadilə bölməsini istifadə etmək
     
     
-      
+      
       Swap (no Hibernate)
       Mübadilə bölməsi (yuxu rejimi olmadan)
     
     
-      
+      
       Swap (with Hibernate)
       Mübadilə bölməsi (yuxu rejimi ilə)
     
     
-      
+      
       Swap to file
       Mübadilə faylı
     
@@ -699,12 +717,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Bütün müvəqqəti qoşulma nöqtələri ləğv edilir.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Müvəqqəti qoşulma nöqtələrinin siyahısı alına bilmədi.
     
     
-      
+      
       Cleared all temporary mounts.
       Bütün müvəqqəti qoşulma nöqtələri ləğv edildi.
     
@@ -731,27 +749,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Klaviatura modelini %1 olaraq təyin etmək.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Klaviatura qatını %1/%2 olaraq təyin etmək.
     
     
-      
+      
       Set timezone to %1/%2.
       Saat quraşağını təyin etmək %1/%2
     
     
-      
+      
       The system language will be set to %1.
       Sistem dili %1 təyin ediləcək.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Yerli say və tarix formatı %1 təyin olunacaq.
     
@@ -875,6 +893,11 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Your passwords do not match!
       Şifrənizin təkrarı eyni deyil!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.The installation of %1 is complete.
       %1-n quraşdırılması başa çatdı.
     
+    
+      
+      Package Selection
+      Paket seçimi
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Lütfən məhsulu siyahıdan seçin. Seçilmiş məhsul quraşdırılacaqdır.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Bayraqlar:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Şifrələmək
     
     
-      
+      
       Logical
       Məntiqi
     
     
-      
+      
       Primary
       Əsas
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Qoşulma nöqtəsi artıq istifadə olunur. Lütfən başqasını seçin.
     
@@ -1005,43 +1048,43 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Yeni %1MiB bölməsini %3 (%2) üzərində %4 girişləri ilə yaradın.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Yeni %1MiB bölməsini %3 (%2) üzərində yaradın.
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       %1 fayl sistemi ilə %4 (%3)-də yeni %2MB bölmə yaratmaq.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində <em>%4</em> girişlərində yaradın.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində yaradın.
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       <strong>%1</strong> fayl sistemi ilə <strong>%4</strong> (%3)-də yeni <strong>%2MB</strong> bölmə yaratmaq.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2-də yeni %1 bölmə yaratmaq.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Quraşdırıcı '%1' diskində bölmə yarada bilmədi.
     
@@ -1092,7 +1135,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.%2-də yeni %1 bölməsi yaratmaq.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Quraşdırıcı %1-də bölmələr cədvəli yarada bilmədi.
     
@@ -1331,7 +1374,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Bayraqlar:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Qoşulma nöqtəsi artıq istifadə olunur. Lütfən başqasını seçin.
     
@@ -1368,57 +1421,57 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Bölmə məlumatlarını ayarlamaq
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       <strong>Yeni</strong> %2 sistem bölməsində <em>%3</em> xüsusiyyətləri ilə %1 quraşdırın
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       %2 <strong>yeni</strong> sistem diskinə %1 quraşdırmaq.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       <strong>Yeni</strong> %2 bölməsini <strong>%1</strong> qoşulma nöqtəsi və <em>%3</em> xüsusiyyətləri ilə qurun.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       <strong>yeni</strong> %2 bölməsini <strong>%1</strong>%3 qoşulma nöqtəsi ilə qurun.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       %3 <strong>%1</strong> sistem bölməsində <em>%4</em> xüsusiyyətləri ilə %2 quraşdırın.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       <strong>%1</strong> %3 bölməsini <strong>%2</strong> qoşulma nöqtəsi və <em>%4</em> xüsusiyyətləri ilə qurun.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       %3 bölməsinə <strong>%1</strong> ilə <strong>%2</strong>%4 qoşulma nöqtəsi ayarlamaq.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       %3 <strong>%1</strong> sistem bölməsində %2 quraşdırın.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Ön yükləyicini <strong>%1</strong> üzərində quraşdırın.
     
     
-      
+      
       Setting up mount points.
       Qoşulma nöqtəsini ayarlamaq.
     
@@ -1831,6 +1884,14 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Məkan
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Üstünlük verdiyiniz bölgəni və ya cari mövqeyinizə əsaslanan standart bir bölgəni seçin.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Saat qurşağı: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Bölgənizlə birlikdə üstünlük verdiyiniz zonanı seçin.
     
     
-      
+      
       Zones
       Zonalar
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Dil və Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz.
     
@@ -2388,7 +2449,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     PackageChooserViewStep
     
-      
+      
       Packages
       Paketlər
     
@@ -2569,33 +2630,38 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.PartitionModel
     
       
-      
+      
       Free Space
       Boş disk sahəsi
     
     
       
-      
+      
       New partition
       Yeni bölmə
     
     
-      
+      
       Name
       Adı
     
     
-      
+      
       File System
       Fayl sistemi
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Qoşulma nöqtəsi
     
     
-      
+      
       Size
       Ölçüsü
     
@@ -2682,117 +2748,117 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sistem məlumatları toplanır ...
     
     
-      
+      
       Partitions
       Bölmələr
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Digər əməliyyat sistemini %1 <strong>yanına</strong> quraşdırmaq.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       Diski <strong>çıxarmaq</strong> və %1 quraşdırmaq.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       Bölməni %1 ilə <strong>əvəzləmək</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Əl ilə</strong> bölüşdürmə.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       <strong>%2</strong> (%3) diskində başqa əməliyyat sistemini %1 <strong>yanında</strong> quraşdırmaq.
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>%2</strong> (%3) diskini <strong>çıxartmaq</strong> və %1 quraşdırmaq.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>%2</strong> (%3) diskində bölməni %1 ilə <strong>əvəzləmək</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>%1</strong> (%2) diskində <strong>əl ilə</strong> bölüşdürmə.
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       <strong>%1</strong> (%2) diski
     
     
-      
+      
       Current:
       Cari:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       No EFI system partition configured
       EFI sistemi bölməsi tənzimlənməyib
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       EFİ sistemi bölməsi, %1 başlatmaq üçün vacibdir. <br/><br/>EFİ sistemi bölməsini yaratmaq üçün geriyə qayıdın və aktiv edilmiş<strong>%3</strong> bayrağı və <strong>%2</strong> qoşulma nöqtəsi ilə FAT32 fayl sistemi seçin və ya yaradın.<br/><br/>Siz EFİ sistemi bölməsi yaratmadan da davam edə bilərsiniz, lakin bu halda sisteminiz açılmaya bilər.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       %1 başlatmaq üçün EFİ sistem bölməsi vacibdir.<br/><br/>Bölmə <strong>%2</strong> qoşulma nöqtəsi ilə yaradılıb, lakin onun <strong>%3</strong> bayrağı seçilməyib.<br/>Bayrağı seçmək üçün geriyə qayıdın və bölməyə süzəliş edin.<br/><br/>Siz bayrağı seçmədən də davam edə bilərsiniz, lakin bu halda sisteminiz açılmaya bilər.
     
     
-      
+      
       EFI system partition flag not set
       EFİ sistem bölməsi bayraqı seçilməyib
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS-da GPT istifadəsi seçimi
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT bölmə cədvəli bütün sistemlər üçün yaxşıdır. Bu quraşdırıcı BIOS sistemləri üçün də belə bir quruluşu dəstəkləyir.<br/><br/>BİOS-da GPT bölmələr cədvəlini ayarlamaq üçün (əgər bu edilməyibsə) geriyə qayıdın və bölmələr cədvəlini GPT-yə qurun, sonra isə <strong>bios_grub</strong> bayrağı seçilmiş 8 MB-lıq formatlanmamış bölmə yaradın.<br/><br/>8 MB-lıq formatlanmamış bölmə GPT ilə BİOS sistemində %1 başlatmaq üçün lazımdır.
     
     
-      
+      
       Boot partition not encrypted
       Ön yükləyici bölməsi çifrələnməyib
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Şifrəli bir kök bölməsi ilə birlikdə ayrı bir ön yükləyici bölməsi qurulub, ancaq ön yükləyici bölməsi şifrələnməyib.<br/><br/>Bu cür quraşdırma ilə bağlı təhlükəsizlik problemləri olur, çünki vacib sistem sənədləri şifrəsiz bölmədə saxlanılır.<br/>İstəyirsinizsə davam edə bilərsiniz, lakin, fayl sisteminin kilidi, sistem başladıldıqdan daha sonra açılacaqdır.<br/>Yükləmə hissəsini şifrələmək üçün geri qayıdın və bölmə yaratma pəncərəsində <strong>Şifrələmə</strong> menyusunu seçərək onu yenidən yaradın.
     
     
-      
+      
       has at least one disk device available.
       ən az bir disk qurğusu mövcuddur.
     
     
-      
+      
       There are no partitions to install on.
       Quraşdırmaq üçün bölmə yoxdur.
     
@@ -2982,17 +3048,17 @@ Output:
       Yeni təsadüfi<pre>%1</pre> faylı yaradıla bilmir.
     
     
-      
+      
       No product
       Məhsul yoxdur
     
     
-      
+      
       No description provided.
       Təsviri verilməyib.
     
     
-      
+      
       (no mount point)
       (qoşulma nöqtəsi yoxdur)
     
@@ -3253,12 +3319,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Ən yaşxı nəticə üçün lütfən, əmin olun ki, bu kompyuter:
     
     
-      
+      
       System requirements
       Sistem tələbləri
     
@@ -3266,27 +3332,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Bu proqram sizə bəi suallar verəcək və %2 sizin komputerinizə qurmağa kömək edəcək.
     
@@ -3442,7 +3508,7 @@ Output:
       <strong>%1</strong> bayraqlarının yeni bölmədə ayarlanması.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Quraşdırıcı %1 bölməsinə bayraqlar qoya bilmədi.
     
@@ -3585,12 +3651,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
     
@@ -4164,107 +4230,127 @@ Output:
       İnzibatçı tapşırıqlarını yerinə yetirmək və sistemə giriş üçün istifadəçi adını və istifadəçi hesabı məlumatlarını daxil edin
     
     
-      
+      
       What is your name?
       Adınız nədir?
     
     
-      
+      
       Your Full Name
       Tam adınız
     
     
-      
+      
       What name do you want to use to log in?
       Giriş üçün hansı adı istifadə etmək istəyirsiniz?
     
     
-      
+      
       Login Name
       Giriş Adı
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Bu kompyuterin adı nədir?
     
     
-      
+      
       Computer Name
       Kompyuterin adı
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Hesabınızın təhlükəsizliyi üçün şifrə seçin.
     
     
-      
+      
       Password
       Şifrə
     
     
-      
+      
       Repeat Password
       Şifrənin təkararı
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir.
     
     
-      
+      
       Validate passwords quality
       Şifrənin keyfiyyətini yoxlamaq
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz.
     
     
-      
+      
       Log in automatically without asking for the password
       Şifrə soruşmadan sistemə daxil olmaq
     
     
-      
+      
       Reuse user password as root password
       İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək
     
     
-      
+      
       Use the same password for the administrator account.
       İdarəçi hesabı üçün eyni şifrədən istifadə etmək.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Hesabınızı qorumaq üçün kök şifrəsini seçin.
     
     
-      
+      
       Root Password
       Kök Şifrəsi
     
     
-      
+      
       Repeat Root Password
       Kök Şifrəsini təkrar yazın
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin.
     
diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts
index 46f94c08cf..ff3894b6d1 100644
--- a/lang/calamares_az_AZ.ts
+++ b/lang/calamares_az_AZ.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 əsas Ön yükləyici qurmaq
     
     
-      
+      
       Boot Partition
       Ön yükləyici bölməsi
     
     
-      
+      
       System Partition
       Sistem bölməsi
     
     
-      
+      
       Do not install a boot loader
       Ön yükləyicini qurmamaq
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 əməliyyatı icra olunur.
     
     
-      
+      
       Bad working directory path
       İş qovluğuna səhv yol
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       %1 qovluğu %2 python işləri üçün açıla bilmir.
     
     
-      
+      
       Bad main script file
       Korlanmış əsas əmrlər faylı
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       %1 əsas əmrlər faylı %2 python işləri üçün açıla bilmir.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python iş xətası "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Quraşdırılma xətası
     
     
-      
+      
       Installation Failed
       Quraşdırılma alınmadı
     
     
-      
+      
       Would you like to paste the install log to the web?
       Quraşdırma jurnalını vebdə yerləşdirmək istəyirsinizmi?
     
     
-      
+      
       Error
       Xəta
     
     
-      
-      
+      
+      
       &Yes
       &Bəli
     
     
-      
-      
+      
+      
       &No
       &Xeyr
     
     
-      
+      
       &Close
       &Bağlamaq
     
     
-      
+      
       Install Log Paste URL
       Jurnal yerləşdirmə URL-nu daxil etmək
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 Keçid mübadilə yaddaşına kopyalandı
     
     
-      
+      
       Calamares Initialization Failed
       Calamares işə salına bilmədi
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Yüklənə bilməyən modullar aşağıdakılardır:
     
     
-      
+      
       Continue with setup?
       Quraşdırılma davam etdirilsin?
     
     
-      
+      
       Continue with installation?
       Quraşdırılma davam etdirilsin?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong>
     
     
-      
+      
       &Set up now
       &İndi ayarlamaq
     
     
-      
+      
       &Install now
       Q&uraşdırmağa başlamaq
     
     
-      
+      
       Go &back
       &Geriyə
     
     
-      
+      
       &Set up
       A&yarlamaq
     
     
-      
+      
       &Install
       Qu&raşdırmaq
     
     
-      
+      
       Setup is complete. Close the setup program.
       Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın.
     
     
-      
+      
       The installation is complete. Close the installer.
       Quraşdırma başa çatdı. Quraşdırıcını bağlayın.
     
     
-      
+      
       Cancel setup without changing the system.
       Sistemi dəyişdirmədən quraşdırmanı ləğv etmək.
     
     
-      
+      
       Cancel installation without changing the system.
       Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək.
     
     
-      
+      
       &Next
       İ&rəli
     
     
-      
+      
       &Back
       &Geriyə
     
     
-      
+      
       &Done
       &Hazır
     
     
-      
+      
       &Cancel
       İm&tina etmək
     
     
-      
+      
       Cancel setup?
       Quraşdırılmadan imtina edilsin?
     
     
-      
+      
       Cancel installation?
       Yüklənmədən imtina edilsin?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz?
 Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz?
@@ -472,22 +472,22 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Naməlum istisna hal
     
     
-      
+      
       unparseable Python error
       görünməmiş Python xətası
     
     
-      
+      
       unparseable Python traceback
       görünməmiş Python izi
     
     
-      
+      
       Unfetchable Python error.
       Oxunmayan Python xətası.
     
@@ -505,6 +505,24 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.%1 Quraşdırıcı
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Format
     
     
-      
+      
       Select storage de&vice:
       Yaddaş ci&hazını seçmək:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Cari:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Əl ilə bölmək</strong><br/>Siz bölməni özünüz yarada və ölçüsünü dəyişə bilərsiniz.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 Ev bölməsi olaraq %2 üçün istifadə edilsin.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Kiçiltmək üçün bir bölmə seçərək altdakı çübüğü sürüşdürərək ölçüsünü verin</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 %2MB-a qədər azalacaq və %4 üçün yeni bölmə %3MB disk bölməsi yaradılacaq.
     
     
-      
+      
       Boot loader location:
       Ön yükləyici (boot) yeri:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Quraşdırılacaq disk bölməsini seçin</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI sistem bölməsi tapılmadı. Geriyə qayıdın və %1 bölməsini əllə yaradın.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 EFI sistemi %2 başlatmaq üçün istifadə olunacaqdır.
     
     
-      
+      
       EFI system partition:
       EFI sistem bölməsi:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazıda əməliyyat sistemi görünmür. Nə etmək istəyərdiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font>seçimi hal-hazırda, seçilmiş diskdəki bütün verilənləri siləcəkdir.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Yanına quraşdırın</strong><br/>Quraşdırıcı, bölməni kiçildərək %1 üçün boş disk sahəsi yaradacaqdır.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Bölməni başqası ilə əvəzləmək</strong><br/>Bölməni %1 ilə əvəzləyir.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda %1 var. Nə etmək istəyirsiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda artıq bir əməliyyat sistemi var. Nə etmək istərdiniz?.<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda bir neçə əməliyyat sistemi mövcuddur. Nə etmək istərdiniz? Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Bu yaddaş qurğusunda artıq əməliyyat sistemi var, lakin, bölmə cədvəli <strong>%1</strong>, lazım olan <strong>%2</strong> ilə fərqlidir.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Bu yaddaş qurğusunda bölmələrdən biri <strong>quraşdırılmışdır</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Bu yaddaş qurğusu <strong>qeyri-aktiv RAİD</strong> qurğusunun bir hissəsidir.
     
     
-      
+      
       No Swap
       Mübadilə bölməsi olmadan
     
     
-      
+      
       Reuse Swap
       Mövcud mübadilə bölməsini istifadə etmək
     
     
-      
+      
       Swap (no Hibernate)
       Mübadilə bölməsi (yuxu rejimi olmadan)
     
     
-      
+      
       Swap (with Hibernate)
       Mübadilə bölməsi (yuxu rejimi ilə)
     
     
-      
+      
       Swap to file
       Mübadilə faylı
     
@@ -699,12 +717,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Bütün müvəqqəti qoşulma nöqtələri ləğv edilir.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Müvəqqəti qoşulma nöqtələrinin siyahısı alına bilmədi.
     
     
-      
+      
       Cleared all temporary mounts.
       Bütün müvəqqəti qoşulma nöqtələri ləğv edildi.
     
@@ -731,27 +749,27 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Klaviatura modelini %1 olaraq təyin etmək.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Klaviatura qatını %1/%2 olaraq təyin etmək.
     
     
-      
+      
       Set timezone to %1/%2.
       Saat quraşağını təyin etmək %1/%2
     
     
-      
+      
       The system language will be set to %1.
       Sistem dili %1 təyin ediləcək.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Yerli say və tarix formatı %1 təyin olunacaq.
     
@@ -875,6 +893,11 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Your passwords do not match!
       Şifrənizin təkrarı eyni deyil!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.The installation of %1 is complete.
       %1-n quraşdırılması başa çatdı.
     
+    
+      
+      Package Selection
+      Paket seçimi
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Lütfən məhsulu siyahıdan seçin. Seçilmiş məhsul quraşdırılacaqdır.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Bayraqlar:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Şifrələmək
     
     
-      
+      
       Logical
       Məntiqi
     
     
-      
+      
       Primary
       Əsas
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Qoşulma nöqtəsi artıq istifadə olunur. Lütfən başqasını seçin.
     
@@ -1005,43 +1048,43 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Yeni %1MiB bölməsini %3 (%2) üzərində %4 girişləri ilə yaradın.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Yeni %1MiB bölməsini %3 (%2) üzərində yaradın.
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       %1 fayl sistemi ilə %4 (%3)-də yeni %2MB bölmə yaratmaq.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində <em>%4</em> girişlərində yaradın.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Yeni <strong>%1MiB</strong> bölməsini <strong>%3</strong> (%2) üzərində yaradın.
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       <strong>%1</strong> fayl sistemi ilə <strong>%4</strong> (%3)-də yeni <strong>%2MB</strong> bölmə yaratmaq.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2-də yeni %1 bölmə yaratmaq.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Quraşdırıcı '%1' diskində bölmə yarada bilmədi.
     
@@ -1092,7 +1135,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.%2-də yeni %1 bölməsi yaratmaq.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Quraşdırıcı %1-də bölmələr cədvəli yarada bilmədi.
     
@@ -1331,7 +1374,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Bayraqlar:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Qoşulma nöqtəsi artıq istifadə olunur. Lütfən başqasını seçin.
     
@@ -1368,57 +1421,57 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Bölmə məlumatlarını ayarlamaq
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       <strong>Yeni</strong> %2 sistem bölməsində <em>%3</em> xüsusiyyətləri ilə %1 quraşdırın
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       %2 <strong>yeni</strong> sistem diskinə %1 quraşdırmaq.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       <strong>Yeni</strong> %2 bölməsini <strong>%1</strong> qoşulma nöqtəsi və <em>%3</em> xüsusiyyətləri ilə qurun.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       <strong>yeni</strong> %2 bölməsini <strong>%1</strong>%3 qoşulma nöqtəsi ilə qurun.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       %3 <strong>%1</strong> sistem bölməsində <em>%4</em> xüsusiyyətləri ilə %2 quraşdırın.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       <strong>%1</strong> %3 bölməsini <strong>%2</strong> qoşulma nöqtəsi və <em>%4</em> xüsusiyyətləri ilə qurun.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       %3 bölməsinə <strong>%1</strong> ilə <strong>%2</strong>%4 qoşulma nöqtəsi ayarlamaq.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       %3 <strong>%1</strong> sistem bölməsində %2 quraşdırın.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Ön yükləyicini <strong>%1</strong> üzərində quraşdırın.
     
     
-      
+      
       Setting up mount points.
       Qoşulma nöqtəsini ayarlamaq.
     
@@ -1831,6 +1884,14 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Məkan
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Üstünlük verdiyiniz bölgəni və ya cari mövqeyinizə əsaslanan standart bir bölgəni seçin.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Saat qurşağı: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Bölgənizlə birlikdə üstünlük verdiyiniz zonanı seçin.
     
     
-      
+      
       Zones
       Zonalar
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Dil və Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz.
     
@@ -2388,7 +2449,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     PackageChooserViewStep
     
-      
+      
       Packages
       Paketlər
     
@@ -2569,33 +2630,38 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.PartitionModel
     
       
-      
+      
       Free Space
       Boş disk sahəsi
     
     
       
-      
+      
       New partition
       Yeni bölmə
     
     
-      
+      
       Name
       Adı
     
     
-      
+      
       File System
       Fayl sistemi
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Qoşulma nöqtəsi
     
     
-      
+      
       Size
       Ölçüsü
     
@@ -2682,117 +2748,117 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sistem məlumatları toplanır ...
     
     
-      
+      
       Partitions
       Bölmələr
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Digər əməliyyat sistemini %1 <strong>yanına</strong> quraşdırmaq.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       Diski <strong>çıxarmaq</strong> və %1 quraşdırmaq.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       Bölməni %1 ilə <strong>əvəzləmək</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Əl ilə</strong> bölüşdürmə.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       <strong>%2</strong> (%3) diskində başqa əməliyyat sistemini %1 <strong>yanında</strong> quraşdırmaq.
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>%2</strong> (%3) diskini <strong>çıxartmaq</strong> və %1 quraşdırmaq.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>%2</strong> (%3) diskində bölməni %1 ilə <strong>əvəzləmək</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>%1</strong> (%2) diskində <strong>əl ilə</strong> bölüşdürmə.
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       <strong>%1</strong> (%2) diski
     
     
-      
+      
       Current:
       Cari:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       No EFI system partition configured
       EFI sistemi bölməsi tənzimlənməyib
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       EFİ sistemi bölməsi, %1 başlatmaq üçün vacibdir. <br/><br/>EFİ sistemi bölməsini yaratmaq üçün geriyə qayıdın və aktiv edilmiş<strong>%3</strong> bayrağı və <strong>%2</strong> qoşulma nöqtəsi ilə FAT32 fayl sistemi seçin və ya yaradın.<br/><br/>Siz EFİ sistemi bölməsi yaratmadan da davam edə bilərsiniz, lakin bu halda sisteminiz açılmaya bilər.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       %1 başlatmaq üçün EFİ sistem bölməsi vacibdir.<br/><br/>Bölmə <strong>%2</strong> qoşulma nöqtəsi ilə yaradılıb, lakin onun <strong>%3</strong> bayrağı seçilməyib.<br/>Bayrağı seçmək üçün geriyə qayıdın və bölməyə süzəliş edin.<br/><br/>Siz bayrağı seçmədən də davam edə bilərsiniz, lakin bu halda sisteminiz açılmaya bilər.
     
     
-      
+      
       EFI system partition flag not set
       EFİ sistem bölməsi bayraqı seçilməyib
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS-da GPT istifadəsi seçimi
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT bölmə cədvəli bütün sistemlər üçün yaxşıdır. Bu quraşdırıcı BIOS sistemləri üçün də belə bir quruluşu dəstəkləyir.<br/><br/>BİOS-da GPT bölmələr cədvəlini ayarlamaq üçün (əgər bu edilməyibsə) geriyə qayıdın və bölmələr cədvəlini GPT-yə qurun, sonra isə <strong>bios_grub</strong> bayrağı seçilmiş 8 MB-lıq formatlanmamış bölmə yaradın.<br/><br/>8 MB-lıq formatlanmamış bölmə GPT ilə BİOS sistemində %1 başlatmaq üçün lazımdır.
     
     
-      
+      
       Boot partition not encrypted
       Ön yükləyici bölməsi çifrələnməyib
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Şifrəli bir kök bölməsi ilə birlikdə ayrı bir ön yükləyici bölməsi qurulub, ancaq ön yükləyici bölməsi şifrələnməyib.<br/><br/>Bu cür quraşdırma ilə bağlı təhlükəsizlik problemləri olur, çünki vacib sistem sənədləri şifrəsiz bölmədə saxlanılır.<br/>İstəyirsinizsə davam edə bilərsiniz, lakin, fayl sisteminin kilidi, sistem başladıldıqdan daha sonra açılacaqdır.<br/>Yükləmə hissəsini şifrələmək üçün geri qayıdın və bölmə yaratma pəncərəsində <strong>Şifrələmə</strong> menyusunu seçərək onu yenidən yaradın.
     
     
-      
+      
       has at least one disk device available.
       ən az bir disk qurğusu mövcuddur.
     
     
-      
+      
       There are no partitions to install on.
       Quraşdırmaq üçün bölmə yoxdur.
     
@@ -2982,17 +3048,17 @@ Output:
       Yeni təsadüfi<pre>%1</pre> faylı yaradıla bilmir.
     
     
-      
+      
       No product
       Məhsul yoxdur
     
     
-      
+      
       No description provided.
       Təsviri verilməyib.
     
     
-      
+      
       (no mount point)
       (qoşulma nöqtəsi yoxdur)
     
@@ -3253,12 +3319,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Ən yaşxı nəticə üçün lütfən, əmin olun ki, bu kompyuter:
     
     
-      
+      
       System requirements
       Sistem tələbləri
     
@@ -3266,27 +3332,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Bu proqram sizə bəi suallar verəcək və %2 sizin komputerinizə qurmağa kömək edəcək.
     
@@ -3442,7 +3508,7 @@ Output:
       <strong>%1</strong> bayraqlarının yeni bölmədə ayarlanması.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Quraşdırıcı %1 bölməsinə bayraqlar qoya bilmədi.
     
@@ -3585,12 +3651,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
     
@@ -4164,107 +4230,127 @@ Output:
       İnzibatçı tapşırıqlarını yerinə yetirmək və sistemə giriş üçün istifadəçi adını və istifadəçi hesabı məlumatlarını daxil edin
     
     
-      
+      
       What is your name?
       Adınız nədir?
     
     
-      
+      
       Your Full Name
       Tam adınız
     
     
-      
+      
       What name do you want to use to log in?
       Giriş üçün hansı adı istifadə etmək istəyirsiniz?
     
     
-      
+      
       Login Name
       Giriş Adı
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Bu kompyuterin adı nədir?
     
     
-      
+      
       Computer Name
       Kompyuterin adı
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Hesabınızın təhlükəsizliyi üçün şifrə seçin.
     
     
-      
+      
       Password
       Şifrə
     
     
-      
+      
       Repeat Password
       Şifrənin təkararı
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir.
     
     
-      
+      
       Validate passwords quality
       Şifrənin keyfiyyətini yoxlamaq
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz.
     
     
-      
+      
       Log in automatically without asking for the password
       Şifrə soruşmadan sistemə daxil olmaq
     
     
-      
+      
       Reuse user password as root password
       İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək
     
     
-      
+      
       Use the same password for the administrator account.
       İdarəçi hesabı üçün eyni şifrədən istifadə etmək.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Hesabınızı qorumaq üçün kök şifrəsini seçin.
     
     
-      
+      
       Root Password
       Kök Şifrəsi
     
     
-      
+      
       Repeat Root Password
       Kök Şifrəsini təkrar yazın
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin.
     
diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts
index 51c4298bbe..cb1a7f0776 100644
--- a/lang/calamares_be.ts
+++ b/lang/calamares_be.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Галоўны загрузачны запіс (MBR) %1
     
     
-      
+      
       Boot Partition
       Загрузачны раздзел
     
     
-      
+      
       System Partition
       Сістэмны раздзел
     
     
-      
+      
       Do not install a boot loader
       Не ўсталёўваць загрузчык
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Выкананне аперацыі %1.
     
     
-      
+      
       Bad working directory path
       Няправільны шлях да працоўнага каталога
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Працоўны каталог %1 для задачы python %2 недаступны для чытання.
     
     
-      
+      
       Bad main script file
       Хібны галоўны файл скрыпта
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Галоўны файл скрыпта %1 для задачы python %2 недаступны для чытання.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python памылка ў задачы "%1".
     
@@ -289,54 +289,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Усталёўка схібіла
     
     
-      
+      
       Installation Failed
       Не атрымалася ўсталяваць
     
     
-      
+      
       Would you like to paste the install log to the web?
       Сапраўды хочаце ўставіць журнал усталёўкі па сеціўным адрасе?
     
     
-      
+      
       Error
       Памылка
     
     
-      
-      
+      
+      
       &Yes
       &Так
     
     
-      
-      
+      
+      
       &No
       &Не
     
     
-      
+      
       &Close
       &Закрыць
     
     
-      
+      
       Install Log Paste URL
       Уставіць журнал усталёўкі па URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Запампаваць не атрымалася.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +345,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Не атрымалася ініцыялізаваць Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Не атрымалася ўсталяваць %1. У Calamares не атрымалася загрузіць усе падрыхтаваныя модулі. Гэтая праблема ўзнікла праз асаблівасці выкарыстання Calamares вашым дыстрыбутывам.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Не атрымалася загрузіць наступныя модулі:
     
     
-      
+      
       Continue with setup?
       Працягнуць усталёўку?
     
     
-      
+      
       Continue with installation?
       Працягнуць усталёўку?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Праграма ўсталёўкі %1 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Скасаваць змены будзе немагчыма.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Праграма ўсталёўкі %1 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Адрабіць змены будзе немагчыма.</strong>
     
     
-      
+      
       &Set up now
       &Усталяваць
     
     
-      
+      
       &Install now
       &Усталяваць
     
     
-      
+      
       Go &back
       &Назад
     
     
-      
+      
       &Set up
       &Усталяваць
     
     
-      
+      
       &Install
       &Усталяваць
     
     
-      
+      
       Setup is complete. Close the setup program.
       Усталёўка завершаная. Закрыйце праграму ўсталёўкі.
     
     
-      
+      
       The installation is complete. Close the installer.
       Усталёўка завершаная. Закрыйце праграму.
     
     
-      
+      
       Cancel setup without changing the system.
       Скасаваць усталёўку без змены сістэмы.
     
     
-      
+      
       Cancel installation without changing the system.
       Скасаваць усталёўку без змены сістэмы.
     
     
-      
+      
       &Next
       &Далей
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       &Завершана
     
     
-      
+      
       &Cancel
       &Скасаваць
     
     
-      
+      
       Cancel setup?
       Скасаваць усталёўку?
     
     
-      
+      
       Cancel installation?
       Скасаваць усталёўку?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Сапраўды хочаце скасаваць працэс усталёўкі? Праграма спыніць працу, а ўсе змены страцяцца.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Сапраўды хочаце скасаваць працэс усталёўкі? Праграма спыніць працу, а ўсе змены страцяцца.
@@ -470,22 +470,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Невядомы тып выключэння
     
     
-      
+      
       unparseable Python error
       памылка Python, якую немагчыма разабраць
     
     
-      
+      
       unparseable Python traceback
       python traceback, што немагчыма разабраць
     
     
-      
+      
       Unfetchable Python error.
       Невядомая памылка Python.
     
@@ -503,6 +503,24 @@ The installer will quit and all changes will be lost.
       Праграма ўсталёўкі %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -519,149 +537,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Абраць &прыладу захоўвання:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Бягучы:
     
     
-      
+      
       After:
       Пасля:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Уласнаручная разметка</strong><br/>Вы можаце самастойна ствараць раздзелы або змяняць іх памеры.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Выкарыстаць %1 як хатні раздзел для %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Абярыце раздзел для памяншэння і цягніце паўзунок, каб змяніць памер</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 будзе паменшаны да %2MiB і новы раздзел %3MiB будзе створаны для %4.
     
     
-      
+      
       Boot loader location:
       Размяшчэнне загрузчыка:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Абярыце раздзел для ўсталёўкі </strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Не выяўлена сістэмнага раздзела EFI. Калі ласка, вярніцеся назад і зрабіце разметку %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Сістэмны раздзел EFI на %1 будзе выкарыстаны для запуску %2.
     
     
-      
+      
       EFI system partition:
       Сістэмны раздзел EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Здаецца, на гэтай прыладзе няма аперацыйнай сістэмы. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Сцерці дыск</strong><br/>Гэта <font color="red">выдаліць</font> усе даныя на абранай прыладзе.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Усталяваць побач</strong><br/>Праграма ўсталёўкі паменшыць раздзел, каб вызваліць месца для %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Замяніць раздзел </strong><br/>Заменіць раздзел на %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На гэтай прыладзе ёсць %1. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На гэтай прыладзе ўжо ёсць аперацыйная сістэма. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На гэтай прыладзе ўжо ёсць некалькі аперацыйных сістэм. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       На гэтай прыладзе ўжо ўсталяваная аперацыйная сістэма, але табліца раздзелаў <strong>%1</strong> не такая, як патрэбна <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Адзін з раздзелаў гэтай назапашвальнай прылады<strong>прымантаваны</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Гэтая назапашвальная прылада ёсць часткай<strong>неактыўнага RAID</strong>.
     
     
-      
+      
       No Swap
       Без раздзела падпампоўкі
     
     
-      
+      
       Reuse Swap
       Выкарыстаць існы раздзел падпампоўкі
     
     
-      
+      
       Swap (no Hibernate)
       Раздзел падпампоўкі (без усыплення)
     
     
-      
+      
       Swap (with Hibernate)
       Раздзел падпампоўкі (з усыпленнем)
     
     
-      
+      
       Swap to file
       Раздзел падпампоўкі ў файле
     
@@ -697,12 +715,12 @@ The installer will quit and all changes will be lost.
       Ачышчаюцца ўсе часовыя пункты мантавання.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Не ўдалося атрымаць спіс часовых пунктаў мантавання.
     
     
-      
+      
       Cleared all temporary mounts.
       Усе часовыя пункты мантавання ачышчаныя.
     
@@ -729,27 +747,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Вызначыць мадэль клавіятуры %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Вызначыць раскладку клавіятуры %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Вызначыць часавы пояс %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       Сістэмнай мовай будзе зроблена %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Рэгіянальным фарматам лічбаў і датаў будзе %1.
     
@@ -873,6 +891,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       Вашыя паролі не супадаюць!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -913,6 +936,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       Усталёўка %1 завершаная.
     
+    
+      
+      Package Selection
+      Выбар пакункаў
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Калі ласка, абярыце прадукт са спіса. Абраны прадукт будзе ўсталяваны.
+    
   
   
     ContextualProcessJob
@@ -975,27 +1008,37 @@ The installer will quit and all changes will be lost.
       Сцягі:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Шыфраваць
     
     
-      
+      
       Logical
       Лагічны
     
     
-      
+      
       Primary
       Асноўны
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Пункт мантавання ўжо выкарыстоўваецца. Калі ласка, абярыце іншы.
     
@@ -1003,43 +1046,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Стварыць новы раздзел %2MБ на %4 (%3) з файлавай сістэмай %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Стварыць новы раздзел <strong>%2MiB</strong> на <strong>%4</strong> (%3) з файлавай сістэмай <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Стварэнне новага раздзела %1 на %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       У праграмы ўсталёўкі не атрымалася стварыць новы раздзел на дыску '%1'.
     
@@ -1090,7 +1133,7 @@ The installer will quit and all changes will be lost.
       Стварэнне новай табліцы раздзелаў %1 на %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       У праграмы ўсталёўкі не атрымалася стварыць табліцу раздзелаў на дыску %1.
     
@@ -1329,7 +1372,17 @@ The installer will quit and all changes will be lost.
       Сцягі:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Пункт мантавання ўжо выкарыстоўваецца. Калі ласка, абярыце іншы.
     
@@ -1366,57 +1419,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Вызначыць звесткі пра раздзел
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Усталяваць %1 на <strong>новы</strong> %2 сістэмны раздзел.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Усталяваць %2 на %3 сістэмны раздзел <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Усталяваць загрузчык на <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Наладка пунктаў мантавання.
     
@@ -1829,6 +1882,14 @@ The installer will quit and all changes will be lost.
       Размяшчэнне
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2048,29 +2109,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Абярыце пераважны рэгіён альбо выкарыстоўвайце прадвызначаны ў залежнасці ад вашага бягучага месцазнаходжання.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Часавы пояс: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Абярыце часавы пояс для вашага рэгіёна.
     
     
-      
+      
       Zones
       Часавыя паясы
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Ніжэй вы можаце наладзіць мову і мясцовасць.
     
@@ -2404,7 +2465,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Пакункі
     
@@ -2585,33 +2646,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       Вольная прастора
     
     
       
-      
+      
       New partition
       Новы раздзел
     
     
-      
+      
       Name
       Назва
     
     
-      
+      
       File System
       Файлавая сістэма
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Пункт мантавання
     
     
-      
+      
       Size
       Памер
     
@@ -2697,117 +2763,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Збор інфармацыі пра сістэму...
     
     
-      
+      
       Partitions
       Раздзелы
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Усталяваць %1 <strong>побач</strong> з іншай аперацыйнай сістэмай.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Ачысціць</strong> дыск і ўсталяваць %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Замяніць</strong> раздзел на %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Уласнаручная</strong> разметка.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Усталяваць %1 <strong>побач</strong> з іншай аперацыйнай сістэмай на дыск<strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Ачысціць</strong> дыск <strong>%2</strong> (%3) і ўсталяваць %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Замяніць</strong> раздзел на дыску <strong>%2</strong> (%3) на %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Уласнаручная</strong> разметка дыска<strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Дыск <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Бягучы:
     
     
-      
+      
       After:
       Пасля:
     
     
-      
+      
       No EFI system partition configured
       Няма наладжанага сістэмнага раздзела EFI
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Для таго, каб пачаць %1, патрабуецца сістэмны раздзел EFI.<br/><br/> Каб наладзіць сістэмны раздзел EFI, вярніцеся назад, абярыце альбо стварыце файлавую сістэму FAT32 са сцягам <strong>%3</strong> і пунктам мантавання <strong>%2</strong>.<br/><br/>Вы можаце працягнуць і без наладкі сістэмнага раздзела EFI, але ваша сістэма можа не загрузіцца.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Для таго, каб пачаць %1, патрабуецца сістэмны раздзел EFI.<br/><br/>Быў наладжаны раздзел з пунктам мантавання<strong>%2</strong> але яго сцяг <strong>%3</strong> не вызначаны.<br/>Каб вызначыць сцяг, вярніцеся назад і адрэдагуйце раздзел.<br/><br/> Вы можаце працягнуць без наладкі раздзела, але ваша сістэма можа не загрузіцца.
     
     
-      
+      
       EFI system partition flag not set
       Не вызначаны сцяг сістэмнага раздзела EFI
     
     
-      
+      
       Option to use GPT on BIOS
       Параметр для выкарыстання GPT у BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Табліца раздзелаў GPT - найлепшы варыянт для ўсіх сістэм. Гэтая праграма ўсталёўкі таксама падтрымлівае гэты варыянт і для BIOS.<br/><br/>Каб наладзіць GPT для BIOS (калі гэта яшчэ не зроблена), вярніцеся назад і абярыце табліцу раздзелаў GPT, пасля стварыце нефарматаваны раздзел памерам 8 МБ са сцягам <strong>bios_grub</strong>.<br/><br/>Гэты раздзел патрэбны для запуску %1 у BIOS з GPT.
     
     
-      
+      
       Boot partition not encrypted
       Загрузачны раздзел не зашыфраваны
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Уключана шыфраванне каранёвага раздзела, але выкарыстаны асобны загрузачны раздзел без шыфравання.<br/><br/>Пры такой канфігурацыі могуць узнікнуць праблемы з бяспекай, бо важныя сістэмныя даныя будуць захоўвацца на раздзеле без шыфравання.<br/>Вы можаце працягнуць, але файлавая сістэма разблакуецца падчас запуску сістэмы.<br/>Каб уключыць шыфраванне загрузачнага раздзела, вярніцеся назад і стварыце яго нанова, адзначыўшы <strong>Шыфраваць</strong> у акне стварэння раздзела.
     
     
-      
+      
       has at least one disk device available.
       ёсць прынамсі адна даступная дыскавая прылада.
     
     
-      
+      
       There are no partitions to install on.
       Няма раздзелаў для ўсталёўкі.
     
@@ -2997,17 +3063,17 @@ Output:
       Не атрымалася стварыць новы выпадковы файл <pre>%1</pre>.
     
     
-      
+      
       No product
       Няма
     
     
-      
+      
       No description provided.
       Апісанне адсутнічае.
     
     
-      
+      
       (no mount point)
       (без пункта мантавання)
     
@@ -3268,12 +3334,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Для дасягнення найлепшых вынікаў пераканайцеся, што гэты камп’ютар:
     
     
-      
+      
       System requirements
       Сістэмныя патрабаванні
     
@@ -3281,27 +3347,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Гэты камп’ютар не адпавядае мінімальным патрэбам для ўсталёўкі %1.<br/>Немагчыма працягнуць. <a href="#details">Падрабязней...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Гэты камп’ютар не адпавядае мінімальным патрэбам для ўсталёўкі %1.<br/>Немагчыма працягнуць. <a href="#details">Падрабязней...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.<br/>Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.<br/>Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Гэтая праграма задасць вам некалькі пытанняў і дапаможа ўсталяваць %2 на ваш камп’ютар.
     
@@ -3457,7 +3523,7 @@ Output:
       Вызначэнне сцягоў <strong>%1</strong> новага раздзела.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       У праграмы ўсталёўкі не атрымалася адзначыць раздзел %1.
     
@@ -3600,12 +3666,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Гэта агляд дзеянняў, якія здейсняцца падчас запуску працэдуры ўсталёўкі.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Гэта агляд дзеянняў, якія здейсняцца падчас запуску працэдуры ўсталёўкі.
     
@@ -4179,107 +4245,127 @@ Output:
       Абярыце свае імя карыстальніка і ўліковыя даныя для ўваходу і выканання задач адміністратара
     
     
-      
+      
       What is your name?
       Як ваша імя?
     
     
-      
+      
       Your Full Name
       Ваша поўнае імя
     
     
-      
+      
       What name do you want to use to log in?
       Якое імя вы хочаце выкарыстоўваць для ўваходу?
     
     
-      
+      
       Login Name
       Лагін
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Дазваляюцца толькі літары, лічбы, знакі падкрэслівання, працяжнікі.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Якая назва гэтага камп’ютара?
     
     
-      
+      
       Computer Name
       Назва камп’ютара
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Назва будзе выкарыстоўвацца для пазначэння камп’ютара ў сетцы.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Абярыце пароль для абароны вашага акаўнта.
     
     
-      
+      
       Password
       Пароль
     
     
-      
+      
       Repeat Password
       Паўтарыце пароль
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Увядзіце двойчы аднолькавы пароль. Гэта неабходна для таго, каб пазбегнуць памылак. Надзейны пароль павінен складацца з літар, лічбаў, знакаў пунктуацыі. Ён павінен змяшчаць прынамсі 8 знакаў, яго перыядычна трэба змяняць.
     
     
-      
+      
       Validate passwords quality
       Праверка якасці пароляў
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Калі адзначана, будзе выконвацца праверка надзейнасці пароля, таму вы не зможаце выкарыстаць слабы пароль.
     
     
-      
+      
       Log in automatically without asking for the password
       Аўтаматычна ўваходзіць без уводу пароля
     
     
-      
+      
       Reuse user password as root password
       Выкарыстоўваць пароль карыстальніка як пароль адміністратара
     
     
-      
+      
       Use the same password for the administrator account.
       Выкарыстоўваць той жа пароль для акаўнта адміністратара.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Абярыце пароль адміністратара для абароны вашага акаўнта.
     
     
-      
+      
       Root Password
       Пароль адміністратара
     
     
-      
+      
       Repeat Root Password
       Паўтарыце пароль адміністратара
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Увядзіце пароль двойчы, каб пазбегнуць памылак уводу.
     
diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index 0fd0ba338c..440d8e5dae 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Сектор за начално зареждане на %1
     
     
-      
+      
       Boot Partition
       Дял за начално зареждане
     
     
-      
+      
       System Partition
       Системен дял
     
     
-      
+      
       Do not install a boot loader
       Не инсталирай програма за начално зареждане
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Изпълнение на %1 операция.
     
     
-      
+      
       Bad working directory path
       Невалиден път на работната директория
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Работна директория %1 за python задача %2 не се чете.
     
     
-      
+      
       Bad main script file
       Невалиден файл на главен скрипт
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Файла на главен скрипт %1 за python задача %2 не се чете.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python грешка в задача "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Неуспешна инсталация
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Грешка
     
     
-      
-      
+      
+      
       &Yes
       &Да
     
     
-      
-      
+      
+      
       &No
       &Не
     
     
-      
+      
       &Close
       &Затвори
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Инициализацията на Calamares се провали
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 не може да се инсталира. Calamares не можа да зареди всичките конфигурирани модули. Това е проблем с начина, по който Calamares е използван от дистрибуцията.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Следните модули не могат да се заредят:
     
     
-      
+      
       Continue with setup?
       Продължаване?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Инсталатора на %1 ще направи промени по вашия диск за да инсталира %2. <br><strong>Промените ще бъдат окончателни.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Инсталирай сега
     
     
-      
+      
       Go &back
       В&ръщане
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Инсталирай
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Инсталацията е завършена. Затворете инсталаторa.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Отказ от инсталацията без промяна на системата.
     
     
-      
+      
       &Next
       &Напред
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       &Готово
     
     
-      
+      
       &Cancel
       &Отказ
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Отмяна на инсталацията?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Наистина ли искате да отмените текущият процес на инсталиране?
@@ -467,22 +467,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Неизвестен тип изключение
     
     
-      
+      
       unparseable Python error
       неанализируема грешка на Python
     
     
-      
+      
       unparseable Python traceback
       неанализируемо проследяване на Python
     
     
-      
+      
       Unfetchable Python error.
       Недостъпна грешка на Python.
     
@@ -500,6 +500,24 @@ The installer will quit and all changes will be lost.
       %1 Инсталатор
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Инсталатора не успя да актуализира таблица на дяловете на диск '%1'.
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Изберете ус&тройство за съхранение:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Сегашен:
     
     
-      
+      
       After:
       След:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Самостоятелно поделяне</strong><br/>Можете да създадете или преоразмерите дяловете сами.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Използване на %1 като домашен дял за %2
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Изберете дял за смаляване, после влачете долната лента за преоразмеряване</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Локация на програмата за начално зареждане:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Изберете дял за инсталацията</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI системен дял не е намерен. Моля, опитайте пак като използвате ръчно поделяне за %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI системен дял в %1 ще бъде използван за стартиране на %2.
     
     
-      
+      
       EFI system partition:
       EFI системен дял:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Това устройство за съхранение няма инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Изтриване на диска</strong><br/>Това ще <font color="red">изтрие</font> всички данни върху устройството за съхранение.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Инсталирайте покрай</strong><br/>Инсталатора ще раздроби дяла за да направи място за %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Замени дял</strong><br/>Заменя този дял с %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Това устройство за съхранение има инсталиран %1. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Това устройство за съхранение има инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Това устройство за съхранение има инсталирани операционни системи. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -694,12 +712,12 @@ The installer will quit and all changes will be lost.
       Разчистване на всички временни монтирания.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Не може да се вземе лист от временни монтирания.
     
     
-      
+      
       Cleared all temporary mounts.
       Разчистени всички временни монтирания.
     
@@ -726,27 +744,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Постави модел на клавиатурата на %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Постави оформлението на клавиатурата на %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       Системният език ще бъде %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Форматът на цифрите и датата ще бъде %1.
     
@@ -871,6 +889,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       Паролите Ви не съвпадат!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       Инсталацията на %1 е завършена.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ The installer will quit and all changes will be lost.
       Флагове:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Ши&фриране
     
     
-      
+      
       Logical
       Логическа
     
     
-      
+      
       Primary
       Главна
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Точката за монтиране вече се използва. Моля изберете друга.
     
@@ -1001,43 +1044,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Създаване на нов %1  дял върху %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Инсталатора не успя да създаде дял върху диск '%1'.
     
@@ -1088,7 +1131,7 @@ The installer will quit and all changes will be lost.
       Създаване на нова %1 таблица на дяловете върху %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Инсталатора не можа да създаде таблица на дяловете върху  %1.
     
@@ -1327,7 +1370,17 @@ The installer will quit and all changes will be lost.
       Флагове:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Точката за монтиране вече се използва. Моля изберете друга.
     
@@ -1364,57 +1417,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Постави информация за дял
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Инсталирай %1 на <strong>нов</strong> %2 системен дял.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Инсталирай %2 на %3 системен дял <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Инсталиране на зареждач върху <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Настройка на точките за монтиране.
     
@@ -1827,6 +1880,14 @@ The installer will quit and all changes will be lost.
       Местоположение
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2105,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2382,7 +2443,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2563,33 +2624,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       Свободно пространство
     
     
       
-      
+      
       New partition
       Нов дял
     
     
-      
+      
       Name
       Име
     
     
-      
+      
       File System
       Файлова система
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Точка на монтиране
     
     
-      
+      
       Size
       Размер
     
@@ -2675,117 +2741,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Събиране на системна информация...
     
     
-      
+      
       Partitions
       Дялове
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Инсталирай %1 <strong>заедно</strong> с друга операционна система.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Изтрий</strong> диска и инсталирай %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Замени</strong> дял с %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Ръчно</strong> поделяне.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Инсталирай %1 <strong>заедно</strong> с друга операционна система на диск <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Изтрий</strong> диск <strong>%2</strong> (%3) и инсталирай %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Замени</strong> дял на диск <strong>%2</strong> (%3) с %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Ръчно</strong> поделяне на диск <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Диск <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Сегашен:
     
     
-      
+      
       After:
       След:
     
     
-      
+      
       No EFI system partition configured
       Няма конфигуриран EFI системен дял
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       Не е зададен флаг на EFI системен дял
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Липсва криптиране на дял за начално зареждане
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2974,17 +3040,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3242,12 +3308,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       За най-добри резултати, моля бъдете сигурни че този компютър:
     
     
-      
+      
       System requirements
       Системни изисквания
     
@@ -3255,28 +3321,28 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Този компютър не отговаря на минималните изисквания за инсталиране %1.<br/>Инсталацията не може да продължи.
 <a href="#details">Детайли...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Този компютър не отговаря на някои от препоръчителните изисквания за инсталиране %1.<br/>Инсталацията може да продължи, но някои свойства могат да бъдат недостъпни.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Тази програма ще ви зададе няколко въпроса и ще конфигурира %2 на вашия компютър.
     
@@ -3432,7 +3498,7 @@ Output:
       Задаване на флагове <strong>%1</strong> на новия дял.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Инсталатора не успя да зададе флагове на дял %1.
     
@@ -3575,12 +3641,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Това е преглед на промените, които ще се извършат, след като започнете процедурата по инсталиране.
     
@@ -4120,107 +4186,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       Какво е вашето име?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Какво име искате да използвате за влизане?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Какво е името на този компютър?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Изберете парола за да държите вашият акаунт в безопасност.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Използвайте същата парола за администраторския акаунт.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts
index 709bbadcda..271c660c6b 100644
--- a/lang/calamares_bn.ts
+++ b/lang/calamares_bn.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       1% মাস্টার বুট রেকর্ড
     
     
-      
+      
       Boot Partition
       বুট পার্টিশন
     
     
-      
+      
       System Partition
       সিস্টেম পার্টিশন
     
     
-      
+      
       Do not install a boot loader
       একটি বুট লোডার ইনস্টল করবেন না
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 ক্রিয়াকলাপ চলছে।
     
     
-      
+      
       Bad working directory path
       ওয়ার্কিং ডিরেক্টরি পাথ ভালো নয়
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       ওয়ার্কিং ডিরেক্টরি 1% পাইথন কাজের জন্য %2 পাঠযোগ্য নয়।
     
     
-      
+      
       Bad main script file
       প্রধান স্ক্রিপ্ট ফাইল ভালো নয়
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       মূল স্ক্রিপ্ট ফাইল 1% পাইথন কাজের জন্য 2% পাঠযোগ্য নয়।
     
     
-      
+      
       Boost.Python error in job "%1".
       বুস্ট.পাইথন কাজে 1% ত্রুটি
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       ইনস্টলেশন ব্যর্থ হলো
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       ত্রুটি
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       সেটআপ চালিয়ে যেতে চান?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 ইনস্টলার %2 সংস্থাপন করতে আপনার ডিস্কে পরিবর্তন করতে যাচ্ছে।
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       এবংএখনই ইনস্টল করুন
     
     
-      
+      
       Go &back
       এবংফিরে যান
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       এবং পরবর্তী
     
     
-      
+      
       &Back
       এবং পেছনে
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       এবংবাতিল করুন
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       ইনস্টলেশন বাতিল করবেন?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       আপনি কি সত্যিই বর্তমান সংস্থাপন প্রক্রিয়া বাতিল করতে চান?
@@ -467,22 +467,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       অজানা ধরনের ব্যতিক্রম
     
     
-      
+      
       unparseable Python error
       অতুলনীয় পাইথন ত্রুটি
     
     
-      
+      
       unparseable Python traceback
       অতুলনীয় পাইথন ট্রেসব্যাক
     
     
-      
+      
       Unfetchable Python error.
       অতুলনীয় পাইথন ত্রুটি।
     
@@ -500,6 +500,24 @@ The installer will quit and all changes will be lost.
       1% ইনস্টল
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ The installer will quit and all changes will be lost.
       ফর্ম
     
     
-      
+      
       Select storage de&vice:
       স্টোরেজ ডিএবংভাইস নির্বাচন করুন:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       বর্তমান:
     
     
-      
+      
       After:
       পরে:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>সংকুচিত করার জন্য একটি পার্টিশন নির্বাচন করুন, তারপর নিচের বারটি পুনঃআকারের জন্য টেনে আনুন</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       বুট লোডার অবস্থান:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>ইনস্টল করতে একটি পার্টিশন নির্বাচন করুন</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 এ EFI সিস্টেম পার্টিশন %2 শুরু করার জন্য ব্যবহার করা হবে।
     
     
-      
+      
       EFI system partition:
       EFI সিস্টেম পার্টিশন:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এই স্টোরেজ ডিভাইসে কোন অপারেটিং সিস্টেম আছে বলে মনে হয় না। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>ডিস্ক মুছে ফেলুন</strong> <br/>এটি বর্তমানে নির্বাচিত স্টোরেজ ডিভাইসে উপস্থিত সকল উপাত্ত <font color="red">মুছে ফেলবে</font>।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>ইনস্টল করুন পাশাপাশি</strong> <br/>ইনস্টলার %1 এর জন্য জায়গা তৈরি করতে একটি পার্টিশন সংকুচিত করবে।
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>একটি পার্টিশন প্রতিস্থাপন করুন</strong><br/>%1-এর সাথে একটি পার্টিশন প্রতিস্থাপন করে।
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এই সঞ্চয় যন্ত্রটিতে %1 আছে। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন।
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এই স্টোরেজ ডিভাইসে ইতোমধ্যে একটি অপারেটিং সিস্টেম আছে। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এই স্টোরেজ ডিভাইসে একাধিক অপারেটিং সিস্টেম আছে। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -694,12 +712,12 @@ The installer will quit and all changes will be lost.
       সব অস্থায়ী মাউন্ট পরিষ্কার করা হচ্ছে।
     
     
-      
+      
       Cannot get list of temporary mounts.
       অস্থায়ী মাউন্টের তালিকা পাওয়া যাচ্ছে না।
     
     
-      
+      
       Cleared all temporary mounts.
       সব অস্থায়ী মাউন্ট পরিষ্কার করা হয়েছে.
     
@@ -726,27 +744,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       %1-এ কীবোর্ড নকশা নির্ধারণ করুন।
     
     
-      
+      
       Set keyboard layout to %1/%2.
       %1/%2 এ কীবোর্ড বিন্যাস নির্ধারণ করুন।
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -870,6 +888,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       আপনার পাসওয়ার্ড মেলে না!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -910,6 +933,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -972,27 +1005,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       যৌক্তিক
     
     
-      
+      
       Primary
       প্রাথমিক
     
     
-      
+      
       GPT
       জিপিটি
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1000,43 +1043,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2-এ নতুন %1 পার্টিশন তৈরি করা হচ্ছে।
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       ইনস্টলার '%1' ডিস্কে পার্টিশন তৈরি করতে ব্যর্থ হয়েছে।
     
@@ -1087,7 +1130,7 @@ The installer will quit and all changes will be lost.
       %2 এ নতুন %1 পার্টিশন টেবিল তৈরি করা হচ্ছে।
     
     
-      
+      
       The installer failed to create a partition table on %1.
       ইনস্টলার %1 এ একটি পার্টিশন টেবিল তৈরি করতে ব্যর্থ হয়েছে।
     
@@ -1326,7 +1369,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1363,57 +1416,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       পার্টিশন তথ্য নির্ধারণ করুন
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       <strong>নতুন</strong> %2 সিস্টেম পার্টিশনে %1 সংস্থাপন করুন।
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       %3 সিস্টেম পার্টিশন <strong>%1</strong> এ %2 ইনস্টল করুন।
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       <strong>%1</strong> এ বুট লোডার ইনস্টল করুন।
     
     
-      
+      
       Setting up mount points.
       মাউন্ট পয়েন্ট সেট আপ করা হচ্ছে।
     
@@ -1826,6 +1879,14 @@ The installer will quit and all changes will be lost.
       অবস্থান
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2043,29 +2104,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2381,7 +2442,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2562,33 +2623,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       খালি জায়গা
     
     
       
-      
+      
       New partition
       নতুন পার্টিশন
     
     
-      
+      
       Name
       নাম
     
     
-      
+      
       File System
       নথি ব্যবস্থা
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       মাউন্ট পয়েন্ট
     
     
-      
+      
       Size
       আকার
     
@@ -2674,117 +2740,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       সিস্টেম তথ্য সংগ্রহ করা হচ্ছে...
     
     
-      
+      
       Partitions
       পার্টিশনগুলো
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       অন্য অপারেটিং সিস্টেমের <strong>পাশাপাশি</strong> %1 ইনস্টল করুন।
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       ডিস্ক <strong>মুছে ফেলুন</strong> এবং %1 সংস্থাপন করুন।
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       %1 দিয়ে একটি পার্টিশন <strong>প্রতিস্থাপন করুন</strong>।
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>ম্যানুয়াল</strong> পার্টিশনিং।
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       <strong>%2</strong> (%3) ডিস্কে অন্য অপারেটিং সিস্টেমের <strong>পাশাপাশি</strong> %1 ইনস্টল করুন।
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       ডিস্ক <strong>%2</strong> (%3) <strong>মুছে ফেলুন</strong> এবং %1 সংস্থাপন করুন।
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       %1 দিয়ে <strong>%2</strong> (%3) ডিস্কে একটি পার্টিশন <strong>প্রতিস্থাপন করুন</strong>।
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>%1</strong>  (%2) ডিস্কে <strong>ম্যানুয়াল</strong> পার্টিশন করা হচ্ছে।
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       ডিস্ক <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       বর্তমান:
     
     
-      
+      
       After:
       পরে:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2971,17 +3037,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3239,12 +3305,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3252,27 +3318,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3428,7 +3494,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3571,12 +3637,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       আপনি ইনস্টল প্রক্রিয়া শুরু করার পর কি হবে তার একটি পর্যালোচনা।
     
@@ -4116,107 +4182,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       আপনার নাম কি?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       লগ-ইন করতে আপনি কোন নাম ব্যবহার করতে চান?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       এই কম্পিউটারের নাম কি?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       আপনার অ্যাকাউন্ট সুরক্ষিত রাখতে একটি পাসওয়ার্ড নির্বাচন করুন।
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       প্রশাসক হিসাবের জন্য একই গুপ্ত-সংকেত ব্যবহার করুন।
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index 4f048689f2..a2dcc12c8f 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Registre d'inici mestre (MBR) de %1
     
     
-      
+      
       Boot Partition
       Partició d'arrencada
     
     
-      
+      
       System Partition
       Partició del sistema
     
     
-      
+      
       Do not install a boot loader
       No instal·lis cap gestor d'arrencada
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       S'executa l'operació %1.
     
     
-      
+      
       Bad working directory path
       Camí incorrecte al directori de treball
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       El directori de treball %1 per a la tasca python %2 no és llegible.
     
     
-      
+      
       Bad main script file
       Fitxer erroni d'script principal
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       El fitxer de script principal %1 per a la tasca de python %2 no és llegible.
     
     
-      
+      
       Boost.Python error in job "%1".
       Error de Boost.Python a la tasca "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Ha fallat la configuració.
     
     
-      
+      
       Installation Failed
       La instal·lació ha fallat.
     
     
-      
+      
       Would you like to paste the install log to the web?
       Voleu enganxar el registre d'instal·lació a la xarxa?
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
+      
       &Yes
       &Sí
     
     
-      
-      
+      
+      
       &No
       &No
     
     
-      
+      
       &Close
       Tan&ca
     
     
-      
+      
       Install Log Paste URL
       URL de publicació del registre d'instal·lació
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 L'enllaç s'ha copiat al porta-retalls.
     
     
-      
+      
       Calamares Initialization Failed
       Ha fallat la inicialització de Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. Aquest és un problema amb la manera com el Calamares és utilitzat per la distribució.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>No s'han pogut carregar els mòduls següents:
     
     
-      
+      
       Continue with setup?
       Voleu continuar la configuració?
     
     
-      
+      
       Continue with installation?
       Voleu continuar la instal·lació?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El programa de configuració %1 està a punt de fer canvis al disc per tal de configurar %2.<br/><strong>No podreu desfer aquests canvis.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       L'instal·lador per a %1 està a punt de fer canvis al disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong>
     
     
-      
+      
       &Set up now
       Con&figura-ho ara
     
     
-      
+      
       &Install now
       &Instal·la'l ara
     
     
-      
+      
       Go &back
       Ves &enrere
     
     
-      
+      
       &Set up
       Con&figura-ho
     
     
-      
+      
       &Install
       &Instal·la
     
     
-      
+      
       Setup is complete. Close the setup program.
       La configuració s'ha acabat. Tanqueu el programa de configuració.
     
     
-      
+      
       The installation is complete. Close the installer.
       La instal·lació s'ha acabat. Tanqueu l'instal·lador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancel·la la configuració sense canviar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancel·leu la instal·lació sense canviar el sistema.
     
     
-      
+      
       &Next
       &Següent
     
     
-      
+      
       &Back
       &Enrere
     
     
-      
+      
       &Done
       &Fet
     
     
-      
+      
       &Cancel
       &Cancel·la
     
     
-      
+      
       Cancel setup?
       Voleu cancel·lar la configuració?
     
     
-      
+      
       Cancel installation?
       Voleu cancel·lar la instal·lació?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Realment voleu cancel·lar el procés de configuració actual?
 El programa de configuració es tancarà i es perdran tots els canvis.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Voleu cancel·lar el procés d'instal·lació actual?
@@ -472,22 +472,22 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tipus d'excepció desconeguda
     
     
-      
+      
       unparseable Python error
       Error de Python no analitzable
     
     
-      
+      
       unparseable Python traceback
       Traceback de Python no analitzable
     
     
-      
+      
       Unfetchable Python error.
       Error de Python irrecuperable.
     
@@ -505,6 +505,24 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Instal·lador de %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      Estableix l'etiqueta del sistema de fitxers a %1.
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      Estableix l'etiqueta del sistema de fitxers <strong>%1</strong> a la partició <strong>%2</strong>.
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      L'instal·lador no ha pogut actualitzar la taula de particions del disc '%1'.
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Formulari
     
     
-      
+      
       Select storage de&vice:
       Seleccioneu un dispositiu d'e&mmagatzematge:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Després:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particions manuals</strong><br/>Podeu crear o canviar la mida de les particions vosaltres mateixos.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilitza %1 com a partició de l'usuari per a %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Seleccioneu una partició per encongir i arrossegueu-la per redimensinar-la</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 s'encongirà a %2 MiB i es crearà una partició nova de %3 MB per a %4.
     
     
-      
+      
       Boot loader location:
       Ubicació del gestor d'arrencada:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Seleccioneu una partició per fer-hi la instal·lació.</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       No s'ha pogut trobar enlloc una partició EFI en aquest sistema. Si us plau, torneu enrere i use les particions manuals per configurar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
        La partició EFI de sistema a %1 s'usarà per iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partició EFI del sistema:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge no sembla que tingui un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Esborra el disc</strong><br/>Això <font color="red">suprimirà</font> totes les dades del dispositiu seleccionat.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instal·la'l al costat</strong><br/>L'instal·lador reduirà una partició per fer espai per a %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Reemplaça una partició</strong><br/>Reemplaça una partició per %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge té %1. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. 
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge ja té un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. 
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge ja múltiples sistemes operatius. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. 
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Aquest dispositiu d'emmagatzematge ja té un sistema operatiu, però la taula de particions <strong>%1</strong> és diferent de la necessària: <strong>%2</strong>.<br/> 
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Aquest dispositiu d'emmagatzematge té una de les particions <strong>muntada</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Aquest sistema d'emmagatzematge forma part d'un dispositiu de <strong>RAID inactiu</strong>.
     
     
-      
+      
       No Swap
       Sense intercanvi
     
     
-      
+      
       Reuse Swap
       Reutilitza l'intercanvi
     
     
-      
+      
       Swap (no Hibernate)
       Intercanvi (sense hibernació)
     
     
-      
+      
       Swap (with Hibernate)
       Intercanvi (amb hibernació)
     
     
-      
+      
       Swap to file
       Intercanvi en fitxer
     
@@ -699,12 +717,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Es netegen tots els muntatges temporals.
     
     
-      
+      
       Cannot get list of temporary mounts.
       No es pot obtenir la llista dels muntatges temporals.
     
     
-      
+      
       Cleared all temporary mounts.
       S'han netejat tots els muntatges temporals.
     
@@ -731,27 +749,27 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Establirà el model del teclat a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Establirà la distribució del teclat a %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Estableix la zona horària a %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       La llengua del sistema s'establirà a %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Els números i les dates de la configuració local s'establiran a %1.
     
@@ -875,6 +893,11 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Your passwords do not match!
       Les contrasenyes no coincideixen!
     
+    
+      
+      OK!
+      D'acord!
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       The installation of %1 is complete.
       La instal·lació de %1 ha acabat.
     
+    
+      
+      Package Selection
+      Selecció de paquets
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Si us plau, trieu un producte de la llista. S'instal·larà el producte seleccionat.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Indicadors:
     
     
-      
+      
+      Label for the filesystem
+      Etiqueta per al sistema de fitxers
+    
+    
+      
+      FS Label:
+      Etiqueta del sistema de fitxers:
+    
+    
+      
       En&crypt
       En&cripta
     
     
-      
+      
       Logical
       Lògica
     
     
-      
+      
       Primary
       Primària
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       El punt de muntatge ja està en ús. Si us plau, seleccioneu-ne un altre.
     
@@ -1005,43 +1048,43 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Crea una partició nova de %1 MiB a %3 (%2) amb entrades %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Crea una partició nova de %1 MiB a %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Crea una partició nova de %2 MiB a %4 (%3) amb el sistema de fitxers %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Crea una partició nova de <strong>%1 MiB</strong> a <strong>%3</strong> (%2) amb entrades <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Crea una partició nova de <strong>%1 MiB</strong> a <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Crea una partició nova de <strong>%2 MiB</strong> a <strong>%4</strong> (%3) amb el sistema de fitxers <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Es crea la partició nova %1 a %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       L'instal·lador no ha pogut crear la partició al disc '%1'.
     
@@ -1092,7 +1135,7 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Es crea la taula de particions nova %1 a %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       L'instal·lador no ha pogut crear la taula de particions a %1.
     
@@ -1331,7 +1374,17 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Indicadors:
     
     
-      
+      
+      Label for the filesystem
+      Etiqueta per al sistema de fitxers
+    
+    
+      
+      FS Label:
+      Etiqueta del sistema de fitxers:
+    
+    
+      
       Mountpoint already in use. Please select another one.
       El punt de muntatge ja està en ús. Si us plau, seleccioneu-ne un altre.
     
@@ -1368,57 +1421,57 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Estableix la informació de la partició
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Instal·la %1 a la partició de sistema <strong>nova</strong> %2 amb funcions <em>%3</em>.
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instal·la %1 a la partició de sistema <strong>nova</strong> %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Estableix la partició <strong>nova</strong> %2 amb el punt de muntatge <strong>%1</strong> i funcions <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Estableix la partició <strong>nova</strong> %2 amb el punt de muntatge <strong>%1</strong> %3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Instal·la %2 a la partició de sistema %3 <strong>%1</strong> amb funcions <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Estableix la partició %3 <strong>%1</strong> amb el punt de muntatge <strong>%2</strong> i funcions <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Estableix la partició %3 <strong>%1</strong> amb el punt de muntatge <strong>%2</strong> %4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instal·la %2 a la partició de sistema %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instal·la el gestor d'arrencada a <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       S'estableixen els punts de muntatge.
     
@@ -1448,7 +1501,7 @@ L'instal·lador es tancarà i tots els canvis es perdran.
     
       
       <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment.
-      <h1>Tot fet.</h1><br/>%1 s'ha instal·lat a l'ordinador.<br/>Ara podeu reiniciar-lo per tal d'accedir al sistema operatiu nou o bé continuar usant l'entorn autònom de %2.
+      <h1>Tot fet.</h1><br/>%1 s'ha instal·lat a l'ordinador.<br/>Ara podeu reiniciar-lo per tal d'accedir al sistema operatiu nou o bé continuar usant l'entorn autònom per a %2.
     
     
       
@@ -1831,6 +1884,14 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Ubicació
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      Surt
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Trieu la regió preferida o useu la predeterminada basada en la ubicació actual.
+      
+      Select your preferred Region, or use the default settings.
+      Seleccioneu la regió preferida o useu els paràmetres per defecte.
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Zona horària: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Trieu la zona preferida dins de la regió.
     
     
-      
+      
       Zones
       Zones
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Podeu acabar d'ajustar els paràmetres locals i de llengua a continuació.
     
@@ -2388,7 +2449,7 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paquets
     
@@ -2569,33 +2630,38 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
     PartitionModel
     
       
-      
+      
       Free Space
       Espai lliure
     
     
       
-      
+      
       New partition
       Partició nova
     
     
-      
+      
       Name
       Nom
     
     
-      
+      
       File System
       Sistema de fitxers
     
     
-      
+      
+      File System Label
+      Etiqueta del sistema de fitxers
+    
+    
+      
       Mount Point
       Punt de muntatge
     
     
-      
+      
       Size
       Mida
     
@@ -2681,117 +2747,117 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Es recopila informació del sistema...
     
     
-      
+      
       Partitions
       Particions
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Esborra</strong> el disc i instal·la-hi %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Reemplaça</strong> una partició amb %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Particions <strong>manuals</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu al disc <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Esborra</strong> el disc <strong>%2</strong> (%3) i instal·la-hi %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Reemplaça</strong> una partició del disc <strong>%2</strong> (%3) amb %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Particions <strong>manuals</strong> del disc <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disc <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Després:
     
     
-      
+      
       No EFI system partition configured
       No hi ha cap partició EFI de sistema configurada
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Cal una partició EFI de sistema per iniciar %1. <br/><br/>Per configurar una partició EFI de sistema, torneu enrere i seleccioneu o creeu un sistema de fitxers FAT32 amb la bandera <strong>%3</strong> habilitada i el punt de muntatge <strong>%2</strong>. <br/><br/>Podeu continuar sense la creació d'una partició EFI de sistema, però el sistema podria no iniciar-se.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Cal una partició EFI de sistema per iniciar %1. <br/><br/> Ja s'ha configurat una partició amb el punt de muntatge <strong>%2</strong> però no se n'ha establert la bandera <strong>%3</strong>. <br/>Per establir-la-hi, torneu enrere i editeu la partició. <br/><br/>Podeu continuar sense establir la bandera, però el sistema podria no iniciar-se.
     
     
-      
+      
       EFI system partition flag not set
       No s'ha establert la bandera de la partició EFI del sistema
     
     
-      
+      
       Option to use GPT on BIOS
       Opció per usar GPT amb BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       La millor opció per a tots els sistemes és una taula de particions GPT. Aquest instal·lador també admet aquesta configuració per a sistemes BIOS.<br/><br/>Per configurar una taula de particions GPT en un sistema BIOS, (si no s'ha fet ja) torneu enrere i establiu la taula de particions a GPT, després creeu una partició sense formatar de 8 MB amb la bandera <strong>bios_grub</strong> habilitada.<br/><br/>Cal una partició sense format de 8 MB per iniciar %1 en un sistema BIOS amb GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partició d'arrencada sense encriptar
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       S'ha establert una partició d'arrencada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrencada no està encriptada.<br/><br/>Hi ha assumptes de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers succeirà després, durant l'inici del sistema.<br/>Per encriptar la partició d'arrencada, torneu enrere i torneu-la a crear seleccionant <strong>Encripta</strong> a la finestra de creació de la partició.
     
     
-      
+      
       has at least one disk device available.
       tingui com a mínim un dispositiu de disc disponible.
     
     
-      
+      
       There are no partitions to install on.
       No hi ha particions per fer-hi una instal·lació.
     
@@ -2981,17 +3047,17 @@ Sortida:
       No s'ha pogut crear el fitxer aleatori nou <pre>%1</pre>.
     
     
-      
+      
       No product
       Cap producte
     
     
-      
+      
       No description provided.
       No se n'ha proporcionat cap descripció.
     
     
-      
+      
       (no mount point)
       (sense punt de muntatge)
     
@@ -3252,12 +3318,12 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Per obtenir els millors resultats, assegureu-vos, si us plau, que aquest ordinador...
     
     
-      
+      
       System requirements
       Requisits del sistema
     
@@ -3265,27 +3331,27 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Aquest ordinador no satisfà els requisits mínims per configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Aquest ordinador no satisfà els requisits mínims per instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Aquest ordinador no satisfà alguns dels requisits recomanats per configurar-hi %1.<br/>La configuració pot continuar, però algunes característiques podrien estar inhabilitades.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Aquest ordinador no satisfà alguns dels requisits recomanats per instal·lar-hi %1.<br/>La instal·lació pot continuar, però algunes característiques podrien estar inhabilitades.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Aquest programa us farà unes preguntes i instal·larà %2 a l'ordinador.
     
@@ -3441,7 +3507,7 @@ La configuració pot continuar, però algunes característiques podrien estar in
       S'estableixen les banderes <strong>%1</strong> a la partició nova.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       L'instal·lador ha fallat en establir les banderes a la partició %1.
     
@@ -3584,12 +3650,12 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Això és un resum del que passarà quan s'iniciï el procés de configuració.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Això és un resum del que passarà quan s'iniciï el procés d'instal·lació.
     
@@ -4165,107 +4231,127 @@ La configuració pot continuar, però algunes característiques podrien estar in
       Trieu el nom d'usuari i les credencials per iniciar la sessió i fer tasques d'administració.
     
     
-      
+      
       What is your name?
       Com us dieu?
     
     
-      
+      
       Your Full Name
       El nom complet
     
     
-      
+      
       What name do you want to use to log in?
       Quin nom voleu usar per iniciar la sessió?
     
     
-      
+      
       Login Name
       Nom d'entrada
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Si aquest ordinador l'usarà més d'una persona, podreu crear diversos comptes després de la instal·lació.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Només es permeten lletres en minúscula, números, ratlles baixes i guions.
+    
+    
+      
+      root is not allowed as username.
+      No es permet root com a nom d'usuari.
+    
+    
+      
       What is the name of this computer?
       Com es diu aquest ordinador?
     
     
-      
+      
       Computer Name
       Nom de l'ordinador
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Només es permeten lletres, números, guionets, guionets baixos i un mínim de dos caràcters.
+    
+    
+      
+      localhost is not allowed as hostname.
+      No es permet localhost com a nom d'amfitrió.
+    
+    
+      
       Choose a password to keep your account safe.
       Trieu una contrasenya per tal de mantenir el compte segur.
     
     
-      
+      
       Password
       Contrasenya
     
     
-      
+      
       Repeat Password
       Repetiu la contrasenya.
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. Una bona contrasenya ha de contenir una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars.
     
     
-      
+      
       Validate passwords quality
       Valida la qualitat de les contrasenyes.
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no en podreu fer una de dèbil.
     
     
-      
+      
       Log in automatically without asking for the password
       Entra automàticament sense demanar la contrasenya.
     
     
-      
+      
       Reuse user password as root password
       Reutilitza la contrasenya d'usuari com a contrasenya d'arrel.
     
     
-      
+      
       Use the same password for the administrator account.
       Usa la mateixa contrasenya per al compte d'administració.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Trieu una contrasenya d'arrel per mantenir el compte segur.
     
     
-      
+      
       Root Password
       Contrasenya d'arrel
     
     
-      
+      
       Repeat Root Password
       Repetiu la contrasenya d'arrel.
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia.
     
diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts
index cac8c4981a..0777777765 100644
--- a/lang/calamares_ca@valencia.ts
+++ b/lang/calamares_ca@valencia.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Registre d'arrancada mestre (MBR) de %1
     
     
-      
+      
       Boot Partition
       Partició d'arrancada
     
     
-      
+      
       System Partition
       Partició del sistema
     
     
-      
+      
       Do not install a boot loader
       No instal·les cap gestor d'arrancada
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       S'està executant l'operació %1.
     
     
-      
+      
       Bad working directory path
       Hi ha un error en el camí del directori de treball
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       El directori de treball %1 per a la tasca python %2 no és llegible.
     
     
-      
+      
       Bad main script file
       El fitxer d'script principal és incorrecte.
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       El fitxer d'script principal %1 per a la tasca de python %2 no és llegible.
     
     
-      
+      
       Boost.Python error in job "%1".
       S'ha produït un error de Boost.Python en la tasca "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       S'ha produït un error en la configuració.
     
     
-      
+      
       Installation Failed
       La instal·lació ha fallat.
     
     
-      
+      
       Would you like to paste the install log to the web?
       Voleu enganxar el registre d'instal·lació a la xarxa?
     
     
-      
+      
       Error
       S'ha produït un error.
     
     
-      
-      
+      
+      
       &Yes
       &Sí
     
     
-      
-      
+      
+      
       &No
       &No
     
     
-      
+      
       &Close
       Tan&ca
     
     
-      
+      
       Install Log Paste URL
       URL de publicació del registre d'instal·lació
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       La inicialització del Calamares ha fallat.
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. El problema es troba en com utilitza el Calamares la distribució.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>No s'han pogut carregar els mòduls següents:
     
     
-      
+      
       Continue with setup?
       Voleu continuar la configuració?
     
     
-      
+      
       Continue with installation?
       Voleu continuar la instal·lació?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El programa de configuració %1 està a punt de fer canvis en el disc per a configurar %2.<br/><strong>No podreu desfer aquests canvis.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       L'instal·lador per a %1 està a punt de fer canvis en el disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong>
     
     
-      
+      
       &Set up now
       Con&figura-ho ara
     
     
-      
+      
       &Install now
       &Instal·la'l ara
     
     
-      
+      
       Go &back
       &Arrere
     
     
-      
+      
       &Set up
       Con&figuració
     
     
-      
+      
       &Install
       &Instal·la
     
     
-      
+      
       Setup is complete. Close the setup program.
       La configuració s'ha completat. Tanqueu el programa de configuració.
     
     
-      
+      
       The installation is complete. Close the installer.
       La instal·lació s'ha completat. Tanqueu l'instal·lador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancel·la la configuració sense canviar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancel·la la instal·lació sense canviar el sistema.
     
     
-      
+      
       &Next
       &Següent
     
     
-      
+      
       &Back
       A&rrere
     
     
-      
+      
       &Done
       &Fet
     
     
-      
+      
       &Cancel
       &Cancel·la
     
     
-      
+      
       Cancel setup?
       Voleu cancel·lar la configuració?
     
     
-      
+      
       Cancel installation?
       Voleu cancel·lar la instal·lació?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Voleu cancel·lar el procés de configuració actual?
 El programa de configuració es tancarà i es perdran tots els canvis.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Voleu cancel·lar el procés d'instal·lació actual?
@@ -468,22 +468,22 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tipus d'excepció desconeguda
     
     
-      
+      
       unparseable Python error
       S'ha produït un error de Python no analitzable.
     
     
-      
+      
       unparseable Python traceback
       La traça de Python no es pot analitzar.
     
     
-      
+      
       Unfetchable Python error.
       S'ha produït un error de Python irrecuperable.
     
@@ -501,6 +501,24 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Instal·lador de %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Formulari
     
     
-      
+      
       Select storage de&vice:
       Seleccioneu un dispositiu d'e&mmagatzematge:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Després:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particions manuals</strong><br/>Podeu crear particions o canviar-ne la mida pel vostre compte.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilitza %1 com a partició de l'usuari per a %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Seleccioneu una partició per a reduir-la i arrossegueu-la per a redimensionar-la</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 es reduirà a %2 MiB i es crearà una partició nova de %3 MiB per a %4.
     
     
-      
+      
       Boot loader location:
       Ubicació del gestor d'arrancada:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Seleccioneu una partició per a fer-hi la instal·lació.</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       No s'ha pogut trobar una partició EFI en cap lloc d'aquest sistema. Torneu arrere i useu les particions manuals per a configurar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partició EFI de sistema en %1 s'usarà per a iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partició del sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Pareix que aquest dispositiu d'emmagatzematge no té cap sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Esborra el disc</strong><br/>Això <font color="red">suprimirà</font> totes les dades del dispositiu seleccionat.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instal·la'l al costat</strong><br/>L'instal·lador reduirà una partició per a fer espai per a %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Reemplaça una partició</strong><br/>Reemplaça una partició per %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge té %1. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge ja té un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge ja té múltiples sistemes operatius. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Aquest dispositiu d'emmagatzematge ja té un sistema operatiu, però la taula de particions <strong>%1</strong> és diferent de la necessària: <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Aquest dispositiu d'emmagatzematge té una de les particions <strong>muntada</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Aquest dispositiu d'emmagatzematge forma part d'un dispositiu de <strong>RAID inactiu</strong>.
     
     
-      
+      
       No Swap
       Sense intercanvi
     
     
-      
+      
       Reuse Swap
       Reutilitza l'intercanvi
     
     
-      
+      
       Swap (no Hibernate)
       Intercanvi (sense hibernació)
     
     
-      
+      
       Swap (with Hibernate)
       Intercanvi (amb hibernació)
     
     
-      
+      
       Swap to file
       Intercanvi en fitxer
     
@@ -695,12 +713,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       S'estan netejant tots els muntatges temporals.
     
     
-      
+      
       Cannot get list of temporary mounts.
       No es pot obtindre la llista dels muntatges temporals.
     
     
-      
+      
       Cleared all temporary mounts.
       S'han netejat tots els muntatges temporals.
     
@@ -727,27 +745,27 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Estableix el model de teclat en %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Estableix la distribució del teclat a %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Estableix el fus horari a %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       La llengua del sistema s'establirà en %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Els números i les dates de la configuració local s'establiran en %1.
     
@@ -871,6 +889,11 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Your passwords do not match!
       Les contrasenyes no coincideixen.
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       The installation of %1 is complete.
       La instal·lació de %1 ha acabat.
     
+    
+      
+      Package Selection
+      Selecció de paquets
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Trieu un producte de la llista. S'instal·larà el producte seleccionat.
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Marcadors:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       En&cripta
     
     
-      
+      
       Logical
       Lògica
     
     
-      
+      
       Primary
       Primària
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       El punt de muntatge ja està en ús. Seleccioneu-ne un altre.
     
@@ -1001,43 +1044,43 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Crea una partició nova de %2 MiB a %4 (%3) amb el sistema de fitxers %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Crea una partició nova de <strong>%2 MiB</strong> a <strong>%4</strong> (%3) amb el sistema de fitxers <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       S'està creant la partició nova %1 en %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       L'instal·lador no ha pogut crear la partició en el disc '%1'.
     
@@ -1088,7 +1131,7 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       S'està creant la taula de particions nova %1 en %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       L'instal·lador no ha pogut crear la taula de particions en %1.
     
@@ -1327,7 +1370,17 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Marcadors:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       El punt de muntatge ja està en ús. Seleccioneu-ne un altre.
     
@@ -1364,57 +1417,57 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Estableix la informació de la partició
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instal·la %1 en la partició de sistema <strong>nova</strong> %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instal·la %2 en la partició de sistema %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instal·la el gestor d'arrancada en <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       S'estableixen els punts de muntatge.
     
@@ -1827,6 +1880,14 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Ubicació
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2046,29 +2107,29 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Trieu la regió preferida o useu la predeterminada basada en la ubicació actual.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Fus horari: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Trieu la zona preferida dins de la regió.
     
     
-      
+      
       Zones
       Zones
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Podeu acabar d'ajustar els paràmetres locals i de llengua a continuació.
     
@@ -2384,7 +2445,7 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paquets
     
@@ -2565,33 +2626,38 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé
     PartitionModel
     
       
-      
+      
       Free Space
       Espai lliure
     
     
       
-      
+      
       New partition
       Partició nova
     
     
-      
+      
       Name
       Nom
     
     
-      
+      
       File System
       Sistema de fitxers
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Punt de muntatge
     
     
-      
+      
       Size
       Mida
     
@@ -2677,117 +2743,117 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       S'està obtenint la informació del sistema...
     
     
-      
+      
       Partitions
       Particions
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Esborra</strong> el disc i instal·la-hi %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Reemplaça</strong> una partició amb %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Particions <strong>manuals</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu en el disc <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Esborra</strong> el disc <strong>%2</strong> (%3) i instal·la-hi %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Reemplaça</strong> una partició del disc <strong>%2</strong> (%3) amb %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Particions <strong>manuals</strong> del disc <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disc <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Després:
     
     
-      
+      
       No EFI system partition configured
       No hi ha cap partició EFI de sistema configurada
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Cal una partició EFI de sistema per a iniciar %1. <br/><br/>Per a configurar una partició EFI de sistema, torneu arrere i seleccioneu o creeu un sistema de fitxers FAT32 amb el marcador <strong>%3</strong> habilitada i el punt de muntatge <strong>%2</strong>. <br/><br/>Podeu continuar sense la creació d'una partició EFI de sistema, però el sistema podria no iniciar-se.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Cal una partició EFI de sistema per a iniciar %1. <br/><br/> Ja s'ha configurat una partició amb el punt de muntatge <strong>%2</strong> però no se n'ha establit el marcador <strong>%3</strong>. <br/>Per a establir-la-hi, torneu arrere i editeu la partició. <br/><br/>Podeu continuar sense establir la bandera, però el sistema podria no iniciar-se.
     
     
-      
+      
       EFI system partition flag not set
       No s'ha establit el marcador de la partició EFI del sistema
     
     
-      
+      
       Option to use GPT on BIOS
       Opció per a usar GPT amb BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       La millor opció per a tots els sistemes és una taula de particions GPT. Aquest instal·lador també admet aquesta configuració per a sistemes BIOS.<br/><br/>Per a configurar una taula de particions GPT en un sistema BIOS, (si no s'ha fet ja) torneu arrere i establiu la taula de particions a GPT, després creeu una partició sense formatar de 8 MB amb el marcador <strong>bios_grub</strong> habilitada.<br/><br/>Cal una partició sense format de 8 MB per a iniciar %1 en un sistema BIOS amb GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partició d'arrancada sense encriptar
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       S'ha establit una partició d'arrancada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrancada no està encriptada.<br/><br/>Hi ha qüestions de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers tindrà lloc després, durant l'inici del sistema.<br/>Per a encriptar la partició d'arrancada, torneu arrere i torneu-la a crear seleccionant <strong>Encripta</strong> en la finestra de creació de la partició.
     
     
-      
+      
       has at least one disk device available.
       té com a mínim un dispositiu de disc disponible.
     
     
-      
+      
       There are no partitions to install on.
       No hi ha particions per a fer-hi una instal·lació.
     
@@ -2977,17 +3043,17 @@ Eixida:
       No s'ha pogut crear el fitxer aleatori nou <pre>%1</pre>.
     
     
-      
+      
       No product
       Cap producte
     
     
-      
+      
       No description provided.
       No s'ha proporcionat cap descripció.
     
     
-      
+      
       (no mount point)
       (sense punt de muntatge)
     
@@ -3248,12 +3314,12 @@ La configuració pot continuar, però és possible que algunes característiques
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Per a obtindre els millors resultats, assegureu-vos que aquest ordinador...
     
     
-      
+      
       System requirements
       Requisits de sistema
     
@@ -3261,27 +3327,27 @@ La configuració pot continuar, però és possible que algunes característiques
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Aquest ordinador no satisfà els requisits mínims per a configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Aquest ordinador no satisfà els requisits mínims per a instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Aquest ordinador no satisfà alguns dels requisits recomanats per a configurar-hi %1.<br/>La configuració pot continuar, però és possible que algunes característiques no estiguen habilitades.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Aquest ordinador no satisfà alguns dels requisits recomanats per a instal·lar-hi %1.<br/>La instal·lació pot continuar, però és possible que algunes característiques no estiguen habilitades.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Aquest programa us farà unes preguntes i instal·larà %2 en l'ordinador.
     
@@ -3437,7 +3503,7 @@ La configuració pot continuar, però és possible que algunes característiques
       S'estan establint els marcadors <strong>%1</strong> en la partició nova.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       L'instal·lador no ha pogut establir els marcadors en la partició %1.
     
@@ -3580,12 +3646,12 @@ La configuració pot continuar, però és possible que algunes característiques
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Això és un resum de què passarà quan s'inicie el procés de configuració.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Això és un resum de què passarà quan s'inicie el procés d'instal·lació.
     
@@ -4159,107 +4225,127 @@ La configuració pot continuar, però és possible que algunes característiques
       Trieu el nom d'usuari i les credencials per a iniciar la sessió i fer tasques d'administració.
     
     
-      
+      
       What is your name?
       Quin és el vostre nom?
     
     
-      
+      
       Your Full Name
       Nom complet
     
     
-      
+      
       What name do you want to use to log in?
       Quin nom voleu utilitzar per a entrar al sistema?
     
     
-      
+      
       Login Name
       Nom d'entrada
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Només es permeten lletres en minúscula, números, ratlles baixes i guions.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Quin és el nom d'aquest ordinador?
     
     
-      
+      
       Computer Name
       Nom de l'ordinador
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Seleccioneu una contrasenya per a mantindre el vostre compte segur.
     
     
-      
+      
       Password
       Contrasenya
     
     
-      
+      
       Repeat Password
       Repetiu la contrasenya
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació. Hauria de tindre un mínim de huit caràcters i s'hauria de canviar sovint.
     
     
-      
+      
       Validate passwords quality
       Valida la qualitat de les contrasenyes.
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no podreu indicar-ne una de dèbil.
     
     
-      
+      
       Log in automatically without asking for the password
       Entra automàticament sense demanar la contrasenya.
     
     
-      
+      
       Reuse user password as root password
       Reutilitza la contrasenya d'usuari com a contrasenya d'arrel.
     
     
-      
+      
       Use the same password for the administrator account.
       Usa la mateixa contrasenya per al compte d'administració.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Trieu una contrasenya d'arrel per mantindre el compte segur.
     
     
-      
+      
       Root Password
       Contrasenya d'arrel
     
     
-      
+      
       Repeat Root Password
       Repetiu la contrasenya d'arrel.
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia.
     
diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index e1eb5256d1..0f69f762f9 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Hlavní zaváděcí záznam (MBR) na %1
     
     
-      
+      
       Boot Partition
       Zaváděcí oddíl
     
     
-      
+      
       System Partition
       Systémový oddíl
     
     
-      
+      
       Do not install a boot loader
       Neinstalovat zavaděč systému
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Spouštění %1 operace.
     
     
-      
+      
       Bad working directory path
       Chybný popis umístění pracovní složky
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Pracovní složku %1 pro Python skript %2 se nedaří otevřít pro čtení.
     
     
-      
+      
       Bad main script file
       Nesprávný soubor s hlavním skriptem
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Hlavní soubor s python skriptem %1 pro úlohu %2 se nedaří otevřít pro čtení..
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python chyba ve skriptu „%1“.
     
@@ -289,54 +289,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Nastavení se nezdařilo
     
     
-      
+      
       Installation Failed
       Instalace se nezdařila
     
     
-      
+      
       Would you like to paste the install log to the web?
       Chcete vyvěsit záznam událostí při instalaci na web?
     
     
-      
+      
       Error
       Chyba
     
     
-      
-      
+      
+      
       &Yes
       &Ano
     
     
-      
-      
+      
+      
       &No
       &Ne
     
     
-      
+      
       &Close
       &Zavřít
     
     
-      
+      
       Install Log Paste URL
       URL pro vložení záznamu událostí při instalaci
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Nahrání se nezdařilo. Na web nebylo nic vloženo.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Inicializace Calamares se nezdařila
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 nemůže být nainstalováno. Calamares se nepodařilo načíst všechny nastavené moduly. Toto je problém způsobu použití Calamares ve vámi používané distribuci.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/> Následující moduly se nepodařilo načíst:
     
     
-      
+      
       Continue with setup?
       Pokračovat s instalací?
     
     
-      
+      
       Continue with installation?
       Pokračovat v instalaci?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong>
     
     
-      
+      
       &Set up now
       Na&stavit nyní
     
     
-      
+      
       &Install now
       &Spustit instalaci
     
     
-      
+      
       Go &back
       Jít &zpět
     
     
-      
+      
       &Set up
       Na&stavit
     
     
-      
+      
       &Install
       Na&instalovat
     
     
-      
+      
       Setup is complete. Close the setup program.
       Nastavení je dokončeno. Ukončete nastavovací program.
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalace je dokončena. Ukončete instalátor.
     
     
-      
+      
       Cancel setup without changing the system.
       Zrušit nastavení bez změny v systému.
     
     
-      
+      
       Cancel installation without changing the system.
       Zrušení instalace bez provedení změn systému.
     
     
-      
+      
       &Next
       &Další
     
     
-      
+      
       &Back
       &Zpět
     
     
-      
+      
       &Done
       &Hotovo
     
     
-      
+      
       &Cancel
       &Storno
     
     
-      
+      
       Cancel setup?
       Zrušit nastavování?
     
     
-      
+      
       Cancel installation?
       Přerušit instalaci?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Opravdu chcete přerušit instalaci?
 Instalační program bude ukončen a všechny změny ztraceny.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Opravdu chcete instalaci přerušit?
@@ -472,22 +472,22 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Neznámý typ výjimky
     
     
-      
+      
       unparseable Python error
       Chyba při zpracovávání (parse) Python skriptu.
     
     
-      
+      
       unparseable Python traceback
       Chyba při zpracovávání (parse) Python záznamu volání funkcí (traceback).
     
     
-      
+      
       Unfetchable Python error.
       Chyba při načítání Python skriptu.
     
@@ -505,6 +505,24 @@ Instalační program bude ukončen a všechny změny ztraceny.
       %1 instalátor
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Instalátoru se nezdařilo aktualizovat tabulku oddílů na jednotce „%1“.
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Formulář
     
     
-      
+      
       Select storage de&vice:
       &Vyberte úložné zařízení:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Stávající:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ruční rozdělení datového úložiště</strong><br/>Sami si můžete vytvořit vytvořit nebo zvětšit/zmenšit oddíly.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Zrecyklovat %1 na oddíl pro domovské složky %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Vyberte oddíl, který chcete zmenšit, poté posouváním na spodní liště změňte jeho velikost.</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 bude zmenšen na %2MiB a nový %3MiB oddíl pro %4 bude vytvořen.
     
     
-      
+      
       Boot loader location:
       Umístění zavaděče:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Vyberte oddíl na který nainstalovat</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nebyl nalezen žádný EFI systémový oddíl. Vraťte se zpět a nastavte %1 pomocí ručního rozdělení.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Pro zavedení %2 se využije EFI systémový oddíl %1.
     
     
-      
+      
       EFI system partition:
       EFI systémový oddíl:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Zdá se, že na tomto úložném zařízení není žádný operační systém. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Vymazat datové úložiště</strong><br/>Touto volbou budou <font color="red">smazána</font> všechna data, která se na něm nyní nacházejí.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Nainstalovat vedle</strong><br/>Instalátor zmenší oddíl a vytvoří místo pro %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Nahradit oddíl</strong><br/>Původní oddíl bude nahrazen %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Na tomto úložném zařízení bylo nalezeno %1. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Na tomto úložném zařízení se už nachází operační systém. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Na tomto úložném zařízení se už nachází několik operačních systémů. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled změn a budete požádáni o jejich potvrzení.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Na tomto úložném zařízení se už nachází operační systém, ale tabulka rozdělení <strong>%1</strong> je jiná než potřebná <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Některé z oddílů tohoto úložného zařízení jsou <strong>připojené</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Toto úložné zařízení je součástí <strong>Neaktivního RAID</strong> zařízení.
     
     
-      
+      
       No Swap
       Žádný odkládací prostor (swap)
     
     
-      
+      
       Reuse Swap
       Použít existující odkládací prostor
     
     
-      
+      
       Swap (no Hibernate)
       Odkládací prostor (bez uspávání na disk)
     
     
-      
+      
       Swap (with Hibernate)
       Odkládací prostor (s uspáváním na disk)
     
     
-      
+      
       Swap to file
       Odkládat do souboru
     
@@ -699,12 +717,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Odpojují se všechny dočasné přípojné body.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Nepodařilo získat seznam dočasných přípojných bodů.
     
     
-      
+      
       Cleared all temporary mounts.
       Všechny přípojné body odpojeny.
     
@@ -731,27 +749,27 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Nastavit model klávesnice na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Nastavit rozložení klávesnice na %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Nastavit časové pásmo na %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       Jazyk systému bude nastaven na %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Formát zobrazení čísel, data a času bude nastaven dle národního prostředí %1.
     
@@ -875,6 +893,11 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Your passwords do not match!
       Zadání hesla se neshodují!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ Instalační program bude ukončen a všechny změny ztraceny.
       The installation of %1 is complete.
       Instalace %1 je dokončena.
     
+    
+      
+      Package Selection
+      Výběr balíčků
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Vyberte produkt ze seznamu. Ten vybraný bude nainstalován.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Příznaky:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Š&ifrovat
     
     
-      
+      
       Logical
       Logický
     
     
-      
+      
       Primary
       Primární
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Tento přípojný bod už je používán – vyberte jiný.
     
@@ -1005,43 +1048,43 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Vytvořit nový %2MiB oddíl na %4 (%3) se souborovým systémem %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Vytvořit nový <strong>%2MiB</strong> oddíl na <strong>%4</strong> (%3) se souborovým systémem <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Vytváří se nový %1 oddíl na %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Instalátoru se nepodařilo vytvořit oddíl na datovém úložišti „%1“.
     
@@ -1092,7 +1135,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Vytváří se nová %1 tabulka oddílů na %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Instalátoru se nepodařilo vytvořit tabulku oddílů na %1.
     
@@ -1331,7 +1374,17 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Příznaky:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Tento přípojný bod je už používán – vyberte jiný.
     
@@ -1368,57 +1421,57 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Nastavit informace o oddílu
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Nainstalovat %1 na <strong>nový</strong> %2 systémový oddíl.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Nainstalovat %2 na %3 systémový oddíl <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Nainstalovat zavaděč do <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Nastavují se přípojné body.
     
@@ -1831,6 +1884,14 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Poloha
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Vyberte si Váš preferovaný region nebo použijte výchozí region na základě vaší aktuální polohy.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Časová zóna: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Vyberte preferovanou zónu ve vašem regionu.
     
     
-      
+      
       Zones
       Zóny
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Níže můžete doladit nastavení jazyka a národního prostředí.
     
@@ -2406,7 +2467,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Balíčky
     
@@ -2587,33 +2648,38 @@ Instalační program bude ukončen a všechny změny ztraceny.
     PartitionModel
     
       
-      
+      
       Free Space
       Volné místo
     
     
       
-      
+      
       New partition
       Nový oddíl
     
     
-      
+      
       Name
       Název
     
     
-      
+      
       File System
       Souborový systém
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Přípojný bod
     
     
-      
+      
       Size
       Velikost
     
@@ -2699,117 +2765,117 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Shromažďování informací o systému…
     
     
-      
+      
       Partitions
       Oddíly
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Nainstalovat %1 <strong>vedle</strong> dalšího operačního systému.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Smazat</strong> obsah jednotky a nainstalovat %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Nahradit</strong> oddíl %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Ruční</strong> dělení úložiště.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Nainstalovat %1 <strong>vedle</strong> dalšího operačního systému na disk <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Vymazat</strong> obsah jednotky <strong>%2</strong> (%3) a nainstalovat %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Nahradit</strong> oddíl na jednotce <strong>%2</strong> (%3) %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Ruční</strong> dělení jednotky <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Jednotka <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Stávající:
     
     
-      
+      
       After:
       Potom:
     
     
-      
+      
       No EFI system partition configured
       Není nastavený žádný EFI systémový oddíl
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Pro spuštění %1 je potřeba EFI systémový oddíl.<br/><br/>Pro nastavení EFI systémového oddílu se vraťte zpět a vyberte nebo vytvořte oddíl typu FAT32 s příznakem <strong>%3</strong> a přípojným bodem <strong>%2</strong>.<br/><br/>Je možné pokračovat bez nastavení EFI systémového oddílu, ale systém nemusí jít spustit.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Pro spuštění %1 je potřeba EFI systémový oddíl.<br/><br/>Byl nastaven oddíl s přípojným bodem <strong>%2</strong> ale nemá nastaven příznak <strong>%3</strong>.<br/>Pro nastavení příznaku se vraťte zpět a upravte oddíl.<br/><br/>Je možné pokračovat bez nastavení příznaku, ale systém nemusí jít spustit.
     
     
-      
+      
       EFI system partition flag not set
       Příznak EFI systémového oddílu není nastavený
     
     
-      
+      
       Option to use GPT on BIOS
       Volba použít GPT i pro BIOS zavádění (MBR)
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT tabulka oddílů je nejlepší volbou pro všechny systémy. Tento instalátor podporuje takové uspořádání i pro zavádění v režimu BIOS firmware.<br/><br/>Pro nastavení GPT tabulky oddílů v případě BIOS, (pokud už není provedeno) jděte zpět a nastavte tabulku oddílů na, dále vytvořte 8 MB oddíl (bez souborového systému s příznakem <strong>bios_grub</strong>.<br/><br/>Tento oddíl je zapotřebí pro spuštění %1 na systému s BIOS firmware/režimem a GPT.
     
     
-      
+      
       Boot partition not encrypted
       Zaváděcí oddíl není šifrován
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Kromě šifrovaného kořenového oddílu byl vytvořen i nešifrovaný oddíl zavaděče.<br/><br/>To by mohl být bezpečnostní problém, protože na nešifrovaném oddílu jsou důležité soubory systému.<br/>Pokud chcete, můžete pokračovat, ale odemykání souborového systému bude probíhat později při startu systému.<br/>Pro zašifrování oddílu zavaděče se vraťte a vytvořte ho vybráním možnosti <strong>Šifrovat</strong> v okně při vytváření oddílu.
     
     
-      
+      
       has at least one disk device available.
       má k dispozici alespoň jedno zařízení pro ukládání dat.
     
     
-      
+      
       There are no partitions to install on.
       Nejsou zde žádné oddíly na které by se dalo nainstalovat.
     
@@ -2999,17 +3065,17 @@ Výstup:
       Nepodařilo se vytvořit nový náhodný soubor <pre>%1</pre>.
     
     
-      
+      
       No product
       Žádný produkt
     
     
-      
+      
       No description provided.
       Nebyl poskytnut žádný popis.
     
     
-      
+      
       (no mount point)
       (žádný přípojný bod)
     
@@ -3270,12 +3336,12 @@ Výstup:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Nejlepších výsledků se dosáhne, pokud tento počítač bude:
     
     
-      
+      
       System requirements
       Požadavky na systém
     
@@ -3283,27 +3349,27 @@ Výstup:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Instalace nemůže pokračovat <a href="#details">Podrobnosti…</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Instalace nemůže pokračovat <a href="#details">Podrobnosti…</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Počítač nesplňuje některé doporučené požadavky pro instalaci %1.<br/>Instalace může pokračovat, ale některé funkce mohou být vypnuty.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Počítač nesplňuje některé doporučené požadavky pro instalaci %1.<br/>Instalace může pokračovat, ale některé funkce mohou být vypnuty.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Tento program vám položí několik dotazů, aby na základě odpovědí příslušně nainstaloval %2 na váš počítač.
     
@@ -3459,7 +3525,7 @@ Výstup:
       Nastavování příznaků <strong>%1</strong> na novém oddílu.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Instalátoru se nepodařilo nastavit příznak na oddílu %1
     
@@ -3602,12 +3668,12 @@ Výstup:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Toto je přehled událostí které nastanou po spuštění instalačního procesu.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Toto je přehled událostí které nastanou po spuštění instalačního procesu.
     
@@ -4181,107 +4247,127 @@ Výstup:
       Vyberte své uživatelské jméno a přihlašovací údaje pro přihlášení a provádění administrátorských úkolů
     
     
-      
+      
       What is your name?
       Jak se jmenujete?
     
     
-      
+      
       Your Full Name
       Vaše celé jméno
     
     
-      
+      
       What name do you want to use to log in?
       Jaké jméno chcete používat pro přihlašování do systému?
     
     
-      
+      
       Login Name
       Přihlašovací jméno
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Pokud bude tento počítač používat více než jedna osoba, můžete po instalaci vytvořit více účtů.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Je možné použít pouze malá písmena, číslice, podtržítko a spojovník.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Jaký je název tohoto počítače?
     
     
-      
+      
       Computer Name
       Název počítače
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Tento název se použije, pokud počítač zviditelníte ostatním v síti.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Zvolte si heslo pro ochranu svého účtu.
     
     
-      
+      
       Password
       Heslo
     
     
-      
+      
       Repeat Password
       Zopakování zadání hesla
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní. Dobré heslo by mělo obsahovat směs písmen, čísel a interpunkce a mělo by mít alespoň osm znaků. Zvažte také jeho pravidelnou změnu.
     
     
-      
+      
       Validate passwords quality
       Ověřte kvalitu hesel
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Když je toto zaškrtnuto, je prověřována odolnost hesla a nebude umožněno použít snadno prolomitelné heslo.
     
     
-      
+      
       Log in automatically without asking for the password
       Přihlaste se automaticky bez zadávání hesla
     
     
-      
+      
       Reuse user password as root password
       Použijte uživatelské heslo zároveň jako heslo root
     
     
-      
+      
       Use the same password for the administrator account.
       Použít stejné heslo i pro účet správce systému.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Zvolte heslo uživatele root, aby byl váš účet v bezpečí.
     
     
-      
+      
       Root Password
       Heslo uživatele root
     
     
-      
+      
       Repeat Root Password
       Opakujte root heslo
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní.
     
diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts
index 2f5ff91911..60b6c5d000 100644
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record af %1
     
     
-      
+      
       Boot Partition
       Bootpartition
     
     
-      
+      
       System Partition
       Systempartition
     
     
-      
+      
       Do not install a boot loader
       Installér ikke en bootloader
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Kører %1-handling.
     
     
-      
+      
       Bad working directory path
       Ugyldig arbejdsmappesti
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Arbejdsmappen %1 til python-jobbet %2 er ikke læsbar.
     
     
-      
+      
       Bad main script file
       Ugyldig primær skriptfil
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Primær skriptfil %1 til python-jobbet %2 er ikke læsbar.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python-fejl i job "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Opsætningen mislykkedes
     
     
-      
+      
       Installation Failed
       Installation mislykkedes
     
     
-      
+      
       Would you like to paste the install log to the web?
       Vil du indsætte installationsloggen på webbet?
     
     
-      
+      
       Error
       Fejl
     
     
-      
-      
+      
+      
       &Yes
       &Ja
     
     
-      
-      
+      
+      
       &No
       &Nej
     
     
-      
+      
       &Close
       &Luk
     
     
-      
+      
       Install Log Paste URL
       Indsættelses-URL for installationslog
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Uploaden lykkedes ikke. Der blev ikke foretaget nogen webindsættelse.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Initiering af Calamares mislykkedes
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 kan ikke installeres. Calamares kunne ikke indlæse alle de konfigurerede moduler. Det er et problem med den måde Calamares bruges på af distributionen.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Følgende moduler kunne ikke indlæses:
     
     
-      
+      
       Continue with setup?
       Fortsæt med opsætningen?
     
     
-      
+      
       Continue with installation?
       Fortsæt installationen?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1-opsætningsprogrammet er ved at foretage ændringer til din disk for at opsætte %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1-installationsprogrammet er ved at foretage ændringer til din disk for at installere %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong>
     
     
-      
+      
       &Set up now
       &Opsæt nu
     
     
-      
+      
       &Install now
       &Installér nu
     
     
-      
+      
       Go &back
       Gå &tilbage
     
     
-      
+      
       &Set up
       &Opsæt
     
     
-      
+      
       &Install
       &Installér
     
     
-      
+      
       Setup is complete. Close the setup program.
       Opsætningen er fuldført. Luk opsætningsprogrammet.
     
     
-      
+      
       The installation is complete. Close the installer.
       Installationen er fuldført. Luk installationsprogrammet.
     
     
-      
+      
       Cancel setup without changing the system.
       Annullér opsætningen uden at ændre systemet.
     
     
-      
+      
       Cancel installation without changing the system.
       Annullér installation uden at ændre systemet.
     
     
-      
+      
       &Next
       &Næste
     
     
-      
+      
       &Back
       &Tilbage
     
     
-      
+      
       &Done
       &Færdig
     
     
-      
+      
       &Cancel
       &Annullér
     
     
-      
+      
       Cancel setup?
       Annullér opsætningen?
     
     
-      
+      
       Cancel installation?
       Annullér installationen?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Vil du virkelig annullere den igangværende opsætningsproces?
 Opsætningsprogrammet vil stoppe og alle ændringer vil gå tabt.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Vil du virkelig annullere den igangværende installationsproces?
@@ -468,22 +468,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Ukendt undtagelsestype
     
     
-      
+      
       unparseable Python error
       Python-fejl som ikke kan fortolkes
     
     
-      
+      
       unparseable Python traceback
       Python-traceback som ikke kan fortolkes
     
     
-      
+      
       Unfetchable Python error.
       Python-fejl som ikke kan hentes.
     
@@ -501,6 +501,24 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.%1-installationsprogram
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Installationsprogrammet kunne ikke opdatere partitionstabel på disk '%1'.
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Formular
     
     
-      
+      
       Select storage de&vice:
       Vælg lageren&hed:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Nuværende:
     
     
-      
+      
       After:
       Efter:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuel partitionering</strong><br/>Du kan selv oprette og ændre størrelse på partitioner.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Genbrug %1 som hjemmepartition til %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Vælg en partition der skal mindskes, træk herefter den nederste bjælke for at ændre størrelsen</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 vil blive skrumpet til %2 MiB og en ny %3 MiB partition vil blive oprettet for %4.
     
     
-      
+      
       Boot loader location:
       Placering af bootloader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Vælg en partition at installere på</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       En EFI-partition blev ikke fundet på systemet. Gå venligst tilbage og brug manuel partitionering til at opsætte %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI-systempartitionen ved %1 vil blive brugt til at starte %2.
     
     
-      
+      
       EFI system partition:
       EFI-systempartition:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Lagerenheden ser ikke ud til at indeholde et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Slet disk</strong><br/>Det vil <font color="red">slette</font> alt data på den valgte lagerenhed.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installér ved siden af</strong><br/>Installationsprogrammet vil mindske en partition for at gøre plads til %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Erstat en partition</strong><br/>Erstatter en partition med %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Lagerenheden har %1 på sig. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før det sker ændringer til lagerenheden.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Lagerenheden indeholder allerede et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Lagerenheden indeholder flere styresystemer. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Lagerenheden har allerede et styresystem på den men partitionstabellen <strong>%1</strong> er ikke magen til den nødvendige <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Lagerenhden har en af sine partitioner <strong>monteret</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Lagringsenheden er en del af en <strong>inaktiv RAID</strong>-enhed.
     
     
-      
+      
       No Swap
       Ingen swap
     
     
-      
+      
       Reuse Swap
       Genbrug swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (ingen dvale)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (med dvale)
     
     
-      
+      
       Swap to file
       Swap til fil
     
@@ -695,12 +713,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Rydder alle midlertidige monteringspunkter.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Kan ikke få liste over midlertidige monteringspunkter.
     
     
-      
+      
       Cleared all temporary mounts.
       Rydder alle midlertidige monteringspunkter.
     
@@ -727,27 +745,27 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Indstil tastaturmodel til %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Indstil tastaturlayout til %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Indstil tidszone til %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       Systemets sprog indstilles til %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Lokalitet for tal og datoer indstilles til %1.
     
@@ -871,6 +889,11 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Your passwords do not match!
       Dine adgangskoder er ikke ens!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.The installation of %1 is complete.
       Installationen af %1 er fuldført.
     
+    
+      
+      Package Selection
+      Valg af pakke
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Vælg venligst et produkt fra listen. Det valgte produkt installeres.
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Flag:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Kryp&tér
     
     
-      
+      
       Logical
       Logisk
     
     
-      
+      
       Primary
       Primær
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Monteringspunktet er allerede i brug. Vælg venligst et andet.
     
@@ -1001,43 +1044,43 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Opret en ny %2 MiB partition på %4 (%3) med %1-filsystem.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Opret en ny <strong>%2 MiB</strong> partition på <strong>%4</strong> (%3) med <strong>%1</strong>-filsystem.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Opretter ny %1-partition på %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Installationsprogrammet kunne ikke oprette partition på disk '%1'.
     
@@ -1088,7 +1131,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Opretter ny %1-partitionstabel på %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Installationsprogrammet kunne ikke oprette en partitionstabel på %1.
     
@@ -1327,7 +1370,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Flag:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Monteringspunktet er allerede i brug. Vælg venligst et andet.
     
@@ -1364,57 +1417,57 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Indstil partitionsinformation
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Installér %1 på <strong>ny</strong> %2-systempartition.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Installér %2 på %3-systempartition <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Installér bootloader på <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Opsætter monteringspunkter.
     
@@ -1827,6 +1880,14 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Placering
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2046,29 +2107,29 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Vælg dit foretrukne område eller brug den som er standard for din nuværende placering.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Tidszone: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Vælg din foretrukne zone i dit område.
     
     
-      
+      
       Zones
       Zoner
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Du kan finjustere sprog- og lokalitetsindstillinger nedenfor.
     
@@ -2384,7 +2445,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     PackageChooserViewStep
     
-      
+      
       Packages
       Pakker
     
@@ -2565,33 +2626,38 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.PartitionModel
     
       
-      
+      
       Free Space
       Ledig plads
     
     
       
-      
+      
       New partition
       Ny partition
     
     
-      
+      
       Name
       Navn
     
     
-      
+      
       File System
       Filsystem
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Monteringspunkt
     
     
-      
+      
       Size
       Størrelse
     
@@ -2677,117 +2743,117 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Indsamler systeminformation ...
     
     
-      
+      
       Partitions
       Partitioner
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Installér %1 <strong>ved siden af</strong> et andet styresystem.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Slet</strong> disk og installér %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Erstat</strong> en partition med %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Manuel</strong> partitionering.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Installér %1 <strong>ved siden af</strong> et andet styresystem på disk <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Slet</strong> disk <strong>%2</strong> (%3) og installér %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Erstat</strong> en partition på disk <strong>%2</strong> (%3) med %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Manuel</strong> partitionering på disk <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disk <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Nuværende:
     
     
-      
+      
       After:
       Efter:
     
     
-      
+      
       No EFI system partition configured
       Der er ikke konfigureret nogen EFI-systempartition
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       En EFI-systempartition er nødvendig for at starte %1.<br/><br/>For at konfigurere en EFI-systempartition skal du gå tilbage og vælge eller oprette et FAT32-filsystem med <strong>%3</strong>-flaget aktiveret og monteringspunkt <strong>%2</strong>.<br/><br/>Du kan fortsætte uden at opsætte en EFI-systempartition, men dit system vil muligvis ikke kunne starte.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       En EFI-systempartition er nødvendig for at starte %1.<br/><br/>En partition var konfigureret med monteringspunkt <strong>%2</strong>, men dens <strong>%3</strong>-flag var ikke indstillet.<br/>For at indstille flaget skal du gå tilbage og redigere partitionen.<br/><br/>Du kan fortsætte uden at konfigurere flaget, men dit system vil muligvis ikke kunne starte.
     
     
-      
+      
       EFI system partition flag not set
       EFI-systempartitionsflag ikke sat
     
     
-      
+      
       Option to use GPT on BIOS
       Valgmulighed til at bruge GPT på BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       En GPT-partitionstabel er den bedste valgmulighed til alle systemer. Installationsprogrammet understøtter også sådan en opsætning for BIOS-systemer.<br/><br/>Konfigurer en GPT-partitionstabel på BIOS, (hvis det ikke allerede er gjort) ved at gå tilbage og indstil partitionstabellen til GPT, opret herefter en 8 MB uformateret partition med <strong>bios_grub</strong>-flaget aktiveret.<br/><br/>En uformateret 8 MB partition er nødvendig for at starte %1 på et BIOS-system med GPT.
     
     
-      
+      
       Boot partition not encrypted
       Bootpartition ikke krypteret
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       En separat bootpartition blev opsat sammen med en krypteret rodpartition, men bootpartitionen er ikke krypteret.<br/><br/>Der er sikkerhedsmæssige bekymringer med denne slags opsætning, da vigtige systemfiler er gemt på en ikke-krypteret partition.<br/>Du kan fortsætte hvis du vil, men oplåsning af filsystemet sker senere under systemets opstart.<br/>For at kryptere bootpartitionen skal du gå tilbage og oprette den igen, vælge <strong>Kryptér</strong> i partitionsoprettelsesvinduet.
     
     
-      
+      
       has at least one disk device available.
       har mindst én tilgængelig diskenhed.
     
     
-      
+      
       There are no partitions to install on.
       Der er ikke nogen partitioner at installere på.
     
@@ -2977,17 +3043,17 @@ Output:
       Kunne ikke oprette den tilfældige fil <pre>%1</pre>.
     
     
-      
+      
       No product
       Intet produkt
     
     
-      
+      
       No description provided.
       Der er ikke angivet nogen beskrivelse.
     
     
-      
+      
       (no mount point)
       (intet monteringspunkt)
     
@@ -3249,12 +3315,12 @@ setting
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       For at få det bedste resultat sørg venligst for at computeren:
     
     
-      
+      
       System requirements
       Systemkrav
     
@@ -3262,27 +3328,27 @@ setting
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Computeren imødekommer ikke minimumsystemkravene for at opsætte %1.<br/>Opsætningen kan ikke fortsætte. <a href="#details">Detaljer ...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Computeren imødekommer ikke minimumsystemkravene for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer ...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Computeren imødekommer ikke nogle af de anbefalede systemkrav for at opsætte %1.<br/>Opsætningen kan fortsætte, men nogle funktionaliteter kan være deaktiveret.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Computeren imødekommer ikke nogle af de anbefalede systemkrav for at installere %1.<br/>Installationen kan fortsætte, men nogle funktionaliteter kan være deaktiveret.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Programmet vil stille dig nogle spørgsmål og opsætte %2 på din computer.
     
@@ -3438,7 +3504,7 @@ setting
       Indstiller flag <strong>%1</strong> på ny partition.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Installationsprogrammet kunne ikke indstille flag på partition %1.
     
@@ -3581,12 +3647,12 @@ setting
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Dette er et overblik over hvad der vil ske når du starter opsætningsprocessen.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Dette er et overblik over hvad der vil ske når du starter installationsprocessen.
     
@@ -4159,107 +4225,127 @@ setting
       Vælg dit brugernavn og loginoplysninger som bruges til at logge ind med og udføre administrative opgaver
     
     
-      
+      
       What is your name?
       Hvad er dit navn?
     
     
-      
+      
       Your Full Name
       Dit fulde navn
     
     
-      
+      
       What name do you want to use to log in?
       Hvilket navn skal bruges til at logge ind?
     
     
-      
+      
       Login Name
       Loginnavn
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Det er kun tilladt at bruge bogstaver med småt, tal, understregning og bindestreg.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Hvad er navnet på computeren?
     
     
-      
+      
       Computer Name
       Computernavn
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Navnet bruges, hvis du gør computeren synlig for andre på et netværk.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Vælg en adgangskode for at beskytte din konto.
     
     
-      
+      
       Password
       Adgangskode
     
     
-      
+      
       Repeat Password
       Gentag adgangskode
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl. En god adgangskode indeholder en blanding af bogstaver, tal og specialtegn, bør være mindst 8 tegn langt og bør skiftes jævnligt.
     
     
-      
+      
       Validate passwords quality
       Validér kvaliteten af adgangskoderne
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Når boksen er tilvalgt, så foretages der tjek af adgangskodens styrke og du vil ikke være i stand til at bruge en svag adgangskode.
     
     
-      
+      
       Log in automatically without asking for the password
       Log ind automatisk uden at spørge efter adgangskoden
     
     
-      
+      
       Reuse user password as root password
       Genbrug brugeradgangskode som root-adgangskode
     
     
-      
+      
       Use the same password for the administrator account.
       Brug den samme adgangskode til administratorkontoen.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Vælg en root-adgangskode til at holde din konto sikker
     
     
-      
+      
       Root Password
       Root-adgangskode
     
     
-      
+      
       Repeat Root Password
       Gentag root-adgangskode
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl.
     
diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index cecd14c459..379a4a922a 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record von %1
     
     
-      
+      
       Boot Partition
       Boot-Partition
     
     
-      
+      
       System Partition
       System-Partition
     
     
-      
+      
       Do not install a boot loader
       Installiere keinen Bootloader
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Operation %1 wird ausgeführt.
     
     
-      
+      
       Bad working directory path
       Fehlerhafter Arbeitsverzeichnis-Pfad
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Arbeitsverzeichnis %1 für Python-Job %2 ist nicht lesbar.
     
     
-      
+      
       Bad main script file
       Fehlerhaftes Hauptskript
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Hauptskript-Datei %1 für Python-Job %2 ist nicht lesbar.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python-Fehler in Job "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Setup fehlgeschlagen
     
     
-      
+      
       Installation Failed
       Installation gescheitert
     
     
-      
+      
       Would you like to paste the install log to the web?
       Möchten Sie das Installationsprotokoll an eine Internetadresse senden?
     
     
-      
+      
       Error
       Fehler
     
     
-      
-      
+      
+      
       &Yes
       &Ja
     
     
-      
-      
+      
+      
       &No
       &Nein
     
     
-      
+      
       &Close
       &Schließen
     
     
-      
+      
       Install Log Paste URL
       Internetadresse für das Senden des Installationsprotokolls
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Das Hochladen ist fehlgeschlagen. Es wurde nichts an eine Internetadresse gesendet.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 Link wurde in die Zwischenablage kopiert
     
     
-      
+      
       Calamares Initialization Failed
       Initialisierung von Calamares fehlgeschlagen
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 kann nicht installiert werden. Calamares war nicht in der Lage, alle konfigurierten Module zu laden. Dieses Problem hängt mit der Art und Weise zusammen, wie Calamares von der jeweiligen Distribution eingesetzt wird.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Die folgenden Module konnten nicht geladen werden:
     
     
-      
+      
       Continue with setup?
       Setup fortsetzen?
     
     
-      
+      
       Continue with installation?
       Installation fortsetzen?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Das %1 Installationsprogramm ist dabei, Änderungen an Ihrer Festplatte vorzunehmen, um %2 einzurichten.<br/><strong> Sie werden diese Änderungen nicht rückgängig machen können.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Das %1 Installationsprogramm wird Änderungen an Ihrer Festplatte vornehmen, um %2 zu installieren.<br/><strong>Diese Änderungen können nicht rückgängig gemacht werden.</strong>
     
     
-      
+      
       &Set up now
       &Jetzt einrichten
     
     
-      
+      
       &Install now
       Jetzt &installieren
     
     
-      
+      
       Go &back
       Gehe &zurück
     
     
-      
+      
       &Set up
       &Einrichten
     
     
-      
+      
       &Install
       &Installieren
     
     
-      
+      
       Setup is complete. Close the setup program.
       Setup ist abgeschlossen. Schließe das Installationsprogramm.
     
     
-      
+      
       The installation is complete. Close the installer.
       Die Installation ist abgeschlossen. Schließe das Installationsprogramm.
     
     
-      
+      
       Cancel setup without changing the system.
       Installation abbrechen ohne das System zu verändern.
     
     
-      
+      
       Cancel installation without changing the system.
       Installation abbrechen, ohne das System zu verändern.
     
     
-      
+      
       &Next
       &Weiter
     
     
-      
+      
       &Back
       &Zurück
     
     
-      
+      
       &Done
       &Erledigt
     
     
-      
+      
       &Cancel
       &Abbrechen
     
     
-      
+      
       Cancel setup?
       Installation abbrechen?
     
     
-      
+      
       Cancel installation?
       Installation abbrechen?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Wollen Sie die Installation wirklich abbrechen?
 Dadurch wird das Installationsprogramm beendet und alle Änderungen gehen verloren.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Wollen Sie wirklich die aktuelle Installation abbrechen?
@@ -472,22 +472,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Unbekannter Ausnahmefehler
     
     
-      
+      
       unparseable Python error
       Nicht analysierbarer Python-Fehler
     
     
-      
+      
       unparseable Python traceback
       Nicht analysierbarer Python-Traceback
     
     
-      
+      
       Unfetchable Python error.
       Nicht zuzuordnender Python-Fehler
     
@@ -505,6 +505,24 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       %1 Installationsprogramm
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Das Aktualisieren der Partitionstabelle auf Datenträger '%1' ist fehlgeschlagen.
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Form
     
     
-      
+      
       Select storage de&vice:
       Speichermedium auswählen
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Aktuell:
     
     
-      
+      
       After:
       Nachher:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuelle Partitionierung</strong><br/>Sie können Partitionen eigenhändig erstellen oder in der Grösse verändern.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 als Home-Partition für %2 wiederverwenden.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Wählen Sie die zu verkleinernde Partition, dann ziehen Sie den Regler, um die Größe zu ändern</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 wird auf %2MiB verkleinert und eine neue Partition mit einer Größe von %3MiB wird für %4 erstellt werden.
     
     
-      
+      
       Boot loader location:
       Installationsziel des Bootloaders:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Wählen Sie eine Partition für die Installation</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Es wurde keine EFI-Systempartition auf diesem System gefunden. Bitte gehen Sie zurück und nutzen Sie die manuelle Partitionierung für das Einrichten von %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Die EFI-Systempartition %1 wird benutzt, um %2 zu starten.
     
     
-      
+      
       EFI system partition:
       EFI-Systempartition:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Auf diesem Speichermedium scheint kein Betriebssystem installiert zu sein. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen auf diesem Speichermedium vorgenommen werden.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Festplatte löschen</strong><br/>Dies wird alle vorhandenen Daten auf dem gewählten Speichermedium <font color="red">löschen</font>. 
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Parallel dazu installieren</strong><br/>Das Installationsprogramm wird eine Partition verkleinern, um Platz für %1 zu schaffen.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ersetze eine Partition</strong><br/>Ersetzt eine Partition durch %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Auf diesem Speichermedium ist %1 installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dieses Speichermedium enthält bereits ein Betriebssystem. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen wird.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Auf diesem Speichermedium sind mehrere Betriebssysteme installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Auf diesem Speichergerät befindet sich bereits ein Betriebssystem, aber die Partitionstabelle <strong>%1</strong> unterscheidet sich von den erforderlichen <strong>%2</strong><br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Bei diesem Speichergerät ist eine seiner Partitionen <strong>eingehängt</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Dieses Speichergerät ist ein Teil eines <strong>inaktiven RAID</strong>-Geräts.
     
     
-      
+      
       No Swap
       Kein Swap
     
     
-      
+      
       Reuse Swap
       Swap wiederverwenden
     
     
-      
+      
       Swap (no Hibernate)
       Swap (ohne Ruhezustand)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (mit Ruhezustand)
     
     
-      
+      
       Swap to file
       Auslagerungsdatei verwenden
     
@@ -699,12 +717,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Löse alle temporär eingehängten Laufwerke.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Konnte keine Liste von temporären Mount-Points einlesen.
     
     
-      
+      
       Cleared all temporary mounts.
       Alle temporären Mount-Points geleert.
     
@@ -731,27 +749,27 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Setze Tastaturmodell auf %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Setze Tastaturbelegung auf %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Setze Zeitzone auf %1%2.
     
     
-      
+      
       The system language will be set to %1.
       Die Systemsprache wird auf %1 eingestellt.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Das Format für Zahlen und Datum wird auf %1 gesetzt.
     
@@ -875,6 +893,11 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Your passwords do not match!
       Ihre Passwörter stimmen nicht überein!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       The installation of %1 is complete.
       Die Installation von %1 ist abgeschlossen.
     
+    
+      
+      Package Selection
+      Paketauswahl
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Bitte wählen Sie ein Produkt aus der Liste aus. Das ausgewählte Produkt wird installiert.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Markierungen:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Verschlüsseln
     
     
-      
+      
       Logical
       Logisch
     
     
-      
+      
       Primary
       Primär
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Dieser Einhängepunkt wird schon benuztzt. Bitte wählen Sie einen anderen.
     
@@ -1005,43 +1048,43 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Erstelle neue %1MiB Partition auf %3 (%2) mit den Einträgen %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Erstelle neue %1MiB Partition auf %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Erstelle eine neue Partition mit einer Größe von %2MiB auf %4 (%3) mit dem Dateisystem %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Erstelle neue <strong>%1MiB</strong>Partition auf <strong>%3</strong> (%2) mit den Einträgen <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Erstelle neue <strong>%1MiB</strong> Partition auf <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Erstelle eine neue Partition mit einer Größe von <strong>%2MiB</strong> auf <strong>%4</strong> (%3) mit dem Dateisystem <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Erstelle eine neue %1 Partition auf %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Das Installationsprogramm scheiterte beim Erstellen der Partition auf Datenträger '%1'.
     
@@ -1092,7 +1135,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Erstelle eine neue %1 Partitionstabelle auf %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Das Installationsprogramm konnte die Partitionstabelle auf %1 nicht erstellen.
     
@@ -1331,7 +1374,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Markierungen:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Der Einhängepunkt wird schon benutzt. Bitte wählen Sie einen anderen.
     
@@ -1368,57 +1421,57 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Setze Partitionsinformationen
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Installiere %1 auf <strong>neue</strong> %2 Systempartition mit den Funktionen <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Installiere %1 auf <strong>neuer</strong> %2 Systempartition.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Erstelle <strong>neue</strong> %2 Partition mit Einhängepunkt <strong>%1</strong> und den Funktionen <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Erstelle<strong>neue</strong> %2 Partition mit Einhängepunkt <strong>%1</strong>%3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Installiere %2 auf %3 Systempartition <strong>%1</strong> mit den Funktionen <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Erstelle %3 Partition <strong>%1</strong> mit Einhängepunkt <strong>%2</strong> und den Funktionen <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Erstelle %3 Partition <strong>%1</strong> mit Einhängepunkt <strong>%2</strong>%4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Installiere %2 auf %3 Systempartition <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Installiere Bootloader auf <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Richte Einhängepunkte ein.
     
@@ -1831,6 +1884,14 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Standort
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Wählen Sie Ihre bevorzugte Region oder nutzen Sie die standardmäßige Region basierend auf Ihrem Standort. 
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Zeitzone: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Wählen Sie Ihre bevorzugte Zone innerhalb Ihrer Region.
     
     
-      
+      
       Zones
       Zonen
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Sie können Sprache und Regionalschema unten weiter anpassen.
     
@@ -2388,7 +2449,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Pakete
     
@@ -2569,33 +2630,38 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     PartitionModel
     
       
-      
+      
       Free Space
       Freier Platz
     
     
       
-      
+      
       New partition
       Neue Partition
     
     
-      
+      
       Name
       Name
     
     
-      
+      
       File System
       Dateisystem
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Einhängepunkt
     
     
-      
+      
       Size
       Grösse
     
@@ -2681,117 +2747,117 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sammle Systeminformationen...
     
     
-      
+      
       Partitions
       Partitionen
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Installiere %1 <strong>neben</strong> einem anderen Betriebssystem.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Lösche</strong> Festplatte und installiere %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Ersetze</strong> eine Partition durch %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Manuelle</strong> Partitionierung.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       %1 <strong>parallel</strong> zu einem anderen Betriebssystem auf der Festplatte <strong>%2</strong> (%3) installieren.
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       Festplatte <strong>%2</strong> <strong>löschen</strong> (%3) und %1 installieren.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       Eine Partition auf Festplatte <strong>%2</strong> (%3) durch %1 <strong>ersetzen</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Manuelle</strong> Partitionierung auf Festplatte <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Festplatte <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Aktuell:
     
     
-      
+      
       After:
       Nachher:
     
     
-      
+      
       No EFI system partition configured
       Keine EFI-Systempartition konfiguriert
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Eine EFI-Systempartition wird benötigt, um %1 zu starten.<br/><br/>Um eine EFI-Systempartition einzurichten, gehen Sie zurück und wählen oder erstellen Sie ein FAT32-Dateisystem mit einer aktivierten <strong>%3</strong> Markierung sowie <strong>%2</strong> als Einhängepunkt .<br/><br/>Sie können ohne die Einrichtung einer EFI-Systempartition fortfahren, aber ihr System wird unter Umständen nicht starten können.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Eine EFI-Systempartition wird benötigt, um %1 zu starten.<br/><br/>Eine Partition mit dem Einhängepunkt <strong>%2</strong> wurde eingerichtet, jedoch wurde dort keine <strong>%3</strong> Markierung gesetzt.<br/>Um diese Markierung zu setzen, gehen Sie zurück und bearbeiten Sie die Partition.<br/><br/>Sie können ohne diese Markierung fortfahren, aber ihr System wird unter Umständen nicht starten können.
     
     
-      
+      
       EFI system partition flag not set
       Die Markierung als EFI-Systempartition wurde nicht gesetzt
     
     
-      
+      
       Option to use GPT on BIOS
       Option zur Verwendung von GPT mit BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Eine GPT-Partitionstabelle ist die beste Option für alle Systeme. Dieses Installationsprogramm unterstützt ein solches Setup auch für BIOS-Systeme.<br/><br/>Um eine GPT-Partitionstabelle mit BIOS zu konfigurieren, gehen Sie (falls noch nicht geschehen) zurück und setzen Sie die Partitionstabelle auf GPT, als nächstes erstellen Sie eine 8 MB große, unformatierte Partition mit der Markierung <strong>bios_grub</strong> aktiviert.<br/><br/>Eine unformatierte 8 MB große Partition ist erforderlich, um %1 auf einem BIOS-System mit GPT zu starten.
     
     
-      
+      
       Boot partition not encrypted
       Bootpartition nicht verschlüsselt
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Eine separate Bootpartition wurde zusammen mit einer verschlüsselten Rootpartition erstellt, die Bootpartition ist aber unverschlüsselt.<br/><br/> Dies ist sicherheitstechnisch nicht optimal, da wichtige Systemdateien auf der unverschlüsselten Bootpartition gespeichert werden.<br/>Wenn Sie wollen, können Sie fortfahren, aber das Entschlüsseln des Dateisystems wird erst später während des Systemstarts erfolgen.<br/>Um die Bootpartition zu verschlüsseln, gehen Sie zurück und erstellen Sie diese neu, indem Sie bei der Partitionierung <strong>Verschlüsseln</strong> wählen. 
     
     
-      
+      
       has at least one disk device available.
       mindestens eine Festplatte zur Verfügung hat
     
     
-      
+      
       There are no partitions to install on.
       Keine Partitionen für die Installation verfügbar.
     
@@ -2981,17 +3047,17 @@ Ausgabe:
       Die neue Zufallsdatei <pre>%1</pre> konnte nicht erstellt werden.
     
     
-      
+      
       No product
       Kein Produkt
     
     
-      
+      
       No description provided.
       Keine Beschreibung vorhanden.
     
     
-      
+      
       (no mount point)
       (kein Einhängepunkt)
     
@@ -3252,12 +3318,12 @@ Ausgabe:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Für das beste Ergebnis stellen Sie bitte sicher, dass dieser Computer:
     
     
-      
+      
       System requirements
       Systemanforderungen
     
@@ -3265,27 +3331,27 @@ Ausgabe:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.<br/>Die Installation kann nicht fortgesetzt werden. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.<br/>Die Installation kann nicht fortgesetzt werden. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Dieser Computer erfüllt nicht alle empfohlenen Voraussetzungen für die Installation von %1.<br/>Die Installation kann fortgesetzt werden, aber es werden eventuell nicht alle Funktionen verfügbar sein.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Dieser Computer erfüllt nicht alle empfohlenen Voraussetzungen für die Installation von %1.<br/>Die Installation kann fortgesetzt werden, aber es werden eventuell nicht alle Funktionen verfügbar sein.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Dieses Programm wird Ihnen einige Fragen stellen, um %2 auf Ihrem Computer zu installieren.
     
@@ -3441,7 +3507,7 @@ Ausgabe:
       Setze Markierungen <strong>%1</strong> für neue Partition.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Das Installationsprogramm konnte keine Markierungen für Partition %1 setzen.
     
@@ -3584,12 +3650,12 @@ Ausgabe:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Dies ist eine Übersicht der Aktionen, die nach dem Starten des Installationsprozesses durchgeführt werden.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Dies ist eine Übersicht der Aktionen, die nach dem Starten des Installationsprozesses durchgeführt werden.
     
@@ -4165,107 +4231,127 @@ Ausgabe:
       Wählen Sie Benutzername und Passwort, um sich als Administrator anzumelden.
     
     
-      
+      
       What is your name?
       Wie ist Ihr Vor- und Nachname?
     
     
-      
+      
       Your Full Name
       Ihr vollständiger Name
     
     
-      
+      
       What name do you want to use to log in?
       Welchen Namen möchten Sie zum Anmelden benutzen?
     
     
-      
+      
       Login Name
       Anmeldename
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Falls mehrere Personen diesen Computer benutzen, können Sie nach der Installation weitere Konten hinzufügen.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Es sind nur Kleinbuchstaben, Zahlen, Unterstrich und Bindestrich erlaubt.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Wie ist der Name dieses Computers?
     
     
-      
+      
       Computer Name
       Computername
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Dieser Name wird benutzt, wenn Sie den Computer im Netzwerk für andere sichtbar machen.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Wählen Sie ein Passwort, um Ihr Konto zu sichern.
     
     
-      
+      
       Password
       Passwort
     
     
-      
+      
       Repeat Password
       Passwort wiederholen
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann. Ein gutes Passwort sollte eine Mischung aus Buchstaben, Zahlen sowie Sonderzeichen enthalten, mindestens acht Zeichen lang sein und regelmäßig geändert werden. 
     
     
-      
+      
       Validate passwords quality
       Passwort-Qualität überprüfen
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Wenn dieses Kontrollkästchen aktiviert ist, wird die Passwortstärke überprüft und verhindert, dass Sie ein schwaches Passwort verwenden.
     
     
-      
+      
       Log in automatically without asking for the password
       Automatisch anmelden ohne Passwortabfrage
     
     
-      
+      
       Reuse user password as root password
       Benutzerpasswort als Root-Passwort benutzen 
     
     
-      
+      
       Use the same password for the administrator account.
       Nutze das gleiche Passwort auch für das Administratorkonto.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Wählen Sie ein Root-Passwort, um Ihr Konto zu schützen.
     
     
-      
+      
       Root Password
       Root-Passwort
     
     
-      
+      
       Repeat Root Password
       Root-Passwort wiederholen
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann.
     
diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts
index b9ef0eedc4..33688f9886 100644
--- a/lang/calamares_el.ts
+++ b/lang/calamares_el.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record του %1
     
     
-      
+      
       Boot Partition
       Κατάτμηση εκκίνησης
     
     
-      
+      
       System Partition
       Κατάτμηση συστήματος
     
     
-      
+      
       Do not install a boot loader
       Να μην εγκατασταθεί το πρόγραμμα εκκίνησης
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Εκτελείται η λειτουργία %1.
     
     
-      
+      
       Bad working directory path
       Λανθασμένη διαδρομή καταλόγου εργασίας
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Ο ενεργός κατάλογος %1 για την εργασία python %2 δεν είναι δυνατόν να διαβαστεί.
     
     
-      
+      
       Bad main script file
       Λανθασμένο κύριο αρχείο δέσμης ενεργειών
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Η κύρια δέσμη ενεργειών %1 για την εργασία python %2 δεν είναι δυνατόν να διαβαστεί.
     
     
-      
+      
       Boost.Python error in job "%1".
       Σφάλμα Boost.Python στην εργασία "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Η εγκατάσταση απέτυχε
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Σφάλμα
     
     
-      
-      
+      
+      
       &Yes
       &Ναι
     
     
-      
-      
+      
+      
       &No
       &Όχι
     
     
-      
+      
       &Close
       &Κλείσιμο
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Η αρχικοποίηση του Calamares απέτυχε
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Συνέχεια με την εγκατάσταση;
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Το πρόγραμμα εγκατάστασης %1 θα κάνει αλλαγές στον δίσκο για να εγκαταστήσετε το %2.<br/><strong>Δεν θα είστε σε θέση να αναιρέσετε τις αλλαγές.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Εγκατάσταση τώρα
     
     
-      
+      
       Go &back
       Μετάβαση &πίσω
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Εγκατάσταση
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Η εγκτάσταση ολοκληρώθηκε. Κλείστε το πρόγραμμα εγκατάστασης.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Ακύρωση της εγκατάστασης χωρίς αλλαγές στο σύστημα.
     
     
-      
+      
       &Next
       &Επόμενο
     
     
-      
+      
       &Back
       &Προηγούμενο
     
     
-      
+      
       &Done
       &Ολοκληρώθηκε
     
     
-      
+      
       &Cancel
       &Ακύρωση
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Ακύρωση της εγκατάστασης;
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Θέλετε πραγματικά να ακυρώσετε τη διαδικασία εγκατάστασης;
@@ -467,22 +467,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Άγνωστος τύπος εξαίρεσης
     
     
-      
+      
       unparseable Python error
       Μη αναγνώσιμο σφάλμα Python
     
     
-      
+      
       unparseable Python traceback
       Μη αναγνώσιμη ανίχνευση Python
     
     
-      
+      
       Unfetchable Python error.
       Μη ανακτήσιµο σφάλμα Python.
     
@@ -500,6 +500,24 @@ The installer will quit and all changes will be lost.
       Εφαρμογή εγκατάστασης του %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Η εγκατάσταση απέτυχε να αναβαθμίσει τον πίνακα κατατμήσεων στον δίσκο '%1'.
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ The installer will quit and all changes will be lost.
       Τύπος
     
     
-      
+      
       Select storage de&vice:
       Επιλέξτε συσκευή απ&οθήκευσης:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Τρέχον:
     
     
-      
+      
       After:
       Μετά:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Χειροκίνητη τμηματοποίηση</strong><br/>Μπορείτε να δημιουργήσετε κατατμήσεις ή να αλλάξετε το μέγεθός τους μόνοι σας.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Επιλέξτε ένα διαμέρισμα για σμίκρυνση, και μετά σύρετε το κάτω τμήμα της μπάρας για αλλαγή του μεγέθους</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Τοποθεσία προγράμματος εκκίνησης:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Επιλέξτε διαμέρισμα για την εγκατάσταση</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Πουθενά στο σύστημα δεν μπορεί να ανιχθευθεί μία κατάτμηση EFI. Παρακαλώ επιστρέψτε πίσω και χρησιμοποιήστε τη χειροκίνητη τμηματοποίηση για την εγκατάσταση του %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Η κατάτμηση συστήματος EFI στο %1 θα χρησιμοποιηθεί για την εκκίνηση του %2.
     
     
-      
+      
       EFI system partition:
       Κατάτμηση συστήματος EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Η συσκευή αποθήκευσης δεν φαίνεται να διαθέτει κάποιο λειτουργικό σύστημα. Τί θα ήθελες να κάνεις;<br/>Θα έχεις την δυνατότητα να επιβεβαιώσεις και αναθεωρήσεις τις αλλαγές πριν γίνει οποιαδήποτε αλλαγή στην συσκευή αποθήκευσης.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Διαγραφή του δίσκου</strong><br/>Αυτό θα <font color="red">διαγράψει</font> όλα τα αρχεία στην επιλεγμένη συσκευή αποθήκευσης.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Εγκατάσταση σε επαλληλία</strong><br/>Η εγκατάσταση θα συρρικνώσει μία κατάτμηση για να κάνει χώρο για το %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Αντικατάσταση μίας κατάτμησης</strong><br/>Αντικαθιστά μία κατάτμηση με το %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -694,12 +712,12 @@ The installer will quit and all changes will be lost.
       Καθάρισμα όλων των προσωρινών προσαρτήσεων.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Η λίστα των προσωρινών προσαρτήσεων δεν μπορεί να ληφθεί.
     
     
-      
+      
       Cleared all temporary mounts.
       Καθαρίστηκαν όλες οι προσωρινές προσαρτήσεις.
     
@@ -726,27 +744,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Ορισμός του μοντέλου πληκτρολογίου σε %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Ορισμός της διάταξης πληκτρολογίου σε %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       Η τοπική γλώσσα του συστήματος έχει οριστεί σε %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -870,6 +888,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       Οι κωδικοί πρόσβασης δεν ταιριάζουν!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -910,6 +933,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -972,27 +1005,37 @@ The installer will quit and all changes will be lost.
       Σημαίες:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       Λογική
     
     
-      
+      
       Primary
       Πρωτεύουσα
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1000,43 +1043,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Δημιουργείται νέα %1 κατάτμηση στο %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Η εγκατάσταση απέτυχε να δημιουργήσει μία κατάτμηση στον δίσκο '%1'.
     
@@ -1087,7 +1130,7 @@ The installer will quit and all changes will be lost.
       Δημιουργείται νέα %1 κατάτμηση στο %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Η εγκατάσταση απέτυχε να δημιουργήσει ένα πίνακα κατατμήσεων στο %1.
     
@@ -1326,7 +1369,17 @@ The installer will quit and all changes will be lost.
       Σημαίες:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1363,57 +1416,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Ορισμός πληροφοριών κατάτμησης
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Εγκατάσταση %1 στο <strong>νέο</strong> %2 διαμέρισμα συστήματος.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Εγκατάσταση φορτωτή εκκίνησης στο <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1826,6 +1879,14 @@ The installer will quit and all changes will be lost.
       Τοποθεσία
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2043,29 +2104,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2381,7 +2442,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2562,33 +2623,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       Ελεύθερος χώρος
     
     
       
-      
+      
       New partition
       Νέα κατάτμηση
     
     
-      
+      
       Name
       Όνομα
     
     
-      
+      
       File System
       Σύστημα αρχείων
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Σημείο προσάρτησης
     
     
-      
+      
       Size
       Μέγεθος
     
@@ -2674,117 +2740,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Συλλογή πληροφοριών συστήματος...
     
     
-      
+      
       Partitions
       Κατατμήσεις
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Εγκατάσταση του %1 <strong>παράλληλα με</strong> ένα άλλο λειτουργικό σύστημα στον δίσκο.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Διαγραφή</strong> του δίσκου και εγκατάσταση του %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Αντικατάσταση</strong> μιας κατάτμησης με το %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Χειροκίνητη</strong> τμηματοποίηση.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Εγκατάσταση του %1 <strong>παράλληλα με</strong> ένα άλλο λειτουργικό σύστημα στον δίσκο<strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Διαγραφή</strong> του δίσκου <strong>%2</strong> (%3) και εγκατάσταση του %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Αντικατάσταση</strong> μιας κατάτμησης στον δίσκο <strong>%2</strong> (%3) με το %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Χειροκίνητη</strong> τμηματοποίηση του δίσκου <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Δίσκος <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Τρέχον:
     
     
-      
+      
       After:
       Μετά:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2971,17 +3037,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3239,12 +3305,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Για καλύτερο αποτέλεσμα, παρακαλώ βεβαιωθείτε ότι ο υπολογιστής:
     
     
-      
+      
       System requirements
       Απαιτήσεις συστήματος
     
@@ -3252,27 +3318,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ο υπολογιστής δεν ικανοποιεί τις ελάχιστες απαιτήσεις για την εγκατάσταση του  %1.<br/>Η εγκατάσταση δεν μπορεί να συνεχιστεί. <a href="#details">Λεπτομέριες...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Αυτός ο υπολογιστής δεν ικανοποιεί μερικές από τις συνιστώμενες απαιτήσεις για την εγκατάσταση του %1.<br/>Η εγκατάσταση μπορεί να συνεχιστεί, αλλά ορισμένες λειτουργίες μπορεί να απενεργοποιηθούν.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Το πρόγραμμα θα σας κάνει μερικές ερωτήσεις και θα ρυθμίσει το %2 στον υπολογιστή σας.
     
@@ -3428,7 +3494,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Ο εγκαταστάτης απέτυχε να θέσει τις σημαίες στο διαμέρισμα %1.
     
@@ -3571,12 +3637,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Αυτή είναι μια επισκόπηση του τι θα συμβεί μόλις ξεκινήσετε τη διαδικασία εγκατάστασης.
     
@@ -4116,107 +4182,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       Ποιο είναι το όνομά σας;
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Ποιο όνομα θα θέλατε να χρησιμοποιείτε για σύνδεση;
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Ποιο είναι το όνομά του υπολογιστή;
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Επιλέξτε ένα κωδικό για να διατηρήσετε το λογαριασμό σας ασφαλή.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Χρησιμοποιήστε τον ίδιο κωδικό πρόσβασης για τον λογαριασμό διαχειριστή.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 6c6a8122c1..ad01224f99 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -510,17 +510,17 @@ The installer will quit and all changes will be lost.
     
       
       Set filesystem label on %1.
-      
+      Set filesystem label on %1.
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
     
     
       
       The installer failed to update partition table on disk '%1'.
-      
+      The installer failed to update partition table on disk '%1'.
     
   
   
@@ -896,7 +896,7 @@ The installer will quit and all changes will be lost.
     
       
       OK!
-      
+      OK!
     
     
       
@@ -941,12 +941,12 @@ The installer will quit and all changes will be lost.
     
       
       Package Selection
-      Package Selection
+      Package Selection
     
     
       
       Please pick a product from the list. The selected product will be installed.
-      Please pick a product from the list. The selected product will be installed.
+      Please pick a product from the list. The selected product will be installed.
     
   
   
@@ -1012,12 +1012,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      Label for the filesystem
     
     
       
       FS Label:
-      
+      FS Label:
     
     
       
@@ -1376,12 +1376,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      Label for the filesystem
     
     
       
       FS Label:
-      
+      FS Label:
     
     
       
@@ -1889,7 +1889,7 @@ The installer will quit and all changes will be lost.
     
       
       Quit
-      
+      Quit
     
   
   
@@ -2113,7 +2113,7 @@ The installer will quit and all changes will be lost.
     
       
       Select your preferred Region, or use the default settings.
-      
+      Select your preferred Region, or use the default settings.
     
     
       
@@ -2653,7 +2653,7 @@ The installer will quit and all changes will be lost.
     
       
       File System Label
-      
+      File System Label
     
     
       
@@ -4258,12 +4258,12 @@ Output:
     
       
       Only lowercase letters, numbers, underscore and hyphen are allowed.
-      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
     
     
       
       root is not allowed as username.
-      
+      root is not allowed as username.
     
     
       
@@ -4283,12 +4283,12 @@ Output:
     
       
       Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
     
     
       
       localhost is not allowed as hostname.
-      
+      localhost is not allowed as hostname.
     
     
       
diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts
index 524a8435be..78eed7524b 100644
--- a/lang/calamares_en_GB.ts
+++ b/lang/calamares_en_GB.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record of %1
     
     
-      
+      
       Boot Partition
       Boot Partition
     
     
-      
+      
       System Partition
       System Partition
     
     
-      
+      
       Do not install a boot loader
       Do not install a boot loader
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Running %1 operation.
     
     
-      
+      
       Bad working directory path
       Bad working directory path
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Working directory %1 for python job %2 is not readable.
     
     
-      
+      
       Bad main script file
       Bad main script file
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Main script file %1 for python job %2 is not readable.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python error in job "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Installation Failed
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
+      
       &Yes
       &Yes
     
     
-      
-      
+      
+      
       &No
       &No
     
     
-      
+      
       &Close
       &Close
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Calamares Initialisation Failed
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>The following modules could not be loaded:
     
     
-      
+      
       Continue with setup?
       Continue with setup?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Install now
     
     
-      
+      
       Go &back
       Go &back
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Install
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       The installation is complete. Close the installer.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Cancel installation without changing the system.
     
     
-      
+      
       &Next
       &Next
     
     
-      
+      
       &Back
       &Back
     
     
-      
+      
       &Done
       &Done
     
     
-      
+      
       &Cancel
       &Cancel
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Cancel installation?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Do you really want to cancel the current install process?
@@ -467,22 +467,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Unknown exception type
     
     
-      
+      
       unparseable Python error
       unparseable Python error
     
     
-      
+      
       unparseable Python traceback
       unparseable Python traceback
     
     
-      
+      
       Unfetchable Python error.
       Unfetchable Python error.
     
@@ -500,6 +500,24 @@ The installer will quit and all changes will be lost.
       %1 Installer
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      The installer failed to update partition table on disk '%1'.
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ The installer will quit and all changes will be lost.
       Form
     
     
-      
+      
       Select storage de&vice:
       Select storage de&vice:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Current:
     
     
-      
+      
       After:
       After:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reuse %1 as home partition for %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Boot loader location:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Select a partition to install on</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       The EFI system partition at %1 will be used for starting %2.
     
     
-      
+      
       EFI system partition:
       EFI system partition:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -694,12 +712,12 @@ The installer will quit and all changes will be lost.
       Clearing all temporary mounts.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Cannot get list of temporary mounts.
     
     
-      
+      
       Cleared all temporary mounts.
       Cleared all temporary mounts.
     
@@ -726,27 +744,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Set keyboard model to %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Set keyboard layout to %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       The system language will be set to %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       The numbers and dates locale will be set to %1.
     
@@ -870,6 +888,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       Your passwords do not match!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -910,6 +933,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       The installation of %1 is complete.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -972,27 +1005,37 @@ The installer will quit and all changes will be lost.
       Flags:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       En&crypt
     
     
-      
+      
       Logical
       Logical
     
     
-      
+      
       Primary
       Primary
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Mountpoint already in use. Please select another one.
     
@@ -1000,43 +1043,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Creating new %1 partition on %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       The installer failed to create partition on disk '%1'.
     
@@ -1087,7 +1130,7 @@ The installer will quit and all changes will be lost.
       Creating new %1 partition table on %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       The installer failed to create a partition table on %1.
     
@@ -1326,7 +1369,17 @@ The installer will quit and all changes will be lost.
       Flags:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Mountpoint already in use. Please select another one.
     
@@ -1363,57 +1416,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Set partition information
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Install %1 on <strong>new</strong> %2 system partition.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Install %2 on %3 system partition <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Install boot loader on <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Setting up mount points.
     
@@ -1826,6 +1879,14 @@ The installer will quit and all changes will be lost.
       Location
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2043,29 +2104,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2381,7 +2442,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2562,33 +2623,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       Free Space
     
     
       
-      
+      
       New partition
       New partition
     
     
-      
+      
       Name
       Name
     
     
-      
+      
       File System
       File System
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Mount Point
     
     
-      
+      
       Size
       Size
     
@@ -2674,117 +2740,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Gathering system information...
     
     
-      
+      
       Partitions
       Partitions
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Install %1 <strong>alongside</strong> another operating system.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Erase</strong> disk and install %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Replace</strong> a partition with %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Manual</strong> partitioning.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disk <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Current:
     
     
-      
+      
       After:
       After:
     
     
-      
+      
       No EFI system partition configured
       No EFI system partition configured
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       EFI system partition flag not set
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Boot partition not encrypted
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2974,17 +3040,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3242,12 +3308,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       For best results, please ensure that this computer:
     
     
-      
+      
       System requirements
       System requirements
     
@@ -3255,27 +3321,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       This program will ask you some questions and set up %2 on your computer.
     
@@ -3431,7 +3497,7 @@ Output:
       Setting flags <strong>%1</strong> on new partition.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       The installer failed to set flags on partition %1.
     
@@ -3574,12 +3640,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       This is an overview of what will happen once you start the install procedure.
     
@@ -4119,107 +4185,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       What is your name?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       What name do you want to use to log in?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       What is the name of this computer?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Choose a password to keep your account safe.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Use the same password for the administrator account.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts
index 4db4d9025b..f220c318f9 100644
--- a/lang/calamares_eo.ts
+++ b/lang/calamares_eo.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Ĉefa Ŝargodosiero de %1
     
     
-      
+      
       Boot Partition
       Praŝarga Subdisko
     
     
-      
+      
       System Partition
       Sistema Subdisko
     
     
-      
+      
       Do not install a boot loader
       Ne instalu praŝargilon
     
     
-      
+      
       %1 (%2)
       %1(%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Eraro
     
     
-      
-      
+      
+      
       &Yes
       &Jes
     
     
-      
-      
+      
+      
       &No
       &Ne
     
     
-      
+      
       &Close
       &Fermi
     
     
-      
+      
       Install Log Paste URL
       Retadreso de la alglua servilo
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Alŝuto malsukcesinta. Neniu transpoŝigis al la reto.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +345,123 @@ Link copied to clipboard
 La retadreso estis copiita al vian tondujon.
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       &Aranĝu nun
     
     
-      
+      
       &Install now
       &Instali nun
     
     
-      
+      
       Go &back
       Iru &Reen
     
     
-      
+      
       &Set up
       &Aranĝu
     
     
-      
+      
       &Install
       &Instali
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Nuligi instalado sen ŝanĝante la sistemo.
     
     
-      
+      
       &Next
       &Sekva
     
     
-      
+      
       &Back
       &Reen
     
     
-      
+      
       &Done
       &Finita
     
     
-      
+      
       &Cancel
       &Nuligi
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Nuligi instalado?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Ĉu vi vere volas nuligi la instalan procedon?
@@ -471,22 +471,22 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -504,6 +504,24 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       %1 Instalilo
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -520,149 +538,149 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       Formularo
     
     
-      
+      
       Select storage de&vice:
       Elektita &tenada aparato
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Nune:
     
     
-      
+      
       After:
       Poste:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Allokigo de la Praŝargilo:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -698,12 +716,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -730,27 +748,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -874,6 +892,11 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -914,6 +937,16 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       The installation of %1 is complete.
       La instalaĵo de %1 estas plenumita.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -976,27 +1009,37 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       Flagoj:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Ĉifras
     
     
-      
+      
       Logical
       Logika
     
     
-      
+      
       Primary
       Ĉefa
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Muntopunkto jam utiliĝi. Bonvolu elektu alian.
     
@@ -1004,43 +1047,43 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1091,7 +1134,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1330,7 +1373,17 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       &Flagoj:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Muntopunkto jam utiliĝi. Bonvolu elektu alian.
     
@@ -1367,57 +1420,57 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1830,6 +1883,14 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2047,29 +2108,29 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2385,7 +2446,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2566,33 +2627,38 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2678,117 +2744,117 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       Nune:
     
     
-      
+      
       After:
       Poste:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2975,17 +3041,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3243,12 +3309,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3256,27 +3322,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3432,7 +3498,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3575,12 +3641,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4120,107 +4186,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index 41c37f0117..2844fe699a 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -31,27 +31,27 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record de %1
     
     
-      
+      
       Boot Partition
       Partición de Arranque
     
     
-      
+      
       System Partition
       Partición del Sistema
     
     
-      
+      
       Do not install a boot loader
       No instalar el gestor de arranque
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -206,32 +206,32 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Ejecutando %1 operación.
     
     
-      
+      
       Bad working directory path
       Error en la ruta del directorio de trabajo
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       El directorio de trabajo %1 para el script de python %2 no se puede leer.
     
     
-      
+      
       Bad main script file
       Script principal erróneo
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       El script principal %1 del proceso python %2 no es accesible.
     
     
-      
+      
       Boost.Python error in job "%1".
       Error Boost.Python en el proceso "%1".
     
@@ -286,54 +286,54 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Configuración Fallida
     
     
-      
+      
       Installation Failed
       Error en la Instalación
     
     
-      
+      
       Would you like to paste the install log to the web?
       ¿Desea pegar el registro de instalación en la web?
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
+      
       &Yes
       &Sí
     
     
-      
-      
+      
+      
       &No
       &No
     
     
-      
+      
       &Close
       &Cerrar
     
     
-      
+      
       Install Log Paste URL
       Pegar URL Registro de Instalación
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       La carga no tuvo éxito. No se realizó pegado web.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -342,123 +342,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       La inicialización de Calamares falló
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 no se pudo instalar. Calamares no fue capaz de cargar todos los módulos configurados. Esto es un problema con la forma en que Calamares es usado por la distribución
     
     
-      
+      
       <br/>The following modules could not be loaded:
       Los siguientes módulos no se pudieron cargar:
     
     
-      
+      
       Continue with setup?
       ¿Continuar con la configuración?
     
     
-      
+      
       Continue with installation?
       Continuar con la instalación?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El programa de instalación %1 está a punto de hacer cambios en el disco con el fin de configurar %2.<br/><strong>No podrá deshacer estos cambios.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong>
     
     
-      
+      
       &Set up now
       &Configurar ahora
     
     
-      
+      
       &Install now
       &Instalar ahora
     
     
-      
+      
       Go &back
       Regresar
     
     
-      
+      
       &Set up
       &Instalar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       La instalación se ha completado. Cierre el instalador.
     
     
-      
+      
       The installation is complete. Close the installer.
       La instalación se ha completado. Cierre el instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancelar instalación sin cambiar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar instalación sin cambiar el sistema.
     
     
-      
+      
       &Next
       &Siguiente
     
     
-      
+      
       &Back
       &Atrás 
     
     
-      
+      
       &Done
       &Hecho
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       ¿Cancelar la instalación?
     
     
-      
+      
       Cancel installation?
       ¿Cancelar la instalación?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       ¿Realmente quiere cancelar el proceso de instalación?
@@ -468,22 +468,22 @@ Saldrá del instalador y se perderán todos los cambios.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Excepción desconocida
     
     
-      
+      
       unparseable Python error
       error unparseable Python
     
     
-      
+      
       unparseable Python traceback
       rastreo de Python unparseable
     
     
-      
+      
       Unfetchable Python error.
       Error de Python Unfetchable.
     
@@ -501,6 +501,24 @@ Saldrá del instalador y se perderán todos los cambios.
       %1 Instalador
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      El instalador falló al actualizar la tabla de particiones del disco '%1'.
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ Saldrá del instalador y se perderán todos los cambios.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       Seleccionar dispositivo de almacenamiento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Despues:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionado manual </strong><br/> Usted puede crear o cambiar el tamaño de las particiones usted mismo.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Volver a usar %1 como partición home para %2
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Seleccione una partición para reducir el tamaño, a continuación, arrastre la barra inferior para cambiar el tamaño</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Ubicación del cargador de arranque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Seleccione una partición para instalar en</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       No se puede encontrar una partición de sistema EFI en ningún lugar de este sistema. Por favor, vuelva y use el particionamiento manual para establecer %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partición de sistema EFI en %1 se usará para iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partición del sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento no parece tener un sistema operativo en él. ¿Qué quiere hacer?<br/>Podrá revisar y confirmar sus elecciones antes de que se haga cualquier cambio en el dispositivo de almacenamiento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Borrar disco</strong><br/>Esto <font color="red">borrará</font> todos los datos presentes actualmente en el dispositivo de almacenamiento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar junto al otro SO</strong><br/>El instalador reducirá la partición del SO existente para tener espacio para instalar %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Reemplazar una partición</strong><br/>Reemplazar una partición con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       %1 se encuentra instalado en este dispositivo de almacenamiento. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento parece que ya tiene un sistema operativo instalado en él. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento contiene múltiples sistemas operativos instalados en él. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Sin Swap
     
     
-      
+      
       Reuse Swap
       Reusar Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sin hibernación)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (con hibernación)
     
     
-      
+      
       Swap to file
       Swap a archivo
     
@@ -695,12 +713,12 @@ Saldrá del instalador y se perderán todos los cambios.
       Limpiando todos los puntos de montaje temporales.
     
     
-      
+      
       Cannot get list of temporary mounts.
       No se puede obtener la lista de puntos de montaje temporales.
     
     
-      
+      
       Cleared all temporary mounts.
       Limpiado todos los puntos de montaje temporales.
     
@@ -727,27 +745,27 @@ Saldrá del instalador y se perderán todos los cambios.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Establecer el modelo de teclado a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Configurar la disposición de teclado a %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       El idioma del sistema se establecerá a %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       La localización de números y fechas se establecerá a %1.
     
@@ -871,6 +889,11 @@ Saldrá del instalador y se perderán todos los cambios.
       Your passwords do not match!
       ¡Sus contraseñas no coinciden!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ Saldrá del instalador y se perderán todos los cambios.
       The installation of %1 is complete.
       Se ha completado la instalación de %1.
     
+    
+      
+      Package Selection
+      Selección de paquetes
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ Saldrá del instalador y se perderán todos los cambios.
       Banderas:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Cifrar
     
     
-      
+      
       Logical
       Lógica
     
     
-      
+      
       Primary
       Primaria
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Punto de montaje ya en uso. Por favor, seleccione otro.
     
@@ -1001,43 +1044,43 @@ Saldrá del instalador y se perderán todos los cambios.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Creando nueva %1 partición en %2
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       El instalador fallo al crear la partición en el disco '%1'.
     
@@ -1088,7 +1131,7 @@ Saldrá del instalador y se perderán todos los cambios.
       Creando nueva %1 tabla de particiones en %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       El instalador fallo al crear la tabla de partición en %1.
     
@@ -1327,7 +1370,17 @@ Saldrá del instalador y se perderán todos los cambios.
       Banderas:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Punto de montaje ya en uso. Por favor, seleccione otro.
     
@@ -1364,57 +1417,57 @@ Saldrá del instalador y se perderán todos los cambios.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Establecer la información de la partición
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instalar %1 en <strong>nuevo</strong> %2 partición del sistema.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instalar %2 en %3 partición del sistema <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instalar gestor de arranque en <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Configurando puntos de montaje.
     
@@ -1827,6 +1880,14 @@ Saldrá del instalador y se perderán todos los cambios.
       Ubicación
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2105,29 @@ Saldrá del instalador y se perderán todos los cambios.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2382,7 +2443,7 @@ Saldrá del instalador y se perderán todos los cambios.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paquetes
     
@@ -2563,33 +2624,38 @@ Saldrá del instalador y se perderán todos los cambios.
     PartitionModel
     
       
-      
+      
       Free Space
       Espacio libre
     
     
       
-      
+      
       New partition
       Partición nueva
     
     
-      
+      
       Name
       Nombre
     
     
-      
+      
       File System
       Sistema de archivos
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Punto de montaje
     
     
-      
+      
       Size
       Tamaño
     
@@ -2675,117 +2741,117 @@ Saldrá del instalador y se perderán todos los cambios.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Obteniendo información del sistema...
     
     
-      
+      
       Partitions
       Particiones
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instalar %1 <strong>junto a</strong> otro sistema operativo.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Borrar</strong> disco e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Reemplazar</strong> una partición con %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Particionamiento <strong>manual</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instalar %1 <strong>junto a</strong> otro sistema operativo en disco <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Borrar</strong> disco <strong>%2</strong> (%3) e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Reemplazar</strong> una partición en disco <strong>%2</strong> (%3) con %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Particionamiento <strong>manual</strong> en disco <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disco <strong>%1<strong> (%2)
     
     
-      
+      
       Current:
       Corriente
     
     
-      
+      
       After:
       Despúes:
     
     
-      
+      
       No EFI system partition configured
       No hay una partición del sistema EFI configurada
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       Bandera EFI no establecida en la partición del sistema
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partición de arranque no cifrada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Se estableció una partición de arranque aparte junto con una partición raíz cifrada, pero la partición de arranque no está cifrada.<br/><br/>Hay consideraciones de seguridad con esta clase de instalación, porque los ficheros de sistema importantes se mantienen en una partición no cifrada.<br/>Puede continuar si lo desea, pero el desbloqueo del sistema de ficheros ocurrirá más tarde durante el arranque del sistema.<br/>Para cifrar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Cifrar</strong> en la ventana de creación de la partición.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2975,17 +3041,17 @@ Salida:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       (sin punto de montaje)
     
@@ -3243,12 +3309,12 @@ Salida:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para obtener los mejores resultados, por favor asegúrese que este ordenador:
     
     
-      
+      
       System requirements
       Requisitos del sistema
     
@@ -3256,27 +3322,27 @@ Salida:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Este ordenador no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Este ordenador no cumple alguno de los requisitos recomendados para la instalación %1.<br/>La instalación puede continuar, pero algunas funcionalidades podrían ser deshabilitadas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       El programa le preguntará algunas cuestiones y configurará %2 en su ordenador.
     
@@ -3432,7 +3498,7 @@ Salida:
       Estableciendo indicadores <strong>%1</strong> en una nueva partición.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       El instalador no pudo establecer indicadores en la partición %1.
     
@@ -3575,12 +3641,12 @@ Salida:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Esto es una previsualización de que ocurrirá una vez que empiece la instalación.
     
@@ -4120,107 +4186,127 @@ Salida:
       
     
     
-      
+      
       What is your name?
       Nombre
     
     
-      
+      
       Your Full Name
       Su nombre completo
     
     
-      
+      
       What name do you want to use to log in?
       ¿Qué nombre desea usar para ingresar?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Nombre del equipo
     
     
-      
+      
       Computer Name
       Nombre de computadora
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Elija una contraseña para mantener su cuenta segura.
     
     
-      
+      
       Password
       Contraseña
     
     
-      
+      
       Repeat Password
       Repita la contraseña
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Usar la misma contraseña para la cuenta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts
index 9fef8fcbbb..356da18df7 100644
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record de %1
     
     
-      
+      
       Boot Partition
       Partición de arranque
     
     
-      
+      
       System Partition
       Partición del Sistema
     
     
-      
+      
       Do not install a boot loader
        No instalar el gestor de arranque
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Ejecutando operación %1.
     
     
-      
+      
       Bad working directory path
       Ruta a la carpeta de trabajo errónea
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       La carpeta de trabajo %1 para la tarea de python %2 no es accesible.
     
     
-      
+      
       Bad main script file
       Script principal erróneo
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       El script principal %1 del proceso python %2 no es accesible.
     
     
-      
+      
       Boost.Python error in job "%1".
       Error Boost.Python en el proceso "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Fallo en la configuración.
     
     
-      
+      
       Installation Failed
       Instalación Fallida
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
+      
       &Yes
       &Si
     
     
-      
-      
+      
+      
       &No
       &No
     
     
-      
+      
       &Close
       &Cerrar
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       La inicialización de Calamares ha fallado
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 no pudo ser instalado. Calamares no pudo cargar todos los módulos configurados. Este es un problema con la forma en que Calamares esta siendo usada por la distribución.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Los siguientes módulos no pudieron ser cargados:
     
     
-      
+      
       Continue with setup?
       ¿Continuar con la instalación?
     
     
-      
+      
       Continue with installation?
       ¿Continuar con la instalación?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El  %1 programa de instalación esta a punto de realizar cambios a su disco con el fin de establecer %2.<br/><strong>Usted no podrá deshacer estos cambios.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
        El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong>
     
     
-      
+      
       &Set up now
       &Configurar ahora
     
     
-      
+      
       &Install now
       &Instalar ahora
     
     
-      
+      
       Go &back
       &Regresar
     
     
-      
+      
       &Set up
       &Configurar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       Configuración completa. Cierre el programa de instalación.
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalación completa. Cierre el instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancelar la configuración sin cambiar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar instalación sin cambiar el sistema.
     
     
-      
+      
       &Next
       &Siguiente
     
     
-      
+      
       &Back
       &Atrás 
     
     
-      
+      
       &Done
       &Hecho
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       ¿Cancelar la configuración?
     
     
-      
+      
       Cancel installation?
       ¿Cancelar la instalación?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       ¿Realmente desea cancelar el actual proceso de configuración?
 El programa de instalación se cerrará y todos los cambios se perderán.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       ¿Realmente desea cancelar el proceso de instalación actual?
@@ -468,22 +468,22 @@ El instalador terminará y se perderán todos los cambios.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tipo de excepción desconocida
     
     
-      
+      
       unparseable Python error
       error Python no analizable 
     
     
-      
+      
       unparseable Python traceback
       rastreo de Python no analizable
     
     
-      
+      
       Unfetchable Python error.
       Error de Python inalcanzable.
     
@@ -501,6 +501,24 @@ El instalador terminará y se perderán todos los cambios.
       %1 Instalador
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      El instalador falló al actualizar la tabla de partición en el disco '%1'.
+    
+  
   
     CheckerContainer
     
@@ -517,150 +535,150 @@ El instalador terminará y se perderán todos los cambios.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       Seleccionar dispositivo de almacenamiento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Después:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionado manual </strong><br/> Puede crear o cambiar el tamaño de las particiones usted mismo.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reuse %1 como partición home para %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
        <strong>Seleccione una partición para reducir el tamaño, a continuación, arrastre la barra inferior para redimencinar</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 será reducido a %2MiB y una nueva %3MiB partición se creará para %4.
     
     
-      
+      
       Boot loader location:
       Ubicación del cargador de arranque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
        <strong>Seleccione una partición para instalar</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       No se puede encontrar en el sistema una partición EFI. Por favor vuelva atrás y use el particionamiento manual para configurar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partición EFI en %1 será usada para iniciar %2.
 
     
     
-      
+      
       EFI system partition:
       Partición de sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento parece no tener un sistema operativo en el. ¿que le gustaría hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Borrar disco</strong> <br/>Esto <font color="red">borrará</font> todos los datos presentes actualmente en el dispositivo de almacenamiento seleccionado.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar junto a</strong> <br/>El instalador reducirá una partición con el fin de hacer espacio para %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Reemplazar una partición</strong> <br/>Reemplaza una partición con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento tiene %1 en el. ¿Que le gustaría hacer? <br/>Usted podrá revisar y confirmar sus elecciones antes de que cualquier cambio se realice al dispositivo de almacenamiento.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento ya tiene un sistema operativo en el. ¿Que le gustaría hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento tiene múltiples sistemas operativos en el. ¿Que le gustaria hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Sin Swap
     
     
-      
+      
       Reuse Swap
       Reutilizar Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sin hibernación)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (con hibernación)
     
     
-      
+      
       Swap to file
       Swap a archivo
     
@@ -696,12 +714,12 @@ El instalador terminará y se perderán todos los cambios.
       Despejando todos los puntos de montaje temporales.
     
     
-      
+      
       Cannot get list of temporary mounts.
       No se puede obtener la lista de puntos de montaje temporales.
     
     
-      
+      
       Cleared all temporary mounts.
       Todos los puntos de montaje temporales despejados.
     
@@ -728,27 +746,27 @@ El instalador terminará y se perderán todos los cambios.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Ajustar el modelo de teclado a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Ajustar teclado a %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       El lenguaje del sistema será establecido a %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Los números y datos locales serán establecidos a %1.
     
@@ -872,6 +890,11 @@ El instalador terminará y se perderán todos los cambios.
       Your passwords do not match!
       Las contraseñas no coinciden!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -912,6 +935,16 @@ El instalador terminará y se perderán todos los cambios.
       The installation of %1 is complete.
       La instalación de %1 está completa.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -974,27 +1007,37 @@ El instalador terminará y se perderán todos los cambios.
       Indicadores:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       En&criptar
     
     
-      
+      
       Logical
       Lógica
     
     
-      
+      
       Primary
       Primaria
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Punto de montaje ya esta en uso. Por favor seleccione otro.
     
@@ -1002,43 +1045,43 @@ El instalador terminará y se perderán todos los cambios.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Crear nueva %2MiB partición en %4 (%3) con el sistema de archivos %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Crear nueva<strong>%2MiB</strong> partición en<strong>%2MiB</strong> (%3) con el sistema de archivos <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
        Creando nueva partición %1 en %2
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       El instalador falló en crear la partición en el disco '%1'.
     
@@ -1089,7 +1132,7 @@ El instalador terminará y se perderán todos los cambios.
        Creando nueva tabla de particiones %1 en %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       El instalador falló al crear una tabla de partición en %1.
     
@@ -1328,7 +1371,17 @@ El instalador terminará y se perderán todos los cambios.
       Indicadores:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Punto de montaje ya esta en uso. Por favor seleccione otro.
     
@@ -1365,57 +1418,57 @@ El instalador terminará y se perderán todos los cambios.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Fijar información de la partición. 
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instalar %1 en <strong>nueva</strong> %2 partición de sistema.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instalar %2 en %3 partición del sistema <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instalar el cargador de arranque en <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Configurando puntos de montaje.
     
@@ -1828,6 +1881,14 @@ El instalador terminará y se perderán todos los cambios.
       Ubicación
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2045,29 +2106,29 @@ El instalador terminará y se perderán todos los cambios.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2383,7 +2444,7 @@ El instalador terminará y se perderán todos los cambios.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2564,33 +2625,38 @@ El instalador terminará y se perderán todos los cambios.
     PartitionModel
     
       
-      
+      
       Free Space
       Espacio libre
     
     
       
-      
+      
       New partition
       Partición nueva
     
     
-      
+      
       Name
       Nombre
     
     
-      
+      
       File System
       Sistema de archivos
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Punto de montaje
     
     
-      
+      
       Size
       Tamaño
     
@@ -2676,117 +2742,117 @@ El instalador terminará y se perderán todos los cambios.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Obteniendo información del sistema...
     
     
-      
+      
       Partitions
       Particiones
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
        Instalar %1 <strong>junto con</strong> otro sistema operativo.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
        <strong>Borrar</strong> el disco e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
        <strong>Reemplazar</strong> una parición con %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
        Particionamiento <strong>manual</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
        Instalar %1 <strong>junto con</strong> otro sistema operativo en el disco <strong>%2</strong>(%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Borrar</strong> el disco <strong>%2<strong> (%3) e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
        <strong>Reemplazar</strong> una parición en el disco <strong>%2</strong> (%3) con %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
        Particionar <strong>manualmente</strong> el disco <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disco <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Después:
     
     
-      
+      
       No EFI system partition configured
       Sistema de partición EFI no configurada
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       Indicador de partición del sistema EFI no configurado
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partición de arranque no encriptada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Se creó una partición de arranque separada junto con una partición raíz cifrada, pero la partición de arranque no está encriptada.<br/><br/> Existen problemas de seguridad con este tipo de configuración, ya que los archivos importantes del sistema se guardan en una partición no encriptada. <br/>Puede continuar si lo desea, pero el desbloqueo del sistema de archivos ocurrirá más tarde durante el inicio del sistema. <br/>Para encriptar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Encriptar</strong> en la ventana de creación de la partición.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2976,17 +3042,17 @@ Salida
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3245,12 +3311,12 @@ Salida
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para mejores resultados, por favor verifique que esta computadora:
     
     
-      
+      
       System requirements
       Requisitos de sistema
     
@@ -3258,27 +3324,27 @@ Salida
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
        Este equipo no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
        Este equipo no cumple alguno de los requisitos recomendados para la instalación %1.<br/>La instalación puede continuar, pero algunas funcionalidades podrían ser deshabilitadas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
        El programa le hará algunas preguntas y configurará %2 en su ordenador.
     
@@ -3434,7 +3500,7 @@ Salida
       Establecer indicadores <strong>%1</strong> en nueva partición.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       El instalador no pudo establecer indicadores en la partición %1.
     
@@ -3577,12 +3643,12 @@ Salida
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Esta es una descripción general de lo que sucederá una vez que comience el procedimiento de configuración.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Esto es un resumen de lo que pasará una vez que inicie el procedimiento de instalación.
     
@@ -4122,107 +4188,127 @@ Salida
       
     
     
-      
+      
       What is your name?
       ¿Cuál es su nombre?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       ¿Qué nombre desea usar para acceder al sistema?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       ¿Cuál es el nombre de esta computadora?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Seleccione una contraseña para mantener segura su cuenta.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Usar la misma contraseña para la cuenta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_es_PE.ts b/lang/calamares_es_PE.ts
index aa7bc768c2..ff84d0f62a 100644
--- a/lang/calamares_es_PE.ts
+++ b/lang/calamares_es_PE.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts
index ba29564ec6..f0fbdf6f8b 100644
--- a/lang/calamares_es_PR.ts
+++ b/lang/calamares_es_PR.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Registro de arranque maestro de %1
     
     
-      
+      
       Boot Partition
       Partición de arranque
     
     
-      
+      
       System Partition
       Partición del sistema
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       La ruta del directorio de trabajo es incorrecta
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       El directorio de trabajo %1 para el script de python %2 no se puede leer.
     
     
-      
+      
       Bad main script file
       Script principal erróneo
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       El script principal %1 del proceso python %2 no es accesible.
     
     
-      
+      
       Boost.Python error in job "%1".
       Error Boost.Python en el proceso "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Falló la instalación
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Próximo
     
     
-      
+      
       &Back
       &Atrás
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       Ubicación
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts
index c6dad0a2af..f28d7d8c36 100644
--- a/lang/calamares_et.ts
+++ b/lang/calamares_et.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 Master Boot Record
     
     
-      
+      
       Boot Partition
       Käivituspartitsioon
     
     
-      
+      
       System Partition
       Süsteemipartitsioon
     
     
-      
+      
       Do not install a boot loader
       Ära paigalda käivituslaadurit
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Käivitan %1 tegevust.
     
     
-      
+      
       Bad working directory path
       Halb töökausta tee
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Töökaust %1 python tööle %2 pole loetav.
     
     
-      
+      
       Bad main script file
       Halb põhiskripti fail
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Põhiskripti fail %1 python tööle %2 pole loetav.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python viga töös "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Paigaldamine ebaõnnestus
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Viga
     
     
-      
-      
+      
+      
       &Yes
       &Jah
     
     
-      
-      
+      
+      
       &No
       &Ei
     
     
-      
+      
       &Close
       &Sulge
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Calamarese alglaadimine ebaõnnestus
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ei saa paigaldada. Calamares ei saanud laadida kõiki konfigureeritud mooduleid. See on distributsiooni põhjustatud Calamarese kasutamise viga.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Järgnevaid mooduleid ei saanud laadida:
     
     
-      
+      
       Continue with setup?
       Jätka seadistusega?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 paigaldaja on tegemas muudatusi sinu kettale, et paigaldada %2.<br/><strong>Sa ei saa neid muudatusi tagasi võtta.</strong>
     
     
-      
+      
       &Set up now
       &Seadista kohe
     
     
-      
+      
       &Install now
       &Paigalda kohe
     
     
-      
+      
       Go &back
       Mine &tagasi
     
     
-      
+      
       &Set up
       &Seadista
     
     
-      
+      
       &Install
       &Paigalda
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Paigaldamine on lõpetatud. Sulge paigaldaja.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Tühista paigaldamine ilma süsteemi muutmata.
     
     
-      
+      
       &Next
       &Edasi
     
     
-      
+      
       &Back
       &Tagasi
     
     
-      
+      
       &Done
       &Valmis
     
     
-      
+      
       &Cancel
       &Tühista
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Tühista paigaldamine?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Kas sa tõesti soovid tühistada praeguse paigaldusprotsessi?
@@ -467,22 +467,22 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tundmatu veateade
     
     
-      
+      
       unparseable Python error
       mittetöödeldav Python'i viga
     
     
-      
+      
       unparseable Python traceback
       mittetöödeldav Python'i traceback
     
     
-      
+      
       Unfetchable Python error.
       Kättesaamatu Python'i viga.
     
@@ -500,6 +500,24 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       %1 paigaldaja
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Form
     
     
-      
+      
       Select storage de&vice:
       Vali mäluseade:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Hetkel:
     
     
-      
+      
       After:
       Pärast:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Käsitsi partitsioneerimine</strong><br/>Sa võid ise partitsioone luua või nende suurust muuta. 
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Taaskasuta %1 %2 kodupartitsioonina.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Vali vähendatav partitsioon, seejärel sikuta alumist riba suuruse muutmiseks</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Käivituslaaduri asukoht:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Vali partitsioon, kuhu paigaldada</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI süsteemipartitsiooni ei leitud sellest süsteemist. Palun mine tagasi ja kasuta käsitsi partitsioonimist, et seadistada %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI süsteemipartitsioon asukohas %1 kasutatakse %2 käivitamiseks.
     
     
-      
+      
       EFI system partition:
       EFI süsteemipartitsioon:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Sellel mäluseadmel ei paista olevat operatsioonisüsteemi peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Tühjenda ketas</strong><br/>See <font color="red">kustutab</font> kõik valitud mäluseadmel olevad andmed.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Paigalda kõrvale</strong><br/>Paigaldaja vähendab partitsiooni, et teha ruumi operatsioonisüsteemile %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Asenda partitsioon</strong><br/>Asendab partitsiooni operatsioonisüsteemiga %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Sellel mäluseadmel on peal %1. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Sellel mäluseadmel on juba operatsioonisüsteem peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Sellel mäluseadmel on mitu operatsioonisüsteemi peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -694,12 +712,12 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Tühjendan kõik ajutised monteeringud.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Ajutiste monteeringute nimekirja ei saa hankida.
     
     
-      
+      
       Cleared all temporary mounts.
       Kõik ajutised monteeringud tühjendatud.
     
@@ -726,27 +744,27 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Sea klaviatuurimudeliks %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Sea klaviatuuripaigutuseks %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       Süsteemikeeleks määratakse %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Arvude ja kuupäevade lokaaliks seatakse %1.
     
@@ -870,6 +888,11 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Your passwords do not match!
       Sinu paroolid ei ühti!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -910,6 +933,16 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       The installation of %1 is complete.
       %1 paigaldus on valmis.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -972,27 +1005,37 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Sildid:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Krüpti
     
     
-      
+      
       Logical
       Loogiline
     
     
-      
+      
       Primary
       Peamine
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Monteerimispunkt on juba kasutusel. Palun vali mõni teine.
     
@@ -1000,43 +1043,43 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Loon uut %1 partitsiooni kettal %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Paigaldaja ei suutnud luua partitsiooni kettale "%1".
     
@@ -1087,7 +1130,7 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Loon uut %1 partitsioonitabelit kohta %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Paigaldaja ei suutnud luua partitsioonitabelit kettale %1.
     
@@ -1326,7 +1369,17 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Sildid:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Monteerimispunkt on juba kasutusel. Palun vali mõni teine.
     
@@ -1363,57 +1416,57 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Sea partitsiooni teave
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Paigalda %1 <strong>uude</strong> %2 süsteemipartitsiooni.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Paigalda %2 %3 süsteemipartitsioonile <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Paigalda käivituslaadur kohta <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Seadistan monteerimispunkte.
     
@@ -1826,6 +1879,14 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Asukoht
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2043,29 +2104,29 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2381,7 +2442,7 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2562,33 +2623,38 @@ Paigaldaja sulgub ning kõik muutused kaovad.
     PartitionModel
     
       
-      
+      
       Free Space
       Tühi ruum
     
     
       
-      
+      
       New partition
       Uus partitsioon
     
     
-      
+      
       Name
       Nimi
     
     
-      
+      
       File System
       Failisüsteem
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Monteerimispunkt
     
     
-      
+      
       Size
       Suurus
     
@@ -2674,117 +2740,117 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Hangin süsteemiteavet...
     
     
-      
+      
       Partitions
       Partitsioonid
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Paigalda %1 praeguse operatsioonisüsteemi <strong>kõrvale</strong>
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Tühjenda</strong> ketas ja paigalda %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Asenda</strong> partitsioon operatsioonisüsteemiga %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Käsitsi</strong> partitsioneerimine.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Paigalda %1 teise operatsioonisüsteemi <strong>kõrvale</strong> kettal <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Tühjenda</strong> ketas <strong>%2</strong> (%3) ja paigalda %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Asenda</strong> partitsioon kettal <strong>%2</strong> (%3) operatsioonisüsteemiga %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Käsitsi</strong> partitsioneerimine kettal <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Ketas <strong>%1</strong> (%2).
     
     
-      
+      
       Current:
       Hetkel:
     
     
-      
+      
       After:
       Pärast:
     
     
-      
+      
       No EFI system partition configured
       EFI süsteemipartitsiooni pole seadistatud
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       EFI süsteemipartitsiooni silt pole määratud
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Käivituspartitsioon pole krüptitud
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Eraldi käivituspartitsioon seadistati koos krüptitud juurpartitsiooniga, aga käivituspartitsioon ise ei ole krüptitud.<br/><br/>Selle seadistusega kaasnevad turvaprobleemid, sest tähtsad süsteemifailid hoitakse krüptimata partitsioonil.<br/>Sa võid soovi korral jätkata, aga failisüsteemi lukust lahti tegemine toimub hiljem süsteemi käivitusel.<br/>Et krüpteerida käivituspartisiooni, mine tagasi ja taasloo see, valides <strong>Krüpteeri</strong> partitsiooni loomise aknas.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2974,17 +3040,17 @@ Väljund:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3242,12 +3308,12 @@ Väljund:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Parimate tulemuste jaoks palun veendu, et see arvuti:
     
     
-      
+      
       System requirements
       Süsteeminõudmised
     
@@ -3255,27 +3321,27 @@ Väljund:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       See arvuti ei rahulda %1 paigldamiseks vajalikke minimaaltingimusi.<br/>Paigaldamine ei saa jätkuda. <a href="#details">Detailid...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       See arvuti ei rahulda mõnda %1 paigaldamiseks soovitatud tingimust.<br/>Paigaldamine võib jätkuda, ent mõned funktsioonid võivad olla keelatud.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       See programm küsib sult mõned küsimused ja seadistab %2 sinu arvutisse.
     
@@ -3431,7 +3497,7 @@ Väljund:
       Määran sildid <strong>%1</strong> uuele partitsioonile.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Paigaldaja ei suutnud partitsioonile %1 silte määrata.
     
@@ -3574,12 +3640,12 @@ Väljund:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       See on ülevaade sellest mis juhtub, kui alustad paigaldusprotseduuri.
     
@@ -4119,107 +4185,127 @@ Väljund:
       
     
     
-      
+      
       What is your name?
       Mis on su nimi?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Mis nime soovid sisselogimiseks kasutada?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Mis on selle arvuti nimi?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Vali parool, et hoida oma konto turvalisena.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Kasuta sama parooli administraatorikontole.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts
index f9b6b44e1e..515734b016 100644
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1-(e)n Master Boot Record
     
     
-      
+      
       Boot Partition
       Abio partizioa
     
     
-      
+      
       System Partition
       Sistema-partizioa
     
     
-      
+      
       Do not install a boot loader
       Ez instalatu abio kargatzailerik
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 eragiketa burutzen.
     
     
-      
+      
       Bad working directory path
       Direktorio ibilbide ezegokia
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       %1 lanerako direktorioa %2 python lanak ezin du irakurri.
     
     
-      
+      
       Bad main script file
       Script fitxategi nagusi okerra
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       %1 script fitxategi nagusia ezin da irakurri python %2 lanerako
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python errorea "%1" lanean.
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Instalazioak huts egin du
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Akatsa
     
     
-      
-      
+      
+      
       &Yes
       &Bai
     
     
-      
-      
+      
+      
       &No
       &Ez
     
     
-      
+      
       &Close
       &Itxi
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Calamares instalazioak huts egin du
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ezin da instalatu. Calamares ez da gai konfiguratutako modulu guztiak kargatzeko. Arazao hau banaketak Calamares erabiltzen duen eragatik da.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/> Ondorengo moduluak ezin izan dira kargatu:
     
     
-      
+      
       Continue with setup?
       Ezarpenarekin jarraitu?
     
     
-      
+      
       Continue with installation?
       Instalazioarekin jarraitu?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 instalatzailea zure diskoan aldaketak egitera doa %2 instalatzeko.<br/><strong>Ezingo dituzu desegin aldaketa hauek.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Instalatu orain
     
     
-      
+      
       Go &back
       &Atzera
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Instalatu
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalazioa burutu da. Itxi instalatzailea.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Instalazioa bertan behera utsi da sisteman aldaketarik gabe.
     
     
-      
+      
       &Next
       &Hurrengoa
     
     
-      
+      
       &Back
       &Atzera
     
     
-      
+      
       &Done
       E&ginda
     
     
-      
+      
       &Cancel
       &Utzi
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Bertan behera utzi instalazioa?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Ziur uneko instalazio prozesua bertan behera utzi nahi duzula?
@@ -467,22 +467,22 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Salbuespen-mota ezezaguna
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -500,6 +500,24 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       %1 Instalatzailea
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       Aukeratu &biltegiratze-gailua:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Unekoa: 
     
     
-      
+      
       After:
       Ondoren:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Eskuz partizioak landu</strong><br/>Zure kasa sortu edo tamainaz alda dezakezu partizioak.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Berrerabili %1 home partizio bezala %2rentzat.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Aukeratu partizioa txikitzeko eta gero arrastatu azpiko-barra tamaina aldatzeko</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Abio kargatzaile kokapena:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>aukeratu partizioa instalatzeko</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Ezin da inon aurkitu EFI sistemako partiziorik sistema honetan. Mesedez joan atzera eta erabili eskuz partizioak lantzea %1 ezartzeko.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1eko EFI partizio sistema erabiliko da abiarazteko %2.
     
     
-      
+      
       EFI system partition:
       EFI sistema-partizioa:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Biltegiratze-gailuak badirudi ez duela sistema eragilerik. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Diskoa ezabatu</strong><br/>Honek orain dauden datu guztiak <font color="red">ezabatuko</font> ditu biltegiratze-gailutik.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalatu alboan</strong><br/>Instalatzaileak partizioa txikituko du lekua egiteko %1-(r)i.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ordeztu partizioa</strong><br/>ordezkatu partizioa %1-(e)kin.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Biltegiratze-gailuak %1 dauka. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Biltegiragailu honetan badaude jadanik eragile sistema bat. Zer gustatuko litzaizuke egin?<br/>Biltegiragailuan aldaketarik egin baino lehen zure aukerak aztertu eta konfirmatu ahal izango duzu.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Biltegiragailu honetan badaude jadanik eragile sistema batzuk. Zer gustatuko litzaizuke egin?<br/>Biltegiragailuan aldaketarik egin baino lehen zure aukerak aztertu eta konfirmatu ahal izango duzu.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -694,12 +712,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Garbitzen aldi-baterako muntaketa puntu guztiak.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Ezin izan da aldi-baterako muntaketa puntu guztien zerrenda lortu.
     
     
-      
+      
       Cleared all temporary mounts.
       Garbitu dira aldi-baterako muntaketa puntu guztiak.
     
@@ -726,27 +744,27 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Ezarri teklatu mota %1ra.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Ezarri teklatu diseinua %1%2ra.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       %1 ezarriko da sistemako hizkuntza bezala.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Zenbaki eta daten eskualdea %1-(e)ra ezarri da.
     
@@ -870,6 +888,11 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Your passwords do not match!
       Pasahitzak ez datoz bat!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -910,6 +933,16 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       The installation of %1 is complete.
       %1 instalazioa amaitu da.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -972,27 +1005,37 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Banderak:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       En%kriptatu
     
     
-      
+      
       Logical
       Logikoa
     
     
-      
+      
       Primary
       Primarioa
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Muntatze-puntua erabiltzen. Mesedez aukeratu beste bat.
     
@@ -1000,43 +1043,43 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %1 partizioa berria sortzen %2n.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Huts egin du instalatzaileak '%1' diskoan partizioa sortzen.
     
@@ -1087,7 +1130,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       %1 partizio taula berria %2n sortzen.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Huts egin du instalatzaileak '%1' diskoan partizioa taula sortzen.
     
@@ -1326,7 +1369,17 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Banderak:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Muntatze-puntua erabiltzen. Mesedez aukeratu beste bat.
     
@@ -1363,57 +1416,57 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Ezarri partizioaren informazioa
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instalatu %1 sistemako %2 partizio <strong>berrian</strong>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instalatu abio kargatzailea <strong>%1</strong>-(e)n.
     
     
-      
+      
       Setting up mount points.
       Muntatze puntuak ezartzen.
     
@@ -1826,6 +1879,14 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Kokapena
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2043,29 +2104,29 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2381,7 +2442,7 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2562,33 +2623,38 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
     PartitionModel
     
       
-      
+      
       Free Space
       Espazio librea
     
     
       
-      
+      
       New partition
       Partizio berria
     
     
-      
+      
       Name
       Izena
     
     
-      
+      
       File System
       Fitxategi Sistema
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Muntatze Puntua
     
     
-      
+      
       Size
       Tamaina
     
@@ -2674,117 +2740,117 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sistemaren informazioa eskuratzen...
     
     
-      
+      
       Partitions
       Partizioak
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       Unekoa: 
     
     
-      
+      
       After:
       Ondoren:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2973,17 +3039,17 @@ Irteera:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3241,12 +3307,12 @@ Irteera:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Emaitza egokienak lortzeko, ziurtatu ordenagailu honek baduela:
     
     
-      
+      
       System requirements
       Sistemaren betebeharrak
     
@@ -3254,27 +3320,27 @@ Irteera:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Konputagailu honek ez dauzka gutxieneko eskakizunak %1 instalatzeko. <br/>Instalazioak ezin du jarraitu. <a href="#details">Xehetasunak...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Konputagailu honek ez du betetzen gomendatutako zenbait eskakizun %1 instalatzeko. <br/>Instalazioak jarraitu ahal du, baina zenbait ezaugarri desgaituko dira.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Konputagailuan %2 ezartzeko programa honek hainbat galdera egingo dizkizu.
     
@@ -3430,7 +3496,7 @@ Irteera:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3573,12 +3639,12 @@ Irteera:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4118,107 +4184,127 @@ Irteera:
       
     
     
-      
+      
       What is your name?
       Zein da zure izena?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Zein izen erabili nahi duzu saioa hastean?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Zein da ordenagailu honen izena?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Aukeratu pasahitza zure kontua babesteko.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Erabili pasahitz bera administratzaile kontuan.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts
index ec0753b7f2..af3116735b 100644
--- a/lang/calamares_fa.ts
+++ b/lang/calamares_fa.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       رکورد راه اندازی اصلی %1
     
     
-      
+      
       Boot Partition
       افراز راه‌اندازی
     
     
-      
+      
       System Partition
       افراز سامانه‌ای
     
     
-      
+      
       Do not install a boot loader
       نصب نکردن یک بارکنندهٔ راه‌اندازی
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       اجرا عملیات %1
     
     
-      
+      
       Bad working directory path
       مسیر شاخهٔ جاری بد
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       شاخهٔ کاری %1 برای کار پایتونی %2 خواندنی نیست
     
     
-      
+      
       Bad main script file
       پروندهٔ کدنوشتهٔ اصلی بد
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       پروندهٔ کدنویسهٔ اصلی %1 برای کار پایتونی %2 قابل خواندن نیست.
     
     
-      
+      
       Boost.Python error in job "%1".
       خطای Boost.Python در کار %1.
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       راه‌اندازی شکست خورد.
     
     
-      
+      
       Installation Failed
       نصب شکست خورد
     
     
-      
+      
       Would you like to paste the install log to the web?
       آیا مایلید که گزارش‌ها در وب الصاق شوند؟
     
     
-      
+      
       Error
       خطا
     
     
-      
-      
+      
+      
       &Yes
       &بله
     
     
-      
-      
+      
+      
       &No
       &خیر
     
     
-      
+      
       &Close
       &بسته
     
     
-      
+      
       Install Log Paste URL
       Install Log Paste URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       The upload was unsuccessful. No web-paste was done.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       راه اندازی کالاماریس شکست خورد.
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 نمی‌تواند نصب شود. کالاماریس نمی‌تواند همه ماژول‌های پیکربندی را بالا بیاورد. این یک مشکل در نحوه استفاده کالاماریس توسط توزیع است.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>این ماژول  نمی‌تواند بالا بیاید:
     
     
-      
+      
       Continue with setup?
       ادامهٔ برپایی؟
     
     
-      
+      
       Continue with installation?
       نصب ادامه یابد؟
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       برنامه نصب %1 در شرف ایجاد تغییرات در دیسک شما به منظور راه‌اندازی %2 است. <br/><strong>شما قادر نخواهید بود تا این تغییرات را برگردانید.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       نصب‌کنندهٔ %1 می‌خواهد برای نصب %2 تغییراتی در دیسکتان بدهد. <br/><strong>نخواهید توانست این تغییرات را برگردانید.</strong>
     
     
-      
+      
       &Set up now
       &همین حالا راه‌انداری کنید
     
     
-      
+      
       &Install now
       &اکنون نصب شود
     
     
-      
+      
       Go &back
       &بازگشت
     
     
-      
+      
       &Set up
       &راه‌اندازی
     
     
-      
+      
       &Install
       &نصب
     
     
-      
+      
       Setup is complete. Close the setup program.
       نصب انجام شد. برنامه نصب را ببندید.
     
     
-      
+      
       The installation is complete. Close the installer.
       نصب انجام شد. نصاب را ببندید.
     
     
-      
+      
       Cancel setup without changing the system.
       لغو راه‌اندازی بدون تغییر سیستم.
     
     
-      
+      
       Cancel installation without changing the system.
       لغو نصب بدون تغییر کردن سیستم.
     
     
-      
+      
       &Next
       &بعدی
     
     
-      
+      
       &Back
       &پیشین
     
     
-      
+      
       &Done
       &انجام شد
     
     
-      
+      
       &Cancel
       &لغو
     
     
-      
+      
       Cancel setup?
       لغو راه‌اندازی؟
     
     
-      
+      
       Cancel installation?
       لغو نصب؟
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       آیا واقعا می‌خواهید روند راه‌اندازی فعلی رو لغو کنید؟
 برنامه راه اندازی ترک می شود و همه تغییرات از بین می روند.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       واقعاً می خواهید فرایند نصب فعلی را لغو کنید؟
@@ -468,22 +468,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       گونهٔ استثنای ناشناخته
     
     
-      
+      
       unparseable Python error
       خطای پایتونی غیرقابل تجزیه
     
     
-      
+      
       unparseable Python traceback
       ردیابی پایتونی غیرقابل تجزیه
     
     
-      
+      
       Unfetchable Python error.
       خطای پایتونی غیرقابل دریافت.
     
@@ -501,6 +501,24 @@ The installer will quit and all changes will be lost.
       نصب‌کنندهٔ %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ The installer will quit and all changes will be lost.
       فرم
     
     
-      
+      
       Select storage de&vice:
       انتخاب &دستگاه ذخیره‌سازی:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       فعلی:
     
     
-      
+      
       After:
       بعد از:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       شما می توانید پارتیشن بندی دستی ایجاد یا تغییر اندازه دهید .
     
     
-      
+      
       Reuse %1 as home partition for %2.
       استفاده مجدد از %1 به عنوان پارتیشن خانه برای %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>انتخاب یک پارتیشن برای کوجک کردن و ایجاد پارتیشن جدید از آن، سپس نوار دکمه را بکشید تا تغییر اندازه دهد</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 تغییر سایز خواهد داد به %2 مبی‌بایت و یک پارتیشن %3 مبی‌بایتی برای %4 ساخته خواهد شد.
     
     
-      
+      
       Boot loader location:
       مکان بالاآورنده بوت:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>یک پارتیشن را برای نصب بر روی آن، انتخاب کنید</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       پارتیشن سیستم ای.اف.آی نمی‌تواند در هیچ جایی از این سیستم یافت شود. لطفا برگردید و از پارتیشن بندی دستی استفاده کنید تا %1 را راه‌اندازی کنید.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       پارتیشن سیستم ای.اف.آی در %1 برای شروع %2 استفاده خواهد شد.
     
     
-      
+      
       EFI system partition:
       پارتیشن سیستم ای.اف.آی
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       به نظر می‌رسد در دستگاه ذخیره‌سازی هیچ سیستم‌عاملی وجود ندارد. تمایل به انجام چه کاری دارید؟<br/>شما می‌توانید انتخاب‌هایتان را قبل از اعمال هر تغییری در دستگاه ذخیره‌سازی، مرور و تأیید نمایید.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>پاک کردن دیسک</strong><br/>این کار تمام داده‌های موجود بر روی دستگاه ذخیره‌سازی انتخاب شده را <font color="red">حذف می‌کند</font>.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>نصب در امتداد</strong><br/>این نصاب از یک پارتیشن برای ساخت یک اتاق برای %1 استفاده می‌کند.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>جایگزینی یک افراز</strong><br/>افرازی را با %1 جایگزین می‌کند.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       این دستگاه ذخیره سازی٪ 1 روی خود دارد. دوست دارید چه کاری انجام دهید؟ قبل از اینکه تغییری در دستگاه ذخیره ایجاد شود ، می توانید انتخاب های خود را بررسی و تأیید کنید.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       این دستگاه ذخیره سازی از قبل یک سیستم عامل روی خود دارد. دوست دارید چه کاری انجام دهید؟ قبل از اینکه تغییری در دستگاه ذخیره ایجاد شود ، می توانید انتخاب های خود را بررسی و تأیید کنید.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       این دستگاه ذخیره سازی دارای چندین سیستم عامل است. دوست دارید چه کاری انجام دهید؟ قبل از اینکه تغییری در دستگاه ذخیره ایجاد شود ، می توانید انتخاب های خود را بررسی و تأیید کنید.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       بدون Swap
     
     
-      
+      
       Reuse Swap
       باز استفاده از مبادله
     
     
-      
+      
       Swap (no Hibernate)
       مبادله (بدون خواب‌زمستانی)
     
     
-      
+      
       Swap (with Hibernate)
       مبادله (با خواب‌زمستانی)
     
     
-      
+      
       Swap to file
       مبادله به پرونده
     
@@ -695,12 +713,12 @@ The installer will quit and all changes will be lost.
       در حال پاک‌سازی همهٔ اتّصال‌های موقّتی.
     
     
-      
+      
       Cannot get list of temporary mounts.
       نمی‌توان فهرست اتّصال‌های موقّتی را گرفت.
     
     
-      
+      
       Cleared all temporary mounts.
       همهٔ اتّصال‌های موقّتی پاک‌سازی شدند.
     
@@ -727,27 +745,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       تنظیم مدل صفحه‌کلید به %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       تنظیم چینش صفحه‌کلید به %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       منطقه زمانی را تنظیم کنید 1%
     
     
-      
+      
       The system language will be set to %1.
       زبان سامانه به %1 تنظیم خواهد شد.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       محلی و اعداد و تاریخ ها روی٪ 1 تنظیم می شوند.
     
@@ -871,6 +889,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       گذرواژه‌هایتان مطابق نیستند!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       نصب %1 کامل شد.
     
+    
+      
+      Package Selection
+      گزینش بسته‌ها
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      لطفاً محصولی را از لیست انتخاب کنید. محصول انتخاب شده نصب خواهد شد.
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ The installer will quit and all changes will be lost.
       پرچم‌ها:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       رمز&نگاری
     
     
-      
+      
       Logical
       منطقی
     
     
-      
+      
       Primary
       اصلی
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       نقطهٔ اتّصال از پیش در حال استفاده است. لطفاً نقطهٔ دیگری برگزینید.
     
@@ -1001,43 +1044,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       ایچاد افراز %2می‌ب جدید روی %4 (%3) با سامانهٔ پروندهٔ %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       ایچاد افراز <strong>%2می‌ب</strong> جدید روی <strong>%</strong>4 (%3) با سامانهٔ پروندهٔ <strong>%</strong>1.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       در حال ایجاد افراز %1 جدید روی %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1088,7 +1131,7 @@ The installer will quit and all changes will be lost.
       در حال ایجاد جدول افراز %1 جدید روی %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1327,7 +1370,17 @@ The installer will quit and all changes will be lost.
       پرچم‌ها:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       نقطهٔ اتّصال از پیش در حال استفاده است. لطفاً نقطهٔ دیگری برگزینید.
     
@@ -1364,57 +1417,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       تنظیم اطّلاعات افراز
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       برپایی نقطه‌های اتّصال
     
@@ -1827,6 +1880,14 @@ The installer will quit and all changes will be lost.
       موقعیت
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2105,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      منطقه مورد نظر خود را انتخاب کنید یا از منطقه پیش فرض بر اساس مکان فعلی خود استفاده کنید.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       منطقه مورد نظر خود را در منطقه خود انتخاب کنید.
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2382,7 +2443,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       بسته‌ها
     
@@ -2563,33 +2624,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       فضای آزاد
     
     
       
-      
+      
       New partition
       افراز جدید
     
     
-      
+      
       Name
       نام
     
     
-      
+      
       File System
       سامانهٔ پرونده
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       نقطهٔ اتّصال
     
     
-      
+      
       Size
       اندازه
     
@@ -2675,117 +2741,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       جمع‌آوری اطّلاعات سامانه…
     
     
-      
+      
       Partitions
       افرازها
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       نصب %1 <strong>در امتداد</strong> سیستم عامل دیگر.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>پاک کردن</strong> دیسک و نصب %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>جایگزینی</strong> یک پارتیشن و با %1
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>پارتیشن‌بندی</strong> دستی.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       دیسک <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       فعلی:
     
     
-      
+      
       After:
       بعد از:
     
     
-      
+      
       No EFI system partition configured
       هیچ پارتیشن سیستم EFI پیکربندی نشده است
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       برای راه اندازی پارتیشن سیستم EFI لازم است. برای پیکربندی یک پارتیشن سیستم EFI ، به عقب برگردید و یک سیستم فایل FAT32 را با پرچم٪ 3 فعال کنید و نقطه نصب را نصب کنید. 2. بدون تنظیم پارتیشن سیستم EFI می توانید ادامه دهید اما ممکن است سیستم شما از کار بیفتد.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       پرچم پارتیشن سیستم EFI تنظیم نشده است
     
     
-      
+      
       Option to use GPT on BIOS
       گزینه ای برای استفاده از GPT در BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       جدول پارتیشن GPT بهترین گزینه برای همه سیستم ها است. این نصب از چنین تنظیماتی برای سیستم های BIOS نیز پشتیبانی می کند. برای پیکربندی جدول پارتیشن GPT در BIOS ، (اگر قبلاً این کار انجام نشده است) برگردید و جدول پارتیشن را روی GPT تنظیم کنید ، سپس یک پارتیشن 8 مگابایتی بدون فرمت با پرچم bios_grub ایجاد کنید. برای راه اندازی٪ 1 سیستم BIOS با GPT ، یک پارتیشن 8 مگابایتی بدون قالب لازم است.
     
     
-      
+      
       Boot partition not encrypted
       پارتیشن بوت رمزشده نیست
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       یک پارتیشن بوت جداگانه همراه با یک پارتیشن ریشه ای رمزگذاری شده راه اندازی شده است ، اما پارتیشن بوت رمزگذاری نشده است. با این نوع تنظیمات مشکلات امنیتی وجود دارد ، زیرا پرونده های مهم سیستم در یک پارتیشن رمزگذاری نشده نگهداری می شوند. در صورت تمایل می توانید ادامه دهید ، اما باز کردن قفل سیستم فایل بعداً در هنگام راه اندازی سیستم اتفاق می افتد. برای رمزگذاری پارتیشن بوت ، به عقب برگردید و آن را دوباره ایجاد کنید ، رمزگذاری را در پنجره ایجاد پارتیشن انتخاب کنید.
     
     
-      
+      
       has at least one disk device available.
       حداقل یک دستگاه دیسک در دسترس دارد.
     
     
-      
+      
       There are no partitions to install on.
       هیچ پارتیشنی برای نصب وجود ندارد
     
@@ -2972,17 +3038,17 @@ Output:
       
     
     
-      
+      
       No product
       بدون محصول
     
     
-      
+      
       No description provided.
       هیچ توضیحی وجود ندارد.
     
     
-      
+      
       (no mount point)
       (بدون نقطهٔ اتّصال)
     
@@ -3240,12 +3306,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       برای بهترین نتیجه ، لطفا اطمینان حاصل کنید که این کامپیوتر:
     
     
-      
+      
       System requirements
       نیازمندی‌های سامانه
     
@@ -3253,27 +3319,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       رایانه کمینهٔ نیازمندی‌های برپاسازی %1 را ندارد.<br/>برپاسازی نمی‌تواند ادامه یابد. <a href="#details">جزییات…</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       رایانه کمینهٔ نیازمندی‌های نصب %1 را ندارد.<br/>نصب نمی‌تواند ادامه یابد. <a href="#details">جزییات…</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       رایانه کمینهٔ نیازمندی‌های برپاسازی %1 را ندارد.<br/>برپاسازی می‌تواند ادامه یابد، ولی ممکن است برخی ویژگی‌ها از کار افتاده باشند.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       رایانه کمینهٔ نیازمندی‌های نصب %1 را ندارد.<br/>نصب می‌تواند ادامه یابد، ولی ممکن است برخی ویژگی‌ها از کار افتاده باشند.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       این برنامه تعدادی سوال از شما پرسیده و %2 را روی رایانه‌تان برپا می‌کند.
     
@@ -3429,7 +3495,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3572,12 +3638,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4118,107 +4184,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       نامتان چیست؟
     
     
-      
+      
       Your Full Name
       نام کاملتان
     
     
-      
+      
       What name do you want to use to log in?
       برای ورود می خواهید از چه نامی استفاده کنید؟
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      فقط حروف کوچک ، اعداد ، زیر خط و خط خط مجاز است.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       نام این رایانه چیست؟
     
     
-      
+      
       Computer Name
       نام رایانه
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       برای امن نگه داشتن حسابتان، گذرواژه‌ای برگزینید.
     
     
-      
+      
       Password
       گذرواژه
     
     
-      
+      
       Repeat Password
       تکرار TextLabel
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       رمز ورود یکسان را دو بار وارد کنید ، تا بتوان آن را از نظر اشتباه تایپ بررسی کرد. یک رمز ورود خوب شامل ترکیبی از حروف ، اعداد و علائم نگارشی است ، باید حداقل هشت حرف داشته باشد و باید در فواصل منظم تغییر یابد.
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       وقتی این کادر علامت گذاری شد ، بررسی قدرت رمز عبور انجام می شود و دیگر نمی توانید از رمز عبور ضعیف استفاده کنید.
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       استفاده از گذرواژهٔ یکسان برای حساب مدیر.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts
index 4045f5247e..ef626b2bce 100644
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1:n MBR
     
     
-      
+      
       Boot Partition
       Käynnistysosio
     
     
-      
+      
       System Partition
       Järjestelmäosio
     
     
-      
+      
       Do not install a boot loader
       Älä asenna käynnistyslatainta
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Suoritetaan %1 toimenpidettä.
     
     
-      
+      
       Bad working directory path
       Virheellinen työkansion polku
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Työkansio %1 pythonin työlle %2 ei ole luettavissa.
     
     
-      
+      
       Bad main script file
       Virheellinen komentosarjan tiedosto
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Komentosarjan tiedosto %1 python työlle %2 ei ole luettavissa.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python virhe työlle "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Asennus epäonnistui
     
     
-      
+      
       Installation Failed
       Asentaminen epäonnistui
     
     
-      
+      
       Would you like to paste the install log to the web?
       Haluatko liittää asennuslokin verkkoon?
     
     
-      
+      
       Error
       Virhe
     
     
-      
-      
+      
+      
       &Yes
       &Kyllä
     
     
-      
-      
+      
+      
       &No
       &Ei
     
     
-      
+      
       &Close
       &Sulje
     
     
-      
+      
       Install Log Paste URL
       Asenna lokiliitoksen URL-osoite
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Lähettäminen epäonnistui. Verkko-liittämistä ei tehty.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 Linkki kopioitu leikepöydälle
     
     
-      
+      
       Calamares Initialization Failed
       Calamaresin alustaminen epäonnistui
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ei voi asentaa. Calamares ei voinut ladata kaikkia määritettyjä moduuleja. Ongelma on siinä, miten jakelu käyttää Calamaresia.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Seuraavia moduuleja ei voitu ladata:
     
     
-      
+      
       Continue with setup?
       Jatketaanko asennusta?
     
     
-      
+      
       Continue with installation?
       Jatka asennusta?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 asennusohjelma on aikeissa tehdä muutoksia levylle, jotta voit määrittää kohteen %2.<br/><strong>Et voi kumota näitä muutoksia.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Asennus ohjelman %1 on tehtävä muutoksia levylle, jotta %2 voidaan asentaa.<br/><strong>Et voi kumota näitä muutoksia.</strong>
     
     
-      
+      
       &Set up now
       &Määritä nyt
     
     
-      
+      
       &Install now
       &Asenna nyt
     
     
-      
+      
       Go &back
       Mene &takaisin
     
     
-      
+      
       &Set up
       &Määritä
     
     
-      
+      
       &Install
       &Asenna
     
     
-      
+      
       Setup is complete. Close the setup program.
       Asennus on valmis. Sulje asennusohjelma.
     
     
-      
+      
       The installation is complete. Close the installer.
       Asennus on valmis. Sulje asennusohjelma.
     
     
-      
+      
       Cancel setup without changing the system.
       Peruuta asennus muuttamatta järjestelmää.
     
     
-      
+      
       Cancel installation without changing the system.
       Peruuta asennus tekemättä muutoksia järjestelmään.
     
     
-      
+      
       &Next
       &Seuraava
     
     
-      
+      
       &Back
       &Takaisin
     
     
-      
+      
       &Done
       &Valmis
     
     
-      
+      
       &Cancel
       &Peruuta
     
     
-      
+      
       Cancel setup?
       Peruuta asennus?
     
     
-      
+      
       Cancel installation?
       Peruuta asennus?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Haluatko todella peruuttaa nykyisen asennuksen?
 Asennusohjelma lopetetaan ja kaikki muutokset menetetään.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Oletko varma että haluat peruuttaa käynnissä olevan asennusprosessin? 
@@ -472,22 +472,22 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tuntematon poikkeustyyppi
     
     
-      
+      
       unparseable Python error
       jäsentämätön Python virhe
     
     
-      
+      
       unparseable Python traceback
       jäsentämätön Python jäljitys
     
     
-      
+      
       Unfetchable Python error.
       Python virhettä ei voitu hakea.
     
@@ -505,6 +505,24 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
       %1 asentaja
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Asennusohjelman epäonnistui päivittää osio levyllä '%1'.
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
       Lomake
     
     
-      
+      
       Select storage de&vice:
       Valitse tallennus&laite:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Nykyinen:
     
     
-      
+      
       After:
       Jälkeen:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuaalinen osiointi </strong><br/>Voit luoda tai muuttaa osioita itse.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Käytä %1 uudelleen kotiosiona kohteelle %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Valitse supistettava osio ja säädä alarivillä kokoa vetämällä</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 supistetaan %2Mib:iin ja uusi %3MiB-osio luodaan kohteelle %4.
     
     
-      
+      
       Boot loader location:
       Käynnistyksen lataajan sijainti:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Valitse asennettava osio</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Järjestelmäosiota EFI ei löydy tästä järjestelmästä. Siirry takaisin ja käytä manuaalista osiointia, kun haluat määrittää %1
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Järjestelmäosiota EFI %1 käytetään %2 käynnistämiseen.
     
     
-      
+      
       EFI system partition:
       EFI järjestelmän osio:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tällä tallennuslaitteella ei näytä olevan käyttöjärjestelmää. Mitä haluat tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi ennen kuin tallennuslaitteeseen tehdään muutoksia.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Tyhjennä levy</strong><br/>Tämä <font color="red">poistaa</font> kaikki tiedot valitussa tallennuslaitteessa.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Asenna nykyisen rinnalle</strong><br/>Asennusohjelma supistaa osiota tehdäkseen tilaa kohteelle %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Osion korvaaminen</strong><br/>korvaa osion %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tässä tallennuslaitteessa on %1 dataa. Mitä haluat tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi ennen kuin tallennuslaitteeseen tehdään muutoksia.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tämä tallennuslaite sisältää jo käyttöjärjestelmän. Mitä haluaisit tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi, ennen kuin tallennuslaitteeseen tehdään muutoksia.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tämä tallennuslaite sisältää jo useita käyttöjärjestelmiä. Mitä haluaisit tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi, ennen kuin tallennuslaitteeseen tehdään muutoksia.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Tällä kiintolevyllä on jo käyttöjärjestelmä, mutta osiotaulukko <strong>%1</strong> on erilainen kuin tarvittava <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Tähän kiintolevyyn on <strong>kiinnitetty</strong> yksi osioista.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Tämä kiintolevy on osa <strong>passiivista RAID</strong> kokoonpanoa.
     
     
-      
+      
       No Swap
       Swap ei
     
     
-      
+      
       Reuse Swap
       Swap käytä uudellen
     
     
-      
+      
       Swap (no Hibernate)
       Swap (ei lepotilaa)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (lepotilan kanssa)
     
     
-      
+      
       Swap to file
       Swap tiedostona
     
@@ -699,12 +717,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
       Kaikki tilapäiset kiinnitykset tyhjennetään.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Väliaikaisten liitosten luetteloa ei voi hakea.
     
     
-      
+      
       Cleared all temporary mounts.
       Poistettu kaikki väliaikaiset liitokset.
     
@@ -731,27 +749,27 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Aseta näppäimiston malli %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Aseta näppäimiston asetelmaksi %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Aseta aikavyöhykkeeksi %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       Järjestelmän kielen asetuksena on %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Numerot ja päivämäärät, paikallinen asetus on %1.
     
@@ -876,6 +894,11 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Your passwords do not match!
       Salasanasi eivät täsmää!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -916,6 +939,16 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.The installation of %1 is complete.
       Asennus %1 on valmis.
     
+    
+      
+      Package Selection
+      Paketin valinta
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Ole hyvä ja valitse tuote luettelosta. Valittu tuote asennetaan.
+    
   
   
     ContextualProcessJob
@@ -978,27 +1011,37 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Liput:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Sa&laa
     
     
-      
+      
       Logical
       Looginen
     
     
-      
+      
       Primary
       Ensisijainen
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Asennuskohde on jo käytössä. Valitse toinen.
     
@@ -1006,43 +1049,43 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Luo uusi %1MiB osio kohteeseen %3 (%2), jossa on %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Luo uusi %1MiB osio kohteeseen %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Luo uusi %2Mib-osio %4 (%3) tiedostojärjestelmällä %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Luo uusi <strong>%1MiB</strong> osio kohteeseen <strong>%3</strong> (%2) jossa on <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Luo uusi <strong>%1MiB</strong> osio kohteeseen <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Luo uusi <strong>%2Mib</strong> osio <strong>%4</strong> (%3) tiedostojärjestelmällä <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Luodaan uutta %1-osiota kohteessa %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Asennusohjelma epäonnistui osion luonnissa levylle '%1'.
     
@@ -1093,7 +1136,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Luodaan uutta %1 osiotaulukkoa kohteelle %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Asennusohjelma epäonnistui osiotaulukon luonnissa kohteeseen %1.
     
@@ -1332,7 +1375,17 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Liput:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Asennuskohde on jo käytössä. Valitse toinen.
     
@@ -1369,57 +1422,57 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Aseta osion tiedot
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Asenna %1  <strong>uusi</strong> %2 järjestelmäosio ominaisuuksilla <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Asenna %1 <strong>uusi</strong> %2 järjestelmä osio.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Määritä <strong>uusi</strong> %2 osio liitospisteellä <strong>%1</strong> ja ominaisuuksilla <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Määritä <strong>uusi</strong> %2 osio liitospisteellä <strong>%1</strong>%3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Asenna %2 - %3 järjestelmäosio <strong>%1</strong> ominaisuuksilla <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Määritä %3 osio <strong>%1</strong> liitospisteellä <strong>%2</strong> ja ominaisuuksilla <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Määritä %3 osio <strong>%1</strong> liitospisteellä <strong>%2</strong>%4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Asenna %2 - %3 -järjestelmän osioon <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Asenna käynnistyslatain <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Liitosten määrittäminen.
     
@@ -1832,6 +1885,14 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Sijainti
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2051,29 +2112,29 @@ hiiren vieritystä skaalaamiseen.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Valitse alue tai käytä aluetta nykyisen sijaintisi perusteella.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Aikavyöhyke: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Valitse haluamasi alue alueesi sisällä.
     
     
-      
+      
       Zones
       Vyöhykkeet
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Voit hienosäätää kieli- ja kieliasetuksia alla.
     
@@ -2389,7 +2450,7 @@ hiiren vieritystä skaalaamiseen.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paketit
     
@@ -2570,33 +2631,38 @@ hiiren vieritystä skaalaamiseen.
     PartitionModel
     
       
-      
+      
       Free Space
       Vapaa tila
     
     
       
-      
+      
       New partition
       Uusi osiointi
     
     
-      
+      
       Name
       Nimi
     
     
-      
+      
       File System
       Tiedostojärjestelmä
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Liitoskohta
     
     
-      
+      
       Size
       Koko
     
@@ -2682,117 +2748,117 @@ hiiren vieritystä skaalaamiseen.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Kerätään järjestelmän tietoja...
     
     
-      
+      
       Partitions
       Osiot
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Asenna toisen käyttöjärjestelmän %1 <strong>rinnalle</strong>.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Tyhjennä</strong> levy ja asenna %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Vaihda</strong> osio jolla on %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Manuaalinen</strong> osointi.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Asenna toisen käyttöjärjestelmän %1 <strong>rinnalle</strong> levylle <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Tyhjennä</strong> levy <strong>%2</strong> (%3) ja asenna %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Korvaa</strong> levyn osio <strong>%2</strong> (%3) jolla on %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Manuaalinen</strong> osiointi levyllä <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Levy <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Nykyinen:
     
     
-      
+      
       After:
       Jälkeen:
     
     
-      
+      
       No EFI system partition configured
       EFI-järjestelmäosiota ei ole määritetty
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       EFI-järjestelmän osio on välttämätön käynnistyksessä %1.<br/><br/>Jos haluat tehdä EFI-järjestelmän osion, mene takaisin ja luo FAT32-tiedostojärjestelmä, jossa<strong>%3</strong> lippu on käytössä ja liityntäkohta. <strong>%2</strong>.<br/><br/>Voit jatkaa ilman EFI-järjestelmäosiota, mutta järjestelmä ei ehkä käynnisty.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       EFI-järjestelmän osio on välttämätön käynnistyksessä %1.<br/><br/>Osio on määritetty liityntäkohdan kanssa, <strong>%2</strong> mutta sen <strong>%3</strong> lippua ei ole asetettu.<br/>Jos haluat asettaa lipun, palaa takaisin ja muokkaa osiota.<br/><br/>Voit jatkaa lippua asettamatta, mutta järjestelmä ei ehkä käynnisty.
     
     
-      
+      
       EFI system partition flag not set
       EFI-järjestelmäosion lippua ei ole asetettu
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS:ssa mahdollisuus käyttää GPT:tä
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT-osiotaulukko on paras vaihtoehto kaikille järjestelmille. Tämä asennusohjelma tukee asennusta myös BIOS:n järjestelmään.<br/><br/>Jos haluat määrittää GPT-osiotaulukon BIOS:ssa (jos sitä ei ole jo tehty) palaa takaisin ja aseta osiotaulukkoksi GPT. Luo seuraavaksi 8 Mb alustamaton osio <strong>bios_grub</strong> lipulla käyttöön.<br/><br/>Alustamaton 8 Mb osio on tarpeen %1:n käynnistämiseksi BIOS-järjestelmässä GPT:llä.
     
     
-      
+      
       Boot partition not encrypted
       Käynnistysosiota ei ole salattu
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Erillinen käynnistysosio perustettiin yhdessä salatun juuriosion kanssa, mutta käynnistysosio ei ole salattu.<br/><br/>Tällaisissa asetuksissa on tietoturvaongelmia, koska tärkeät järjestelmätiedostot pidetään salaamattomassa osiossa.<br/>Voit jatkaa, jos haluat, mutta tiedostojärjestelmän lukituksen avaaminen tapahtuu myöhemmin järjestelmän käynnistyksen aikana.<br/>Käynnistysosion salaamiseksi siirry takaisin ja luo se uudelleen valitsemalla <strong>Salaa</strong> osion luominen -ikkunassa. 
     
     
-      
+      
       has at least one disk device available.
       on vähintään yksi levy käytettävissä.
     
     
-      
+      
       There are no partitions to install on.
       Asennettavia osioita ei ole.
     
@@ -2982,17 +3048,17 @@ Ulostulo:
       Uutta satunnaista tiedostoa ei voitu luoda <pre>%1</pre>.
     
     
-      
+      
       No product
       Ei tuotetta
     
     
-      
+      
       No description provided.
       Kuvausta ei ole.
     
     
-      
+      
       (no mount point)
       (ei liitoskohtaa)
     
@@ -3253,12 +3319,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Saadaksesi parhaan lopputuloksen, tarkista että tämä tietokone:
     
     
-      
+      
       System requirements
       Järjestelmävaatimukset
     
@@ -3266,28 +3332,28 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Tämä tietokone ei täytä vähimmäisvaatimuksia,  %1.<br/>Asennusta ei voi jatkaa. <a href="#details">Yksityiskohdat...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Tämä tietokone ei täytä asennuksen vähimmäisvaatimuksia,  %1.<br/>Asennus ei voi jatkua. <a href="#details">Yksityiskohdat...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Tämä tietokone ei täytä joitakin suositeltuja vaatimuksia %1.<br/>Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Tämä tietokone ei täytä joitakin suositeltuja vaatimuksia %1.
 Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Tämä ohjelma kysyy joitakin kysymyksiä %2 ja asentaa tietokoneeseen.
     
@@ -3443,7 +3509,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Asetetaan liput <strong>%1</strong> uuteen osioon.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Asennusohjelma ei voinut asettaa lippuja osioon %1.
     
@@ -3586,12 +3652,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Tämä on yleiskuva siitä, mitä tapahtuu, kun asennusohjelma käynnistetään.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Tämä on yleiskuva siitä, mitä tapahtuu asennuksen aloittamisen jälkeen.
     
@@ -4167,107 +4233,127 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Valitse käyttäjänimi kirjautumiseen ja järjestelmänvalvojan tehtävien suorittamiseen
     
     
-      
+      
       What is your name?
       Mikä on nimesi?
     
     
-      
+      
       Your Full Name
       Koko nimesi
     
     
-      
+      
       What name do you want to use to log in?
       Mitä nimeä haluat käyttää sisäänkirjautumisessa?
     
     
-      
+      
       Login Name
       Kirjautumisnimi
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Jos tätä tietokonetta käyttää useampi kuin yksi henkilö, voit luoda useita tilejä asennuksen jälkeen.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Vain pienet kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Mikä on tämän tietokoneen nimi?
     
     
-      
+      
       Computer Name
       Tietokoneen nimi
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Tätä nimeä käytetään, jos teet tietokoneen näkyväksi verkon muille käyttäjille.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Valitse salasana pitääksesi tilisi turvallisena.
     
     
-      
+      
       Password
       Salasana
     
     
-      
+      
       Repeat Password
       Toista salasana
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoittamisvirheiden varalta. Hyvä salasana sisältää sekoituksen kirjaimia, numeroita ja välimerkkejä. Vähintään kahdeksan merkkiä pitkä ja se on vaihdettava säännöllisin väliajoin.
     
     
-      
+      
       Validate passwords quality
       Tarkista salasanojen laatu
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Kun tämä valintaruutu on valittu, salasanan vahvuus tarkistetaan, etkä voi käyttää heikkoa salasanaa.
     
     
-      
+      
       Log in automatically without asking for the password
       Kirjaudu automaattisesti ilman salasanaa
     
     
-      
+      
       Reuse user password as root password
       Käytä käyttäjän salasanaa myös root-salasanana
     
     
-      
+      
       Use the same password for the administrator account.
       Käytä pääkäyttäjän tilillä samaa salasanaa.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Valitse root-salasana, jotta tilisi pysyy turvassa.
     
     
-      
+      
       Root Password
       Root salasana
     
     
-      
+      
       Repeat Root Password
       Toista Root salasana
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoitusvirheiden varalta.
     
diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts
index b28c80fdd1..0be61451d5 100644
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record de %1
     
     
-      
+      
       Boot Partition
       Partition de démarrage
     
     
-      
+      
       System Partition
       Partition système
     
     
-      
+      
       Do not install a boot loader
       Ne pas installer de chargeur de démarrage
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Exécution de l'opération %1.
     
     
-      
+      
       Bad working directory path
       Chemin du répertoire de travail invalide
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Le répertoire de travail %1 pour le job python %2 n'est pas accessible en lecture.
     
     
-      
+      
       Bad main script file
       Fichier de script principal invalide
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Le fichier de script principal %1 pour la tâche python %2 n'est pas accessible en lecture.
     
     
-      
+      
       Boost.Python error in job "%1".
       Erreur Boost.Python pour le job "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Échec de la configuration
     
     
-      
+      
       Installation Failed
       L'installation a échoué
     
     
-      
+      
       Would you like to paste the install log to the web?
       Voulez-vous copier le journal d'installation sur le Web ?
     
     
-      
+      
       Error
       Erreur
     
     
-      
-      
+      
+      
       &Yes
       &Oui
     
     
-      
-      
+      
+      
       &No
       &Non
     
     
-      
+      
       &Close
       &Fermer
     
     
-      
+      
       Install Log Paste URL
       URL de copie du journal d'installation
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       L'envoi a échoué. La copie sur le web n'a pas été effectuée.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 Lien copié dans le presse-papiers
     
     
-      
+      
       Calamares Initialization Failed
       L'initialisation de Calamares a échoué
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 n'a pas pu être installé. Calamares n'a pas pu charger tous les modules configurés. C'est un problème avec la façon dont Calamares est utilisé par la distribution.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Les modules suivants n'ont pas pu être chargés :
     
     
-      
+      
       Continue with setup?
       Poursuivre la configuration ?
     
     
-      
+      
       Continue with installation?
       Continuer avec l'installation ?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Le programme de configuration de %1 est sur le point de procéder aux changements sur le disque afin de configurer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       L'installateur %1 est sur le point de procéder aux changements sur le disque afin d'installer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.<strong>
     
     
-      
+      
       &Set up now
       &Configurer maintenant
     
     
-      
+      
       &Install now
       &Installer maintenant
     
     
-      
+      
       Go &back
       &Retour
     
     
-      
+      
       &Set up
       &Configurer
     
     
-      
+      
       &Install
       &Installer
     
     
-      
+      
       Setup is complete. Close the setup program.
       La configuration est terminée. Fermer le programme de configuration.
     
     
-      
+      
       The installation is complete. Close the installer.
       L'installation est terminée. Fermer l'installateur.
     
     
-      
+      
       Cancel setup without changing the system.
       Annuler la configuration sans toucher au système.
     
     
-      
+      
       Cancel installation without changing the system.
       Annuler l'installation sans modifier votre système.
     
     
-      
+      
       &Next
       &Suivant
     
     
-      
+      
       &Back
       &Précédent
     
     
-      
+      
       &Done
       &Terminé
     
     
-      
+      
       &Cancel
       &Annuler
     
     
-      
+      
       Cancel setup?
       Annuler la configuration ?
     
     
-      
+      
       Cancel installation?
       Abandonner l'installation ?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Voulez-vous vraiment abandonner le processus de configuration ?
 Le programme de configuration se fermera et les changements seront perdus.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Voulez-vous vraiment abandonner le processus d'installation ?
@@ -472,22 +472,22 @@ L'installateur se fermera et les changements seront perdus.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Type d'exception inconnue
     
     
-      
+      
       unparseable Python error
       Erreur Python non analysable
     
     
-      
+      
       unparseable Python traceback
       Traçage Python non exploitable
     
     
-      
+      
       Unfetchable Python error.
       Erreur Python non rapportable.
     
@@ -505,6 +505,24 @@ L'installateur se fermera et les changements seront perdus.
       Installateur %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Le programme d'installation n'a pas pu mettre à jour la table de partitionnement sur le disque '%1'.
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ L'installateur se fermera et les changements seront perdus.
       Formulaire
     
     
-      
+      
       Select storage de&vice:
       Sélectionner le support de sto&ckage :
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actuel :
     
     
-      
+      
       After:
       Après :
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Partitionnement manuel</strong><br/>Vous pouvez créer ou redimensionner vous-même des partitions.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Réutiliser %1 comme partition home pour %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Sélectionner une partition à réduire, puis faites glisser la barre du bas pour redimensionner</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 va être réduit à %2 Mio et une nouvelle partition de %3 Mio va être créée pour %4.
     
     
-      
+      
       Boot loader location:
       Emplacement du chargeur de démarrage :
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Sélectionner une partition pour l'installation</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Une partition système EFI n'a pas pu être trouvée sur ce système. Veuillez retourner à l'étape précédente et sélectionner le partitionnement manuel pour configurer %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partition système EFI sur %1 va être utilisée pour démarrer %2.
     
     
-      
+      
       EFI system partition:
       Partition système EFI :
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ce périphérique de stockage ne semble pas contenir de système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Effacer le disque</strong><br/>Ceci va <font color="red">effacer</font> toutes les données actuellement présentes sur le périphérique de stockage sélectionné.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installer à côté</strong><br/>L'installateur va réduire une partition pour faire de la place pour %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Remplacer une partition</strong><br>Remplace une partition par %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ce périphérique de stockage contient %1. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ce périphérique de stockage contient déjà un système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ce péiphérique de stockage contient déjà plusieurs systèmes d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Le périphérique de stockage contient déjà un système d'exploitation, mais la table de partition <strong>%1</strong> est différente de celle nécessaire <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Une des partitions de ce périphérique de stockage est <strong>montée</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Ce périphérique de stockage fait partie d'une grappe <strong>RAID inactive</strong>.
     
     
-      
+      
       No Swap
       Aucun Swap
     
     
-      
+      
       Reuse Swap
       Réutiliser le Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sans hibernation)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (avec hibernation)
     
     
-      
+      
       Swap to file
       Swap dans un fichier
     
@@ -699,12 +717,12 @@ L'installateur se fermera et les changements seront perdus.
       Libération des montages temporaires.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Impossible de récupérer la liste des montages temporaires.
     
     
-      
+      
       Cleared all temporary mounts.
       Supprimer les montages temporaires.
     
@@ -731,27 +749,27 @@ L'installateur se fermera et les changements seront perdus.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Configurer le modèle de clavier à %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Configurer la disposition clavier à %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Configurer timezone sur %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       La langue du système sera réglée sur %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Les nombres et les dates seront réglés sur %1.
     
@@ -875,6 +893,11 @@ L'installateur se fermera et les changements seront perdus.
       Your passwords do not match!
       Vos mots de passe ne correspondent pas !
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ L'installateur se fermera et les changements seront perdus.
       The installation of %1 is complete.
       L'installation de %1 est terminée.
     
+    
+      
+      Package Selection
+      Sélection des paquets
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Merci de sélectionner un produit de la liste. Le produit sélectionné sera installé.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ L'installateur se fermera et les changements seront perdus.
       Drapeaux :
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Chi&ffrer
     
     
-      
+      
       Logical
       Logique
     
     
-      
+      
       Primary
       Primaire
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Le point de montage est déjà utilisé. Merci d'en sélectionner un autre.
     
@@ -1005,43 +1048,43 @@ L'installateur se fermera et les changements seront perdus.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Créer une nouvelle partition %1 Mio sur %3 (%2) avec les entrées %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Créer une nouvelle partition %1 Mio sur %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Créer une nouvelle partition de %2 Mio sur %4 (%3) avec le système de fichier %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Créer une nouvelle partition <strong>%1 Mio</strong> sur <strong>%3</strong> (%2) avec les entrées <em>%4</em>. 
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Créer une nouvelle partition <strong>%1 Mio</strong> sur <strong>%3</strong> (%2). 
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Créer une nouvelle partition de <strong>%2 Mio</strong> sur <strong>%4</strong> (%3) avec le système de fichiers <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Création d'une nouvelle partition %1 sur %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Le programme d'installation n'a pas pu créer la partition sur le disque '%1'.
     
@@ -1092,7 +1135,7 @@ L'installateur se fermera et les changements seront perdus.
       Création d'une nouvelle table de partitions %1 sur %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Le programme d'installation n'a pas pu créer la table de partitionnement sur le disque %1.
     
@@ -1331,7 +1374,17 @@ L'installateur se fermera et les changements seront perdus.
       Drapeaux :
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Le point de montage est déjà utilisé. Merci d'en sélectionner un autre.
     
@@ -1368,57 +1421,57 @@ L'installateur se fermera et les changements seront perdus.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Configurer les informations de la partition
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Installer %1 sur la <strong>nouvelle</strong> partition système %2 avec les fonctionnalités <em>%3</em> 
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Installer %1 sur le <strong>nouveau</strong> système de partition %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Configurer la <strong>nouvelle</strong> partition %2 avec le point de montage <strong>%1</strong> et les fonctionnalités <em>%3</em>. 
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Configurer la <strong>nouvelle</strong> partition %2 avec le point de montage <strong>%1</strong>%3. 
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Installer %2 sur la partition système %3 <strong>%1</strong> avec les fonctionnalités <em>%4</em>. 
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Configurer la partition %3 <strong>%1</strong> avec le point de montage <strong>%2</strong> et les fonctionnalités <em>%4</em>. 
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Configurer la partition %3 <strong>%1</strong> avec le point de montage <strong>%2</strong>%4. 
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Installer %2 sur la partition système %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Installer le chargeur de démarrage sur <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Configuration des points de montage.
     
@@ -1831,6 +1884,14 @@ L'installateur se fermera et les changements seront perdus.
       Emplacement
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ L'installateur se fermera et les changements seront perdus.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Sélectionner votre région préférée, ou utiliser celle par défaut basée sur votre localisation actuelle.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Fuseau horaire : %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Sélectionner votre zone préférée dans votre région.
     
     
-      
+      
       Zones
       Zones
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Vous pouvez affiner les paramètres de langue et régionaux ci-dessous.
     
@@ -2388,7 +2449,7 @@ L'installateur se fermera et les changements seront perdus.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paquets
     
@@ -2569,33 +2630,38 @@ L'installateur se fermera et les changements seront perdus.
     PartitionModel
     
       
-      
+      
       Free Space
       Espace libre
     
     
       
-      
+      
       New partition
       Nouvelle partition
     
     
-      
+      
       Name
       Nom
     
     
-      
+      
       File System
       Système de fichiers
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Point de montage
     
     
-      
+      
       Size
       Taille
     
@@ -2681,117 +2747,117 @@ L'installateur se fermera et les changements seront perdus.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Récupération des informations système…
     
     
-      
+      
       Partitions
       Partitions
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Installer %1 <strong>à côté</strong>d'un autre système d'exploitation.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Effacer</strong> le disque et installer %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Remplacer</strong> une partition avec %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Partitionnement <strong>manuel</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Installer %1 <strong>à côté</strong> d'un autre système d'exploitation sur le disque <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Effacer</strong> le disque <strong>%2</strong> (%3) et installer %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Remplacer</strong> une partition sur le disque <strong>%2</strong> (%3) avec %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Partitionnement <strong>manuel</strong> sur le disque <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disque <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Actuel :
     
     
-      
+      
       After:
       Après :
     
     
-      
+      
       No EFI system partition configured
       Aucune partition système EFI configurée
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Pour configurer une partition système EFI, revenez en arrière et sélectionnez ou créez un système de fichiers FAT32 avec l'indicateur <strong>%3</strong> activé et le point de montage <strong>%2</strong>.<br/><br/>Vous pouvez continuer sans configurer de partition système EFI mais votre système peut ne pas démarrer. 
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Une partition a été configurée avec le point de montage <strong>%2</strong> mais son indicateur <strong>%3</strong> n'est pas défini.<br/>Pour définir l'indicateur, revenez en arrière et modifiez la partition.<br/><br/>Vous pouvez continuer sans définir l'indicateur mais votre le système peut ne pas démarrer. 
     
     
-      
+      
       EFI system partition flag not set
       Drapeau de partition système EFI non configuré
     
     
-      
+      
       Option to use GPT on BIOS
       Option pour utiliser GPT sur le BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Une table de partition GPT est la meilleure option pour tous les systèmes. Ce programme d'installation prend également en charge une telle configuration pour les systèmes BIOS.<br/><br/>Pour configurer une table de partition GPT sur le BIOS, (si ce n'est déjà fait) revenez en arrière et définissez la table de partition sur GPT, puis créez une partition non formatée de 8 Mo avec l'indicateur <strong>bios_grub</strong> activé.<br/><br/>Une partition de 8 Mo non formatée est nécessaire pour démarrer %1 sur un système BIOS avec GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partition d'amorçage non chiffrée.
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Une partition d'amorçage distincte a été configurée avec une partition racine chiffrée, mais la partition d'amorçage n'est pas chiffrée. <br/> <br/> Il y a des problèmes de sécurité avec ce type d'installation, car des fichiers système importants sont conservés sur une partition non chiffrée <br/> Vous pouvez continuer si vous le souhaitez, mais le déverrouillage du système de fichiers se produira plus tard au démarrage du système. <br/> Pour chiffrer la partition d'amorçage, revenez en arrière et recréez-la, en sélectionnant <strong> Chiffrer </ strong> dans la partition Fenêtre de création.
     
     
-      
+      
       has at least one disk device available.
       a au moins un disque disponible.
     
     
-      
+      
       There are no partitions to install on.
       Il n'y a pas de partition pour l'installation
     
@@ -2982,17 +3048,17 @@ Sortie
       Impossible de créer le nouveau fichier aléatoire <pre>%1</pre>.
     
     
-      
+      
       No product
       Aucun produit
     
     
-      
+      
       No description provided.
       Aucune description fournie.
     
     
-      
+      
       (no mount point)
       (aucun point de montage)
     
@@ -3253,12 +3319,12 @@ Sortie
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Pour de meilleur résultats, merci de s'assurer que cet ordinateur :
     
     
-      
+      
       System requirements
       Configuration requise
     
@@ -3266,27 +3332,27 @@ Sortie
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Cet ordinateur ne satisfait pas les minimum prérequis pour configurer %1.<br/>La configuration ne peut pas continuer. <a href="#details">Détails...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Cet ordinateur ne satisfait pas les minimum prérequis pour installer %1.<br/>L'installation ne peut pas continuer. <a href="#details">Détails...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Cet ordinateur ne satisfait pas certains des prérequis recommandés pour configurer %1.<br/>La configuration peut continuer, mais certaines fonctionnalités pourraient être désactivées.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Cet ordinateur ne satisfait pas certains des prérequis recommandés pour installer %1.<br/>L'installation peut continuer, mais certaines fonctionnalités pourraient être désactivées.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ce programme va vous poser quelques questions et configurer %2 sur votre ordinateur.
     
@@ -3442,7 +3508,7 @@ Sortie
       Configuration des drapeaux <strong>%1</strong> pour la nouvelle partition.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       L'installateur n'a pas pu activer les drapeaux sur la partition %1.
     
@@ -3585,12 +3651,12 @@ Sortie
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Ceci est un aperçu de ce qui va arriver lorsque vous commencerez la configuration.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Ceci est un aperçu de ce qui va arriver lorsque vous commencerez l'installation.
     
@@ -4164,107 +4230,127 @@ Sortie
       Choisir votre nom d'utilisateur et vos informations d'identification pour vous connecter et effectuer des tâches d'administration
     
     
-      
+      
       What is your name?
       Quel est votre nom ?
     
     
-      
+      
       Your Full Name
       Nom complet
     
     
-      
+      
       What name do you want to use to log in?
       Quel nom souhaitez-vous utiliser pour la connexion ?
     
     
-      
+      
       Login Name
       Identifiant
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Si plusieurs personnes utilisent cet ordinateur, vous pouvez créer plusieurs comptes après l'installation.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Seuls les minuscules, nombres, underscores et tirets sont autorisés.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Quel est le nom de votre ordinateur ?
     
     
-      
+      
       Computer Name
       Nom de l'ordinateur
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Ce nom sera utilisé si vous rendez l'ordinateur visible aux autres sur un réseau.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Veuillez saisir le mot de passe pour sécuriser votre compte.
     
     
-      
+      
       Password
       Mot de passe
     
     
-      
+      
       Repeat Password
       Répéter le mot de passe
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Saisir le même mot de passe deux fois, afin qu'il puisse être vérifié pour les erreurs de frappe. Un bon mot de passe contient un mélange de lettres, de chiffres et de ponctuation, doit comporter au moins huit caractères et doit être changé à intervalles réguliers.
     
     
-      
+      
       Validate passwords quality
       Valider la qualité des mots de passe
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quand cette case est cochée, la vérification de la puissance du mot de passe est activée et vous ne pourrez pas utiliser de mot de passe faible.
     
     
-      
+      
       Log in automatically without asking for the password
       Connectez-vous automatiquement sans demander le mot de passe
     
     
-      
+      
       Reuse user password as root password
       Réutiliser le mot de passe utilisateur comme mot de passe root
     
     
-      
+      
       Use the same password for the administrator account.
       Utiliser le même mot de passe pour le compte administrateur.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Choisir un mot de passe root pour protéger votre compte.
     
     
-      
+      
       Root Password
       Mot de passe root
     
     
-      
+      
       Repeat Root Password
       Répéter le mot de passe root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Entrer le même mot de passe deux fois, afin qu'il puisse être vérifié pour les erreurs de frappe.
     
diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts
index 71f8136f8a..7c6b445a10 100644
--- a/lang/calamares_fr_CH.ts
+++ b/lang/calamares_fr_CH.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts
index 9dbc70b49e..9d66e189a2 100644
--- a/lang/calamares_fur.ts
+++ b/lang/calamares_fur.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record di %1
     
     
-      
+      
       Boot Partition
       Partizion di inviament
     
     
-      
+      
       System Partition
       Partizion di sisteme
     
     
-      
+      
       Do not install a boot loader
       No sta instalâ un gjestôr di inviament
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Operazion %1 in esecuzion.
     
     
-      
+      
       Bad working directory path
       Il percors de cartele di lavôr nol è just
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       No si rive a lei la cartele di lavôr %1 pe operazion di python %2.
     
     
-      
+      
       Bad main script file
       Il file di script principâl nol è valit
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       No si rive a lei il file di script principâl %1 pe operazion di python %2.
     
     
-      
+      
       Boost.Python error in job "%1".
       Erôr di Boost.Python te operazion "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Configurazion falide
     
     
-      
+      
       Installation Failed
       Instalazion falide
     
     
-      
+      
       Would you like to paste the install log to the web?
       Meti sul web il regjistri di instalazion?
     
     
-      
+      
       Error
       Erôr
     
     
-      
-      
+      
+      
       &Yes
       &Sì
     
     
-      
-      
+      
+      
       &No
       &No
     
     
-      
+      
       &Close
       S&iere
     
     
-      
+      
       Install Log Paste URL
       URL de copie dal regjistri di instalazion
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Il cjariament sù pe rêt al è lât strucj. No je stade fate nissune copie sul web.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Inizializazion di Calamares falide
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       No si pues instalâ %1. Calamares nol è rivât a cjariâ ducj i modui configurâts. Chest probleme achì al è causât de distribuzion e di cemût che al ven doprât Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>I modui chi sot no puedin jessi cjariâts:
     
     
-      
+      
       Continue with setup?
       Continuâ cu la configurazion?
     
     
-      
+      
       Continue with installation?
       Continuâ cu la instalazion?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Il program di configurazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No si podarà tornâ indaûr e anulâ chestis modifichis.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Il program di instalazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No tu podarâs tornâ indaûr e anulâ chestis modifichis.</strong>
     
     
-      
+      
       &Set up now
       &Configure cumò
     
     
-      
+      
       &Install now
       &Instale cumò
     
     
-      
+      
       Go &back
       &Torne indaûr
     
     
-      
+      
       &Set up
       &Configure
     
     
-      
+      
       &Install
       &Instale
     
     
-      
+      
       Setup is complete. Close the setup program.
       Configurazion completade. Siere il program di configurazion.
     
     
-      
+      
       The installation is complete. Close the installer.
       La instalazion e je stade completade. Siere il program di instalazion.
     
     
-      
+      
       Cancel setup without changing the system.
       Anule la configurazion cence modificâ il sisteme.
     
     
-      
+      
       Cancel installation without changing the system.
       Anulâ la instalazion cence modificâ il sisteme.
     
     
-      
+      
       &Next
       &Sucessîf
     
     
-      
+      
       &Back
       &Indaûr
     
     
-      
+      
       &Done
       &Fat
     
     
-      
+      
       &Cancel
       &Anule
     
     
-      
+      
       Cancel setup?
       Anulâ la configurazion?
     
     
-      
+      
       Cancel installation?
       Anulâ la instalazion?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Anulâ pardabon il procès di configurazion?
 Il program di configurazion al jessarà e dutis lis modifichis a laran pierdudis.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Anulâ pardabon il procès di instalazion?
@@ -468,22 +468,22 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Gjenar di ecezion no cognossût
     
     
-      
+      
       unparseable Python error
       erôr Python che no si pues analizâ
     
     
-      
+      
       unparseable Python traceback
       rapuart di ricercje erôr di Python che no si pues analizâ
     
     
-      
+      
       Unfetchable Python error.
       erôr di Python che no si pues recuperâ.
     
@@ -501,6 +501,24 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Program di instalazion di %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Formulari
     
     
-      
+      
       Select storage de&vice:
       Selezione il &dispositîf di memorie:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Atuâl:
     
     
-      
+      
       After:
       Dopo:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Partizionament manuâl</strong><br/>Tu puedis creâ o ridimensionâ lis partizions di bessôl.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Torne dopre %1 come partizion home par %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selezione une partizion di scurtâ, dopo strissine la sbare inferiôr par ridimensionâ</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 e vignarà scurtade a %2MiB e une gnove partizion di %3MiB e vignarà creade par %4.
     
     
-      
+      
       Boot loader location:
       Ubicazion dal gjestôr di inviament:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selezione une partizion dulà lâ a instalâ</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Impussibil cjatâ une partizion di sisteme EFI. Par plasê torne indaûr e dopre un partizionament manuâl par configurâ %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partizion di sisteme EFI su %1 e vignarà doprade par inviâ %2.
     
     
-      
+      
       EFI system partition:
       Partizion di sisteme EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Al somee che chest dispositîf di memorie nol vedi parsore un sisteme operatîf. Ce desideristu fâ?<br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Scancelâ il disc</strong><br/>Chest al <font color="red">eliminarà</font> ducj i dâts presints sul dispositîf di memorie selezionât.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalâ in bande</strong><br/>Il program di instalazion al scurtarà une partizion par fâ spazi a %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Sostituî une partizion</strong><br/>Al sostituìs une partizion cun %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Chest dispositîf di memorie al à parsore %1. Ce desideristu fâ? <br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Chest dispositîf di memorie al à za parsore un sisteme operatîf. Ce desideristu fâ?<br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Chest dispositîf di memorie al à parsore plui sistemis operatîfs. Ce desideristu fâ?<br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Chest dispositîf di memorie al à za un sisteme operatîf parsore, ma la tabele des partizions <strong>%1</strong> e je diferente di chê che a covente: <strong>%2</strong>.<br/> 
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Une des partizions dal dispositîf di memorie e je <strong>montade</strong>. 
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Chest dispositîf di memorie al fâs part di un dispositîf <strong>RAID inatîf</strong>.
     
     
-      
+      
       No Swap
       Cence Swap
     
     
-      
+      
       Reuse Swap
       Torne dopre Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (cence ibernazion)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (cun ibernazion)
     
     
-      
+      
       Swap to file
       Swap su file
     
@@ -695,12 +713,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Daûr a netâ ducj i ponts di montaç temporanis.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Impussibil otignî la liste dai ponts di montaç temporanis.
     
     
-      
+      
       Cleared all temporary mounts.
       Netâts ducj i ponts di montaç temporanis.
     
@@ -727,27 +745,27 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Stabilî il model di tastiere a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Stabilî la disposizion di tastiere a %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Stabilî il fûs orari a %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       La lenghe dal sisteme e vignarà configurade a %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       La localizazion dai numars e des datis e vignarà configurade a %1.
     
@@ -871,6 +889,11 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Your passwords do not match!
       Lis passwords no corispuindin!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       The installation of %1 is complete.
       La instalazion di %1 e je completade.
     
+    
+      
+      Package Selection
+      Selezion pachets
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Sielç un prodot de liste. Il prodot selezionât al vignarà instalât.
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Proprietâts:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Ci&frâ
     
     
-      
+      
       Logical
       Logjiche
     
     
-      
+      
       Primary
       Primarie
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Pont di montaç za in ûs. Selezione un altri.
     
@@ -1001,43 +1044,43 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Creâ une gnove partizion di %2MiB su %4 (%3) cul filesystem %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Creâ une gnove partizion di <strong>%2MiB</strong> su <strong>%4</strong> (%3) cul filesystem <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Daûr a creâ une gnove partizion %1 su %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Il program di instalazion nol è rivât a creâ la partizion sul disc '%1'.
     
@@ -1088,7 +1131,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Daûr a creâ une gnove tabele des partizions %1 su %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Il program di instalazion nol è rivât a creâ une tabele des partizions su %1.
     
@@ -1327,7 +1370,17 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Proprietâts:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Pont di montaç za in ûs. Selezione un altri.
     
@@ -1364,57 +1417,57 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Stabilî informazions di partizion
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instalâ %1 te <strong>gnove</strong> partizion di sisteme %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instalâ %2 te partizion di sisteme %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instalâ il gjestôr di inviament su <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Daûr a configurâ i ponts di montaç.
     
@@ -1827,6 +1880,14 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Posizion
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2046,29 +2107,29 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Selezione la tô Regjon preferide o dopre chê predefinide basade su la tô posizion atuâl.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Fûs orari: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Selezione la tô Zone preferide dentri de tô Regjon.
     
     
-      
+      
       Zones
       Zonis
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Tu puedis regolâ lis impostazions di Lenghe e Localizazion chi sot.
     
@@ -2384,7 +2445,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Pachets
     
@@ -2565,33 +2626,38 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
     PartitionModel
     
       
-      
+      
       Free Space
       Spazi libar
     
     
       
-      
+      
       New partition
       Gnove partizion
     
     
-      
+      
       Name
       Non
     
     
-      
+      
       File System
       File System
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Pont di montaç
     
     
-      
+      
       Size
       Dimension
     
@@ -2677,117 +2743,117 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Daûr a dâ dongje lis informazions dal sisteme...
     
     
-      
+      
       Partitions
       Partizions
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instalâ %1 <strong>in bande</strong> a un altri sisteme operatîf.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       Scancelâ<strong> il disc e instalâ %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Sostituî</strong> une partizion cun %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Partizionament <strong>manuâl</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instalâ %1 <strong>in bande</strong> a un altri sisteme operatîf sul disc <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Scancelâ</strong> il disc <strong>%2</strong> (%3) e instalâ %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Sostituî</strong> une partizion sul disc <strong>%2</strong> (%3) cun %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Partizionament <strong>manuâl</strong> su disc <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disc <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Atuâl:
     
     
-      
+      
       After:
       Dopo:
     
     
-      
+      
       No EFI system partition configured
       Nissune partizion di sisteme EFI configurade
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       E covente une partizion di sisteme EFI par inviâ %1.<br/><br/>Par configurâ une partizion di sisteme EFI torne indaûr e selezione o cree un filesystem FAT32 cu la opzion <strong>%3</strong> abilitade e il pont di montaç <strong>%2</strong>.<br/><br/>Si pues continuâ cence stabilî une partizion di sisteme EFI ma al è pussibil che il sisteme no si invii.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       E covente une partizion di sisteme EFI par inviâ %1.<br/><br/>Une partizion e jere configurade cul pont di montaç <strong>%2</strong> ma no je stade stabilide la opzion <strong>%3</strong>. Par configurâ chê opzion, torne indaûr e modifiche la partizion.<br/><br/>Si pues continuâ cence stabilî chê opzion, ma al è facil che il sisteme no si invii.
     
     
-      
+      
       EFI system partition flag not set
       Opzion de partizion di sisteme EFI no stabilide
     
     
-      
+      
       Option to use GPT on BIOS
       Opzion par doprâ GPT su BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       La miôr opzion par ducj i sistemis e je une tabele des partizions GPT. Il program di instalazion al supuarte ancje chest gjenar di configurazion pai sistemis BIOS.<br/><br/>Par configurâ une tabele des partizions GPT su BIOS, (se nol è za stât fat) torne indaûr e met a GPT la tabele des partizions, dopo cree une partizion no formatade di 8MB cu la opzion <strong>bios_grup</strong> abilitade. <br/><br/>Une partizion no formatade di 8MB e je necessarie par inviâ %1 su sistemsi BIOS cun GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partizion di inviament no cifrade
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       E je stade configurade une partizion di inviament separade adun cuntune partizion lidrîs cifrade, ma la partizion di inviament no je cifrade.<br/><br/> A esistin problemis di sigurece cun chest gjenar di configurazion, par vie che i file di sisteme impuartants a vegnin tignûts intune partizion no cifrade.<br/>Tu puedis continuâ se tu lu desideris, ma il sbloc dal filesystem al sucedarà plui indenant tal inviament dal sisteme.<br/>Par cifrâ la partizion di inviament, torne indaûr e torne creile, selezionant <strong>Cifrâ</strong> tal barcon di creazion de partizion.
     
     
-      
+      
       has at least one disk device available.
       al à almancul une unitât disc disponibil.
     
     
-      
+      
       There are no partitions to install on.
       No son partizions dulà lâ a instalâ.
     
@@ -2977,17 +3043,17 @@ Output:
       Impussibil creâ il gnûf file casuâl <pre>%1</pre>.
     
     
-      
+      
       No product
       Nissun prodot
     
     
-      
+      
       No description provided.
       Nissune descrizion dade.
     
     
-      
+      
       (no mount point)
       (nissun pont di montaç)
     
@@ -3248,12 +3314,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Par otignî i miôrs risultâts, siguriti che chest computer:
     
     
-      
+      
       System requirements
       Recuisîts di sisteme
     
@@ -3261,27 +3327,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Chest computer nol sodisfe i recuisîts minims pe configurazion di %1.<br/>La configurazion no pues continuâ. <a href="#details">Detais...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Chest computer nol sodisfe i recuisîts minims pe instalazion di %1.<br/>La instalazion no pues continuâ. <a href="#details">Detais...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Chest computer nol sodisfe cualchi recuisît conseât pe configurazion di %1.<br/>La configurazion e pues continuâ, ma cualchi funzionalitât e podarès vignî disabilitade.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Chest computer nol sodisfe cualchi recuisît conseât pe instalazion di %1.<br/>La instalazion e pues continuâ, ma cualchi funzionalitât e podarès vignî disabilitade.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Chest program al fasarà cualchi domande e al configurarà %2 sul computer.
     
@@ -3437,7 +3503,7 @@ Output:
       Daûr a meti lis opzions <strong>%1</strong> te gnove partizion.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Il program di instalazion nol è rivât a meti lis opzions te partizion %1.
     
@@ -3580,12 +3646,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Cheste e je une panoramiche di ce che al sucedarà une volte inviade la procedure di configurazion.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Cheste e je une panoramiche di ce che al sucedarà une volte inviade la procedure di instalazion.
     
@@ -4159,107 +4225,127 @@ Output:
       Sielç e dopre il to non utent e lis credenziâls par jentrâ e eseguî ativitâts di aministradôr
     
     
-      
+      
       What is your name?
       Ce non âstu?
     
     
-      
+      
       Your Full Name
       Il to non complet
     
     
-      
+      
       What name do you want to use to log in?
       Ce non vûstu doprâ pe autenticazion?
     
     
-      
+      
       Login Name
       Non di acès
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Se chest computer al vignarà doprât di plui personis, tu puedis creâ plui account dopo vê completade la instalazion.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      A son ametûts dome i numars, lis letaris minusculis, lis liniutis bassis e i tratuts.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Ce non aial chest computer?
     
     
-      
+      
       Computer Name
       Non dal computer
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Si doprarà chest non se tu rindis visibil a altris chest computer suntune rêt.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Sielç une password par tignî il to account al sigûr.
     
     
-      
+      
       Password
       Password
     
     
-      
+      
       Repeat Password
       Ripeti password
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. Une buine password e contignarà un miscliç di letaris, numars e puntuazions, e sarà lungje almancul vot caratars e si scugnarà cambiâle a intervai regolârs.
     
     
-      
+      
       Validate passwords quality
       Convalidâ la cualitât des passwords
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Cuant che cheste casele e je selezionade, il control su la fuarce de password al ven fat e no si podarà doprâ une password debile.
     
     
-      
+      
       Log in automatically without asking for the password
       Jentre in automatic cence domandâ la password
     
     
-      
+      
       Reuse user password as root password
       Torne dopre la password dal utent pe password di root
     
     
-      
+      
       Use the same password for the administrator account.
       Dopre la stesse password pal account di aministradôr.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Sielç une password di root par tignî il to account al sigûr.
     
     
-      
+      
       Root Password
       Password di root
     
     
-      
+      
       Repeat Root Password
       Ripeti password di root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure.
     
diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts
index 13921e7183..9a00dded55 100644
--- a/lang/calamares_gl.ts
+++ b/lang/calamares_gl.ts
@@ -31,27 +31,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Rexistro de arranque maestro de %1
     
     
-      
+      
       Boot Partition
       Partición de arranque
     
     
-      
+      
       System Partition
       Partición do sistema
     
     
-      
+      
       Do not install a boot loader
       Non instalar un cargador de arranque
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -206,32 +206,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Excutando a operación %1.
     
     
-      
+      
       Bad working directory path
       A ruta ó directorio de traballo é errónea
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       O directorio de traballo %1 para o traballo de python %2 non é lexible
     
     
-      
+      
       Bad main script file
       Ficheiro de script principal erróneo
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       O ficheiro principal de script %1 para a execución de python %2 non é lexible.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python tivo un erro na tarefa "%1".
     
@@ -286,54 +286,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Erro na instalación
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Erro
     
     
-      
-      
+      
+      
       &Yes
       &Si
     
     
-      
-      
+      
+      
       &No
       &Non
     
     
-      
+      
       &Close
       &Pechar
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -342,123 +342,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Fallou a inicialización do Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Non é posíbel instalar %1. O calamares non foi quen de cargar todos os módulos configurados. Este é un problema relacionado con como esta distribución utiliza o Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/> Non foi posíbel cargar os módulos seguintes:
     
     
-      
+      
       Continue with setup?
       Continuar coa posta en marcha?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       O %1 instalador está a piques de realizar cambios no seu disco para instalar %2.<br/><strong>Estes cambios non poderán desfacerse.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Instalar agora
     
     
-      
+      
       Go &back
       Ir &atrás
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Completouse a instalacion. Peche o instalador
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar a instalación sen cambiar o sistema
     
     
-      
+      
       &Next
       &Seguinte
     
     
-      
+      
       &Back
       &Atrás
     
     
-      
+      
       &Done
       &Feito
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Cancelar a instalación?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Desexa realmente cancelar o proceso actual de instalación?
@@ -468,22 +468,22 @@ O instalador pecharase e perderanse todos os cambios.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Excepción descoñecida
     
     
-      
+      
       unparseable Python error
       Erro de Python descoñecido
     
     
-      
+      
       unparseable Python traceback
       O rastreo de Python non é analizable.
     
     
-      
+      
       Unfetchable Python error.
       Erro de Python non recuperable
     
@@ -501,6 +501,24 @@ O instalador pecharase e perderanse todos os cambios.
       Instalador de %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      O instalador fallou ó actualizar a táboa de particións no disco '%1'.
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ O instalador pecharase e perderanse todos os cambios.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       Seleccione o dispositivo de almacenamento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Despois:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionado manual</strong><br/> Pode crear o redimensionar particións pola súa conta.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilizar %1 como partición home para %2
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Seleccione unha partición para acurtar, logo empregue a barra para redimensionala</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Localización do cargador de arranque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Seleccione unha partición para instalar</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Non foi posible atopar unha partición de sistema de tipo EFI. Por favor, volva atrás e empregue a opción de particionado manual para crear unha en %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       A partición EFI do sistema en %1 será usada para iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partición EFI do sistema:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esta unidade de almacenamento non semella ter un sistema operativo instalado nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Borrar disco</strong><br/>Esto <font color="red">eliminará</font> todos os datos gardados na unidade de almacenamento seleccionada.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar a carón</strong><br/>O instalador encollerá a partición para facerlle sitio a %1
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Substituír a partición</strong><br/>Substitúe a partición con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       A unidade de almacenamento ten %1 nela. Que desexa facer?<br/>Poderá revisar e confirmar a súa elección antes de que se aplique algún cambio á unidade.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esta unidade de almacenamento xa ten un sistema operativo instalado nel. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esta unidade de almacenamento ten múltiples sistemas operativos instalados nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -695,12 +713,12 @@ O instalador pecharase e perderanse todos os cambios.
       Limpando todas as montaxes temporais.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Non se pode obter unha lista dos montaxes temporais.
     
     
-      
+      
       Cleared all temporary mounts.
       Desmontados todos os volumes temporais.
     
@@ -727,27 +745,27 @@ O instalador pecharase e perderanse todos os cambios.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Seleccionado modelo de teclado a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Seleccionada a disposición do teclado a %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       A linguaxe do sistema será establecida a %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       A localización de números e datas será establecida a %1.
     
@@ -871,6 +889,11 @@ O instalador pecharase e perderanse todos os cambios.
       Your passwords do not match!
       Os contrasinais non coinciden!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ O instalador pecharase e perderanse todos os cambios.
       The installation of %1 is complete.
       Completouse a instalación de %1
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ O instalador pecharase e perderanse todos os cambios.
       Bandeiras:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Encriptar
     
     
-      
+      
       Logical
       Lóxica
     
     
-      
+      
       Primary
       Primaria
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Punto de montaxe xa en uso. Faga o favor de escoller outro
     
@@ -1001,43 +1044,43 @@ O instalador pecharase e perderanse todos os cambios.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Creando unha nova partición %1 en %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       O instalador fallou ó crear a partición no disco '%1'.
     
@@ -1088,7 +1131,7 @@ O instalador pecharase e perderanse todos os cambios.
       Creando nova táboa de partición %1 en %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       O instalador fallou ó crear a táboa de partición en %1.
     
@@ -1327,7 +1370,17 @@ O instalador pecharase e perderanse todos os cambios.
       Bandeiras:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Punto de montaxe xa en uso. Faga o favor de escoller outro.
     
@@ -1364,57 +1417,57 @@ O instalador pecharase e perderanse todos os cambios.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Poñela información da partición
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instalar %1 nunha <strong>nova</strong> partición do sistema %2
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instalar %2 na partición do sistema %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instalar o cargador de arranque en <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Configuralos puntos de montaxe.
     
@@ -1827,6 +1880,14 @@ O instalador pecharase e perderanse todos os cambios.
       Localización...
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2105,29 @@ O instalador pecharase e perderanse todos os cambios.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2382,7 +2443,7 @@ O instalador pecharase e perderanse todos os cambios.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2563,33 +2624,38 @@ O instalador pecharase e perderanse todos os cambios.
     PartitionModel
     
       
-      
+      
       Free Space
       Espazo libre
     
     
       
-      
+      
       New partition
       Nova partición
     
     
-      
+      
       Name
       Nome
     
     
-      
+      
       File System
       Sistema de ficheiros
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Punto de montaxe
     
     
-      
+      
       Size
       Tamaño
     
@@ -2675,117 +2741,117 @@ O instalador pecharase e perderanse todos os cambios.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       A reunir a información do sistema...
     
     
-      
+      
       Partitions
       Particións
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instalar %1 <strong>a carón</strong> doutro sistema operativo.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Limpar</strong> o disco e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Substituír</strong> unha partición por %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Particionamento <strong>manual</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instalar %1 <strong>a carón</strong> doutro sistema operativo no disco <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Limpar</strong> o disco <strong>%2</strong> (%3) e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Substituír</strong> unha partición do disco <strong>%2</strong> (%3) por %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Particionamento <strong>manual</strong> do disco <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disco <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Despois:
     
     
-      
+      
       No EFI system partition configured
       Non hai ningunha partición de sistema EFI configurada
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       A bandeira da partición de sistema EFI non está configurada
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       A partición de arranque non está cifrada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Configurouse unha partición de arranque separada xunto cunha partición raíz cifrada, mais a partición raíz non está cifrada.<br/><br/>Con este tipo de configuración preocupa a seguranza porque nunha partición sen cifrar grávanse ficheiros de sistema importantes.<br/>Pode continuar, se así o desexa, mais o desbloqueo do sistema de ficheiros producirase máis tarde durante o arranque do sistema.<br/>Para cifrar unha partición raíz volva atrás e créea de novo, seleccionando <strong>Cifrar</strong> na xanela de creación de particións.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2975,17 +3041,17 @@ Saída:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3243,12 +3309,12 @@ Saída:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para os mellores resultados, por favor, asegúrese que este ordenador:
     
     
-      
+      
       System requirements
       Requisitos do sistema
     
@@ -3256,27 +3322,27 @@ Saída:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Este ordenador non satisfai os requerimentos mínimos ara a instalación de %1.<br/>A instalación non pode continuar. <a href="#details">Máis información...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Este ordenador non satisfai algúns dos requisitos recomendados para instalar %1.<br/> A instalación pode continuar, pero pode que algunhas características sexan desactivadas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Este programa faralle algunhas preguntas mentres prepara %2 no seu ordenador.
     
@@ -3432,7 +3498,7 @@ Saída:
       A configurar as bandeiras <strong>%1</strong> na nova partición.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       O instalador non foi quen de configurar as bandeiras na partición %1.
     
@@ -3575,12 +3641,12 @@ Saída:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Esta é unha vista xeral do que vai acontecer cando inicie o procedemento de instalación.
     
@@ -4120,107 +4186,127 @@ Saída:
       
     
     
-      
+      
       What is your name?
       Cal é o seu nome?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Cal é o nome que quere usar para entrar?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Cal é o nome deste computador?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Escolla un contrasinal para mante-la sua conta segura.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Empregar o mesmo contrasinal para a conta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts
index 86e9f956f6..da75b501de 100644
--- a/lang/calamares_gu.ts
+++ b/lang/calamares_gu.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index 881e05a5c8..8ea3b98af7 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record של %1
     
     
-      
+      
       Boot Partition
       מחיצת האתחול (Boot)
     
     
-      
+      
       System Partition
       מחיצת מערכת
     
     
-      
+      
       Do not install a boot loader
       לא להתקין מנהל אתחול מערכת
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -104,17 +104,17 @@
     
       
       Crashes Calamares, so that Dr. Konqui can look at it.
-      
+      מקריס את Calamares כדי ש־Dr. Konqui יוכל לבחון אותו.
     
     
       
       Reloads the stylesheet from the branding directory.
-      
+      מרענן את גיליון העיצוב מתיקיית המיתוג.
     
     
       
       Uploads the session log to the configured pastebin.
-      
+      מעלה את יומן ההפעלה ל־pastebin המוגדר.
     
     
       
@@ -129,7 +129,7 @@
     
       
       Displays the tree of widget names in the log (for stylesheet debugging).
-      
+      מציג את עץ שמות הווידג׳טים ביומן (לניפוי שגיאות בגיליונות עיצוב).
     
     
       
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       הפעולה %1 רצה.
     
     
-      
+      
       Bad working directory path
       נתיב תיקיית עבודה שגוי
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       תיקיית העבודה %1 עבור משימת python‏ %2 אינה קריאה.
     
     
-      
+      
       Bad main script file
       קובץ תסריט הרצה ראשי לא תקין
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       קובץ תסריט הרצה ראשי %1 עבור משימת python %2 לא קריא. 
     
     
-      
+      
       Boost.Python error in job "%1".
       שגיאת Boost.Python במשימה „%1”.
     
@@ -289,180 +289,184 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       ההתקנה נכשלה
     
     
-      
+      
       Installation Failed
       ההתקנה נכשלה
     
     
-      
+      
       Would you like to paste the install log to the web?
       להדביק את יומן ההתקנה לאינטרנט?
     
     
-      
+      
       Error
       שגיאה
     
     
-      
-      
+      
+      
       &Yes
       &כן
     
     
-      
-      
+      
+      
       &No
       &לא
     
     
-      
+      
       &Close
       &סגירה
     
     
-      
+      
       Install Log Paste URL
       כתובת הדבקת יומן התקנה
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       ההעלאה לא הצליחה. לא בוצעה הדבקה לאינטרנט.
     
     
-      
+      
       Install log posted to
 
 %1
 
 Link copied to clipboard
-      
+      יומן ההתקנה פורסם אל
+
+%1
+
+הקישור הועתק ללוח הגזירים
     
     
-      
+      
       Calamares Initialization Failed
       הפעלת Calamares נכשלה
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       אין אפשרות להתקין את %1. ל־Calamares אין אפשרות לטעון את המודולים המוגדרים. מדובר בתקלה באופן בו ההפצה משתמשת ב־Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>לא ניתן לטעון את המודולים הבאים:
     
     
-      
+      
       Continue with setup?
       להמשיך בהתקנה?
     
     
-      
+      
       Continue with installation?
       להמשיך בהתקנה?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       תכנית ההתקנה של %1 עומדת לבצע שינויים בכונן הקשיח שלך לטובת התקנת %2.<br/><strong>לא תהיה לך אפשרות לבטל את השינויים האלה.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       אשף התקנת %1 עומד לבצע שינויים בכונן שלך לטובת התקנת %2.<br/><strong>לא תהיה אפשרות לבטל את השינויים הללו.</strong>
     
     
-      
+      
       &Set up now
       להת&קין כעת
     
     
-      
+      
       &Install now
       להת&קין כעת
     
     
-      
+      
       Go &back
       ח&זרה
     
     
-      
+      
       &Set up
       להת&קין
     
     
-      
+      
       &Install
       הת&קנה
     
     
-      
+      
       Setup is complete. Close the setup program.
       ההתקנה הושלמה. נא לסגור את תכנית ההתקנה.
     
     
-      
+      
       The installation is complete. Close the installer.
       ההתקנה הושלמה. נא לסגור את אשף ההתקנה.
     
     
-      
+      
       Cancel setup without changing the system.
       ביטול ההתקנה ללא ביצוע שינוי במערכת.
     
     
-      
+      
       Cancel installation without changing the system.
       ביטול ההתקנה ללא ביצוע שינוי במערכת.
     
     
-      
+      
       &Next
       &קדימה
     
     
-      
+      
       &Back
       &אחורה
     
     
-      
+      
       &Done
       &סיום
     
     
-      
+      
       &Cancel
       &ביטול
     
     
-      
+      
       Cancel setup?
       לבטל את ההתקנה?
     
     
-      
+      
       Cancel installation?
       לבטל את ההתקנה?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       האם לבטל את תהליך ההתקנה הנוכחי?
 אשף ההתקנה ייסגר וכל השינויים יאבדו.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       האם לבטל את תהליך ההתקנה הנוכחי?
@@ -472,22 +476,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       סוג חריגה לא מוכר
     
     
-      
+      
       unparseable Python error
       שגיאת Python לא ניתנת לניתוח
     
     
-      
+      
       unparseable Python traceback
       עקבה לאחור של Python לא ניתנת לניתוח
     
     
-      
+      
       Unfetchable Python error.
       שגיאת Python לא ניתנת לאחזור.
     
@@ -505,6 +509,24 @@ The installer will quit and all changes will be lost.
       אשף התקנת %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      הגדרת תווית מערכת קבצים על %1.
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      הגדרת תווית מערכת הקבצים <strong>%1</strong> למחיצה <strong>%2</strong>.
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      אשף ההתקנה נכשל בעת עדכון טבלת המחיצות על כונן '%1'.
+    
+  
   
     CheckerContainer
     
@@ -521,149 +543,149 @@ The installer will quit and all changes will be lost.
       Form
     
     
-      
+      
       Select storage de&vice:
       בחירת התקן א&חסון:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       נוכחי:
     
     
-      
+      
       After:
       לאחר:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>הגדרת מחיצות באופן ידני</strong><br/>ניתן ליצור או לשנות את גודל המחיצות בעצמך.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       שימוש ב־%1 כמחיצת הבית (home) עבור %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>ראשית יש לבחור מחיצה לכיווץ, לאחר מכן לגרור את הסרגל התחתון כדי לשנות את גודלה</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 תכווץ לכדי %2MiB ותיווצר מחיצה חדשה בגודל %3MiB עבור %4.
     
     
-      
+      
       Boot loader location:
       מיקום מנהל אתחול המערכת:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>נא לבחור מחיצה כדי להתקין עליה</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       במערכת זו לא נמצאה מחיצת מערכת EFI. נא לחזור ולהשתמש ביצירת מחיצות באופן ידני כדי להגדיר את %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       מחיצת מערכת EFI שב־%1 תשמש לטעינת %2.
     
     
-      
+      
       EFI system partition:
       מחיצת מערכת EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       לא נמצאה מערכת הפעלה על התקן אחסון זה. מה ברצונך לעשות?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>מחיקת כונן</strong><br/> פעולה זו <font color="red">תמחק</font> את כל המידע השמור על התקן האחסון הנבחר.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>התקנה לצד</strong><br/> אשף ההתקנה יכווץ מחיצה כדי לפנות מקום לטובת %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>החלפת מחיצה</strong><br/> ביצוע החלפה של המחיצה ב־%1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       בהתקן אחסון זה נמצאה %1. מה ברצונך לעשות?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       כבר קיימת מערכת הפעלה על התקן האחסון הזה. כיצד להמשיך?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ישנן מגוון מערכות הפעלה על התקן אחסון זה. איך להמשיך? <br/>ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       בהתקן האחסון הזה כבר יש מערכת הפעלה אך טבלת המחיצות <strong>%1</strong> שונה מהנדרשת <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       אחת המחיצות של התקן האחסון הזה <strong>מעוגנת</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       התקן אחסון זה הוא חלק מהתקן <strong>RAID בלתי פעיל</strong>.
     
     
-      
+      
       No Swap
       ללא החלפה
     
     
-      
+      
       Reuse Swap
       שימוש מחדש בהחלפה
     
     
-      
+      
       Swap (no Hibernate)
       החלפה (ללא תרדמת)
     
     
-      
+      
       Swap (with Hibernate)
       החלפה (עם תרדמת)
     
     
-      
+      
       Swap to file
       החלפה לקובץ
     
@@ -699,12 +721,12 @@ The installer will quit and all changes will be lost.
       מבצע מחיקה של כל נקודות העיגון הזמניות.
     
     
-      
+      
       Cannot get list of temporary mounts.
       לא ניתן לשלוף רשימה של כל נקודות העיגון הזמניות.
     
     
-      
+      
       Cleared all temporary mounts.
       בוצעה מחיקה של כל נקודות העיגון הזמניות.
     
@@ -731,27 +753,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       הגדרת דגם המקלדת בתור %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       הגדרת פריסת לוח המקשים בתור %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       הגדרת אזור הזמן לכדי %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       שפת המערכת תוגדר להיות %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       תבנית של המספרים והתאריכים של המיקום יוגדרו להיות %1.
     
@@ -773,7 +795,7 @@ The installer will quit and all changes will be lost.
     
       
       Network Installation. (Disabled: No package list)
-      
+      התקנה מהרשתץ (מושבתת: אין רשימת חבילות)
     
     
       
@@ -875,6 +897,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       הסיסמאות לא תואמות!
     
+    
+      
+      OK!
+      בסדר!
+    
     
       
       Setup Failed
@@ -915,6 +942,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       ההתקנה של %1 הושלמה.
     
+    
+      
+      Package Selection
+      בחירת חבילות
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      נא לבחור במוצר מהרשימה. המוצר הנבחר יותקן.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1014,37 @@ The installer will quit and all changes will be lost.
       סימונים:
     
     
-      
+      
+      Label for the filesystem
+      תווית למערכת הקבצים
+    
+    
+      
+      FS Label:
+      תווית מערכת הקבצים:
+    
+    
+      
       En&crypt
       ה&צפנה
     
     
-      
+      
       Logical
       לוגית
     
     
-      
+      
       Primary
       ראשית
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       נקודת העיגון בשימוש. נא לבחור בנקודת עיגון אחרת.
     
@@ -1005,43 +1052,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
-      
+      יצירת מחיצת %1MiB על גבי %3 (%2) עם הרשומות %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       יצירת מחיצה חדשה בגודל %1MiB על גבי %3 ‏(%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       יצירת מחיצה חדשה בגודל %2MiB על גבי %4 (%3) עם מערכת הקבצים %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
-      
+      יצירת מחיצה חדשה בגודל <strong>%1MiB</strong> על גבי <strong>%3</strong> (%2) עם הרשומות <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       יצירת מחיצה חדשה בגודל <strong>%1MiB</strong> על גבי <strong>%3</strong> ‏(%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       יצירת מחיצה חדשה בגודל <strong>%2MiB</strong> על גבי <strong>%4</strong> (%3) עם מערכת הקבצים <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       מוגדרת מחיצת %1 חדשה על %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       אשף ההתקנה נכשל ביצירת מחיצה על הכונן ‚%1’.
     
@@ -1092,7 +1139,7 @@ The installer will quit and all changes will be lost.
       נוצרת טבלת מחיצות חדשה מסוג %1 על %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       אשף ההתקנה נכשל בעת יצירת טבלת המחיצות על %1.
     
@@ -1331,7 +1378,17 @@ The installer will quit and all changes will be lost.
       סימונים:
     
     
-      
+      
+      Label for the filesystem
+      תווית למערכת הקבציםת
+    
+    
+      
+      FS Label:
+      תווית מערכת הקבצים:
+    
+    
+      
       Mountpoint already in use. Please select another one.
       נקודת העיגון בשימוש. נא לבחור בנקודת עיגון אחרת.
     
@@ -1368,57 +1425,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       הגדרת מידע עבור המחיצה
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       התקנת %1 על מחיצת מערכת <strong>חדשה</strong> מסוג %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
-      
+      התקנת %2 על מחיצת מערכת %3 בשם <strong>%1</strong> עם היכולות <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
-      
+      הקמת מחיצת %3 בשם <strong>%1</strong> עם נקודת העגינה <strong>%2</strong>%4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       התקנת %2 על מחיצת מערכת <strong>%1</strong> מסוג %3.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       התקנת מנהל אתחול מערכת על <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       כעת בהגדרת נקודות העיגון.
     
@@ -1831,6 +1888,14 @@ The installer will quit and all changes will be lost.
       מיקום
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      יציאה
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2115,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      נא לבחור את המחוז המועדף עליכם או להשתמש בברירת המחדל לפי המיקום הנוכחי שלכם.
+      
+      Select your preferred Region, or use the default settings.
+      ניתן לבחור את האזור המועדף עליך או להשתמש בהגדרות בררת המחדל.
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       אזור זמן: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       נא לבחור את האזור המועדף במחוז שלך.
     
     
-      
+      
       Zones
       אזורים
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       ניתן לכוון את הגדרות השפה והמיקום להלן.
     
@@ -2406,7 +2471,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       חבילות
     
@@ -2587,33 +2652,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       שטח פנוי
     
     
       
-      
+      
       New partition
       מחיצה חדשה
     
     
-      
+      
       Name
       שם
     
     
-      
+      
       File System
       מערכת קבצים
     
     
-      
+      
+      File System Label
+      תווית מערכת קבצים
+    
+    
+      
       Mount Point
       נקודת עיגון
     
     
-      
+      
       Size
       גודל
     
@@ -2699,117 +2769,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       נאסף מידע על המערכת…
     
     
-      
+      
       Partitions
       מחיצות
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       להתקין את %1 <strong>לצד</strong> מערכת הפעלה אחרת.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>למחוק</strong> את הכונן ולהתקין את %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>החלפת</strong> מחיצה עם %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       להגדיר מחיצות באופן <strong>ידני</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       להתקין את %1 <strong>לצד</strong> מערכת הפעלה אחרת על כונן <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>למחוק</strong> את הכונן <strong>%2</strong> (%3) ולהתקין את %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>החלפת</strong> מחיצה על כונן <strong>%2</strong> (%3) ב־%1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       חלוקה למחיצות באופן <strong>ידני</strong> על כונן <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       כונן <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       נוכחי:
     
     
-      
+      
       After:
       לאחר:
     
     
-      
+      
       No EFI system partition configured
       לא הוגדרה מחיצת מערכת EFI
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       מחיצת מערכת EFI נדרשת כדי להפעיל את %1.<br/><br/> כדי להגדיר מחיצת מערכת EFI, יש לחזור ולבחור או ליצור מערכת קבצים מסוג FAT32 עם סימון <strong>%3</strong> פעיל ועם נקודת עיגון <strong>%2</strong>.<br/><br/> ניתן להמשיך ללא הגדרת מחיצת מערכת EFI אך טעינת המערכת עשויה להיכשל.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       לצורך הפעלת %1 נדרשת מחיצת מערכת EFI.<br/><br/> הוגדרה מחיצה עם נקודת עיגון <strong>%2</strong> אך לא הוגדר סימון <strong>%3</strong>.<br/> כדי לסמן את המחיצה, יש לחזור ולערוך את המחיצה.<br/><br/> ניתן להמשיך ללא הוספת הסימון אך טעינת המערכת עשויה להיכשל.
     
     
-      
+      
       EFI system partition flag not set
       לא מוגדר סימון מחיצת מערכת EFI
     
     
-      
+      
       Option to use GPT on BIOS
       אפשרות להשתמש ב־GPT או ב־BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       טבלת מחיצות מסוג GPT היא האפשרות הטובה ביותר בכל המערכות. תכנית התקנה זו תומכת גם במערכות מסוג BIOS.<br/><br/>כדי להגדיר טבלת מחיצות מסוג GPT על גבי BIOS, (אם זה טרם בוצע) יש לחזור ולהגדיר את טבלת המחיצות ל־GPT, לאחר מכן יש ליצור מחיצה של 8 מ״ב ללא פירמוט עם הדגלון <strong>bios_grub</strong> פעיל.<br/><br/>מחיצה בלתי מפורמטת בגודל 8 מ״ב נחוצה לטובת הפעלת %1 על מערכת מסוג BIOS עם GPT.
     
     
-      
+      
       Boot partition not encrypted
       מחיצת האתחול (Boot) אינה מוצפנת
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       מחיצת אתחול, boot, נפרדת הוגדרה יחד עם מחיצת מערכת ההפעלה, root, מוצפנת, אך מחיצת האתחול לא הוצפנה.<br/><br/> ישנן השלכות בטיחותיות עם התצורה שהוגדרה, מכיוון שקובצי מערכת חשובים נשמרים על מחיצה לא מוצפנת.<br/>ניתן להמשיך אם זהו רצונך, אך שחרור מערכת הקבצים יתרחש מאוחר יותר כחלק מהאתחול.<br/>בכדי להצפין את מחיצת האתחול, יש לחזור וליצור אותה מחדש, על ידי בחירה ב <strong>הצפנה</strong> בחלונית יצירת המחיצה.
     
     
-      
+      
       has at least one disk device available.
       יש לפחות התקן כונן אחד זמין.
     
     
-      
+      
       There are no partitions to install on.
       אין מחיצות להתקין עליהן.
     
@@ -2999,17 +3069,17 @@ Output:
       לא ניתן ליצור קובץ אקראי חדש <pre>%1</pre>.
     
     
-      
+      
       No product
       אין מוצר
     
     
-      
+      
       No description provided.
       לא סופק תיאור.
     
     
-      
+      
       (no mount point)
       (אין נקודת עגינה)
     
@@ -3270,12 +3340,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       לקבלת התוצאות הטובות ביותר, נא לוודא כי מחשב זה:
     
     
-      
+      
       System requirements
       דרישות מערכת
     
@@ -3283,27 +3353,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       המחשב לא עומד ברף הדרישות המזערי להתקנת %1. <br/>להתקנה אין אפשרות להמשיך. <a href="#details">פרטים…</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       המחשב לא עומד ברף דרישות המינימום להתקנת %1. <br/>ההתקנה לא יכולה להמשיך. <a href="#details"> פרטים...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       המחשב לא עומד בחלק מרף דרישות המזערי להתקנת %1.<br/> ההתקנה יכולה להמשיך, אך יתכן כי חלק מהתכונות יושבתו.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       המחשב לא עומד בחלק מרף דרישות המינימום להתקנת %1.<br/> ההתקנה יכולה להמשיך, אך יתכן כי חלק מהתכונות יושבתו.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       תכנית זו תשאל אותך מספר שאלות ותתקין את %2 על המחשב שלך.
     
@@ -3459,7 +3529,7 @@ Output:
       מגדיר סימונים <strong>%1</strong> על מחיצה חדשה.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       אשף ההתקנה נכשל בהצבת סימונים במחיצה %1.
     
@@ -3602,12 +3672,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       זו סקירה של מה שיקרה לאחר התחלת תהליך ההתקנה.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       להלן סקירת המאורעות שיתרחשו עם תחילת תהליך ההתקנה.
     
@@ -4034,7 +4104,8 @@ Output:
       
       <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
             This log is copied to /var/log/installation.log of the target system.</p>
-      
+      <p>יומן מלא של ההתקנה זמין בשם installation.log בתיקיית הבית של המשתמש Live.<br/>
+            יומן זה מועתק אל ‎/var/log/installation.log במערכת היעד.</p>
     
   
   
@@ -4181,107 +4252,127 @@ Output:
       נא לבחור את שם המשתמש ואת פרטי הגישה שלך כדי להיכנס ולבצע פעולות ניהוליות.
     
     
-      
+      
       What is your name?
       מה שמך?
     
     
-      
+      
       Your Full Name
       שמך המלא
     
     
-      
+      
       What name do you want to use to log in?
       איזה שם ברצונך שישמש אותך לכניסה?
     
     
-      
+      
       Login Name
       שם הכניסה
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       אם במחשב זה יש יותר ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      מותר להשתמש רק באותיות קטנות, ספרות, קווים תחתיים ומינוסים.
+    
+    
+      
+      root is not allowed as username.
+      אסור להשתמש ב־root כשם משתמש.
+    
+    
+      
       What is the name of this computer?
       מהו השם של המחשב הזה?
     
     
-      
+      
       Computer Name
       שם המחשב
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       השם הזה יהיה בשימוש אם המחשב הזה יהיה גלוי לשאר הרשת.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      מותר להשתמש באותיות, ספרות, קווים תחתונים ומינוסים, שני תווים ומעלה.
+    
+    
+      
+      localhost is not allowed as hostname.
+      אסור להשתמש ב־localhost כשם מארח.
+    
+    
+      
       Choose a password to keep your account safe.
       נא לבחור סיסמה להגנה על חשבונך.
     
     
-      
+      
       Password
       סיסמה
     
     
-      
+      
       Repeat Password
       חזרה על הסיסמה
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       יש להקליד את אותה הסיסמה פעמיים כדי שניתן יהיה לבדוק שגיאות הקלדה. סיסמה טובה אמורה להכיל שילוב של אותיות, מספרים וסימני פיסוק, להיות באורך של שמונה תווים לפחות ויש להחליף אותה במרווחי זמן קבועים.
     
     
-      
+      
       Validate passwords quality
       אימות איכות הסיסמאות
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       כשתיבה זו מסומנת, בדיקת אורך סיסמה מתבצעת ולא תהיה לך אפשרות להשתמש בסיסמה חלשה.
     
     
-      
+      
       Log in automatically without asking for the password
       להיכנס אוטומטית מבלי לבקש סיסמה
     
     
-      
+      
       Reuse user password as root password
       להשתמש בסיסמת המשתמש גם בשביל משתמש העל (root)
     
     
-      
+      
       Use the same password for the administrator account.
       להשתמש באותה הסיסמה בשביל חשבון המנהל.
     
     
-      
+      
       Choose a root password to keep your account safe.
       נא לבחור סיסמה למשתמש העל (root) כדי להגן על חשבונך.
     
     
-      
+      
       Root Password
       סיסמה למשתמש העל (root)
     
     
-      
+      
       Repeat Root Password
       נא לחזור על סיסמת משתמש העל
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       נא להקליד את הסיסמה פעמיים כדי לאפשר זיהוי של שגיאות הקלדה.
     
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index e914157f9d..88859e01aa 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 का मास्टर बूट रिकॉर्ड
     
     
-      
+      
       Boot Partition
       बूट विभाजन
     
     
-      
+      
       System Partition
       सिस्टम विभाजन
     
     
-      
+      
       Do not install a boot loader
       बूट लोडर इंस्टॉल न करें
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 चल रहा है।
     
     
-      
+      
       Bad working directory path
       कार्यरत फोल्डर का पथ गलत है
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       पाइथन कार्य %2 हेतु कार्यरत डायरेक्टरी %1 रीड योग्य नहीं है।
     
     
-      
+      
       Bad main script file
       गलत मुख्य स्क्रिप्ट फ़ाइल
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       पाइथन कार्य %2 हेतु मुख्य स्क्रिप्ट फ़ाइल %1 रीड योग्य नहीं है।
     
     
-      
+      
       Boost.Python error in job "%1".
       कार्य "%1" में Boost.Python त्रुटि।
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       सेटअप विफल रहा
     
     
-      
+      
       Installation Failed
       इंस्टॉल विफल रहा।
     
     
-      
+      
       Would you like to paste the install log to the web?
       क्या आप इंस्टॉल प्रक्रिया की लॉग फ़ाइल इंटरनेट पर पेस्ट करना चाहेंगे ? 
     
     
-      
+      
       Error
       त्रुटि
     
     
-      
-      
+      
+      
       &Yes
       हाँ (&Y)
     
     
-      
-      
+      
+      
       &No
       नहीं (&N)
     
     
-      
+      
       &Close
       बंद करें (&C)
     
     
-      
+      
       Install Log Paste URL
       इंस्टॉल प्रक्रिया की लॉग फ़ाइल पेस्ट करें
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       अपलोड विफल रहा। इंटरनेट पर पेस्ट नहीं हो सका।
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 लिंक को क्लिपबोर्ड पर कॉपी किया गया
     
     
-      
+      
       Calamares Initialization Failed
       Calamares का आरंभीकरण विफल रहा
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 इंस्टॉल नहीं किया जा सका। Calamares सभी विन्यस्त मॉड्यूल लोड करने में विफल रहा। यह आपके लिनक्स वितरण द्वारा Calamares के उपयोग से संबंधित एक समस्या है।
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>निम्नलिखित मॉड्यूल लोड नहीं हो सकें :
     
     
-      
+      
       Continue with setup?
       सेटअप करना जारी रखें?
     
     
-      
+      
       Continue with installation?
       इंस्टॉल प्रक्रिया जारी रखें?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %2 सेटअप करने हेतु %1 सेटअप प्रोग्राम आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %2 इंस्टॉल करने के लिए %1 इंस्टॉलर आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong>
     
     
-      
+      
       &Set up now
       अभी सेटअप करें (&S)
     
     
-      
+      
       &Install now
       अभी इंस्टॉल करें (&I)
     
     
-      
+      
       Go &back
       वापस जाएँ (&b)
     
     
-      
+      
       &Set up
       सेटअप करें (&S)
     
     
-      
+      
       &Install
       इंस्टॉल करें (&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       सेटअप पूर्ण हुआ। सेटअप प्रोग्राम बंद कर दें।
     
     
-      
+      
       The installation is complete. Close the installer.
       इंस्टॉल पूर्ण हुआ।अब इंस्टॉलर को बंद करें।
     
     
-      
+      
       Cancel setup without changing the system.
       सिस्टम में बदलाव किये बिना सेटअप रद्द करें।
     
     
-      
+      
       Cancel installation without changing the system.
       सिस्टम में बदलाव किये बिना इंस्टॉल रद्द करें।
     
     
-      
+      
       &Next
       आगे (&N)
     
     
-      
+      
       &Back
       वापस (&B)
     
     
-      
+      
       &Done
       हो गया (&D)
     
     
-      
+      
       &Cancel
       रद्द करें (&C)
     
     
-      
+      
       Cancel setup?
       सेटअप रद्द करें?
     
     
-      
+      
       Cancel installation?
       इंस्टॉल रद्द करें?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       क्या आप वाकई वर्तमान सेटअप प्रक्रिया रद्द करना चाहते हैं?
 सेटअप प्रोग्राम बंद हो जाएगा व सभी बदलाव नष्ट।
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       क्या आप वाकई वर्तमान इंस्टॉल प्रक्रिया रद्द करना चाहते हैं?
@@ -472,22 +472,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       अपवाद का प्रकार अज्ञात है
     
     
-      
+      
       unparseable Python error
       अप्राप्य पाइथन त्रुटि
     
     
-      
+      
       unparseable Python traceback
       अप्राप्य पाइथन ट्रेसबैक
     
     
-      
+      
       Unfetchable Python error.
       अप्राप्य पाइथन त्रुटि।
     
@@ -505,6 +505,24 @@ The installer will quit and all changes will be lost.
       %1 इंस्टॉलर
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ The installer will quit and all changes will be lost.
       रूप
     
     
-      
+      
       Select storage de&vice:
       डिवाइस चुनें (&v):
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       मौजूदा :
     
     
-      
+      
       After:
       बाद में:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>मैनुअल विभाजन</strong><br/> स्वयं विभाजन बनाएँ या उनका आकार बदलें।
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %2 के होम विभाजन के लिए %1 को पुनः उपयोग करें।
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>छोटा करने के लिए विभाजन चुनें, फिर नीचे bar से उसका आकर सेट करें</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 को छोटा करके %2MiB किया जाएगा व %4 हेतु %3MiB का एक नया विभाजन बनेगा।
     
     
-      
+      
       Boot loader location:
       बूट लोडर का स्थान:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>इंस्टॉल के लिए विभाजन चुनें</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       इस सिस्टम पर कहीं भी कोई EFI सिस्टम विभाजन नहीं मिला। कृपया वापस जाएँ व %1 को सेट करने के लिए मैनुअल रूप से विभाजन करें।
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 वाले EFI सिस्टम विभाजन का उपयोग %2 को शुरू करने के लिए किया जाएगा।
     
     
-      
+      
       EFI system partition:
       EFI सिस्टम विभाजन:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       इस डिवाइस पर लगता है कि कोई ऑपरेटिंग सिस्टम नहीं है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>डिस्क का सारा डाटा हटाएँ</strong><br/>इससे चयनित डिवाइस पर मौजूद सारा डाटा <font color="red">हटा</font>हो जाएगा।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>साथ में इंस्टॉल करें</strong><br/>इंस्टॉलर %1 के लिए स्थान बनाने हेतु एक विभाजन को छोटा कर देगा।
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>विभाजन को बदलें</strong><br/>एक विभाजन को %1 से बदलें।
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       इस डिवाइस पर %1 है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       इस डिवाइस पर पहले से एक ऑपरेटिंग सिस्टम है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       इस डिवाइस पर एक से अधिक ऑपरेटिंग सिस्टम है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       इस संचय उपकरण पर पहले से ऑपरेटिंग सिस्टम है, परंतु <strong>%1</strong> विभाजन तालिका अपेक्षित <strong>%2</strong> से भिन्न है।<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       इस संचय उपकरण के विभाजनों में से कोई एक विभाजन <strong>माउंट</strong> है।
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       यह संचय उपकरण एक <strong>निष्क्रिय RAID</strong> उपकरण का हिस्सा है।
     
     
-      
+      
       No Swap
       कोई स्वैप नहीं
     
     
-      
+      
       Reuse Swap
       स्वैप पुनः उपयोग करें
     
     
-      
+      
       Swap (no Hibernate)
       स्वैप (हाइबरनेशन/सिस्टम सुप्त रहित)
     
     
-      
+      
       Swap (with Hibernate)
       स्वैप (हाइबरनेशन/सिस्टम सुप्त सहित)
     
     
-      
+      
       Swap to file
       स्वैप फाइल बनाएं
     
@@ -699,12 +717,12 @@ The installer will quit and all changes will be lost.
       सभी अस्थायी माउंट हटाएँ जा रहे हैं।
     
     
-      
+      
       Cannot get list of temporary mounts.
       अस्थाई माउंट की सूची नहीं मिली।
     
     
-      
+      
       Cleared all temporary mounts.
       सभी अस्थायी माउंट हटा दिए गए।
     
@@ -731,27 +749,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       कुंजीपटल का मॉडल %1 सेट करें।<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       कुंजीपटल का अभिन्यास %1/%2 सेट करें।
     
     
-      
+      
       Set timezone to %1/%2.
       समय क्षेत्र %1%2 सेट करें।
     
     
-      
+      
       The system language will be set to %1.
       सिस्टम भाषा %1 सेट की जाएगी।
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       संख्या व दिनांक स्थानिकी %1 सेट की जाएगी।
     
@@ -875,6 +893,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       आपके कूटशब्द मेल नहीं खाते!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       %1 का इंस्टॉल पूर्ण हुआ।
     
+    
+      
+      Package Selection
+      पैकेज चयन
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      सूची में से वस्तु विशेष का चयन करें। चयनित वस्तु इंस्टॉल कर दी जाएगी।
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ The installer will quit and all changes will be lost.
       फ्लैग :
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       एन्क्रिप्ट (&c)
     
     
-      
+      
       Logical
       तार्किक
     
     
-      
+      
       Primary
       मुख्य
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       माउंट पॉइंट पहले से उपयोग में है । कृपया दूसरा चुनें।
     
@@ -1005,43 +1048,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       %3 (%2) पर %4 प्रविष्टि युक्त %1 एमबी का नया विभाजन बनाएँ।
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       %3 (%2) पर %1 एमबी का नया विभाजन बनाएँ।
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       फ़ाइल सिस्टम %1 के साथ %4 (%3) पर नया %2MiB का विभाजन बनाएँ।
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       <strong>%3</strong> (%2) पर <em>%4</em> प्रविष्टि युक्त <strong>%1 एमबी</strong> का नया विभाजन बनाएँ।
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       <strong>%3</strong> (%2) पर <strong>%1 एमबी</strong> का नया विभाजन बनाएँ।
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       फ़ाइल सिस्टम <strong>%1</strong> के साथ <strong>%4</strong> (%3) पर नया <strong>%2MiB</strong> का विभाजन बनाएँ।
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2 पर नया %1 विभाजन बनाया जा रहा है।
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       इंस्टॉलर डिस्क '%1' पर विभाजन बनाने में विफल रहा।
     
@@ -1092,7 +1135,7 @@ The installer will quit and all changes will be lost.
       %2 पर नई %1 विभाजन तालिका बनाई जा रही है।
     
     
-      
+      
       The installer failed to create a partition table on %1.
       इंस्टॉलर डिस्क '%1' पर विभाजन तालिका बनाने में विफल रहा।
     
@@ -1331,7 +1374,17 @@ The installer will quit and all changes will be lost.
       फ्लैग :
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       माउंट पॉइंट पहले से उपयोग में है । कृपया दूसरा चुनें।
     
@@ -1368,57 +1421,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       विभाजन संबंधी जानकारी सेट करें
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       <strong>नवीन</strong> सिस्टम विभाजन %2 पर %1 को <em>%3</em> विशेषताओं सहित इंस्टॉल करें।
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       <strong>नए</strong> %2 सिस्टम विभाजन पर %1 इंस्टॉल करें।
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       <strong>नवीन</strong> %2 विभाजन को माउंट पॉइंट <strong>%1</strong> व <em>%3</em>विशेषताओं सहित सेट करें।
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       <strong>नवीन</strong> %2 विभाजन को माउंट पॉइंट <strong>%1</strong>%3 सहित सेट करें।
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       %3 सिस्टम विभाजन <strong>%1</strong> %2 को <em>%4</em> विशेषताओं सहित इंस्टॉल करें।
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       %3 विभाजन <strong>%1</strong> को माउंट पॉइंट <strong>%2</strong> व <em>%4</em>विशेषताओं सहित सेट करें।
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       %3 विभाजन <strong>%1</strong> माउंट पॉइंट <strong>%2</strong>%4 सहित सेट करें।
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       %3 सिस्टम विभाजन <strong>%1</strong> पर %2 इंस्टॉल करें।
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       बूट लोडर <strong>%1</strong> पर इंस्टॉल करें।
     
     
-      
+      
       Setting up mount points.
       माउंट पॉइंट सेट किए जा रहे हैं।
     
@@ -1831,6 +1884,14 @@ The installer will quit and all changes will be lost.
       स्थान
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      इच्छित क्षेत्र चुनें या फिर वर्तमान स्थान अनुरूप डिफ़ॉल्ट क्षेत्र उपयोग करें।
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       समय क्षेत्र : %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       इच्छित क्षेत्र में भूभाग चुनें।
     
     
-      
+      
       Zones
       भूभाग
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       भाषा व स्थानिकी हेतु निम्नलिखित सेटिंग्स उपयोग करें।
     
@@ -2388,7 +2449,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       पैकेज
     
@@ -2569,33 +2630,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       खाली स्पेस
     
     
       
-      
+      
       New partition
       नया विभाजन
     
     
-      
+      
       Name
       नाम
     
     
-      
+      
       File System
       फ़ाइल सिस्टम
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       माउंट पॉइंट
     
     
-      
+      
       Size
       आकार
     
@@ -2681,117 +2747,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       सिस्टम की जानकारी प्राप्त की जा रही है...
     
     
-      
+      
       Partitions
       विभाजन
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       %1 को दूसरे ऑपरेटिंग सिस्टम <strong>के साथ</strong> इंस्टॉल करें।
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       डिस्क का सारा डाटा<strong>हटाकर</strong> कर %1 इंस्टॉल करें।
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       विभाजन को %1 से <strong>बदलें</strong>।
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>मैनुअल</strong> विभाजन।
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       डिस्क <strong>%2</strong> (%3) पर %1 को दूसरे ऑपरेटिंग सिस्टम <strong>के साथ</strong> इंस्टॉल करें।
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       डिस्क <strong>%2</strong> (%3) <strong>erase</strong> कर %1 इंस्टॉल करें।
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       डिस्क <strong>%2</strong> (%3) के विभाजन को %1 से <strong>बदलें</strong>।
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       डिस्क <strong>%1</strong> (%2) पर <strong>मैनुअल</strong> विभाजन।
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       डिस्क <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       मौजूदा :
     
     
-      
+      
       After:
       बाद में:
     
     
-      
+      
       No EFI system partition configured
       कोई EFI सिस्टम विभाजन विन्यस्त नहीं है
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       %1 आरंभ करने हेतु EFI सिस्टम विभाजन ज़रूरी है।<br/><br/>EFI सिस्टम विभाजन को विन्यस्त करने के लिए, वापस जाएँ और चुनें या बनाएँ एक FAT32 फ़ाइल सिस्टम जिस पर <strong>%3</strong> flag चालू हो व माउंट पॉइंट <strong>%2</strong>हो।<br/><br/>आप बिना सेट करें भी आगे बढ़ सकते है पर सिस्टम चालू नहीं होगा।
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       %1 को शुरू करने हेतु EFI सिस्टम विभाजन ज़रूरी है।<br/><br/>विभाजन को माउंट पॉइंट <strong>%2</strong> के साथ विन्यस्त किया गया परंतु उसका <strong>%3</strong> फ्लैग सेट नहीं था।<br/> फ्लैग सेट करने के लिए, वापस जाएँ और विभाजन को edit करें।<br/><br/>आप बिना सेट करें भी आगे बढ़ सकते है पर सिस्टम चालू नहीं होगा।
     
     
-      
+      
       EFI system partition flag not set
       EFI सिस्टम विभाजन फ्लैग सेट नहीं है
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS पर GPT उपयोग करने के लिए विकल्प
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT विभाजन तालिका सभी सिस्टम हेतु सबसे उत्तम विकल्प है। यह इंस्टॉलर BIOS सिस्टम के सेटअप को भी समर्थन करता है। <br/><br/>BIOS पर GPT विभाजन तालिका को विन्यस्त करने हेतु, (अगर अब तक नहीं करा है तो) वापस जाकर विभाजन तालिका GPT पर सेट करें, फिर एक 8 MB का बिना फॉर्मेट हुआ विभाजन बनाए जिस पर <strong>bios_grub</strong> का flag हो।<br/><br/>यह बिना फॉर्मेट हुआ 8 MB का विभाजन %1 को BIOS सिस्टम पर GPT के साथ शुरू करने के लिए आवश्यक है।
     
     
-      
+      
       Boot partition not encrypted
       बूट विभाजन एन्क्रिप्टेड नहीं है
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       एन्क्रिप्टेड रुट विभाजन के साथ एक अलग बूट विभाजन भी सेट किया गया था, पर बूट विभाजन एन्क्रिप्टेड नहीं था।<br/><br/> इस तरह का सेटअप सुरक्षित नहीं होता क्योंकि सिस्टम फ़ाइल एन्क्रिप्टेड विभाजन पर होती हैं।<br/>आप चाहे तो जारी रख सकते है, पर फिर फ़ाइल सिस्टम बाद में सिस्टम स्टार्टअप के दौरान अनलॉक होगा।<br/> विभाजन को एन्क्रिप्ट करने के लिए वापस जाकर उसे दोबारा बनाएँ व विभाजन निर्माण विंडो में<strong>एन्क्रिप्ट</strong> चुनें।
     
     
-      
+      
       has at least one disk device available.
       कम-से-कम एक डिस्क डिवाइस उपलब्ध हो।
     
     
-      
+      
       There are no partitions to install on.
       इंस्टॉल हेतु कोई विभाजन नहीं हैं।
     
@@ -2981,17 +3047,17 @@ Output:
       नवीन यादृच्छिक फ़ाइल <pre>%1</pre>नहीं बनाई जा सकी।
     
     
-      
+      
       No product
       कोई वस्तु नहीं
     
     
-      
+      
       No description provided.
       कोई विवरण प्रदान नहीं किया गया।
     
     
-      
+      
       (no mount point)
       (कोई माउंट पॉइंट नहीं)
     
@@ -3252,12 +3318,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       उत्तम परिणाम हेतु, कृपया सुनिश्चित करें कि यह कंप्यूटर :
     
     
-      
+      
       System requirements
       सिस्टम इंस्टॉल हेतु आवश्यकताएँ
     
@@ -3265,27 +3331,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       यह कंप्यूटर %1 को सेटअप करने की न्यूनतम आवश्यकताओं को पूरा नहीं करता।<br/>सेटअप जारी नहीं रखा जा सकता।<a href="#details">विवरण...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       यह कंप्यूटर %1 को इंस्टॉल करने की न्यूनतम आवश्यकताओं को पूरा नहीं करता।<br/>इंस्टॉल जारी नहीं रखा जा सकता।<a href="#details">विवरण...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       यह कंप्यूटर %1 को सेटअप करने हेतु सुझाई गई आवश्यकताओं को पूरा नहीं करता।<br/>सेटअप जारी रखा जा सकता है, लेकिन कुछ विशेषताएँ को निष्क्रिय किया जा सकता हैं।
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       यह कंप्यूटर %1 को इंस्टॉल करने हेतु सुझाई गई आवश्यकताओं को पूरा नहीं करता।<br/>इंस्टॉल जारी रखा जा सकता है, लेकिन कुछ विशेषताएँ को निष्क्रिय किया जा सकता हैं।
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       यह प्रोग्राम एक प्रश्नावली के आधार पर आपके कंप्यूटर पर %2 को सेट करेगा।
     
@@ -3441,7 +3507,7 @@ Output:
       नए विभाजन पर फ्लैग <strong>%1</strong> सेट किए जा रहे हैं।
     
     
-      
+      
       The installer failed to set flags on partition %1.
       इंस्टॉलर विभाजन %1 पर फ्लैग सेट करने में विफल रहा।
     
@@ -3584,12 +3650,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       यह एक अवलोकन है कि सेटअप प्रक्रिया आरंभ होने के उपरांत क्या होगा।
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       यह अवलोकन है कि इंस्टॉल शुरू होने के बाद क्या होगा।
     
@@ -4165,107 +4231,127 @@ Output:
       लॉगिन एवं प्रशासक कार्यों हेतु उपयोक्ता नाम इत्यादि चुनें।
     
     
-      
+      
       What is your name?
       आपका नाम क्या है?
     
     
-      
+      
       Your Full Name
       आपका पूरा नाम
     
     
-      
+      
       What name do you want to use to log in?
       लॉग इन के लिए आप किस नाम का उपयोग करना चाहते हैं?
     
     
-      
+      
       Login Name
       लॉगिन नाम
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं।
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      केवल लोअरकेस अक्षर, अंक, अंडरस्कोर(_) व हाइफ़न(-) ही स्वीकार्य हैं।
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       इस कंप्यूटर का नाम ?
     
     
-      
+      
       Computer Name
       कंप्यूटर का नाम
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       यदि आपका कंप्यूटर किसी नेटवर्क पर दृश्यमान होता है, तो यह नाम उपयोग किया जाएगा।
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       अपना अकाउंट सुरक्षित रखने के लिए पासवर्ड चुनें ।
     
     
-      
+      
       Password
       कूटशब्द
     
     
-      
+      
       Repeat Password
       कूटशब्द पुनः दर्ज करें
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       एक ही कूटशब्द दो बार दर्ज़ करें, ताकि उसे टाइप त्रुटि हेतु जाँचा जा सके। एक अच्छे कूटशब्द में अक्षर, अंक व विराम चिन्हों का मेल होता है, उसमें कम-से-कम आठ अक्षर होने चाहिए, और उसे नियमित अंतराल पर बदलते रहना चाहिए।
     
     
-      
+      
       Validate passwords quality
       कूटशब्द गुणवत्ता प्रमाणीकरण
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       यह बॉक्स टिक करने के परिणाम स्वरुप कूटशब्द-क्षमता की जाँच होगी व आप कमज़ोर कूटशब्द उपयोग नहीं कर पाएंगे।
     
     
-      
+      
       Log in automatically without asking for the password
       कूटशब्द बिना पूछे ही स्वतः लॉग इन करें
     
     
-      
+      
       Reuse user password as root password
       रुट कूटशब्द हेतु भी उपयोक्ता कूटशब्द उपयोग करें
     
     
-      
+      
       Use the same password for the administrator account.
       प्रबंधक अकाउंट के लिए भी यही कूटशब्द उपयोग करें।
     
     
-      
+      
       Choose a root password to keep your account safe.
       अकाउंट सुरक्षा हेतु रुट कूटशब्द चुनें।
     
     
-      
+      
       Root Password
       रुट कूटशब्द
     
     
-      
+      
       Repeat Root Password
       रुट कूटशब्द पुनः दर्ज करें
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       समान कूटशब्द दो बार दर्ज करें, ताकि टाइपिंग त्रुटि हेतु जाँच की जा सकें।
     
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index 955a5d3d9b..7aa9d9cffb 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record od %1
     
     
-      
+      
       Boot Partition
       Boot particija
     
     
-      
+      
       System Partition
       Particija sustava
     
     
-      
+      
       Do not install a boot loader
       Nemoj instalirati boot učitavač
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Izvodim %1 operaciju.
     
     
-      
+      
       Bad working directory path
       Krivi put do radnog direktorija
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Radni direktorij %1 za python zadatak %2 nije čitljiv.
     
     
-      
+      
       Bad main script file
       Kriva glavna datoteka skripte
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Glavna skriptna datoteka %1 za python zadatak %2 nije čitljiva.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python greška u zadatku "%1".
     
@@ -287,54 +287,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Instalacija nije uspjela
     
     
-      
+      
       Installation Failed
       Instalacija nije uspjela
     
     
-      
+      
       Would you like to paste the install log to the web?
       Želite li objaviti dnevnik instaliranja na web?
     
     
-      
+      
       Error
       Greška
     
     
-      
-      
+      
+      
       &Yes
       &Da
     
     
-      
-      
+      
+      
       &No
       &Ne
     
     
-      
+      
       &Close
       &Zatvori
     
     
-      
+      
       Install Log Paste URL
       URL za objavu dnevnika instaliranja
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Objava dnevnika instaliranja na web nije uspjela.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -347,124 +347,124 @@ Link copied to clipboard
 Veza je kopirana u međuspremnik
     
     
-      
+      
       Calamares Initialization Failed
       Inicijalizacija Calamares-a nije uspjela
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 se ne može se instalirati. Calamares nije mogao učitati sve konfigurirane module. Ovo je problem s načinom na koji se Calamares koristi u distribuciji.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Sljedeći moduli se nisu mogli učitati:
     
     
-      
+      
       Continue with setup?
       Nastaviti s postavljanjem?
     
     
-      
+      
       Continue with installation?
       Nastaviti sa instalacijom?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instalacijski program %1 će izvršiti promjene na vašem disku kako bi postavio %2. <br/><strong>Ne možete poništiti te promjene.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 instalacijski program će napraviti promjene na disku kako bi instalirao %2.<br/><strong>Nećete moći vratiti te promjene.</strong>
     
     
-      
+      
       &Set up now
       &Postaviti odmah
     
     
-      
+      
       &Install now
       &Instaliraj sada
     
     
-      
+      
       Go &back
       Idi &natrag
     
     
-      
+      
       &Set up
       &Postaviti
     
     
-      
+      
       &Install
       &Instaliraj
     
     
-      
+      
       Setup is complete. Close the setup program.
       Instalacija je završena. Zatvorite instalacijski program.
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalacija je završena. Zatvorite instalacijski program.
     
     
-      
+      
       Cancel setup without changing the system.
       Odustanite od instalacije bez promjena na sustavu.
     
     
-      
+      
       Cancel installation without changing the system.
       Odustanite od instalacije bez promjena na sustavu.
     
     
-      
+      
       &Next
       &Sljedeće 
     
     
-      
+      
       &Back
       &Natrag
     
     
-      
+      
       &Done
       &Gotovo
     
     
-      
+      
       &Cancel
       &Odustani
     
     
-      
+      
       Cancel setup?
       Prekinuti instalaciju?
     
     
-      
+      
       Cancel installation?
       Prekinuti instalaciju?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Stvarno želite prekinuti instalacijski proces?
 Instalacijski program će izaći i sve promjene će biti izgubljene.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Stvarno želite prekinuti instalacijski proces?
@@ -474,22 +474,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Nepoznati tip iznimke
     
     
-      
+      
       unparseable Python error
       unparseable Python greška
     
     
-      
+      
       unparseable Python traceback
       unparseable Python traceback
     
     
-      
+      
       Unfetchable Python error.
       Nedohvatljiva Python greška.
     
@@ -507,6 +507,24 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.%1 Instalacijski program
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Instalacijski program nije uspio nadograditi particijsku tablicu na disku '%1'.
+    
+  
   
     CheckerContainer
     
@@ -523,149 +541,149 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Oblik
     
     
-      
+      
       Select storage de&vice:
       Odaberi uređaj za spremanje:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Trenutni:
     
     
-      
+      
       After:
       Poslije:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ručno particioniranje</strong><br/>Možete sami stvoriti ili promijeniti veličine particija.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Koristi %1 kao home particiju za %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Odaberite particiju za smanjivanje, te povlačenjem donjeg pokazivača odaberite promjenu veličine</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 će se smanjiti na %2MB i stvorit će se nova %3MB particija za %4.
     
     
-      
+      
       Boot loader location:
       Lokacija boot učitavača:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Odaberite particiju za instalaciju</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI particija ne postoji na ovom sustavu. Vratite se natrag i koristite ručno particioniranje da bi ste postavili %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI particija na %1 će se koristiti za pokretanje %2.
     
     
-      
+      
       EFI system partition:
       EFI particija:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Izgleda da na ovom disku nema operacijskog sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Obriši disk</strong><br/>To će <font color="red">obrisati</font> sve podatke na odabranom disku.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instaliraj uz postojeće</strong><br/>Instalacijski program će smanjiti particiju da bi napravio mjesto za %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Zamijeni particiju</strong><br/>Zamijenjuje particiju sa %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ovaj disk ima %1. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ovaj disk već ima operacijski sustav. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ovaj disk ima više operacijskih sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Ovaj uređaj za pohranu već ima operativni sustav, ali njegova particijska tablica <strong>%1</strong> razlikuje se od potrebne <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Ovaj uređaj za pohranu ima <strong>montiranu</strong> jednu od particija.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Ovaj uređaj za pohranu je dio <strong>neaktivnog RAID</strong> uređaja.
     
     
-      
+      
       No Swap
       Bez swap-a
     
     
-      
+      
       Reuse Swap
       Iskoristi postojeći swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (bez hibernacije)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (sa hibernacijom)
     
     
-      
+      
       Swap to file
       Swap datoteka
     
@@ -701,12 +719,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Uklanjam sva privremena montiranja.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Ne mogu dohvatiti popis privremenih montiranja.
     
     
-      
+      
       Cleared all temporary mounts.
       Uklonjena sva privremena montiranja.
     
@@ -733,27 +751,27 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Postavi model tipkovnice na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Postavi raspored tipkovnice na %1%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Postavi vremesku zonu na %1%2.
     
     
-      
+      
       The system language will be set to %1.
       Jezik sustava će se postaviti na %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Regionalne postavke brojeva i datuma će se postaviti na %1.
     
@@ -877,6 +895,11 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Your passwords do not match!
       Lozinke se ne podudaraju!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -917,6 +940,16 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.The installation of %1 is complete.
       Instalacija %1 je završena.
     
+    
+      
+      Package Selection
+      Odabir paketa
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Molimo odaberite proizvod s popisa. Izabrani proizvod će biti instaliran.
+    
   
   
     ContextualProcessJob
@@ -979,27 +1012,37 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Oznake:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Ši&friraj
     
     
-      
+      
       Logical
       Logično
     
     
-      
+      
       Primary
       Primarno
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Točka montiranja se već koristi. Odaberite drugu.
     
@@ -1007,43 +1050,43 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Stvori novu %1MiB particiju na %3 (%2) s unosima %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Stvori novu %1MiB particiju na %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Stvori novu %2MB particiju na %4 (%3) s datotečnim sustavom %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Stvori novu <strong>%1MiB</strong> particiju na <strong>%3</strong> (%2) sa unosima <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Stvori novu <strong>%1MiB</strong> particiju na <strong>%3</strong> (%2). 
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Stvori novu <strong>%2MB</strong> particiju na <strong>%4</strong> (%3) s datotečnim sustavom <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Stvaram novu %1 particiju na %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Instalacijski program nije uspio stvoriti particiju na disku '%1'.
     
@@ -1094,7 +1137,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Stvaram novu %1 particijsku tablicu na %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Instalacijski program nije uspio stvoriti particijsku tablicu na %1.
     
@@ -1333,7 +1376,17 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Oznake:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Točka montiranja se već koristi. Odaberite drugu.
     
@@ -1370,57 +1423,57 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Postavi informacije o particiji
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Instaliraj %1 na <strong>novu</strong> %2 sistemsku particiju sa značajkama <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instaliraj %1 na <strong>novu</strong> %2 sistemsku particiju.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Postavi <strong>novu</strong> %2 particiju s točkom montiranja <strong>%1</strong> i značajkama <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Postavi <strong>novu</strong> %2 particiju s točkom montiranja <strong>%1</strong> %3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Instaliraj %2 na %3 sistemsku particiju <strong>%1</strong> sa značajkama <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Postavi %3 particiju <strong>%1</strong> s točkom montiranja <strong>%2</strong> i značajkama <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Postavi %3 particiju <strong>%1</strong> s točkom montiranja <strong>%2</strong> %4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instaliraj %2 na %3 sistemsku particiju <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instaliraj boot učitavač na <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Postavljam točke montiranja.
     
@@ -1833,6 +1886,14 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Lokacija
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2052,29 +2113,29 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Odaberite željenu regiju ili upotrijebite zadanu na temelju vaše trenutne lokacije
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Vremenska zona: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Odaberite željenu zonu unutar svoje regije.
     
     
-      
+      
       Zones
       Zone
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Dolje možete fino prilagoditi postavke jezika i regionalne postavke.
     
@@ -2399,7 +2460,7 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paketi
     
@@ -2580,33 +2641,38 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
     PartitionModel
     
       
-      
+      
       Free Space
       Slobodni prostor
     
     
       
-      
+      
       New partition
       Nova particija
     
     
-      
+      
       Name
       Ime
     
     
-      
+      
       File System
       Datotečni sustav
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Točka montiranja
     
     
-      
+      
       Size
       Veličina
     
@@ -2692,117 +2758,117 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Skupljanje informacija o sustavu...
     
     
-      
+      
       Partitions
       Particije
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instaliraj %1 <strong>uz postojeći</strong> operacijski sustav.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Obriši</strong> disk i instaliraj %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Zamijeni</strong> particiju s %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Ručno</strong> particioniranje.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instaliraj %1 <strong>uz postojeći</strong> operacijski sustav na disku <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Obriši</strong> disk <strong>%2</strong> (%3) i instaliraj %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Zamijeni</strong> particiju na disku <strong>%2</strong> (%3) s %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Ručno</strong> particioniram disk <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disk <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Trenutni:
     
     
-      
+      
       After:
       Poslije:
     
     
-      
+      
       No EFI system partition configured
       EFI particija nije konfigurirana
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       EFI particija je potrebna za pokretanje %1.<br/><br/>Da bi ste konfigurirali EFI particiju, idite natrag i odaberite ili stvorite FAT32 datotečni sustav s omogućenom <strong>%3</strong> oznakom i točkom montiranja <strong>%2</strong>.<br/><br/>Možete nastaviti bez postavljanja EFI particije, ali vaš sustav se možda neće moći pokrenuti.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       EFI particija je potrebna za pokretanje %1.<br/><br/>Particija je konfigurirana s točkom montiranja <strong>%2</strong>, ali njezina <strong>%3</strong> oznaka nije postavljena.<br/>Za postavljanje oznake, vratite se i uredite postavke particije.<br/><br/>Možete nastaviti bez postavljanja oznake, ali vaš sustav se možda neće moći pokrenuti.
     
     
-      
+      
       EFI system partition flag not set
       Oznaka EFI particije nije postavljena
     
     
-      
+      
       Option to use GPT on BIOS
       Mogućnost korištenja GPT-a na BIOS-u
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT tablica particija je najbolja opcija za sve sustave. Ovaj instalacijski program podržava takvo postavljanje i za BIOS sustave. <br/><br/>Da biste konfigurirali GPT particijsku tablicu za BIOS sustave, (ako to već nije učinjeno) vratite se natrag i postavite particijsku tablicu na GPT, a zatim stvorite neformatiranu particiju od 8 MB s omogućenom zastavicom <strong>bios_grub</strong>. <br/><br/>Neformirana particija od 8 MB potrebna je za pokretanje %1 na BIOS sustavu s GPT-om.
     
     
-      
+      
       Boot partition not encrypted
       Boot particija nije kriptirana
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Odvojena boot particija je postavljena zajedno s kriptiranom root particijom, ali boot particija nije kriptirana.<br/><br/>Zabrinuti smo za vašu sigurnost jer su važne datoteke sustava na nekriptiranoj particiji.<br/>Možete nastaviti ako želite, ali datotečni sustav će se otključati kasnije tijekom pokretanja sustava.<br/>Da bi ste kriptirali boot particiju, vratite se natrag i napravite ju, odabirom opcije <strong>Kriptiraj</strong> u prozoru za stvaranje prarticije.
     
     
-      
+      
       has at least one disk device available.
       ima barem jedan disk dostupan.
     
     
-      
+      
       There are no partitions to install on.
       Ne postoje particije na koje bi se instalirao sustav.
     
@@ -2992,17 +3058,17 @@ Izlaz:
       Ne mogu stvoriti slučajnu datoteku <pre>%1</pre>.
     
     
-      
+      
       No product
       Nema proizvoda
     
     
-      
+      
       No description provided.
       Nije naveden opis.
     
     
-      
+      
       (no mount point)
       (nema točke montiranja)
     
@@ -3263,12 +3329,12 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Za najbolje rezultate, pobrinite se da ovo računalo:
     
     
-      
+      
       System requirements
       Zahtjevi sustava
     
@@ -3276,27 +3342,27 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Ovo računalo ne zadovoljava minimalne zahtjeve za instalaciju %1.<br/>Instalacija se ne može nastaviti.<a href="#details">Detalji...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ovo računalo ne zadovoljava minimalne uvijete za instalaciju %1.<br/>Instalacija se ne može nastaviti.<a href="#details">Detalji...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.<br/>Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.<br/>Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ovaj program će vam postaviti neka pitanja i instalirati %2 na vaše računalo.
     
@@ -3452,7 +3518,7 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
       Postavljam oznake <strong>%1</strong> na novoj particiji.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Instalacijski program nije uspio postaviti oznake na particiji %1.
     
@@ -3595,12 +3661,12 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Ovo je prikaz događaja koji će uslijediti jednom kad počne instalacijska procedura.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Ovo je prikaz događaja koji će uslijediti jednom kad počne instalacijska procedura.
     
@@ -4175,107 +4241,127 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str
       Odaberite svoje korisničko ime i vjerodajnice za prijavu i izvršavanje administracijskih zadataka
     
     
-      
+      
       What is your name?
       Koje je tvoje ime?
     
     
-      
+      
       Your Full Name
       Vaše puno ime
     
     
-      
+      
       What name do you want to use to log in?
       Koje ime želite koristiti za prijavu?
     
     
-      
+      
       Login Name
       Korisničko ime
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Ako će više korisnika koristiti ovo računalo, nakon instalacije možete otvoriti više računa.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Dopuštena su samo mala slova, brojevi, podvlake i crtice.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Koje je ime ovog računala?
     
     
-      
+      
       Computer Name
       Ime računala
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Ovo će se ime upotrebljavati ako računalo učinite vidljivim drugima na mreži.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Odaberite lozinku da bi račun bio siguran.
     
     
-      
+      
       Password
       Lozinka
     
     
-      
+      
       Repeat Password
       Ponovite lozinku
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Dvaput unesite istu lozinku kako biste je mogli provjeriti ima li pogrešaka u tipkanju. Dobra lozinka sadržavat će mješavinu slova, brojeva i interpunkcije, treba imati najmanje osam znakova i treba je mijenjati u redovitim intervalima.
     
     
-      
+      
       Validate passwords quality
       Provjerite kvalitetu lozinki
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Kad je ovaj okvir potvrđen, bit će napravljena provjera jakosti lozinke te nećete moći koristiti slabu lozinku.
     
     
-      
+      
       Log in automatically without asking for the password
       Automatska prijava bez traženja lozinke
     
     
-      
+      
       Reuse user password as root password
       Upotrijebite lozinku korisnika kao root lozinku
     
     
-      
+      
       Use the same password for the administrator account.
       Koristi istu lozinku za administratorski račun.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Odaberite root lozinku da biste zaštitili svoj račun.
     
     
-      
+      
       Root Password
       Root lozinka
     
     
-      
+      
       Repeat Root Password
       Ponovite root lozinku
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Dvaput unesite istu lozinku kako biste mogli provjeriti ima li pogrešaka u tipkanju.
     
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index e758560e0c..4a934ee39e 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Mester Boot Record - %1
     
     
-      
+      
       Boot Partition
       Indító partíció
     
     
-      
+      
       System Partition
       Rendszer Partíció
     
     
-      
+      
       Do not install a boot loader
       Ne telepítsen rendszerbetöltőt
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Futó %1 műveletek.
     
     
-      
+      
       Bad working directory path
       Rossz munkakönyvtár útvonal
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Munkakönyvtár %1 a python folyamathoz %2 nem olvasható.
     
     
-      
+      
       Bad main script file
       Rossz alap script fájl
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Alap script fájl %1 a python folyamathoz %2 nem olvasható.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost. Python hiba ebben a folyamatban "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Telepítési hiba
     
     
-      
+      
       Installation Failed
       Telepítés nem sikerült
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Hiba
     
     
-      
-      
+      
+      
       &Yes
       &Igen
     
     
-      
-      
+      
+      
       &No
       &Nem
     
     
-      
+      
       &Close
       &Bezár
     
     
-      
+      
       Install Log Paste URL
       Telepítési napló beillesztési URL-je.
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       A Calamares előkészítése meghiúsult
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       A(z) %1 nem telepíthető. A Calamares nem tudta betölteni a konfigurált modulokat. Ez a probléma abból fakad, ahogy a disztribúció a Calamarest használja.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>A következő modulok nem tölthetőek be:
     
     
-      
+      
       Continue with setup?
       Folytatod a telepítéssel?
     
     
-      
+      
       Continue with installation?
       Folytatja a telepítést?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       A %1 telepítő változtatásokat fog végrehajtani a lemezen a %2 telepítéséhez. <br/><strong>Ezután már nem tudja visszavonni a változtatásokat.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       A %1 telepítő változtatásokat fog elvégezni, hogy telepítse a következőt: %2.<br/><strong>A változtatások visszavonhatatlanok lesznek.</strong>
     
     
-      
+      
       &Set up now
       &Telepítés most
     
     
-      
+      
       &Install now
       &Telepítés most
     
     
-      
+      
       Go &back
       Menj &vissza
     
     
-      
+      
       &Set up
       &Telepítés
     
     
-      
+      
       &Install
       &Telepítés
     
     
-      
+      
       Setup is complete. Close the setup program.
       Telepítés sikerült. Zárja be a telepítőt.
     
     
-      
+      
       The installation is complete. Close the installer.
       A telepítés befejeződött, Bezárhatod a telepítőt.
     
     
-      
+      
       Cancel setup without changing the system.
       Telepítés megszakítása a rendszer módosítása nélkül.
     
     
-      
+      
       Cancel installation without changing the system.
       Kilépés a telepítőből a rendszer megváltoztatása nélkül.
     
     
-      
+      
       &Next
       &Következő
     
     
-      
+      
       &Back
       &Vissza
     
     
-      
+      
       &Done
       &Befejez
     
     
-      
+      
       &Cancel
       &Mégse
     
     
-      
+      
       Cancel setup?
       Megszakítja a telepítést?
     
     
-      
+      
       Cancel installation?
       Abbahagyod a telepítést?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Valóban megszakítod a telepítési eljárást?
 A telepítő ki fog lépni és minden változtatás elveszik.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Biztos abba szeretnéd hagyni a telepítést?
@@ -468,22 +468,22 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Ismeretlen kivétel típus
     
     
-      
+      
       unparseable Python error
       nem egyeztethető Python hiba
     
     
-      
+      
       unparseable Python traceback
       nem egyeztethető Python visszakövetés
     
     
-      
+      
       Unfetchable Python error.
       Összehasonlíthatatlan Python hiba.
     
@@ -501,6 +501,24 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.
       %1 Telepítő
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      A telepítő nem tudta frissíteni a partíciós táblát a %1 lemezen.
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.
       Adatlap
     
     
-      
+      
       Select storage de&vice:
       Válassz tároló eszközt:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Aktuális:
     
     
-      
+      
       After:
       Utána:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuális partícionálás</strong><br/>Létrehozhat vagy átméretezhet partíciókat.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 partíció használata mint home partíció a %2 -n
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Válaszd ki a partíciót amit zsugorítani akarsz és egérrel méretezd át.</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 zsugorítva lesz %2MiB -re és új %3MiB partíció lesz létrehozva itt %4.
     
     
-      
+      
       Boot loader location:
       Rendszerbetöltő helye:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Válaszd ki a telepítésre szánt partíciót </strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nem található EFI partíció a rendszeren. Menj vissza a manuális partícionáláshoz és állíts be %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       A %1 EFI rendszer partíció lesz használva %2 indításához.
     
     
-      
+      
       EFI system partition:
       EFI rendszerpartíció:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Úgy tűnik ezen a tárolóeszközön nincs operációs rendszer. Mit szeretnél csinálni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Lemez törlése</strong><br/>Ez <font color="red">törölni</font> fogja a lemezen levő összes adatot.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Meglévő mellé telepíteni</strong><br/>A telepítő zsugorítani fogja a partíciót, hogy elférjen a %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>A partíció lecserélése</strong> a következővel: %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ezen a tárolóeszközön %1 található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ez a tárolóeszköz már tartalmaz egy operációs rendszert. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       A tárolóeszközön több operációs rendszer található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Swap nélkül
     
     
-      
+      
       Reuse Swap
       Swap újrahasználata
     
     
-      
+      
       Swap (no Hibernate)
       Swap (nincs hibernálás)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (hibernálással)
     
     
-      
+      
       Swap to file
       Swap fájlba
     
@@ -695,12 +713,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.
       Minden ideiglenes csatolás törlése
     
     
-      
+      
       Cannot get list of temporary mounts.
       Nem lehet lekérni az ideiglenes csatolási listát
     
     
-      
+      
       Cleared all temporary mounts.
       Minden ideiglenes csatolás törölve
     
@@ -727,27 +745,27 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Billentyűzet típus beállítása %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Billentyűzet kiosztás beállítása %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       A rendszer területi beállítása %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       A számok és dátumok területi beállítása %1.
     
@@ -872,6 +890,11 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Your passwords do not match!
       A két jelszó nem egyezik!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -912,6 +935,16 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>The installation of %1 is complete.
       A %1 telepítése elkészült.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -974,27 +1007,37 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Zászlók:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Titkosítás
     
     
-      
+      
       Logical
       Logikai
     
     
-      
+      
       Primary
       Elsődleges
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       A csatolási pont már használatban van. Kérlek, válassz másikat.
     
@@ -1002,43 +1045,43 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Új partíció létrehozása %2MiB partíción a %4 (%3) %1 fájlrendszerrel
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Új <strong>%2MiB </strong>partíció létrehozása itt <strong>%4</strong> (%3) fájlrendszer típusa <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Új %1 partíció létrehozása a következőn: %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       A telepítő nem tudta létrehozni a partíciót ezen a lemezen '%1'.
     
@@ -1089,7 +1132,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Új %1 partíciós tábla létrehozása a következőn: %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       A telepítőnek nem sikerült létrehoznia a partíciós táblát a lemezen %1.
     
@@ -1328,7 +1371,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Zászlók:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       A csatolási pont már használatban van. Kérlek, válassz másikat.
     
@@ -1365,57 +1418,57 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Partíció információk beállítása
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       %1 telepítése az <strong>új</strong> %2 partícióra.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       %2 telepítése %3 <strong>%1</strong> rendszer partícióra.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Rendszerbetöltő telepítése ide <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Csatlakozási pontok létrehozása
     
@@ -1828,6 +1881,14 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Hely
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2045,29 +2106,29 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2383,7 +2444,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2564,33 +2625,38 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>PartitionModel
     
       
-      
+      
       Free Space
       Szabad terület
     
     
       
-      
+      
       New partition
       Új partíció
     
     
-      
+      
       Name
       Név
     
     
-      
+      
       File System
       Fájlrendszer
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Csatolási pont
     
     
-      
+      
       Size
       Méret
     
@@ -2676,117 +2742,117 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Rendszerinformációk gyűjtése...
     
     
-      
+      
       Partitions
       Partíciók
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       %1 telepítése más operációs rendszer <strong>mellé</strong> .
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Lemez törlés</strong>és %1 telepítés.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>A partíció lecserélése</strong> a következővel: %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Kézi</strong> partícionálás.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       %1 telepítése más operációs rendszer <strong>mellé</strong> a <strong>%2</strong> (%3) lemezen.
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>%2 lemez törlése</strong> (%3) és %1 telepítés.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>A partíció lecserélése</strong> a <strong>%2</strong> lemezen(%3) a következővel: %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Kézi</strong> telepítés a <strong>%1</strong> (%2) lemezen.
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Lemez <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Aktuális:
     
     
-      
+      
       After:
       Utána:
     
     
-      
+      
       No EFI system partition configured
       Nincs EFI rendszer partíció beállítva
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       EFI partíciós zászló nincs beállítva
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Indító partíció nincs titkosítva
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Egy külön indító partíció lett beállítva egy titkosított root partícióval, de az indító partíció nincs titkosítva.br/><br/>Biztonsági aggályok merülnek fel ilyen beállítás mellet, mert fontos fájlok nem titkosított partíción vannak tárolva. <br/>Ha szeretnéd, folytathatod így, de a fájlrendszer zárolása meg fog történni az indítás után. <br/> Az indító partíció titkosításához lépj vissza és az újra létrehozáskor válaszd a <strong>Titkosít</strong> opciót.
     
     
-      
+      
       has at least one disk device available.
       legalább egy lemez eszköz elérhető.
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2976,17 +3042,17 @@ Kimenet:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       (nincs csatolási pont)
     
@@ -3244,12 +3310,12 @@ Kimenet:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       A legjobb eredményért győződjünk meg, hogy ez a számítógép:
     
     
-      
+      
       System requirements
       Rendszer követelmények
     
@@ -3257,28 +3323,28 @@ Kimenet:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez. <br/>A telepítés nem folytatható. <a href="#details">Részletek...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/>
 Telepítés nem folytatható. <a href="#details">Részletek...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Ez a számítógép nem felel meg néhány követelménynek a %1 telepítéséhez. <br/>A telepítés folytatható de előfordulhat néhány képesség nem lesz elérhető.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/>Telepítés folytatható de néhány tulajdonság valószínűleg nem lesz elérhető.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ez a program fel fog tenni néhány kérdést és %2 -t telepíti a számítógépre.
     
@@ -3434,7 +3500,7 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Jelzők beállítása az új <strong>%1</strong> partíción.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       A telepítőnek nem sikerült a zászlók beállítása a partíción %1.
     
@@ -3577,12 +3643,12 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Összefoglaló arról mi fog történni a telepítés során.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Ez áttekintése annak, hogy mi fog történni, ha megkezded a telepítést.
     
@@ -4123,107 +4189,127 @@ Calamares hiba %1.
       
     
     
-      
+      
       What is your name?
       Mi a neved?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Milyen felhasználónévvel szeretnél bejelentkezni?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Mi legyen a számítógép neve?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Adj meg jelszót a felhasználói fiókod védelmére.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Ugyanaz a jelszó használata az adminisztrátor felhasználóhoz.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts
index 04e1036942..c79cd1baac 100644
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record %1
     
     
-      
+      
       Boot Partition
       Partisi Boot
     
     
-      
+      
       System Partition
       Partisi Sistem
     
     
-      
+      
       Do not install a boot loader
       Jangan instal boot loader
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Menjalankan %1 operasi.
     
     
-      
+      
       Bad working directory path
       Jalur lokasi direktori tidak berjalan baik
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Direktori kerja %1 untuk penugasan python %2 tidak dapat dibaca.
     
     
-      
+      
       Bad main script file
       Berkas skrip utama buruk
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Berkas skrip utama %1 untuk penugasan python %2 tidak dapat dibaca.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python mogok dalam penugasan "%1".
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Pengaturan Gagal
     
     
-      
+      
       Installation Failed
       Instalasi Gagal
     
     
-      
+      
       Would you like to paste the install log to the web?
       Maukah anda untuk menempelkan log instalasi ke situs?
     
     
-      
+      
       Error
       Kesalahan
     
     
-      
-      
+      
+      
       &Yes
       &Ya
     
     
-      
-      
+      
+      
       &No
       &Tidak
     
     
-      
+      
       &Close
       &Tutup
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Inisialisasi Calamares Gagal
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 tidak dapat terinstal. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Modul berikut tidak dapat dimuat.
     
     
-      
+      
       Continue with setup?
       Lanjutkan dengan setelan ini?
     
     
-      
+      
       Continue with installation?
       Lanjutkan instalasi?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Installer %1 akan membuat perubahan ke disk Anda untuk memasang %2.<br/><strong>Anda tidak dapat membatalkan perubahan tersebut.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Instal sekarang
     
     
-      
+      
       Go &back
       &Kembali
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Instal
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalasi sudah lengkap. Tutup installer.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Batalkan instalasi tanpa mengubah sistem yang ada.
     
     
-      
+      
       &Next
       &Berikutnya
     
     
-      
+      
       &Back
       &Kembali
     
     
-      
+      
       &Done
       &Kelar
     
     
-      
+      
       &Cancel
       &Batal
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Batalkan instalasi?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Apakah Anda benar-benar ingin membatalkan proses instalasi ini?
@@ -465,22 +465,22 @@ Instalasi akan ditutup dan semua perubahan akan hilang.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tipe pengecualian tidak dikenal
     
     
-      
+      
       unparseable Python error
       tidak dapat mengurai pesan kesalahan Python
     
     
-      
+      
       unparseable Python traceback
       tidak dapat mengurai penelusuran balik Python
     
     
-      
+      
       Unfetchable Python error.
       Tidak dapat mengambil pesan kesalahan Python.
     
@@ -498,6 +498,24 @@ Instalasi akan ditutup dan semua perubahan akan hilang.
       Installer %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Pemasang gagal memperbarui tabel partisi pada disk '%1'.
+    
+  
   
     CheckerContainer
     
@@ -514,149 +532,149 @@ Instalasi akan ditutup dan semua perubahan akan hilang.
       Isian
     
     
-      
+      
       Select storage de&vice:
       Pilih perangkat penyimpanan:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Saat ini:
     
     
-      
+      
       After:
       Setelah:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Pemartisian manual</strong><br/>Anda bisa membuat atau mengubah ukuran partisi.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Gunakan kembali %1 sebagai partisi home untuk %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Pilih sebuah partisi untuk diiris, kemudian seret bilah di bawah untuk mengubah ukuran</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Lokasi Boot loader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Pilih sebuah partisi untuk memasang</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Sebuah partisi sistem EFI tidak ditemukan pada sistem ini. Silakan kembali dan gunakan pemartisian manual untuk mengeset %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Partisi sistem EFI di %1 akan digunakan untuk memulai %2.
     
     
-      
+      
       EFI system partition:
       Partisi sistem EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tampaknya media penyimpanan ini tidak mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Hapus disk</strong><br/>Aksi ini akan <font color="red">menghapus</font> semua berkas yang ada pada media penyimpanan terpilih.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instal berdampingan dengan</strong><br/>Installer akan mengiris sebuah partisi untuk memberi ruang bagi %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ganti sebuah partisi</strong><br/> Ganti partisi dengan %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Media penyimpanan ini mengandung %1. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Media penyimpanan ini telah mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Media penyimpanan ini telah mengandung beberapa sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Perngkat penyimpanan ini sudah terdapat sistem operasi, tetapi tabel partisi <strong>%1</strong>berbeda dari yang dibutuhkan <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Perangkat penyimpanan ini terdapat partisi yang <strong>terpasang</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Perangkat penyimpanan ini merupakan bagian dari sebuah <strong>perangkat RAID yang tidak aktif</strong>.
     
     
-      
+      
       No Swap
       Tidak pakai SWAP
     
     
-      
+      
       Reuse Swap
       Gunakan kembali SWAP
     
     
-      
+      
       Swap (no Hibernate)
       Swap (tanpa hibernasi)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (dengan hibernasi)
     
     
-      
+      
       Swap to file
       Swap ke file
     
@@ -692,12 +710,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang.
       Melepaskan semua kaitan sementara.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Tidak bisa mendapatkan daftar kaitan sementara.
     
     
-      
+      
       Cleared all temporary mounts.
       Semua kaitan sementara dilepas.
     
@@ -724,27 +742,27 @@ Instalasi akan ditutup dan semua perubahan akan hilang.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Setel model papan ketik ke %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Setel tata letak papan ketik ke %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Terapkan zona waktu ke %1/%2
     
     
-      
+      
       The system language will be set to %1.
       Bahasa sistem akan disetel ke %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Nomor dan tanggal lokal akan disetel ke %1.
     
@@ -869,6 +887,11 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Your passwords do not match!
       Sandi Anda tidak sama!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.The installation of %1 is complete.
       Instalasi %1 telah lengkap.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Tanda:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Enkripsi
     
     
-      
+      
       Logical
       Logikal
     
     
-      
+      
       Primary
       Utama
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Titik-kait sudah digunakan. Silakan pilih yang lainnya.
     
@@ -999,43 +1042,43 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Membuat partisi %1 baru di %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Installer gagal untuk membuat partisi di disk '%1'.
     
@@ -1086,7 +1129,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Membuat tabel partisi %1 baru di %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Installer gagal membuat tabel partisi pada %1.
     
@@ -1325,7 +1368,17 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Bendera:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Titik-kait sudah digunakan. Silakan pilih yang lainnya.
     
@@ -1362,57 +1415,57 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Tetapkan informasi partisi
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instal %1 pada partisi sistem %2 <strong>baru</strong>
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instal %2 pada sistem partisi %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instal boot loader di <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Menyetel tempat kait.
     
@@ -1825,6 +1878,14 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Lokasi
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Zona Waktu: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2371,7 +2432,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2552,33 +2613,38 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.PartitionModel
     
       
-      
+      
       Free Space
       Ruang Kosong
     
     
       
-      
+      
       New partition
       Partisi baru
     
     
-      
+      
       Name
       Nama
     
     
-      
+      
       File System
       Berkas Sistem
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Lokasi Mount
     
     
-      
+      
       Size
       Ukuran
     
@@ -2664,117 +2730,117 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Mengumpulkan informasi sistem...
     
     
-      
+      
       Partitions
       Partisi
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instal %1 <strong>berdampingan</strong> dengan sistem operasi lain.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Hapus</strong> diska dan instal %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Ganti</strong> partisi dengan %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Partisi <strong>manual</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instal %1 <strong>berdampingan</strong> dengan sistem operasi lain di disk <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Hapus</strong> diska <strong>%2</strong> (%3) dan instal %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Ganti</strong> partisi pada diska <strong>%2</strong> (%3) dengan %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Partisi Manual</strong> pada diska <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disk <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Saat ini:
     
     
-      
+      
       After:
       Sesudah:
     
     
-      
+      
       No EFI system partition configured
       Tiada partisi sistem EFI terkonfigurasi
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       Bendera partisi sistem EFI tidak disetel
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partisi boot tidak dienkripsi
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Sebuah partisi tersendiri telah terset bersama dengan sebuah partisi root terenkripsi, tapi partisi boot tidak terenkripsi.<br/><br/>Ada kekhawatiran keamanan dengan jenis setup ini, karena file sistem penting tetap pada partisi tak terenkripsi.<br/>Kamu bisa melanjutkan jika kamu menghendaki, tapi filesystem unlocking akan terjadi nanti selama memulai sistem.<br/>Untuk mengenkripsi partisi boot, pergi mundur dan menciptakannya ulang, memilih <strong>Encrypt</strong> di jendela penciptaan partisi.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2964,17 +3030,17 @@ Keluaran:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3232,12 +3298,12 @@ Keluaran:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Untuk hasil terbaik, mohon pastikan bahwa komputer ini:
     
     
-      
+      
       System requirements
       Kebutuhan sistem
     
@@ -3245,29 +3311,29 @@ Keluaran:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Komputer ini tidak memenuhi syarat minimum untuk memasang %1.
 Installer tidak dapat dilanjutkan. <a href="
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Komputer ini tidak memenuhi beberapa syarat yang dianjurkan untuk memasang %1.
 Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Program ini akan mengajukan beberapa pertanyaan dan menyetel %2 pada komputer Anda.
     
@@ -3423,7 +3489,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Menyetel bendera <strong>%1</strong> pada partisi baru.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Installer gagal menetapkan bendera pada partisi %1.
     
@@ -3566,12 +3632,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Berikut adalah tinjauan mengenai yang akan terjadi setelah Anda memulai prosedur instalasi.
     
@@ -4122,107 +4188,127 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     
     
-      
+      
       What is your name?
       Siapa nama Anda?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Nama apa yang ingin Anda gunakan untuk log in?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Apakah nama dari komputer ini?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Pilih sebuah kata sandi untuk menjaga keamanan akun Anda.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Gunakan sandi yang sama untuk akun administrator.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_id_ID.ts b/lang/calamares_id_ID.ts
index 2eae5886f3..cdaea98abb 100644
--- a/lang/calamares_id_ID.ts
+++ b/lang/calamares_id_ID.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -464,22 +464,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -497,6 +497,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -513,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -691,12 +709,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -723,27 +741,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -867,6 +885,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -907,6 +930,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -969,27 +1002,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -997,43 +1040,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1084,7 +1127,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1323,7 +1366,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1360,57 +1413,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1823,6 +1876,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2040,29 +2101,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2369,7 +2430,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2550,33 +2611,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2662,117 +2728,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2959,17 +3025,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3227,12 +3293,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3240,27 +3306,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3416,7 +3482,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3559,12 +3625,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4104,107 +4170,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts
index 3b5e219475..420fd1d13d 100644
--- a/lang/calamares_ie.ts
+++ b/lang/calamares_ie.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       MBR del %1
     
     
-      
+      
       Boot Partition
       Partition de inicialisation
     
     
-      
+      
       System Partition
       Partition del sistema
     
     
-      
+      
       Do not install a boot loader
       Ne installar un bootloader
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Configuration ne successat
     
     
-      
+      
       Installation Failed
       Installation ne successat
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Errore
     
     
-      
-      
+      
+      
       &Yes
       &Yes
     
     
-      
-      
+      
+      
       &No
       &No
     
     
-      
+      
       &Close
       C&luder
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Continuar li configuration?
     
     
-      
+      
       Continue with installation?
       Continuar li installation?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       &Configurar nu
     
     
-      
+      
       &Install now
       &Installar nu
     
     
-      
+      
       Go &back
       Ear &retro
     
     
-      
+      
       &Set up
       &Configurar
     
     
-      
+      
       &Install
       &Installar
     
     
-      
+      
       Setup is complete. Close the setup program.
       Configuration es completat. Ples cluder li configurator.
     
     
-      
+      
       The installation is complete. Close the installer.
       Installation es completat. Ples cluder li installator.
     
     
-      
+      
       Cancel setup without changing the system.
       Anullar li configuration sin modificationes del sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Anullar li installation sin modificationes del sistema.
     
     
-      
+      
       &Next
       &Sequent
     
     
-      
+      
       &Back
       &Retro
     
     
-      
+      
       &Done
       &Finir
     
     
-      
+      
       &Cancel
       A&nullar
     
     
-      
+      
       Cancel setup?
       Anullar li configuration?
     
     
-      
+      
       Cancel installation?
       Anullar li installation?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Ínconosset tip de exception
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       Installator de %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       Redimensionar un gruppe de tomes
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Pos:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Localisation del bootloader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       Partition de sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Sin swap
     
     
-      
+      
       Reuse Swap
       Reusar un swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sin hivernation)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (con hivernation)
     
     
-      
+      
       Swap to file
       Swap in un file
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       Li installation de %1 es completat.
     
+    
+      
+      Package Selection
+      Selection de paccages
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Ciffrar
     
     
-      
+      
       Logical
       Logic
     
     
-      
+      
       Primary
       Primari
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Creante un nov partition de %1 sur %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       Creante un nov tabelle de partitiones %1 sur %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Li installator ne successat crear un tabelle de partitiones sur %1.
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       Localisation
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Zone horari: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paccages
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       Líber spacie
     
     
       
-      
+      
       New partition
       Nov partition
     
     
-      
+      
       Name
       Nómine
     
     
-      
+      
       File System
       Sistema de files
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Monte-punctu
     
     
-      
+      
       Size
       Grandore
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       Partitiones
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Pos:
     
     
-      
+      
       No EFI system partition configured
       Null partition del sistema EFI es configurat
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       Ne existe disponibil partitiones por installation.
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts
index ccee0ec0cf..c67e49511c 100644
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Aðalræsifærsla (MBR) %1
     
     
-      
+      
       Boot Partition
       Ræsidisksneið
     
     
-      
+      
       System Partition
       Kerfisdisksneið
     
     
-      
+      
       Do not install a boot loader
       Ekki setja upp ræsistjóra
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Keyri %1 aðgerð.
     
     
-      
+      
       Bad working directory path
       Röng slóð á vinnumöppu
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Vinnslumappa %1 fyrir python-verkið %2 er ekki lesanleg.
     
     
-      
+      
       Bad main script file
       Röng aðal-skriftuskrá
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Aðal-skriftuskrá %1 fyrir python-verkið %2 er ekki lesanleg.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python villa í verkinu "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Uppsetning mistókst
     
     
-      
+      
       Installation Failed
       Uppsetning mistókst
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Villa
     
     
-      
-      
+      
+      
       &Yes
       &Já
     
     
-      
-      
+      
+      
       &No
       &Nei
     
     
-      
+      
       &Close
       &Loka
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Calamares uppsetning mistókst
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Halda áfram með uppsetningu?
     
     
-      
+      
       Continue with installation?
       Halda áfram með uppsetningu?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 uppsetningarforritið er um það bil að gera breytingar á diskinum til að setja upp %2.<br/><strong>Þú munt ekki geta afturkallað þessar breytingar.</strong>
     
     
-      
+      
       &Set up now
       &Setja upp núna
     
     
-      
+      
       &Install now
       Setja &inn núna
     
     
-      
+      
       Go &back
       Fara til &baka
     
     
-      
+      
       &Set up
       &Setja upp
     
     
-      
+      
       &Install
       &Setja upp
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Uppsetning er lokið. Lokaðu uppsetningarforritinu.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Hætta við uppsetningu ánþess að breyta kerfinu.
     
     
-      
+      
       &Next
       &Næst
     
     
-      
+      
       &Back
       &Til baka
     
     
-      
+      
       &Done
       &Búið
     
     
-      
+      
       &Cancel
       &Hætta við
     
     
-      
+      
       Cancel setup?
       Hætta við uppsetningu?
     
     
-      
+      
       Cancel installation?
       Hætta við uppsetningu?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Viltu virkilega að hætta við núverandi uppsetningarferli?
@@ -467,22 +467,22 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Óþekkt tegund fráviks
     
     
-      
+      
       unparseable Python error
       óþáttanleg Python villa
     
     
-      
+      
       unparseable Python traceback
       óþáttanleg Python reki
     
     
-      
+      
       Unfetchable Python error.
       Ósækjanleg Python villa.
     
@@ -500,6 +500,24 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       %1 uppsetningarforrit
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Uppsetningarforritinu mistókst að uppfæra disksneiðatöflu á diski '%1'.
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Eyðublað
     
     
-      
+      
       Select storage de&vice:
       Veldu geymslu tæ&ki:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Núverandi:
     
     
-      
+      
       After:
       Eftir:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Handvirk disksneiðing</strong><br/>Þú getur búið til eða breytt stærð disksneiða sjálft.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Endurnota %1 sem heimasvæðis disksneið fyrir %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Veldu disksneið til að minnka, dragðu síðan botnstikuna til að breyta stærðinni</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Staðsetning ræsistjóra
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Veldu disksneið til að setja upp á </strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI kerfisdisksneið er hvergi að finna á þessu kerfi. Farðu til baka og notaðu handvirka skiptingu til að setja upp %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI kerfisdisksneið á %1 mun verða notuð til að ræsa %2.
     
     
-      
+      
       EFI system partition:
       EFI kerfisdisksneið:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Eyða disk</strong><br/>Þetta mun <font color="red">eyða</font> öllum gögnum á þessu valdna geymslu tæki.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Setja upp samhliða</strong><br/>Uppsetningarforritið mun minnka disksneið til að búa til pláss fyrir %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Skipta út disksneið</strong><br/>Skiptir disksneið út með %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Þetta geymslu tæki hefur %1 á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Þetta geymslu tæki hefur stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -694,12 +712,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Hreinsa alla bráðabirgðatengipunkta.
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       Hreinsaði alla bráðabirgðatengipunkta.
     
@@ -726,27 +744,27 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       Tungumál kerfisins verður sett sem %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -870,6 +888,11 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Your passwords do not match!
       Lykilorð passa ekki!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -910,6 +933,16 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       The installation of %1 is complete.
       Uppsetningu á %1 er lokið.
     
+    
+      
+      Package Selection
+      Valdir pakkar
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -972,27 +1005,37 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Flögg:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Dulrita
     
     
-      
+      
       Logical
       Rökleg
     
     
-      
+      
       Primary
       Aðal
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Tengipunktur er þegar í notkun. Veldu einhvern annan.
     
@@ -1000,43 +1043,43 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Búa til nýja %1 disksneiðatöflu á %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Uppsetningarforritinu mistókst að búa til disksneið á diski '%1'.
     
@@ -1087,7 +1130,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Búa til nýja %1 disksneiðatöflu á %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Uppsetningarforritinu mistókst að búa til disksneiðatöflu á diski '%1'.
     
@@ -1326,7 +1369,17 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Flögg:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Tengipunktur er þegar í notkun. Veldu einhvern annan.
     
@@ -1363,57 +1416,57 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Setja upplýsingar um disksneið
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Setja upp %1 á <strong>nýja</strong> %2 disk sneiðingu.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Setja upp %2 á %3 disk sneiðingu <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Setja ræsistjórann upp á <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Set upp tengipunkta.
     
@@ -1826,6 +1879,14 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Staðsetning
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2043,29 +2104,29 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2381,7 +2442,7 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Pakkar
     
@@ -2562,33 +2623,38 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
     PartitionModel
     
       
-      
+      
       Free Space
       Laust pláss
     
     
       
-      
+      
       New partition
       Ný disksneið
     
     
-      
+      
       Name
       Heiti
     
     
-      
+      
       File System
       Skráakerfi
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Tengipunktur
     
     
-      
+      
       Size
       Stærð
     
@@ -2674,117 +2740,117 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Söfnun kerfis upplýsingar...
     
     
-      
+      
       Partitions
       Disksneiðar
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Setja upp %1 <strong>ásamt</strong> ásamt öðru stýrikerfi.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Eyða</strong> disk og setja upp %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Skipta út</strong> disksneið með %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Handvirk</strong> disksneiðaskipting.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Uppsetning %1 <strong>með</strong> öðru stýrikerfi á disk <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Eyða</strong> disk <strong>%2</strong> (%3) og setja upp %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Skipta út</strong> disksneið á diski <strong>%2</strong> (%3) með %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Handvirk</strong> disksneiðaskipting á diski <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Diskur <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Núverandi:
     
     
-      
+      
       After:
       Eftir:
     
     
-      
+      
       No EFI system partition configured
       Ekkert EFI kerfisdisksneið stillt
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2971,17 +3037,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       (enginn tengipunktur)
     
@@ -3239,12 +3305,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Fyrir bestu niðurstöður, skaltu tryggja að þessi tölva:
     
     
-      
+      
       System requirements
       Kerfiskröfur
     
@@ -3252,27 +3318,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur ekki haldið áfram. <a href="#details">Upplýsingar...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur haldið áfram, en sumir eiginleikar gætu verið óvirk.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Þetta forrit mun spyrja þig nokkurra spurninga og setja upp %2 á tölvunni þinni.
     
@@ -3428,7 +3494,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Uppsetningarforritinu mistókst að setja flögg á disksneið %1.
     
@@ -3571,12 +3637,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Þetta er yfirlit yfir það sem mun gerast þegar þú byrjar að setja upp aðferð.
     
@@ -4116,107 +4182,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       Hvað heitir þú?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Hvaða nafn vilt þú vilt nota til að skrá þig inn?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Hvað er nafnið á þessari tölvu?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Veldu lykilorð til að halda reikningnum þínum öruggum.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Nota sama lykilorð fyrir kerfisstjóra reikning.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts
index 8df85420ab..dc6a30466f 100644
--- a/lang/calamares_it_IT.ts
+++ b/lang/calamares_it_IT.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record di %1
     
     
-      
+      
       Boot Partition
       Partizione di avvio
     
     
-      
+      
       System Partition
       Partizione di sistema
     
     
-      
+      
       Do not install a boot loader
       Non installare un boot loader
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Operazione %1 in esecuzione.
     
     
-      
+      
       Bad working directory path
       Il percorso della cartella corrente non è corretto
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       La cartella corrente %1 per l'attività di Python %2 non è accessibile.
     
     
-      
+      
       Bad main script file
       File dello script principale non valido
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Il file principale dello script %1 per l'attività di python %2 non è accessibile.
     
     
-      
+      
       Boost.Python error in job "%1".
       Errore da Boost.Python nell'operazione "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Installazione fallita
     
     
-      
+      
       Installation Failed
       Installazione non riuscita
     
     
-      
+      
       Would you like to paste the install log to the web?
       Si vuole mettere il log di installazione sul web?
     
     
-      
+      
       Error
       Errore
     
     
-      
-      
+      
+      
       &Yes
       &Si
     
     
-      
-      
+      
+      
       &No
       &No
     
     
-      
+      
       &Close
       &Chiudi
     
     
-      
+      
       Install Log Paste URL
       URL di copia del log d'installazione
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Il caricamento è fallito. Non è stata fatta la copia sul web.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Inizializzazione di Calamares fallita
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 non può essere installato. Calamares non ha potuto caricare tutti i moduli configurati. Questo è un problema del modo in cui Calamares viene utilizzato dalla distribuzione.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>I seguenti moduli non possono essere caricati:
     
     
-      
+      
       Continue with setup?
       Procedere con la configurazione?
     
     
-      
+      
       Continue with installation?
       Continuare l'installazione?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Il programma d'installazione %1 sta per modificare il disco di per installare %2. Non sarà possibile annullare queste modifiche.
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Il programma d'installazione %1 sta per eseguire delle modifiche al tuo disco per poter installare %2.<br/><strong> Non sarà possibile annullare tali modifiche.</strong>
     
     
-      
+      
       &Set up now
       &Installa adesso
     
     
-      
+      
       &Install now
       &Installa adesso
     
     
-      
+      
       Go &back
       &Indietro
     
     
-      
+      
       &Set up
       &Installazione
     
     
-      
+      
       &Install
       &Installa
     
     
-      
+      
       Setup is complete. Close the setup program.
       Installazione completata. Chiudere il programma d'installazione.
     
     
-      
+      
       The installation is complete. Close the installer.
       L'installazione è terminata. Chiudere il programma d'installazione.
     
     
-      
+      
       Cancel setup without changing the system.
       Annulla l'installazione senza modificare il sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Annullare l'installazione senza modificare il sistema.
     
     
-      
+      
       &Next
       &Avanti
     
     
-      
+      
       &Back
       &Indietro
     
     
-      
+      
       &Done
       &Fatto
     
     
-      
+      
       &Cancel
       &Annulla
     
     
-      
+      
       Cancel setup?
       Annullare l'installazione?
     
     
-      
+      
       Cancel installation?
       Annullare l'installazione?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Si vuole annullare veramente il processo di installazione? Il programma d'installazione verrà terminato e tutti i cambiamenti saranno persi.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Si vuole davvero annullare l'installazione in corso?
@@ -467,22 +467,22 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tipo di eccezione sconosciuto
     
     
-      
+      
       unparseable Python error
       Errore Python non definibile
     
     
-      
+      
       unparseable Python traceback
       Traceback Python non definibile
     
     
-      
+      
       Unfetchable Python error.
       Errore di Python non definibile.
     
@@ -500,6 +500,24 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       %1 Programma di installazione
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Il programma di installazione non è riuscito ad aggiornare la tabella delle partizioni sul disco '%1'.
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Modulo
     
     
-      
+      
       Select storage de&vice:
       Selezionare un dispositivo di me&moria:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Corrente:
     
     
-      
+      
       After:
       Dopo:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Partizionamento manuale</strong><br/>Si possono creare o ridimensionare le partizioni manualmente.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Riutilizzare %1 come partizione home per &2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selezionare una partizione da ridurre, trascina la barra inferiore per ridimensionare</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 sarà ridotta a %2MiB ed una nuova partizione di %3MiB sarà creata per %4
     
     
-      
+      
       Boot loader location:
       Posizionamento del boot loader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selezionare la partizione sulla quale si vuole installare</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Impossibile trovare una partizione EFI di sistema. Si prega di tornare indietro ed effettuare un partizionamento manuale per configurare %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partizione EFI di sistema su %1 sarà usata per avviare %2.
     
     
-      
+      
       EFI system partition:
       Partizione EFI di sistema:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Questo dispositivo di memoria non sembra contenere alcun sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Cancellare disco</strong><br/>Questo <font color="red">cancellerà</font> tutti i dati attualmente presenti sul dispositivo di memoria.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installare a fianco</strong><br/>Il programma di installazione ridurrà una partizione per dare spazio a %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Sostituire una partizione</strong><br/>Sostituisce una partizione con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Questo dispositivo di memoria ha %1. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Questo dispositivo di memoria contenere già un sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Questo dispositivo di memoria contenere diversi sistemi operativi. Come si vuole procedere?<br/>Comunque si potranno rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       No Swap
     
     
-      
+      
       Reuse Swap
       Riutilizza Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (senza ibernazione)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (con ibernazione)
     
     
-      
+      
       Swap to file
       Swap su file
     
@@ -694,12 +712,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Rimozione di tutti i punti di mount temporanei.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Non è possibile ottenere la lista dei punti di mount temporanei.
     
     
-      
+      
       Cleared all temporary mounts.
       Rimossi tutti i punti di mount temporanei.
     
@@ -726,27 +744,27 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Impostare il modello di tastiera a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Impostare il layout della tastiera a %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       La lingua di sistema sarà impostata a %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       I numeri e le date locali saranno impostati a %1.
     
@@ -870,6 +888,11 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Your passwords do not match!
       Le password non corrispondono!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -910,6 +933,16 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       The installation of %1 is complete.
       L'installazione di %1 è completata.
     
+    
+      
+      Package Selection
+      Selezione del Pacchetto
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Si prega di scegliere un prodotto dalla lista. Il prodotto selezionato verrà installato.
+    
   
   
     ContextualProcessJob
@@ -972,27 +1005,37 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Flag:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Cr&iptare
     
     
-      
+      
       Logical
       Logica
     
     
-      
+      
       Primary
       Primaria
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Il punto di mount è già in uso. Sceglierne un altro.
     
@@ -1000,43 +1043,43 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Crea una nuova partizione da %2MiB su %4 (%3) con file system %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Crea una nuova partizione di <strong>%2MiB</strong> su <strong>%4</strong> (%3) con file system <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Creazione della nuova partizione %1 su %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Il programma di installazione non è riuscito a creare la partizione sul disco '%1'.
     
@@ -1087,7 +1130,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Creazione della nuova tabella delle partizioni %1 su %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Il programma di installazione non è riuscito a creare una tabella delle partizioni su %1.
     
@@ -1326,7 +1369,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Flag:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Il punto di mount è già in uso. Sceglierne un altro.
     
@@ -1363,57 +1416,57 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Impostare informazioni partizione
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Installare %1 sulla <strong>nuova</strong> partizione di sistema %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Installare %2 sulla partizione di sistema %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Installare il boot loader su <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Impostazione dei punti di mount.
     
@@ -1826,6 +1879,14 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Posizione
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2043,29 +2104,29 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Fuso orario: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2381,7 +2442,7 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Pacchetti
     
@@ -2562,33 +2623,38 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
     PartitionModel
     
       
-      
+      
       Free Space
       Spazio disponibile
     
     
       
-      
+      
       New partition
       Nuova partizione
     
     
-      
+      
       Name
       Nome
     
     
-      
+      
       File System
       File System
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Punto di mount
     
     
-      
+      
       Size
       Dimensione
     
@@ -2674,117 +2740,117 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Raccolta delle informazioni di sistema...
     
     
-      
+      
       Partitions
       Partizioni
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Installare %1 <strong>a fianco</strong> di un altro sistema operativo.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Cancellare</strong> il disco e installare %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Sostituire</strong> una partizione con %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Partizionamento <strong>manuale</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Installare %1 <strong>a fianco</strong> di un altro sistema operativo sul disco<strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Cancellare</strong> il disco <strong>%2</strong> (%3) e installa %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Sostituire</strong> una partizione sul disco <strong>%2</strong> (%3) con %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Partizionamento <strong>manuale</strong> sul disco <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disco <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Corrente:
     
     
-      
+      
       After:
       Dopo:
     
     
-      
+      
       No EFI system partition configured
       Nessuna partizione EFI di sistema è configurata
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Una partizione EFI è necessaria per avviare %1.<br/><br/> Per configurare una partizione EFI, tornare indietro e selezionare o creare un filesystem FAT32 con il parametro<strong>%3</strong>abilitato e punto di montaggio <strong>%2</strong>. <br/><br/>Si può continuare senza impostare una partizione EFI ma il sistema potrebbe non avviarsi correttamente.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Una partizione EFI è necessaria per avviare %1.<br/><br/> Una partizione è stata configurata con punto di montaggio <strong>%2</strong> ma il suo parametro <strong>%3</strong> non è impostato.<br/>Per impostare il flag, tornare indietro e modificare la partizione.<br/><br/>Si può continuare senza impostare il parametro ma il sistema potrebbe non avviarsi correttamente.
     
     
-      
+      
       EFI system partition flag not set
       Il flag della partizione EFI di sistema non è impostato.
     
     
-      
+      
       Option to use GPT on BIOS
       Opzione per usare GPT su BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Una tabella partizioni GPT è la migliore opzione per tutti i sistemi. Comunque il programma d'installazione supporta anche la tabella di tipo BIOS. <br/><br/>Per configurare una tabella partizioni GPT su BIOS (se non già configurata) tornare indietro e impostare la tabella partizioni a GPT e creare una partizione non formattata di 8 MB con opzione <strong>bios_grub</strong> abilitata.<br/><br/>Una partizione non formattata di 8 MB è necessaria per avviare %1 su un sistema BIOS con GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partizione di avvio non criptata
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       E' stata configurata una partizione di avvio non criptata assieme ad una partizione root criptata. <br/><br/>Ci sono problemi di sicurezza con questo tipo di configurazione perchè dei file di sistema importanti sono tenuti su una partizione non criptata.<br/>Si può continuare se lo si desidera ma dopo ci sarà lo sblocco del file system, durante l'avvio del sistema.<br/>Per criptare la partizione di avvio, tornare indietro e ricrearla, selezionando <strong>Criptare</strong> nella finestra di creazione della partizione.
     
     
-      
+      
       has at least one disk device available.
       ha almeno un'unità disco disponibile.
     
     
-      
+      
       There are no partitions to install on.
       Non ci sono partizioni su cui installare.
     
@@ -2974,17 +3040,17 @@ Output:
       Impossibile creare un nuovo file random <pre>%1</pre>.
     
     
-      
+      
       No product
       Nessun prodotto
     
     
-      
+      
       No description provided.
       Non è stata fornita alcuna descrizione.
     
     
-      
+      
       (no mount point)
       (nessun mount point)
     
@@ -3242,12 +3308,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Per ottenere prestazioni ottimali, assicurarsi che questo computer:
     
     
-      
+      
       System requirements
       Requisiti di sistema
     
@@ -3255,27 +3321,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Questo computer non soddisfa i requisiti minimi per l'installazione di %1.<br/>L'installazione non può continuare. <a href="#details">Dettagli...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Questo computer non soddisfa i requisiti minimi per installare %1. <br/>L'installazione non può proseguire. <a href="#details">Dettagli...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Questo computer non soddisfa alcuni requisiti raccomandati per l'installazione di %1.<br/>L'installazione può continuare, ma alcune funzionalità potrebbero essere disabilitate.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Questo computer non soddisfa alcuni requisiti consigliati per l'installazione di %1. <br/>L'installazione può proseguire ma alcune funzionalità potrebbero non essere disponibili.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Questo programma chiederà alcune informazioni e configurerà %2 sul computer.
     
@@ -3431,7 +3497,7 @@ Output:
       Impostazione dei flag <strong>%1</strong> sulla nuova partizione.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Impossibile impostare i flag sulla partizione %1.
     
@@ -3574,12 +3640,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Questa è una panoramica di quello che succederà una volta avviata la procedura di configurazione.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Una panoramica delle modifiche che saranno effettuate una volta avviata la procedura di installazione.
     
@@ -4140,107 +4206,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       Qual è il tuo nome?
     
     
-      
+      
       Your Full Name
       Nome Completo
     
     
-      
+      
       What name do you want to use to log in?
       Quale nome usare per l'autenticazione?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Solo lettere minuscole, numeri, trattini e trattini bassi sono permessi.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Qual è il nome di questo computer?
     
     
-      
+      
       Computer Name
       Nome Computer
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Scegliere una password per rendere sicuro il tuo account.
     
     
-      
+      
       Password
       Password
     
     
-      
+      
       Repeat Password
       Ripetere Password
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quando questa casella è selezionata, la robustezza della password viene verificata e non sarà possibile utilizzare password deboli.
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Usare la stessa password per l'account amministratore.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index db8e8421b9..7f8a0d884e 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 のマスターブートレコード
     
     
-      
+      
       Boot Partition
       ブートパーティション
     
     
-      
+      
       System Partition
       システムパーティション
     
     
-      
+      
       Do not install a boot loader
       ブートローダーをインストールしません
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 操作を実行しています。
     
     
-      
+      
       Bad working directory path
       不正なワーキングディレクトリパス
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       python ジョブ %2 の作業ディレクトリ %1 が読み取れません。
     
     
-      
+      
       Bad main script file
       不正なメインスクリプトファイル
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       python ジョブ %2 におけるメインスクリプトファイル %1 が読み込めません。
     
     
-      
+      
       Boost.Python error in job "%1".
       ジョブ "%1" での Boost.Python エラー。
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       セットアップに失敗しました。
     
     
-      
+      
       Installation Failed
       インストールに失敗
     
     
-      
+      
       Would you like to paste the install log to the web?
       インストールログをWebに貼り付けますか？
     
     
-      
+      
       Error
       エラー
     
     
-      
-      
+      
+      
       &Yes
       はい (&Y)
     
     
-      
-      
+      
+      
       &No
       いいえ (&N)
     
     
-      
+      
       &Close
       閉じる (&C)
     
     
-      
+      
       Install Log Paste URL
       インストールログを貼り付けるURL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       アップロードは失敗しました。 ウェブへの貼り付けは行われませんでした。
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,124 +343,124 @@ Link copied to clipboard
 クリップボードにリンクをコピーしました
     
     
-      
+      
       Calamares Initialization Failed
       Calamares によるインストールに失敗しました。
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 をインストールできません。Calamares はすべてのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>以下のモジュールがロードできませんでした。:
     
     
-      
+      
       Continue with setup?
       セットアップを続行しますか？
     
     
-      
+      
       Continue with installation?
       インストールを続行しますか？
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 のセットアッププログラムは %2 のセットアップのためディスクの内容を変更します。<br/><strong>これらの変更は取り消しできません。</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 インストーラーは %2 をインストールするためディスクの内容を変更しようとしています。<br/><strong>これらの変更は取り消せません。</strong>
     
     
-      
+      
       &Set up now
       セットアップしています (&S)
     
     
-      
+      
       &Install now
       今すぐインストール (&I)
     
     
-      
+      
       Go &back
       戻る (&B)
     
     
-      
+      
       &Set up
       セットアップ （&S）
     
     
-      
+      
       &Install
       インストール (&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       セットアップが完了しました。プログラムを閉じます。
     
     
-      
+      
       The installation is complete. Close the installer.
       インストールが完了しました。インストーラーを閉じます。
     
     
-      
+      
       Cancel setup without changing the system.
       システムを変更することなくセットアップを中断します。
     
     
-      
+      
       Cancel installation without changing the system.
       システムを変更しないでインストールを中止します。
     
     
-      
+      
       &Next
       次へ (&N)
     
     
-      
+      
       &Back
       戻る (&B)
     
     
-      
+      
       &Done
       実行 (&D)
     
     
-      
+      
       &Cancel
       中止 (&C)
     
     
-      
+      
       Cancel setup?
       セットアップを中止しますか？
     
     
-      
+      
       Cancel installation?
       インストールを中止しますか？
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       本当に現在のセットアップのプロセスを中止しますか？
 すべての変更が取り消されます。
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       本当に現在の作業を中止しますか？
@@ -470,22 +470,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       不明な例外型
     
     
-      
+      
       unparseable Python error
       解析不能なPythonエラー
     
     
-      
+      
       unparseable Python traceback
       解析不能な Python トレースバック
     
     
-      
+      
       Unfetchable Python error.
       取得不能なPythonエラー。
     
@@ -503,6 +503,24 @@ The installer will quit and all changes will be lost.
       %1 インストーラー
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      インストーラーはディスク '%1' 上のパーティションテーブルのアップデートに失敗しました。
+    
+  
   
     CheckerContainer
     
@@ -519,149 +537,149 @@ The installer will quit and all changes will be lost.
       フォーム
     
     
-      
+      
       Select storage de&vice:
       ストレージデバイスを選択 (&V):
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       現在:
     
     
-      
+      
       After:
       後:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>手動パーティション</strong><br/>パーティションを自分で作成またはサイズ変更することができます。
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 を %2 のホームパーティションとして再利用する
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>縮小するパーティションを選択し、下のバーをドラッグしてサイズを変更して下さい</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 は %2MiB に縮小され、%4 に新しい %3MiB のパーティションが作成されます。
     
     
-      
+      
       Boot loader location:
       ブートローダーの場所:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>インストールするパーティションの選択</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       システムにEFIシステムパーティションが存在しません。%1 のセットアップのため、元に戻り、手動パーティショニングを使用してください。
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 の EFI システム パーティションは、%2 の起動に使用されます。
     
     
-      
+      
       EFI system partition:
       EFI システムパーティション:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       このストレージデバイスにはオペレーティングシステムが存在しないようです。何を行いますか？<br/>ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>ディスクの消去</strong><br/>選択したストレージデバイス上のデータがすべて <font color="red">削除</font>されます。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>共存してインストール</strong><br/>インストーラは %1 用の空きスペースを確保するため、パーティションを縮小します。
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>パーティションの置換</strong><br/>パーティションを %1 に置き換えます。
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       このストレージデバイスには %1  が存在します。何を行いますか？<br/>ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       このストレージデバイスにはすでにオペレーティングシステムが存在します。何を行いますか？<br/>ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       このストレージデバイスには複数のオペレーティングシステムが存在します。何を行いますか？<br />ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       このストレージデバイスにはすでにオペレーティングシステムがインストールされていますが、パーティションテーブル <strong>%1</strong> は必要な <strong>%2</strong> とは異なります。<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       このストレージデバイスにはパーティションの1つが<strong>マウントされています</strong>。
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       このストレージデバイスは<strong>非アクティブなRAID</strong>デバイスの一部です。
     
     
-      
+      
       No Swap
       スワップを使用しない
     
     
-      
+      
       Reuse Swap
       スワップを再利用
     
     
-      
+      
       Swap (no Hibernate)
       スワップ(ハイバーネートなし)
     
     
-      
+      
       Swap (with Hibernate)
       スワップ(ハイバーネート)
     
     
-      
+      
       Swap to file
       ファイルにスワップ
     
@@ -697,12 +715,12 @@ The installer will quit and all changes will be lost.
       すべての一時的なマウントをクリアしています。
     
     
-      
+      
       Cannot get list of temporary mounts.
       一時的なマウントのリストを取得できません。
     
     
-      
+      
       Cleared all temporary mounts.
       すべての一時的なマウントを解除しました。
     
@@ -729,27 +747,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       キーボードのモデルを %1 に設定する。<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       キーボードのレイアウトを %1/%2 に設定する。
     
     
-      
+      
       Set timezone to %1/%2.
       タイムゾーンを %1/%2 に設定します。
     
     
-      
+      
       The system language will be set to %1.
       システムの言語を %1 に設定します。
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       数値と日付のロケールを %1 に設定します。
     
@@ -873,6 +891,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       パスワードが一致していません！
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -914,6 +937,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       %1 のインストールは完了です。
     
+    
+      
+      Package Selection
+      パッケージの選択
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      リストから製品を選んでください。選択した製品がインストールされます。
+    
   
   
     ContextualProcessJob
@@ -976,27 +1009,37 @@ The installer will quit and all changes will be lost.
       フラグ:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       暗号化 (&C)
     
     
-      
+      
       Logical
       論理
     
     
-      
+      
       Primary
       プライマリ
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       マウントポイントは既に使用されています。他を選択してください。
     
@@ -1004,43 +1047,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       %3 (%2) にエントリ %4 の新しい %1MiB パーティションを作成する。 
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       %3 (%2) に新しい %1MiB パーティションを作成する。
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
        %4 (%3) にファイルシステム %1 の新しい %2MiB パーティションを作成する。
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       <strong>%3</strong> (%2) にエントリ <em>%4</em> の新しい <strong>%1MiB</strong> パーティションを作成する。
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       <strong>%3</strong> (%2) に新しい <strong>%1MiB</strong> パーティションを作成する。
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       <strong>%4</strong> (%3) にファイルシステム <strong>%1</strong> の新しい <strong>%2MiB</strong> パーティションを作成する。
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2 に新しい %1 パーティションを作成しています。
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       インストーラーはディスク '%1' にパーティションを作成できませんでした。
     
@@ -1091,7 +1134,7 @@ The installer will quit and all changes will be lost.
       %2 に新しい %1 パーティションテーブルを作成しています。
     
     
-      
+      
       The installer failed to create a partition table on %1.
       インストーラーは %1 のパーティションテーブル作成に失敗しました。
     
@@ -1330,7 +1373,17 @@ The installer will quit and all changes will be lost.
       フラグ:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       マウントポイントは既に使用されています。他を選択してください。
     
@@ -1367,57 +1420,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       パーティション情報の設定
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       <em>%3</em> 機能の<strong>新しい</strong> %2 システムパーティションに、%1 をインストールする
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       <strong>新しい</strong> %2 システムパーティションに %1 をインストールする。
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       マウントポイント <strong>%1</strong> に、<em>%3</em> 機能の<strong>新しい</strong> %2 パーティションをセットアップする。
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       マウントポイント <strong>%1</strong> %3 に<strong>新しい</strong> %2 パーティションをセットアップする。
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       <em>%4</em> 機能の %3 システムパーティション <strong>%1</strong> に %2 をインストールする。
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       マウントポイント <strong>%2</strong> に、<em>%4</em> 機能の %3 パーティション <strong>%1</strong> をセットアップする。
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       マウントポイント <strong>%2</strong> %4 に、%3 パーティション <strong>%1</strong> をセットアップする。
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       %3 システムパーティション <strong>%1</strong> に%2 をインストール。
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       <strong>%1</strong> にブートローダーをインストール
     
     
-      
+      
       Setting up mount points.
       マウントポイントを設定する。
     
@@ -1830,6 +1883,14 @@ The installer will quit and all changes will be lost.
       ロケーション
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      希望する地域を選択するか、現在の場所に基づくデフォルトの地域を使用してください。
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       タイムゾーン: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       地域内の優先ゾーンを選択してください。
     
     
-      
+      
       Zones
       ゾーン
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       以下の言語とロケールの設定を微調整できます。
     
@@ -2379,7 +2440,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       パッケージ
     
@@ -2560,33 +2621,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       空き領域
     
     
       
-      
+      
       New partition
       新しいパーティション
     
     
-      
+      
       Name
       名前
     
     
-      
+      
       File System
       ファイルシステム
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       マウントポイント
     
     
-      
+      
       Size
       サイズ
     
@@ -2672,117 +2738,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       システム情報を取得しています...
     
     
-      
+      
       Partitions
       パーティション
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       他のオペレーティングシステムに<strong>共存して</strong> %1 をインストール。
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       ディスクを<strong>消去</strong>し %1 をインストール。
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       パーティションを %1 に<strong>置き換える</strong>。
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>手動</strong>パーティショニング。
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       ディスク <strong>%2</strong> (%3) 上ののオペレーティングシステムと<strong>共存</strong>して %1 をインストール。
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
        ディスク <strong>%2</strong> (%3) を<strong>消去して</strong> %1 をインストール。
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       ディスク <strong>%2</strong> (%3) のパーティションを %1 に<strong>置き換える</strong>。
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       ディスク <strong>%1</strong> (%2) に <strong>手動で</strong>パーティショニングする。
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       ディスク <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       現在:
     
     
-      
+      
       After:
       変更後:
     
     
-      
+      
       No EFI system partition configured
       EFI システムパーティションが設定されていません
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       %1 を起動するには EFI システムパーティションが必要です。<br/> <br/>EFI システムパーティションを設定するには、戻って、<strong>%3</strong> フラグを有効にした FAT32 ファイルシステムを選択または作成し、マウントポイントを <strong>%2</strong> にします。<br/><br/>EFI システムパーティションを設定せずに続行すると、システムが起動しない場合があります。 
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       %1 を起動するには EFI システムパーティションが必要です。<br/><br/>パーティションはマウントポイント <strong>%2</strong> に設定されましたが、<strong>%3</strong> フラグが設定されていません。フラグを設定するには、戻ってパーティションを編集してください。フラグを設定せずに続行すると、システムが起動しない場合があります。
     
     
-      
+      
       EFI system partition flag not set
       EFI システムパーティションのフラグが設定されていません
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS で GPT を使用するためのオプション
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT パーティションテーブルは、すべてのシステムに最適なオプションです。このインストーラーは、BIOS システムのこのようなセットアップもサポートしています。<br/><br/>BIOS で GPT パーティションテーブルを設定するには（まだ行っていない場合）、前に戻ってパーティションテーブルを GPT に設定し、<strong>bios_grub</strong> フラグを有効にして 8 MB の未フォーマットのパーティションを作成します。GPT に設定した BIOS システムで %1 を起動するには、未フォーマットの 8 MB パーティションが必要です。
     
     
-      
+      
       Boot partition not encrypted
       ブートパーティションが暗号化されていません
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されます。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong> (暗号化) を選択してください。
     
     
-      
+      
       has at least one disk device available.
       は少なくとも1つのディスクデバイスを利用可能です。
     
     
-      
+      
       There are no partitions to install on.
       インストールするパーティションがありません。
     
@@ -2972,17 +3038,17 @@ Output:
       新しいランダムファイル <pre>%1</pre> を作成できませんでした。
     
     
-      
+      
       No product
       製品がありません。
     
     
-      
+      
       No description provided.
       説明はありません。
     
     
-      
+      
       (no mount point)
       (マウントポイントなし)
     
@@ -3243,12 +3309,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       良好な結果を得るために、このコンピュータについて以下の項目を確認してください：
     
     
-      
+      
       System requirements
       システム要件
     
@@ -3256,27 +3322,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       このコンピュータは %1 をセットアップするための最低要件を満たしていません。<br/>セットアップは続行できません。 <a href="#details">詳細...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       このコンピュータは %1 をインストールするための最低要件を満たしていません。<br/>インストールは続行できません。<a href="#details">詳細...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       このコンピュータは、 %1 をセットアップするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       このコンピュータは、 %1 をインストールするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       このプログラムはあなたにいくつか質問をして、コンピュータに %2 を設定します。
     
@@ -3432,7 +3498,7 @@ Output:
       新しいパーティションに <strong>%1</strong> フラグを設定しています。
     
     
-      
+      
       The installer failed to set flags on partition %1.
       インストーラーはパーティション %1 上のフラグの設定に失敗しました。
     
@@ -3575,12 +3641,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       これはセットアップを開始した時に起こることの概要です。
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       これはインストールを開始した時に起こることの概要です。
     
@@ -4156,107 +4222,127 @@ Output:
       ログインして管理者タスクを実行するには、ユーザー名と資格情報を選択してください
     
     
-      
+      
       What is your name?
       あなたの名前は何ですか？
     
     
-      
+      
       Your Full Name
       あなたのフルネーム
     
     
-      
+      
       What name do you want to use to log in?
       ログイン時に使用する名前は何ですか？
     
     
-      
+      
       Login Name
       ログイン名
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       複数のユーザーがこのコンピュータを使用する場合は、インストール後に複数のアカウントを作成できます。
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      使用できるのはアルファベットの小文字と数字と _ と -  だけです。
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       このコンピュータの名前は何ですか？
     
     
-      
+      
       Computer Name
       コンピュータの名前
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       この名前は、コンピューターをネットワーク上の他のユーザーに表示する場合に使用されます。
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       アカウントを安全に使うため、パスワードを選択してください
     
     
-      
+      
       Password
       パスワード
     
     
-      
+      
       Repeat Password
       パスワードを再度入力
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       同じパスワードを2回入力して、入力エラーをチェックできるようにします。適切なパスワードは文字、数字、句読点が混在する8文字以上のもので、定期的に変更する必要があります。
     
     
-      
+      
       Validate passwords quality
       パスワードの品質を検証する
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       このボックスをオンにするとパスワードの強度チェックが行われ、弱いパスワードを使用できなくなります。
     
     
-      
+      
       Log in automatically without asking for the password
       パスワードを要求せずに自動的にログインする
     
     
-      
+      
       Reuse user password as root password
       rootパスワードとしてユーザーパスワードを再利用する
     
     
-      
+      
       Use the same password for the administrator account.
       管理者アカウントと同じパスワードを使用する。
     
     
-      
+      
       Choose a root password to keep your account safe.
       アカウントを安全に保つために、rootパスワードを選択してください。
     
     
-      
+      
       Root Password
       rootパスワード
     
     
-      
+      
       Repeat Root Password
       rootパスワードを再入力
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       同じパスワードを2回入力して、入力エラーをチェックできるようにします。
     
diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts
index ad7fbd0b5e..11f59e160e 100644
--- a/lang/calamares_kk.ts
+++ b/lang/calamares_kk.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Алға
     
     
-      
+      
       &Back
       А&ртқа
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       Ба&с тарту
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Орнатудан бас тарту керек пе?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       EFI жүйелік бөлімі:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts
index 5a0d5394c3..a14c9faf1f 100644
--- a/lang/calamares_kn.ts
+++ b/lang/calamares_kn.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       ಅನುಸ್ಥಾಪನೆ ವಿಫಲವಾಗಿದೆ
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       ದೋಷ
     
     
-      
-      
+      
+      
       &Yes
       ಹೌದು
     
     
-      
-      
+      
+      
       &No
       ಇಲ್ಲ
     
     
-      
+      
       &Close
       ಮುಚ್ಚಿರಿ
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       ಮುಂದಿನ
     
     
-      
+      
       &Back
       ಹಿಂದಿನ
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       ರದ್ದುಗೊಳಿಸು
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       ಅನುಸ್ಥಾಪನೆಯನ್ನು ರದ್ದುಮಾಡುವುದೇ?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       ಪ್ರಸಕ್ತ:
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       ಪ್ರಸಕ್ತ:
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts
index 094e4b8d70..65a213adee 100644
--- a/lang/calamares_ko.ts
+++ b/lang/calamares_ko.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1의 마스터 부트 레코드
     
     
-      
+      
       Boot Partition
       부트 파티션
     
     
-      
+      
       System Partition
       시스템 파티션
     
     
-      
+      
       Do not install a boot loader
       부트로더를 설치하지 않습니다
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 명령을 실행중
     
     
-      
+      
       Bad working directory path
       잘못된 작업 디렉터리 경로
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       파이썬 작업 %2에 대한 작업 디렉터리 %1을 읽을 수 없습니다.
     
     
-      
+      
       Bad main script file
       잘못된 주 스크립트 파일
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       파이썬 작업 %2에 대한 주 스크립트 파일 %1을 읽을 수 없습니다.
     
     
-      
+      
       Boost.Python error in job "%1".
       작업 "%1"에서 Boost.Python 오류
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       설치 실패
     
     
-      
+      
       Installation Failed
       설치 실패
     
     
-      
+      
       Would you like to paste the install log to the web?
       설치 로그를 웹에 붙여넣으시겠습니까?
     
     
-      
+      
       Error
       오류
     
     
-      
-      
+      
+      
       &Yes
       예(&Y)
     
     
-      
-      
+      
+      
       &No
       아니오(&N)
     
     
-      
+      
       &Close
       닫기(&C)
     
     
-      
+      
       Install Log Paste URL
       로그 붙여넣기 URL 설치
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       업로드에 실패했습니다. 웹 붙여넣기가 수행되지 않았습니다.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,124 +343,124 @@ Link copied to clipboard
 링크가 클립보드에 복사되었습니다.
     
     
-      
+      
       Calamares Initialization Failed
       깔라마레스 초기화 실패
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 가 설치될 수 없습니다. 깔라마레스가 모든 구성된 모듈을 불러올 수 없었습니다. 이것은 깔라마레스가 배포판에서 사용되는 방식에서 발생한 문제입니다.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       다음 모듈 불러오기 실패:
     
     
-      
+      
       Continue with setup?
       설치를 계속하시겠습니까?
     
     
-      
+      
       Continue with installation?
       설치를 계속하시겠습니까?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 설치 프로그램이 %2을(를) 설정하기 위해 디스크를 변경하려고 하는 중입니다.<br/><strong>이러한 변경은 취소할 수 없습니다.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 설치 관리자가 %2를 설치하기 위해 사용자의 디스크의 내용을 변경하려고 합니다. <br/> <strong>이 변경 작업은 되돌릴 수 없습니다.</strong>
     
     
-      
+      
       &Set up now
       지금 설치 (&S)
     
     
-      
+      
       &Install now
       지금 설치 (&I)
     
     
-      
+      
       Go &back
       뒤로 이동 (&b)
     
     
-      
+      
       &Set up
       설치 (&S)
     
     
-      
+      
       &Install
       설치(&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       설치가 완료 되었습니다. 설치 프로그램을 닫습니다.
     
     
-      
+      
       The installation is complete. Close the installer.
       설치가 완료되었습니다. 설치 관리자를 닫습니다.
     
     
-      
+      
       Cancel setup without changing the system.
       시스템을 변경 하지 않고 설치를 취소합니다.
     
     
-      
+      
       Cancel installation without changing the system.
       시스템 변경 없이 설치를 취소합니다.
     
     
-      
+      
       &Next
       다음 (&N)
     
     
-      
+      
       &Back
       뒤로 (&B)
     
     
-      
+      
       &Done
       완료 (&D)
     
     
-      
+      
       &Cancel
       취소 (&C)
     
     
-      
+      
       Cancel setup?
       설치를 취소 하시겠습니까?
     
     
-      
+      
       Cancel installation?
       설치를 취소하시겠습니까?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       현재 설정 프로세스를 취소하시겠습니까?
 설치 프로그램이 종료되고 모든 변경 내용이 손실됩니다.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       정말로 현재 설치 프로세스를 취소하시겠습니까?
@@ -470,22 +470,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       알 수 없는 예외 유형
     
     
-      
+      
       unparseable Python error
       구문 분석할 수 없는 파이썬 오류
     
     
-      
+      
       unparseable Python traceback
       구문 분석할 수 없는 파이썬 역추적 정보
     
     
-      
+      
       Unfetchable Python error.
       가져올 수 없는 파이썬 오류
     
@@ -503,6 +503,24 @@ The installer will quit and all changes will be lost.
       %1 설치 관리자
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -519,149 +537,149 @@ The installer will quit and all changes will be lost.
       형식
     
     
-      
+      
       Select storage de&vice:
       저장 장치 선택 (&v)
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       현재:
     
     
-      
+      
       After:
       이후:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>수동 파티션 작업</strong><br/>직접 파티션을 만들거나 크기를 조정할 수 있습니다.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %2의 홈 파티션으로 %1을 재사용합니다.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>축소할 파티션을 선택한 다음 하단 막대를 끌어 크기를 조정합니다.</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1이 %2MiB로 축소되고 %4에 대해 새 %3MiB 파티션이 생성됩니다.
     
     
-      
+      
       Boot loader location:
       부트 로더 위치 :
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>설치할 파티션을 선택합니다.</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       이 시스템에서는 EFI 시스템 파티션을 찾을 수 없습니다. 돌아가서 수동 파티션 작업을 사용하여 %1을 설정하세요.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1의 EFI 시스템 파티션은 %2의 시작으로 사용될 것입니다.
     
     
-      
+      
       EFI system partition:
       EFI 시스템 파티션:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       이 저장 장치에는 운영 체제가없는 것 같습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>디스크 지우기</strong><br/>그러면 선택한 저장 장치에 현재 있는 모든 데이터가 <font color="red">삭제</font>됩니다.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>함께 설치</strong><br/>설치 관리자가 파티션을 축소하여 %1 공간을 확보합니다.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>파티션 바꾸기</strong><br/>파티션을 %1로 바꿉니다.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       이 저장 장치에 %1이 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       이 저장 장치에는 이미 운영 체제가 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       이 저장 장치에는 여러 개의 운영 체제가 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       이 스토리지 장치에는 이미 운영 체제가 설치되어 있으나 <strong>%1</strong> 파티션 테이블이 필요로 하는 <strong>%2</strong>와 다릅니다.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       이 스토리지 장치는 하나 이상의 <strong>마운트된</strong> 파티션을 갖고 있습니다.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       이 스토리지 장치는 <strong>비활성화된 RAID</strong> 장치의 일부입니다.
     
     
-      
+      
       No Swap
       스왑 없음
     
     
-      
+      
       Reuse Swap
       스왑 재사용
     
     
-      
+      
       Swap (no Hibernate)
       스왑 (최대 절전모드 아님)
     
     
-      
+      
       Swap (with Hibernate)
       스왑 (최대 절전모드 사용)
     
     
-      
+      
       Swap to file
       파일로 스왑
     
@@ -697,12 +715,12 @@ The installer will quit and all changes will be lost.
       모든 임시 마운트들이 해제하는 중입니다.
     
     
-      
+      
       Cannot get list of temporary mounts.
       임시 마운트들의 목록을 가져올 수 없습니다.
     
     
-      
+      
       Cleared all temporary mounts.
       모든 임시 마운트들이 해제되었습니다.
     
@@ -729,27 +747,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       키보드 모델을 %1로 설정합니다.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       키보드 레이아웃을 %1/%2로 설정합니다.
     
     
-      
+      
       Set timezone to %1/%2.
       표준시간대를 %1/%2로 설정합니다.
     
     
-      
+      
       The system language will be set to %1.
       시스템 언어가 %1로 설정됩니다.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       숫자와 날짜 로케일이 %1로 설정됩니다.
     
@@ -873,6 +891,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       암호가 일치하지 않습니다!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -913,6 +936,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       %1의 설치가 완료되었습니다.
     
+    
+      
+      Package Selection
+      패키지 선택
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      목록에서 제품을 선택하십시오. 선택한 제품이 설치됩니다.
+    
   
   
     ContextualProcessJob
@@ -975,27 +1008,37 @@ The installer will quit and all changes will be lost.
       플래그:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       암호화 (&c)
     
     
-      
+      
       Logical
       논리 파티션
     
     
-      
+      
       Primary
       파티션
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       마운트 위치가 이미 사용 중입니다. 다른 위치를 선택해주세요.
     
@@ -1003,43 +1046,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       %4 항목이 있는 %3(%2)에 새 %1MiB 파티션을 만듭니다.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       %3(%2)에 새 %1MiB 파티션을 만듭니다.
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       %1 파일 시스템으로 %4(%3)에 새 %2MiB 파티션을 만듭니다.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       <em>%4</em> 항목이 있는 <strong>%3</strong>(%2)에 새 <strong>%1MiB</strong> 파티션을 만듭니다.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       <strong>%3</strong>(%2)에 새 <strong>%1MiB</strong> 파티션을 만듭니다.
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       <strong>%1</strong> 파일 시스템으로 <strong>%4</strong> (%3)에 새 <strong>%2MiB</strong> 파티션을 만듭니다.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2에 새로운 %1 파티션 테이블을 만드는 중입니다.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       디스크 '%1'에 파티션을 생성하지 못했습니다.
     
@@ -1090,7 +1133,7 @@ The installer will quit and all changes will be lost.
       %2에 새로운 %1 파티션 테이블을 만드는 중입니다.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       설치 관리자가 %1에 파티션 테이블을 만들지 못했습니다.
     
@@ -1329,7 +1372,17 @@ The installer will quit and all changes will be lost.
       플래그:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       마운트 위치가 이미 사용 중입니다. 다른 위치를 선택해주세요.
     
@@ -1366,57 +1419,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       파티션 정보 설정
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       <em>%3</em> 기능이 있는 <strong>새</strong> %2 시스템 파티션에 %1을(를) 설치합니다.
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       <strong>새</strong> %2 시스템 파티션에 %1를설치합니다.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       마운트 지점 <strong>%1</strong> 및 기능 <em>%3</em>(으)로 <strong>새</strong> %2 파티션을 설정합니다.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       마운트 지점 <strong>%1</strong>%3(으)로 <strong>새</strong> %2 파티션을 설정합니다.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       <em>%4</em> 기능이 있는 %3 시스템 파티션 <strong>%1</strong>에 %2을(를) 설치합니다.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       마운트 지점 <strong>%2</strong> 및 기능 <em>%4</em>(으)로 %3 파티션 <strong>%1</strong>을(를) 설정합니다.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       마운트 지점 <strong>%2</strong>%4으로 %3 파티션 <strong>%1</strong>을(를) 설정합니다.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       시스템 파티션 <strong>%1</strong>의 %3에 %2를 설치합니다.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       <strong>%1</strong>에 부트 로더를 설치합니다.
     
     
-      
+      
       Setting up mount points.
       마운트 위치를 설정 중입니다.
     
@@ -1829,6 +1882,14 @@ The installer will quit and all changes will be lost.
       위치
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2048,29 +2109,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      원하는 지역을 선택하거나 현재 위치를 기준으로 기본 지역을 사용하십시오.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       표준시간대: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       선호하는 표준시간대와 지역을 선택하세요.
     
     
-      
+      
       Zones
       표준시간대
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       아래에서 언어 및 로케일을 상세하게 설정할 수 있습니다.
     
@@ -2377,7 +2438,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       패키지
     
@@ -2558,33 +2619,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       여유 공간
     
     
       
-      
+      
       New partition
       새로운 파티션
     
     
-      
+      
       Name
       이름
     
     
-      
+      
       File System
       파일 시스템
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       마운트 위치
     
     
-      
+      
       Size
       크기
     
@@ -2670,117 +2736,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       시스템 정보 수집 중...
     
     
-      
+      
       Partitions
       파티션
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       %1을 다른 운영 체제와 <strong>함께</strong> 설치합니다.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       디스크를 <strong>지우고</strong> %1을 설치합니다.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       파티션을 %1로 <strong>바꿉니다</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>수동</strong> 파티션 작업
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       디스크 <strong>%2</strong> (%3)에 다른 운영 체제와 <strong>함께</strong> %1을 설치합니다.
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       디스크 <strong>%2</strong> (%3)를 <strong>지우고</strong> %1을 설치합니다.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       디스크 <strong>%2</strong> (%3)의 파티션을 %1로 <strong>바꿉니다</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       디스크 <strong>%1</strong> (%2) 의 <strong>수동</strong> 파티션 작업입니다.
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       디스크 <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       현재:
     
     
-      
+      
       After:
       이후:
     
     
-      
+      
       No EFI system partition configured
       EFI 시스템 파티션이 설정되지 않았습니다
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       %1을(를) 시작하려면 EFI 시스템 파티션이 필요합니다.<br/><br/>EFI 시스템 파티션을 구성하려면 돌아가서 <strong>%3</strong> 플래그가 활성화된 FAT32 파일 시스템을 선택하거나 만들고 <strong>%2</strong> 지점을 마운트합니다.<br/><br/>EFI 시스템 파티션을 설정하지 않고 계속할 수 있지만 시스템을 시작하지 못할 수 있습니다.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       %1을(를) 시작하려면 EFI 시스템 파티션이 필요합니다.<br/><br/>파티션이 <strong>%2</strong> 마운트 지점으로 구성되었지만 <strong>%3</strong> 플래그가 설정되지 않았습니다.<br/>플래그를 설정하려면 뒤로 돌아가서 파티션을 편집하십시오.<br/><br/>플래그를 설정하지 않고 계속할 수 있지만 시스템을 시작하지 못할 수 있습니다.
     
     
-      
+      
       EFI system partition flag not set
       EFI 시스템 파티션 플래그가 설정되지 않았습니다
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS에서 GPT를 사용하는 옵션
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT 파티션 테이블은 모든 시스템에 가장 적합한 옵션입니다. 이 설치 프로그램은 BIOS 시스템에 대한 이러한 설정도 지원합니다.<br/><br/>BIOS에서 GPT 파티션 테이블을 구성하려면(아직 구성되지 않은 경우) 돌아가서 파티션 테이블을 GPT로 설정한 다음, <strong>bios_grub</strong> 플래그가 사용하도록 설정된 8MB의 포맷되지 않은 파티션을 생성합니다.<br/><br/>GPT가 있는 BIOS 시스템에서 %1을 시작하려면 포맷되지 않은 8MB 파티션이 필요합니다.
     
     
-      
+      
       Boot partition not encrypted
       부트 파티션이 암호화되지 않았습니다
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       암호화된 루트 파티션과 함께 별도의 부팅 파티션이 설정되었지만 부팅 파티션은 암호화되지 않았습니다.<br/><br/>중요한 시스템 파일은 암호화되지 않은 파티션에 보관되기 때문에 이러한 설정과 관련하여 보안 문제가 있습니다.<br/>원하는 경우 계속할 수 있지만 나중에 시스템을 시작하는 동안 파일 시스템 잠금이 해제됩니다.<br/>부팅 파티션을 암호화하려면 돌아가서 다시 생성하여 파티션 생성 창에서 <strong>암호화</strong>를 선택합니다.
     
     
-      
+      
       has at least one disk device available.
       하나 이상의 디스크 장치를 사용할 수 있습니다.
     
     
-      
+      
       There are no partitions to install on.
       설치를 위한 파티션이 없습니다.
     
@@ -2970,17 +3036,17 @@ Output:
       새 임의 파일 <pre>%1</pre>을(를) 만들 수 없습니다.
     
     
-      
+      
       No product
       제품 없음
     
     
-      
+      
       No description provided.
       설명이 제공되지 않았습니다.
     
     
-      
+      
       (no mount point)
       (마운트 위치 없음)
     
@@ -3241,12 +3307,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       최상의 결과를 얻으려면 이 컴퓨터가 다음 사항을 충족해야 합니다.
     
     
-      
+      
       System requirements
       시스템 요구 사항
     
@@ -3254,27 +3320,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       이 컴퓨터는 %1 설치를 위한 최소 요구 사항을 충족하지 않습니다.<br/>설치를 계속할 수 없습니다.<a href="#details">세부 정보...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       이 컴퓨터는 %1 설치를 위한 최소 요구 사항을 충족하지 않습니다.<br/>설치를 계속할 수 없습니다. <a href="#details">세부 사항입니다...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       이 컴퓨터는 %1 설치를 위한 권장 요구 사항 중 일부를 충족하지 않습니다.<br/>설치를 계속할 수는 있지만 일부 기능을 사용하지 않도록 설정할 수도 있습니다.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       이 컴퓨터는 %1 설치를 위한 권장 요구 사항 중 일부를 충족하지 않습니다.<br/>설치를 계속할 수 있지만 일부 기능을 사용하지 않도록 설정할 수 있습니다.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       이 프로그램은 몇 가지 질문을 하고 컴퓨터에 %2을 설정합니다.
     
@@ -3430,7 +3496,7 @@ Output:
       새 파티션에서 플래그를 <strong>%1</strong>으로 설정합니다.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       설치 관리자가 %1 파티션의 플래그를 설정하지 못했습니다.
     
@@ -3573,12 +3639,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       설치 절차를 시작하면 어떻게 되는지 간략히 설명합니다.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       설치 절차를 시작하면 어떻게 되는지 간략히 설명합니다.
     
@@ -4154,107 +4220,127 @@ Output:
       로그인 및 관리자 작업을 수행하려면 사용자 이름과 자격 증명을 선택하세요
     
     
-      
+      
       What is your name?
       이름이 무엇인가요?
     
     
-      
+      
       Your Full Name
       전체 이름
     
     
-      
+      
       What name do you want to use to log in?
       로그인할 때 사용할 이름은 무엇인가요?
     
     
-      
+      
       Login Name
       로그인 이름
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       다수의 사용자가 이 컴퓨터를 사용하는 경우, 설치를 마친 후에 여러 계정을 만들 수 있습니다.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      소문자, 숫자, 밑줄 및 하이픈만 허용됩니다.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       이 컴퓨터의 이름은 무엇인가요?
     
     
-      
+      
       Computer Name
       컴퓨터 이름
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       이 이름은 네트워크의 다른 사용자가 이 컴퓨터를 볼 수 있게 하는 경우에 사용됩니다.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       사용자 계정의 보안을 유지하기 위한 암호를 선택하세요.
     
     
-      
+      
       Password
       비밀번호
     
     
-      
+      
       Repeat Password
       비밀번호 반복
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       입력 오류를 확인할 수 있도록 동일한 암호를 두 번 입력합니다. 올바른 암호에는 문자, 숫자 및 구두점이 혼합되어 있으며 길이는 8자 이상이어야 하며 정기적으로 변경해야 합니다.
     
     
-      
+      
       Validate passwords quality
       암호 품질 검증
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       이 확인란을 선택하면 비밀번호 강도 검사가 수행되며 불충분한 비밀번호를 사용할 수 없습니다.
     
     
-      
+      
       Log in automatically without asking for the password
       암호를 묻지 않고 자동으로 로그인합니다
     
     
-      
+      
       Reuse user password as root password
       사용자 암호를 루트 암호로 재사용합니다
     
     
-      
+      
       Use the same password for the administrator account.
       관리자 계정에 대해 같은 암호를 사용합니다.
     
     
-      
+      
       Choose a root password to keep your account safe.
       당신의 계정을 안전하게 보호하기 위해서 루트 암호를 선택하세요.
     
     
-      
+      
       Root Password
       루트 암호
     
     
-      
+      
       Repeat Root Password
       루트 암호 확인
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       입력 오류를 확인하기 위해서 동일한 암호를 두번 입력해주세요.
     
diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts
index b83daef1a2..078a35924b 100644
--- a/lang/calamares_lo.ts
+++ b/lang/calamares_lo.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -464,22 +464,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -497,6 +497,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -513,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -691,12 +709,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -723,27 +741,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -867,6 +885,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -907,6 +930,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -969,27 +1002,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -997,43 +1040,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1084,7 +1127,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1323,7 +1366,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1360,57 +1413,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1823,6 +1876,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2040,29 +2101,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2369,7 +2430,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2550,33 +2611,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2662,117 +2728,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2959,17 +3025,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3227,12 +3293,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3240,27 +3306,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3416,7 +3482,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3559,12 +3625,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4104,107 +4170,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index 571a7b2894..5d1cfb128d 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
        %1 paleidimo įrašas (MBR)
     
     
-      
+      
       Boot Partition
       Paleidimo skaidinys
     
     
-      
+      
       System Partition
       Sistemos skaidinys
     
     
-      
+      
       Do not install a boot loader
       Nediegti paleidyklės
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Vykdoma %1 operacija.
     
     
-      
+      
       Bad working directory path
       Netinkama darbinio katalogo vieta
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Darbinis %1 python katalogas  dėl %2 užduoties yra neskaitomas
     
     
-      
+      
       Bad main script file
       Prastas pagrindinio skripto failas
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Pagrindinis scenarijus %1  dėl python %2 užduoties yra neskaitomas
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python klaida užduotyje "%1".
     
@@ -289,54 +289,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Sąranka patyrė nesėkmę
     
     
-      
+      
       Installation Failed
       Diegimas nepavyko
     
     
-      
+      
       Would you like to paste the install log to the web?
       Ar norėtumėte įdėti diegimo žurnalą į saityną?
     
     
-      
+      
       Error
       Klaida
     
     
-      
-      
+      
+      
       &Yes
       &Taip
     
     
-      
-      
+      
+      
       &No
       &Ne
     
     
-      
+      
       &Close
       &Užverti
     
     
-      
+      
       Install Log Paste URL
       Diegimo žurnalo įdėjimo URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Įkėlimas buvo nesėkmingas. Nebuvo atlikta jokio įdėjimo į saityną.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -349,124 +349,124 @@ Link copied to clipboard
 Nuoroda nukopijuota į iškarpinę
     
     
-      
+      
       Calamares Initialization Failed
       Calamares inicijavimas nepavyko
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Nepavyksta įdiegti %1. Calamares nepavyko įkelti visų sukonfigūruotų modulių. Tai yra problema, susijusi su tuo, kaip distribucija naudoja diegimo programą Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Nepavyko įkelti šių modulių:
     
     
-      
+      
       Continue with setup?
       Tęsti sąranką?
     
     
-      
+      
       Continue with installation?
       Tęsti diegimą?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 sąrankos programa, siekdama nustatyti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</strong>
     
     
-      
+      
       &Set up now
       Nu&statyti dabar
     
     
-      
+      
       &Install now
       Į&diegti dabar
     
     
-      
+      
       Go &back
       &Grįžti
     
     
-      
+      
       &Set up
       Nu&statyti
     
     
-      
+      
       &Install
       Į&diegti
     
     
-      
+      
       Setup is complete. Close the setup program.
       Sąranka užbaigta. Užverkite sąrankos programą.
     
     
-      
+      
       The installation is complete. Close the installer.
       Diegimas užbaigtas. Užverkite diegimo programą.
     
     
-      
+      
       Cancel setup without changing the system.
       Atsisakyti sąrankos, nieko sistemoje nekeičiant.
     
     
-      
+      
       Cancel installation without changing the system.
       Atsisakyti diegimo, nieko sistemoje nekeičiant.
     
     
-      
+      
       &Next
       &Toliau
     
     
-      
+      
       &Back
       &Atgal
     
     
-      
+      
       &Done
       A&tlikta
     
     
-      
+      
       &Cancel
       A&tsisakyti
     
     
-      
+      
       Cancel setup?
       Atsisakyti sąrankos?
     
     
-      
+      
       Cancel installation?
       Atsisakyti diegimo?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Ar tikrai norite atsisakyti dabartinio sąrankos proceso?
 Sąrankos programa užbaigs darbą ir visi pakeitimai bus prarasti.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Ar tikrai norite atsisakyti dabartinio diegimo proceso?
@@ -476,22 +476,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Nežinomas išimties tipas
     
     
-      
+      
       unparseable Python error
       Nepalyginama Python klaida
     
     
-      
+      
       unparseable Python traceback
       Nepalyginamas Python atsekimas
     
     
-      
+      
       Unfetchable Python error.
       Neatgaunama Python klaida.
     
@@ -509,6 +509,24 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       %1 diegimo programa
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      Nustatyti failų sistemos etiketę ties %1.
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      Nustatyti failų sistemos etiketę <strong>%1</strong> skaidiniui <strong>%2</strong>.
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Diegimo programai nepavyko atnaujinti skaidinių lentelės diske '%1'.
+    
+  
   
     CheckerContainer
     
@@ -525,149 +543,149 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Forma
     
     
-      
+      
       Select storage de&vice:
       Pasirinkite atminties įr&enginį:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Dabartinis:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Rankinis skaidymas</strong><br/>Galite patys kurti ar keisti skaidinių dydžius.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Pakartotinai naudoti %1 kaip namų skaidinį, skirtą %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Pasirinkite, kurį skaidinį sumažinti, o tuomet vilkite juostą, kad pakeistumėte skaidinio dydį</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 bus sumažintas iki %2MiB ir naujas %3MiB skaidinys bus sukurtas sistemai %4.
     
     
-      
+      
       Boot loader location:
       Paleidyklės vieta:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Pasirinkite kuriame skaidinyje įdiegti</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Šioje sistemoje niekur nepavyko rasti EFI skaidinio. Prašome grįžti ir naudoti rankinį skaidymą, kad nustatytumėte %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %2 paleidimui bus naudojamas EFI sistemos skaidinys, esantis ties %1.
     
     
-      
+      
       EFI system partition:
       EFI sistemos skaidinys:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Atrodo, kad šiame įrenginyje nėra operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Ištrinti diską</strong><br/>Tai <font color="red">ištrins</font> visus, pasirinktame atminties įrenginyje, esančius duomenis.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Įdiegti šalia</strong><br/>Diegimo programa sumažins skaidinį, kad atlaisvintų vietą sistemai %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Pakeisti skaidinį</strong><br/>Pakeičia skaidinį ir įrašo %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Šiame atminties įrenginyje jau yra %1. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Šiame atminties įrenginyje jau yra operacinė sistema. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Šiame atminties įrenginyje jau yra kelios operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Šiame atminties įrenginyje jau yra operacinė sistema, bet skaidinių lentelė <strong>%1</strong> yra kitokia nei reikiama <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Vienas iš šio atminties įrenginio skaidinių yra <strong>prijungtas</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Šis atminties įrenginys yra <strong>neaktyvaus RAID</strong> įrenginio dalis.
     
     
-      
+      
       No Swap
       Be sukeitimų skaidinio
     
     
-      
+      
       Reuse Swap
       Iš naujo naudoti sukeitimų skaidinį
     
     
-      
+      
       Swap (no Hibernate)
       Sukeitimų skaidinys (be užmigdymo)
     
     
-      
+      
       Swap (with Hibernate)
       Sukeitimų skaidinys (su užmigdymu)
     
     
-      
+      
       Swap to file
       Sukeitimų failas
     
@@ -703,12 +721,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Išvalomi visi laikinieji prijungimai.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Nepavyksta gauti laikinųjų prijungimų sąrašo.
     
     
-      
+      
       Cleared all temporary mounts.
       Visi laikinieji prijungimai išvalyti.
     
@@ -735,27 +753,27 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Nustatyti klaviatūros modelį kaip %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Nustatyti klaviatūros išdėstymą kaip %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Nustatyti laiko juostą į %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       Sistemos kalba bus nustatyta į %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Skaičių ir datų lokalė bus nustatyta į %1.
     
@@ -879,6 +897,11 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Your passwords do not match!
       Jūsų slaptažodžiai nesutampa!
     
+    
+      
+      OK!
+      Gerai!
+    
     
       
       Setup Failed
@@ -919,6 +942,16 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       The installation of %1 is complete.
       %1 diegimas yra užbaigtas.
     
+    
+      
+      Package Selection
+      Paketų pasirinkimas
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Pasirinkite iš sąrašo produktą. Pasirinktas produktas bus įdiegtas.
+    
   
   
     ContextualProcessJob
@@ -981,27 +1014,37 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Vėliavėlės:
     
     
-      
+      
+      Label for the filesystem
+      Failų sistemos etiketė
+    
+    
+      
+      FS Label:
+      FS etiketė:
+    
+    
+      
       En&crypt
       Užši&fruoti
     
     
-      
+      
       Logical
       Loginis
     
     
-      
+      
       Primary
       Pirminis
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Prijungimo taškas jau yra naudojamas. Prašome pasirinkti kitą.
     
@@ -1009,43 +1052,43 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Sukurti naują %1MiB skaidinį ties %3 (%2) su įrašais %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Sukurti naują %1MiB skaidinį ties %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Sukurti naują %2MiB skaidinį diske %4 (%3) su %1 failų sistema.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Sukurti naują <strong>%1MiB</strong> skaidinį ties <strong>%3</strong> (%2) su įrašais <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Sukurti naują <strong>%1MiB</strong> skaidinį ties <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Sukurti naują <strong>%2MiB</strong> skaidinį diske <strong>%4</strong> (%3) su <strong>%1</strong> failų sistema.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Kuriamas naujas %1 skaidinys ties %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Diegimo programai nepavyko sukurti skaidinio diske '%1'.
     
@@ -1096,7 +1139,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Kuriama nauja %1 skaidinių lentelė ties %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Diegimo programai nepavyko %1 sukurti skaidinių lentelės.
     
@@ -1335,7 +1378,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Vėliavėlės:
     
     
-      
+      
+      Label for the filesystem
+      Failų sistemos etiketė
+    
+    
+      
+      FS Label:
+      FS etiketė:
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Prijungimo taškas jau yra naudojamas. Prašome pasirinkti kitą.
     
@@ -1372,57 +1425,57 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Nustatyti skaidinio informaciją
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Įdiegti %1 <strong>naujame</strong> %2 sistemos skaidinyje su ypatybėmis <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Įdiegti %1 <strong>naujame</strong> %2 sistemos skaidinyje.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Nustatyti <strong>naują</strong> %2 skaidinį su prijungimo tašku <strong>%1</strong> ir ypatybėmis <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Nustatyti <strong>naują</strong> %2 skaidinį su prijungimo tašku <strong>%1</strong>%3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Įdiegti %2 sistemą %3 sistemos skaidinyje <strong>%1</strong> su ypatybėmis <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Nustatyti %3 skaidinį <strong>%1</strong> su prijungimo tašku <strong>%2</strong> ir ypatybėmis <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Nustatyti %3 skaidinį <strong>%1</strong> su prijungimo tašku <strong>%2</strong>%4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Diegti %2 sistemą, %3 sistemos skaidinyje <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Diegti paleidyklę skaidinyje <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Nustatomi prijungimo taškai.
     
@@ -1835,6 +1888,14 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Vieta
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      Išeiti
+    
+  
   
     LocaleViewStep
     
@@ -2054,29 +2115,29 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Pasirinkite pageidaujamą regioną arba naudokite numatytąjį, kuris remiasi jūsų dabartine vieta.
+      
+      Select your preferred Region, or use the default settings.
+      Pasirinkite pageidaujamą regioną arba naudokite numatytuosius nustatymus.
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Laiko juosta: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Pasirinkite pageidaujamą sritį regiono ribose.
     
     
-      
+      
       Zones
       Sritys
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Žemiau galite derinti kalbos ir lokalės nustatymus.
     
@@ -2410,7 +2471,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paketai
     
@@ -2591,33 +2652,38 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
     PartitionModel
     
       
-      
+      
       Free Space
       Laisva vieta
     
     
       
-      
+      
       New partition
       Naujas skaidinys
     
     
-      
+      
       Name
       Pavadinimas
     
     
-      
+      
       File System
       Failų sistema
     
     
-      
+      
+      File System Label
+      Failų sistemos etiketė
+    
+    
+      
       Mount Point
       Prijungimo vieta
     
     
-      
+      
       Size
       Dydis
     
@@ -2703,117 +2769,117 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Renkama sistemos informacija...
     
     
-      
+      
       Partitions
       Skaidiniai
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Diegti %1 <strong>šalia</strong> kitos operacinės sistemos.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Ištrinti</strong> diską ir diegti %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Pakeisti</strong> skaidinį, įrašant %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Rankinis</strong> skaidymas.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Įdiegti %1 <strong>šalia</strong> kitos operacinės sistemos diske <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Ištrinti</strong> diską <strong>%2</strong> (%3) ir diegti %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Pakeisti</strong> skaidinį diske <strong>%2</strong> (%3), įrašant %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Rankinis</strong> skaidymas diske <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Diskas <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Dabartinis:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       No EFI system partition configured
       Nėra sukonfigūruoto EFI sistemos skaidinio
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       EFI sistemos skaidinys yra būtinas, norint paleisti %1.<br/><br/>Norėdami sukonfigūruoti EFI sistemos skaidinį, grįžkite atgal ir pasirinkite arba sukurkite FAT32 failų sistemą su įjungta <strong>%3</strong> vėliavėle ir <strong>%2</strong> prijungimo tašku.<br/><br/>Jūs galite tęsti ir nenustatę EFI sistemos skaidinio, tačiau tokiu atveju, gali nepavykti paleisti jūsų sistemos.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       EFI sistemos skaidinys yra būtinas, norint paleisti %1.<br/><br/>Skaidinys buvo sukonfigūruotas su prijungimo tašku <strong>%2</strong>, tačiau jo <strong>%3</strong> vėliavėlė yra nenustatyta.<br/>Norėdami nustatyti vėliavėlę, grįžkite atgal ir taisykite skaidinį.<br/><br/>Jūs galite tęsti ir nenustatę vėliavėlės, tačiau tokiu atveju, gali nepavykti paleisti jūsų sistemos.
     
     
-      
+      
       EFI system partition flag not set
       Nenustatyta EFI sistemos skaidinio vėliavėlė
     
     
-      
+      
       Option to use GPT on BIOS
       Parinktis naudoti GPT per BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT skaidinių lentelė yra geriausias variantas visoms sistemoms. Ši diegimo programa palaiko tokią sąranką taip pat ir BIOS sistemoms.<br/><br/>Norėdami konfigūruoti GPT skaidinių lentelę BIOS sistemoje, (jei dar nesate to padarę) grįžkite atgal ir nustatykite skaidinių lentelę į GPT, toliau, sukurkite 8 MB neformatuotą skaidinį su įjungta <strong>bios_grub</strong> vėliavėle.<br/><br/>Neformatuotas 8 MB skaidinys yra būtinas, norint paleisti %1 BIOS sistemoje su GPT.
     
     
-      
+      
       Boot partition not encrypted
       Paleidimo skaidinys nėra užšifruotas
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Kartu su užšifruotu šaknies skaidiniu, buvo nustatytas atskiras paleidimo skaidinys, tačiau paleidimo skaidinys nėra užšifruotas.<br/><br/>Dėl tokios sąrankos iškyla tam tikrų saugumo klausimų, kadangi svarbūs sisteminiai failai yra laikomi neužšifruotame skaidinyje.<br/>Jeigu norite, galite tęsti, tačiau failų sistemos atrakinimas įvyks vėliau, sistemos paleidimo metu.<br/>Norėdami užšifruoti paleidimo skaidinį, grįžkite atgal ir sukurkite jį iš naujo bei skaidinių kūrimo lange pažymėkite parinktį <strong>Užšifruoti</strong>.
     
     
-      
+      
       has at least one disk device available.
       turi bent vieną prieinamą disko įrenginį.
     
     
-      
+      
       There are no partitions to install on.
       Nėra skaidinių į kuriuos diegti.
     
@@ -3003,17 +3069,17 @@ Išvestis:
       Nepavyko sukurti naujo atsitiktinio failo <pre>%1</pre>.
     
     
-      
+      
       No product
       Nėra produkto
     
     
-      
+      
       No description provided.
       Nepateikta jokio aprašo.
     
     
-      
+      
       (no mount point)
       (nėra prijungimo taško)
     
@@ -3274,12 +3340,12 @@ Išvestis:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Norėdami pasiekti geriausių rezultatų, įsitikinkite kad šis kompiuteris:
     
     
-      
+      
       System requirements
       Sistemos reikalavimai
     
@@ -3287,27 +3353,27 @@ Išvestis:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Šis kompiuteris netenkina minimalių %1 nustatymo reikalavimų.<br/>Sąranka negali būti tęsiama. <a href="#details">Išsamiau...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Šis kompiuteris netenkina minimalių %1 diegimo reikalavimų.<br/>Diegimas negali būti tęsiamas. <a href="#details">Išsamiau...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Šis kompiuteris netenkina kai kurių %1 nustatymui rekomenduojamų reikalavimų.<br/>Sąranką galima tęsti, tačiau kai kurios funkcijos gali būti išjungtos.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Šis kompiuteris netenkina kai kurių %1 diegimui rekomenduojamų reikalavimų.<br/>Diegimą galima tęsti, tačiau kai kurios funkcijos gali būti išjungtos.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Programa užduos kelis klausimus ir padės įsidiegti %2.
     
@@ -3463,7 +3529,7 @@ Išvestis:
       Nustatomos vėliavėlės <strong>%1</strong> naujame skaidinyje.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Diegimo programai nepavyko nustatyti vėliavėlių skaidinyje %1.
     
@@ -3606,12 +3672,12 @@ Išvestis:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Tai yra apžvalga to, kas įvyks, prasidėjus sąrankos procedūrai.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Tai yra apžvalga to, kas įvyks, prasidėjus diegimo procedūrai.
     
@@ -4187,107 +4253,127 @@ Išvestis:
       Pasirinkite naudotojo vardą ir prisijungimo duomenis, kad galėtumėte prisijungti ir atlikti administravimo užduotis
     
     
-      
+      
       What is your name?
       Koks jūsų vardas?
     
     
-      
+      
       Your Full Name
       Jūsų visas vardas
     
     
-      
+      
       What name do you want to use to log in?
       Kokį vardą norite naudoti prisijungimui?
     
     
-      
+      
       Login Name
       Prisijungimo vardas
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galėsite sukurti papildomas paskyras.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Yra leidžiamos tik mažosios raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai.
+    
+    
+      
+      root is not allowed as username.
+      root neleidžiama naudoti kaip naudotojo vardą.
+    
+    
+      
       What is the name of this computer?
       Koks šio kompiuterio vardas?
     
     
-      
+      
       Computer Name
       Kompiuterio vardas
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Šis vardas bus naudojamas, jeigu padarysite savo kompiuterį matomą kitiems naudotojams tinkle.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Yra leidžiamos tik raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai, mažiausiai du simboliai.
+    
+    
+      
+      localhost is not allowed as hostname.
+      localhost neleidžiama naudoti kaip naudotojo vardą.
+    
+    
+      
       Choose a password to keep your account safe.
       Apsaugokite savo paskyrą slaptažodžiu
     
     
-      
+      
       Password
       Slaptažodis
     
     
-      
+      
       Repeat Password
       Pakartokite slaptažodį
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus. Stiprus slaptažodis yra raidžių, skaičių ir punktuacijos ženklų mišinys, jis turi būti mažiausiai aštuonių simbolių, be to, turėtų būti reguliariai keičiamas.
     
     
-      
+      
       Validate passwords quality
       Tikrinti slaptažodžių kokybę
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Pažymėjus šį langelį, bus atliekamas slaptažodžio stiprumo tikrinimas ir negalėsite naudoti silpną slaptažodį.
     
     
-      
+      
       Log in automatically without asking for the password
       Prisijungti automatiškai, neklausiant slaptažodžio
     
     
-      
+      
       Reuse user password as root password
       Naudotojo slaptažodį naudoti pakartotinai kaip pagrindinio naudotojo (root) slaptažodį
     
     
-      
+      
       Use the same password for the administrator account.
       Naudoti tokį patį slaptažodį administratoriaus paskyrai.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Pasirinkite pagrindinio naudotojo (root) slaptažodį, kad apsaugotumėte savo paskyrą.
     
     
-      
+      
       Root Password
       Pagrindinio naudotojo (Root) slaptažodis
     
     
-      
+      
       Repeat Root Password
       Pakartokite pagrindinio naudotojo (Root) slaptažodį
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus.
     
diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts
index 092c814bcb..b936a28ead 100644
--- a/lang/calamares_lv.ts
+++ b/lang/calamares_lv.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -287,54 +287,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +343,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -468,22 +468,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -501,6 +501,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -695,12 +713,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -727,27 +745,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -871,6 +889,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1001,43 +1044,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1088,7 +1131,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1327,7 +1370,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1364,57 +1417,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1827,6 +1880,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2105,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2391,7 +2452,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2572,33 +2633,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2684,117 +2750,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,17 +3047,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3249,12 +3315,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3262,27 +3328,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3438,7 +3504,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3581,12 +3647,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4126,107 +4192,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts
index 27d50ddd96..90b11403a7 100644
--- a/lang/calamares_mk.ts
+++ b/lang/calamares_mk.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Грешка
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Инсталацијата е готова. Исклучете го инсталерот.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts
index 581a834f3a..33acf004c6 100644
--- a/lang/calamares_ml.ts
+++ b/lang/calamares_ml.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 ന്റെ മാസ്റ്റർ ബൂട്ട് റെക്കോർഡ്
     
     
-      
+      
       Boot Partition
       ബൂട്ട് പാർട്ടീഷൻ
     
     
-      
+      
       System Partition
       സിസ്റ്റം പാർട്ടീഷൻ
     
     
-      
+      
       Do not install a boot loader
       ബൂട്ട് ലോഡർ ഇൻസ്റ്റാൾ ചെയ്യരുത്
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 ക്രിയ നടപ്പിലാക്കുന്നു.
     
     
-      
+      
       Bad working directory path
       പ്രവർത്ഥനരഹിതമായ ഡയറക്ടറി പാത
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       പൈതൺ ജോബ് %2 യുടെ പ്രവർത്തന പാതയായ %1 വായിക്കുവാൻ കഴിയുന്നില്ല
     
     
-      
+      
       Bad main script file
       മോശമായ പ്രധാന സ്ക്രിപ്റ്റ് ഫയൽ
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       പൈത്തൺ ജോബ് %2 നായുള്ള പ്രധാന സ്ക്രിപ്റ്റ് ഫയൽ %1 വായിക്കാൻ കഴിയുന്നില്ല.
     
     
-      
+      
       Boost.Python error in job "%1".
       "%1" എന്ന പ്രവൃത്തിയില്‍ ബൂസ്റ്റ്.പൈതണ്‍ പിശക്
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       സജ്ജീകരണപ്രക്രിയ പരാജയപ്പെട്ടു
     
     
-      
+      
       Installation Failed
       ഇൻസ്റ്റളേഷൻ പരാജയപ്പെട്ടു
     
     
-      
+      
       Would you like to paste the install log to the web?
       ഇൻസ്റ്റാൾ ലോഗ് വെബിലേക്ക് പകർത്തണോ?
     
     
-      
+      
       Error
       പിശക്
     
     
-      
-      
+      
+      
       &Yes
       വേണം (&Y)
     
     
-      
-      
+      
+      
       &No
       വേണ്ട (&N)
     
     
-      
+      
       &Close
       അടയ്ക്കുക (&C)
     
     
-      
+      
       Install Log Paste URL
       ഇൻസ്റ്റാൾ ലോഗ് പകർപ്പിന്റെ വിലാസം
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       അപ്‌ലോഡ് പരാജയമായിരുന്നു. വെബിലേക്ക് പകർത്തിയില്ല.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       കലാമാരേസ് സമാരംഭിക്കൽ പരാജയപ്പെട്ടു
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയില്ല. ക്രമീകരിച്ച എല്ലാ മൊഡ്യൂളുകളും ലോഡുചെയ്യാൻ കാലാമറെസിന് കഴിഞ്ഞില്ല. വിതരണത്തിൽ കാലാമറെസ് ഉപയോഗിക്കുന്ന രീതിയിലുള്ള ഒരു പ്രശ്നമാണിത്.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>താഴെ പറയുന്ന മൊഡ്യൂളുകൾ ലഭ്യമാക്കാനായില്ല:
     
     
-      
+      
       Continue with setup?
       സജ്ജീകരണപ്രക്രിയ തുടരണോ?
     
     
-      
+      
       Continue with installation?
       ഇൻസ്റ്റളേഷൻ തുടരണോ?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %2 സജ്ജീകരിക്കുന്നതിന് %1 സജ്ജീകരണ പ്രോഗ്രാം നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %2 ഇൻസ്റ്റാളുചെയ്യുന്നതിന് %1 ഇൻസ്റ്റാളർ നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല.</strong>
     
     
-      
+      
       &Set up now
       ഉടൻ സജ്ജീകരിക്കുക (&S)
     
     
-      
+      
       &Install now
       ഉടൻ ഇൻസ്റ്റാൾ ചെയ്യുക (&I)
     
     
-      
+      
       Go &back
       പുറകോട്ടു പോകുക 
     
     
-      
+      
       &Set up
       സജ്ജീകരിക്കുക (&S)
     
     
-      
+      
       &Install
       ഇൻസ്റ്റാൾ (&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       സജ്ജീകരണം പൂർത്തിയായി. പ്രയോഗം അടയ്ക്കുക.
     
     
-      
+      
       The installation is complete. Close the installer.
       ഇൻസ്റ്റളേഷൻ പൂർത്തിയായി. ഇൻസ്റ്റാളർ അടയ്ക്കുക
     
     
-      
+      
       Cancel setup without changing the system.
       സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ സജ്ജീകരണപ്രക്രിയ റദ്ദാക്കുക.
     
     
-      
+      
       Cancel installation without changing the system.
       സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ ഇൻസ്റ്റളേഷൻ റദ്ദാക്കുക.
     
     
-      
+      
       &Next
       അടുത്തത് (&N)
     
     
-      
+      
       &Back
       പുറകോട്ട് (&B)
     
     
-      
+      
       &Done
       ചെയ്‌തു
     
     
-      
+      
       &Cancel
       റദ്ദാക്കുക (&C)
     
     
-      
+      
       Cancel setup?
       സജ്ജീകരണം റദ്ദാക്കണോ?
     
     
-      
+      
       Cancel installation?
       ഇൻസ്റ്റളേഷൻ റദ്ദാക്കണോ?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       നിലവിലുള്ള സജ്ജീകരണപ്രക്രിയ റദ്ദാക്കണോ?
 സജ്ജീകരണപ്രയോഗം നിൽക്കുകയും എല്ലാ മാറ്റങ്ങളും നഷ്ടപ്പെടുകയും ചെയ്യും.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       നിലവിലുള്ള ഇൻസ്റ്റാൾ പ്രക്രിയ റദ്ദാക്കണോ?
@@ -468,22 +468,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       അജ്ഞാതമായ പിശക്
     
     
-      
+      
       unparseable Python error
       മനസ്സിലാക്കാനാവാത്ത പൈത്തൺ പിഴവ്
     
     
-      
+      
       unparseable Python traceback
       മനസ്സിലാക്കാനാവാത്ത പൈത്തൺ ട്രേസ്ബാക്ക്
     
     
-      
+      
       Unfetchable Python error.
       ലഭ്യമാക്കാനാവാത്ത പൈത്തൺ പിഴവ്.
     
@@ -501,6 +501,24 @@ The installer will quit and all changes will be lost.
       %1 ഇൻസ്റ്റാളർ
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ The installer will quit and all changes will be lost.
       ഫോം
     
     
-      
+      
       Select storage de&vice:
       സംഭരണിയ്ക്കുള്ള ഉപകരണം തിരഞ്ഞെടുക്കൂ:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       നിലവിലുള്ളത്:
     
     
-      
+      
       After:
       ശേഷം:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>സ്വമേധയാ ഉള്ള പാർട്ടീഷനിങ്</strong><br/>നിങ്ങൾക്ക് സ്വയം പാർട്ടീഷനുകൾ സൃഷ്ടിക്കാനോ വലുപ്പം മാറ്റാനോ കഴിയും.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %2 നുള്ള ഹോം പാർട്ടീഷനായി %1 വീണ്ടും ഉപയോഗിക്കൂ.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>ചുരുക്കുന്നതിന് ഒരു പാർട്ടീഷൻ തിരഞ്ഞെടുക്കുക, എന്നിട്ട് വലുപ്പം മാറ്റാൻ ചുവടെയുള്ള ബാർ വലിക്കുക.
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 %2MiB ആയി ചുരുങ്ങുകയും %4 ന് ഒരു പുതിയ %3MiB പാർട്ടീഷൻ സൃഷ്ടിക്കുകയും ചെയ്യും.
     
     
-      
+      
       Boot loader location:
       ബൂട്ട് ലോഡറിന്റെ സ്ഥാനം:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>ഇൻസ്റ്റാൾ ചെയ്യാനായി ഒരു പാർട്ടീഷൻ തിരഞ്ഞെടുക്കുക</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       ഈ സിസ്റ്റത്തിൽ എവിടെയും ഒരു ഇ.എഫ്.ഐ സിസ്റ്റം പാർട്ടീഷൻ കണ്ടെത്താനായില്ല. %1 സജ്ജീകരിക്കുന്നതിന് ദയവായി തിരികെ പോയി മാനുവൽ പാർട്ടീഷനിംഗ് ഉപയോഗിക്കുക.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 ലെ ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ %2 ആരംഭിക്കുന്നതിന് ഉപയോഗിക്കും.
     
     
-      
+      
       EFI system partition:
       ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ഈ ഡറ്റോറേജ്‌ ഉപകരണത്തിൽ ഒരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റം ഉണ്ടെന്ന് തോന്നുന്നില്ല. നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങൾക്ക് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും കഴിയും. 
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>ഡിസ്ക് മായ്ക്കൂ</strong><br/>ഈ പ്രവൃത്തി തെരെഞ്ഞെടുത്ത സ്റ്റോറേജ് ഉപകരണത്തിലെ എല്ലാ ഡാറ്റയും <font color="red">മായ്‌ച്ച്കളയും</font>.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>ഇതിനൊപ്പം ഇൻസ്റ്റാൾ ചെയ്യുക</strong><br/>%1 ന് ഇടം നൽകുന്നതിന് ഇൻസ്റ്റാളർ ഒരു പാർട്ടീഷൻ ചുരുക്കും.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>ഒരു പാർട്ടീഷൻ പുനഃസ്ഥാപിക്കുക</strong><br/>ഒരു പാർട്ടീഷന് %1 ഉപയോഗിച്ച് പുനഃസ്ഥാപിക്കുന്നു.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ഈ സ്റ്റോറേജ് ഉപകരണത്തിൽ %1 ഉണ്ട്.നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും നിങ്ങൾക്ക് കഴിയും.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ഈ സ്റ്റോറേജ് ഉപകരണത്തിൽ ഇതിനകം ഒരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റം ഉണ്ട്. നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങൾക്ക് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും കഴിയും. 
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ഈ സ്റ്റോറേജ് ഉപകരണത്തിൽ ഒന്നിലധികം ഓപ്പറേറ്റിംഗ് സിസ്റ്റങ്ങളുണ്ട്. നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങൾക്ക് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും കഴിയും. 
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       സ്വാപ്പ് വേണ്ട
     
     
-      
+      
       Reuse Swap
       സ്വാപ്പ് വീണ്ടും ഉപയോഗിക്കൂ
     
     
-      
+      
       Swap (no Hibernate)
       സ്വാപ്പ് (ഹൈബർനേഷൻ ഇല്ല)
     
     
-      
+      
       Swap (with Hibernate)
       സ്വാപ്പ് (ഹൈബർനേഷനോട് കൂടി)
     
     
-      
+      
       Swap to file
       ഫയലിലേക്ക് സ്വാപ്പ് ചെയ്യുക
     
@@ -695,12 +713,12 @@ The installer will quit and all changes will be lost.
       എല്ലാ താൽക്കാലിക മൗണ്ടുകളും നീക്കം ചെയ്യുന്നു.
     
     
-      
+      
       Cannot get list of temporary mounts.
       താൽക്കാലിക മൗണ്ടുകളുടെ പട്ടിക ലഭ്യമായില്ല.
     
     
-      
+      
       Cleared all temporary mounts.
       എല്ലാ താൽക്കാലിക മൗണ്ടുകളും നീക്കം ചെയ്തു.
     
@@ -727,27 +745,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       കീബോർഡ് മോഡൽ %1 എന്നതായി ക്രമീകരിക്കുക.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       കീബോർഡ് വിന്യാസം %1%2 എന്നതായി ക്രമീകരിക്കുക.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       സിസ്റ്റം ഭാഷ %1 ആയി സജ്ജമാക്കും.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       സംഖ്യ & തീയതി രീതി %1 ആയി ക്രമീകരിക്കും.
     
@@ -871,6 +889,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       നിങ്ങളുടെ പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       %1 ന്റെ ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി.
     
+    
+      
+      Package Selection
+      പാക്കേജ് തിരഞ്ഞെടുക്കൽ
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      പട്ടികയിൽ നിന്നും ഒരു ഉത്പന്നം തിരഞ്ഞെടുക്കുക. തിരഞ്ഞെടുത്ത ഉത്പന്നം ഇൻസ്റ്റാൾ ചെയ്യപ്പെടുക.
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ The installer will quit and all changes will be lost.
       ഫ്ലാഗുകൾ:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       എൻക്രിപ്റ്റ് (&c)
     
     
-      
+      
       Logical
       ലോജിക്കൽ
     
     
-      
+      
       Primary
       പ്രാഥമികം
     
     
-      
+      
       GPT
       ജിപിറ്റി
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       മൗണ്ട്പോയിന്റ് നിലവിൽ ഉപയോഗിക്കപ്പെട്ടിരിക്കുന്നു. ദയവായി മറ്റൊരെണ്ണം തിരഞ്ഞെടുക്കൂ.
     
@@ -1001,43 +1044,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       ഫയൽ സിസ്റ്റം %1 ഉപയോഗിച്ച് %4 (%3) ൽ പുതിയ %2MiB പാർട്ടീഷൻ സൃഷ്ടിക്കുക.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       ഫയൽ സിസ്റ്റം <strong>%1</strong> ഉപയോഗിച്ച് <strong>%4</strong> (%3) ൽ പുതിയ <strong>%2MiB</strong> പാർട്ടീഷൻ സൃഷ്ടിക്കുക.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2 ൽ പുതിയ %1 പാർട്ടീഷൻ സൃഷ്ടിക്കുന്നു.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       '%1' ഡിസ്കിൽ പാർട്ടീഷൻ സൃഷ്ടിക്കുന്നതിൽ ഇൻസ്റ്റാളർ പരാജയപ്പെട്ടു.
     
@@ -1088,7 +1131,7 @@ The installer will quit and all changes will be lost.
       %2 എന്നതില്‍ %1 എന്ന പുതിയ പാര്‍ട്ടീഷന്‍ ടേബിള്‍ സൃഷ്ടിക്കുന്നു.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       %1 ൽ പാർട്ടീഷൻ പട്ടിക സൃഷ്ടിക്കുന്നതിൽ ഇൻസ്റ്റാളർ പരാജയപ്പെട്ടു.
     
@@ -1327,7 +1370,17 @@ The installer will quit and all changes will be lost.
       ഫ്ലാഗുകൾ:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       മൗണ്ട്പോയിന്റ് നിലവിൽ ഉപയോഗിക്കപ്പെട്ടിരിക്കുന്നു. ദയവായി മറ്റൊരെണ്ണം തിരഞ്ഞെടുക്കൂ.
     
@@ -1364,57 +1417,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       പാർട്ടീഷൻ വിവരങ്ങൾ ക്രമീകരിക്കുക
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       <strong>പുതിയ</strong> %2 സിസ്റ്റം പാർട്ടീഷനിൽ %1 ഇൻസ്റ്റാൾ ചെയ്യുക.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       %3 സിസ്റ്റം പാർട്ടീഷൻ <strong>%1-ൽ</strong> %2 ഇൻസ്റ്റാൾ ചെയ്യുക.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       <strong>%1-ൽ</strong> ബൂട്ട് ലോഡർ ഇൻസ്റ്റാൾ ചെയ്യുക.
     
     
-      
+      
       Setting up mount points.
       മൗണ്ട് പോയിന്റുകൾ സജ്ജീകരിക്കുക.
     
@@ -1827,6 +1880,14 @@ The installer will quit and all changes will be lost.
       സ്ഥാനം
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2105,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2382,7 +2443,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       പാക്കേജുകൾ
     
@@ -2563,33 +2624,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       ലഭ്യമായ സ്ഥലം
     
     
       
-      
+      
       New partition
       പുതിയ പാർട്ടീഷൻ
     
     
-      
+      
       Name
       പേര്
     
     
-      
+      
       File System
       ഫയൽ സിസ്റ്റം
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       മൗണ്ട് പോയിന്റ്
     
     
-      
+      
       Size
       വലുപ്പം
     
@@ -2675,117 +2741,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       സിസ്റ്റത്തെക്കുറിച്ചുള്ള വിവരങ്ങൾ ശേഖരിക്കുന്നു...
     
     
-      
+      
       Partitions
       പാർട്ടീഷനുകൾ
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       മറ്റൊരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റത്തിനൊപ്പം %1 ഇൻസ്റ്റാൾ ചെയ്യുക.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       ഡിസ്ക് <strong>മായ്ക്കുക</strong>എന്നിട്ട് %1 ഇൻസ്റ്റാൾ ചെയ്യുക.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       ഒരു പാർട്ടീഷൻ %1 ഉപയോഗിച്ച് <strong>പുനഃസ്ഥാപിക്കുക.</strong>
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>സ്വമേധയാ</strong> ഉള്ള പാർട്ടീഷനിങ്.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       %2 (%3) ഡിസ്കിൽ മറ്റൊരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റത്തിനൊപ്പം %1 ഇൻസ്റ്റാൾ ചെയ്യുക.
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       ഡിസ്ക് <strong>%2</strong> (%3) <strong>മായ്‌ച്ച് </strong> %1 ഇൻസ്റ്റാൾ ചെയ്യുക.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>%2</strong> (%3) ഡിസ്കിലെ ഒരു പാർട്ടീഷൻ %1 ഉപയോഗിച്ച്  <strong>മാറ്റിസ്ഥാപിക്കുക</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>%1 </strong>(%2) ഡിസ്കിലെ <strong>സ്വമേധയാ</strong> പാർട്ടീഷനിംഗ്.
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       ഡിസ്ക് <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       നിലവിലുള്ളത്:
     
     
-      
+      
       After:
       ശേഷം:
     
     
-      
+      
       No EFI system partition configured
       ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷനൊന്നും ക്രമീകരിച്ചിട്ടില്ല
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ ഫ്ലാഗ് ക്രമീകരിച്ചിട്ടില്ല
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യപ്പെട്ടിട്ടില്ല
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       എൻക്രിപ്റ്റ് ചെയ്ത ഒരു റൂട്ട് പാർട്ടീഷനോടൊപ്പം ഒരു വേർപെടുത്തിയ ബൂട്ട് പാർട്ടീഷനും ക്രമീകരിക്കപ്പെട്ടിരുന്നു, എന്നാൽ ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യപ്പെട്ടതല്ല.<br/><br/>ഇത്തരം സജ്ജീകരണത്തിന്റെ സുരക്ഷ ഉത്കണ്ഠാജനകമാണ്, എന്തെന്നാൽ പ്രധാനപ്പെട്ട സിസ്റ്റം ഫയലുകൾ ഒരു എൻക്രിപ്റ്റ് ചെയ്യപ്പെടാത്ത പാർട്ടീഷനിലാണ് സൂക്ഷിച്ചിട്ടുള്ളത്.<br/> താങ്കൾക്ക് വേണമെങ്കിൽ തുടരാം, പക്ഷേ ഫയൽ സിസ്റ്റം തുറക്കൽ സിസ്റ്റം ആരംഭപ്രക്രിയയിൽ വൈകിയേ സംഭവിക്കൂ.<br/>ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യാനായി, തിരിച്ചു പോയി പാർട്ടീഷൻ നിർമ്മാണ ജാലകത്തിൽ <strong>എൻക്രിപ്റ്റ്</strong> തിരഞ്ഞെടുത്തുകൊണ്ട് അത് വീണ്ടും നിർമ്മിക്കുക.
     
     
-      
+      
       has at least one disk device available.
       ഒരു ഡിസ്ക് ഡിവൈസെങ്കിലും ലഭ്യമാണ്.
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2975,17 +3041,17 @@ Output:
       റാൻഡം ഫയൽ <pre>%1</pre> നിർമ്മിക്കാനായില്ല.
     
     
-      
+      
       No product
       ഉൽപ്പന്നമൊന്നുമില്ല
     
     
-      
+      
       No description provided.
       വിവരണമൊന്നും നൽകിയിട്ടില്ല.
     
     
-      
+      
       (no mount point)
       (മൗണ്ട് പോയിന്റ് ഇല്ല)
     
@@ -3243,12 +3309,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       മികച്ച ഫലങ്ങൾക്കായി ഈ കമ്പ്യൂട്ടർ താഴെപ്പറയുന്നവ നിറവേറ്റുന്നു എന്നുറപ്പുവരുത്തുക:
     
     
-      
+      
       System requirements
       സിസ്റ്റം ആവശ്യകതകൾ
     
@@ -3256,27 +3322,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       %1 സജ്ജീകരിക്കുന്നതിനുള്ള ഏറ്റവും കുറഞ്ഞ ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>സജ്ജീകരണം തുടരാനാവില്ല. <a href="#details">വിവരങ്ങൾ...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       %1 ഇൻസ്റ്റാൾ ചെയ്യുന്നതിനുള്ള ഏറ്റവും കുറഞ്ഞ ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>ഇൻസ്റ്റളേഷൻ തുടരാനാവില്ല. <a href="#details">വിവരങ്ങൾ...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       %1 സജ്ജീകരിക്കുന്നതിനുള്ള ചില ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>സജ്ജീകരണം തുടരാം, പക്ഷേ ചില സവിശേഷതകൾ നിഷ്ക്രിയമായിരിക്കാം.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       %1 ഇൻസ്റ്റാൾ ചെയ്യാൻ ശുപാർശ ചെയ്യപ്പെട്ടിട്ടുള്ള ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>ഇൻസ്റ്റളേഷൻ തുടരാം, പക്ഷേ ചില സവിശേഷതകൾ നിഷ്ക്രിയമായിരിക്കാം.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       ഈ പ്രക്രിയ താങ്കളോട് ചില ചോദ്യങ്ങൾ ചോദിക്കുകയും %2 താങ്കളുടെ കമ്പ്യൂട്ടറിൽ സജ്ജീകരിക്കുകയും ചെയ്യും.
     
@@ -3432,7 +3498,7 @@ Output:
       <strong>%1</strong> ഫ്ലാഗുകൾ പുതിയ പാർട്ടീഷനിൽ ക്രമീകരിക്കുക.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       പാർട്ടീഷൻ %1ൽ ഫ്ലാഗുകൾ ക്രമീകരിക്കുന്നതിൽ ഇൻസ്റ്റാളർ പരാജയപ്പെട്ടു.
     
@@ -3575,12 +3641,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       താങ്കൾ സജ്ജീകരണപ്രക്രിയ ആരംഭിച്ചതിനുശേഷം എന്ത് സംഭവിക്കും എന്നതിന്റെ അവലോകനമാണിത്.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       നിങ്ങൾ ഇൻസ്റ്റാൾ നടപടിക്രമങ്ങൾ ആരംഭിച്ചുകഴിഞ്ഞാൽ എന്ത് സംഭവിക്കും എന്നതിന്റെ ഒരു അവലോകനമാണിത്.
     
@@ -4120,107 +4186,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       നിങ്ങളുടെ പേരെന്താണ് ?
     
     
-      
+      
       Your Full Name
       താങ്കളുടെ മുഴുവൻ പേരു്
     
     
-      
+      
       What name do you want to use to log in?
       ലോഗിൻ ചെയ്യാൻ നിങ്ങൾ ഏത് നാമം ഉപയോഗിക്കാനാണു ആഗ്രഹിക്കുന്നത്?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      ചെറിയ അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       ഈ കമ്പ്യൂട്ടറിന്റെ നാമം എന്താണ് ?
     
     
-      
+      
       Computer Name
       കമ്പ്യൂട്ടറിന്റെ പേര്
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       നിങ്ങളുടെ അക്കൗണ്ട് സുരക്ഷിതമായി സൂക്ഷിക്കാൻ ഒരു രഹസ്യവാക്ക് തിരഞ്ഞെടുക്കുക.
     
     
-      
+      
       Password
       രഹസ്യവാക്ക്
     
     
-      
+      
       Repeat Password
       രഹസ്യവാക്ക് വീണ്ടും
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       ഈ കള്ളി തിരഞ്ഞെടുക്കുമ്പോൾ, രഹസ്യവാക്കിന്റെ ബലപരിശോധന നടപ്പിലാക്കുകയും, ആയതിനാൽ താങ്കൾക്ക് ദുർബലമായ ഒരു രഹസ്യവാക്ക് ഉപയോഗിക്കാൻ സാധിക്കാതെ വരുകയും ചെയ്യും.
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       അഡ്മിനിസ്ട്രേറ്റർ അക്കൗണ്ടിനും ഇതേ രഹസ്യവാക്ക് ഉപയോഗിക്കുക.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts
index 1fa074bc1d..a379670584 100644
--- a/lang/calamares_mr.ts
+++ b/lang/calamares_mr.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 च्या मुख्य आरंभ अभिलेखामधे
     
     
-      
+      
       Boot Partition
       आरंभक विभाजन
     
     
-      
+      
       System Partition
       प्रणाली विभाजन
     
     
-      
+      
       Do not install a boot loader
       आरंभ सूचक अधिष्ठापित करु नका
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 क्रिया चालवला जातोय
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       अधिष्ठापना अयशस्वी झाली
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       त्रुटी
     
     
-      
-      
+      
+      
       &Yes
       &होय
     
     
-      
-      
+      
+      
       &No
       &नाही
     
     
-      
+      
       &Close
       &बंद करा
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &आता अधिष्ठापित करा
     
     
-      
+      
       Go &back
       &मागे जा
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       अधिष्ठापना संपूर्ण झाली. अधिष्ठापक बंद करा.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       प्रणालीत बदल न करता अधिष्टापना रद्द करा.
     
     
-      
+      
       &Next
       &पुढे
     
     
-      
+      
       &Back
       &मागे
     
     
-      
+      
       &Done
       &पूर्ण झाली
     
     
-      
+      
       &Cancel
       &रद्द करा
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       अधिष्ठापना रद्द करायचे?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       %1 अधिष्ठापक
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       स्वरुप
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       सद्या :
     
     
-      
+      
       After:
       नंतर :
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       तुमचा परवलीशब्द जुळत नाही
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       तार्किक
     
     
-      
+      
       Primary
       प्राथमिक
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2 वर %1 हे नवीन विभाजन निर्माण करत आहे
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       सद्या :
     
     
-      
+      
       After:
       नंतर :
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       प्रणालीची आवशक्यता
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts
index 6c5f4fb586..dec18302f4 100644
--- a/lang/calamares_nb.ts
+++ b/lang/calamares_nb.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record til %1
     
     
-      
+      
       Boot Partition
       Bootpartisjon
     
     
-      
+      
       System Partition
       Systempartisjon
     
     
-      
+      
       Do not install a boot loader
       Ikke installer en oppstartslaster
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       Feil filsti til arbeidsmappe
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Arbeidsmappe %1 for python oppgave %2 er ikke lesbar.
     
     
-      
+      
       Bad main script file
       Ugyldig hovedskriptfil
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Hovedskriptfil %1 for python oppgave %2 er ikke lesbar.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python feil i oppgave "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Installasjon feilet
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Feil
     
     
-      
-      
+      
+      
       &Yes
       &Ja
     
     
-      
-      
+      
+      
       &No
       &Nei
     
     
-      
+      
       &Close
       &Lukk
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Fortsette å sette opp?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 vil nå gjøre endringer på harddisken, for å installere %2. <br/><strong>Du vil ikke kunne omgjøre disse endringene.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Installer nå
     
     
-      
+      
       Go &back
       Gå &tilbake
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Installasjonen er fullført. Lukk installeringsprogrammet.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Neste
     
     
-      
+      
       &Back
       &Tilbake
     
     
-      
+      
       &Done
       &Ferdig
     
     
-      
+      
       &Cancel
       &Avbryt
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Avbryte installasjon?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Vil du virkelig avbryte installasjonen?
@@ -467,22 +467,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Ukjent unntakstype
     
     
-      
+      
       unparseable Python error
       Ikke-kjørbar Python feil
     
     
-      
+      
       unparseable Python traceback
       Ikke-kjørbar Python tilbakesporing
     
     
-      
+      
       Unfetchable Python error.
       Ukjent Python feil.
     
@@ -500,6 +500,24 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.%1 Installasjonsprogram
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Form
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuell partisjonering</strong><br/>Du kan opprette eller endre størrelse på partisjoner selv.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -694,12 +712,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Klarte ikke å få tak i listen over midlertidige monterte disker.
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -726,27 +744,27 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Sett tastaturmodell til %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Sett tastaturoppsett til %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -870,6 +888,11 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -910,6 +933,16 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.The installation of %1 is complete.
       Installasjonen av %1 er fullført.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -972,27 +1005,37 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       Logisk
     
     
-      
+      
       Primary
       Primær
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1000,43 +1043,43 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1087,7 +1130,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1326,7 +1369,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1363,57 +1416,57 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1826,6 +1879,14 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Plassering
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2043,29 +2104,29 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2381,7 +2442,7 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2562,33 +2623,38 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2674,117 +2740,117 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2971,17 +3037,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3239,12 +3305,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       Systemkrav
     
@@ -3252,27 +3318,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Denne datamaskinen oppfyller ikke minimumskravene for installering %1.<br/> Installeringen kan ikke fortsette. <a href="#details">Detaljer..</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3428,7 +3494,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3571,12 +3637,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4116,107 +4182,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       Hva heter du?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Hvilket navn vil du bruke for å logge inn?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ne.ts b/lang/calamares_ne.ts
index 0bea96a554..d88f94b713 100644
--- a/lang/calamares_ne.ts
+++ b/lang/calamares_ne.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts
index c3038912ea..eceb64838c 100644
--- a/lang/calamares_ne_NP.ts
+++ b/lang/calamares_ne_NP.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       बूट लोडर install नगर्ने
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       सेटअप सकियो । सेटअप प्रोग्राम बन्द गर्नु होस 
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       फारम
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       बूट लोडरको स्थान
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       swap छैन
     
     
-      
+      
       Reuse Swap
       swap पुनः प्रयोग गर्नुहोस
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       पासवर्डहरू मिलेन । 
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts
index 31cf85468b..7dafba7ac1 100644
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record van %1
     
     
-      
+      
       Boot Partition
       Bootpartitie
     
     
-      
+      
       System Partition
       Systeempartitie
     
     
-      
+      
       Do not install a boot loader
       Geen bootloader installeren
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Bewerking %1 uitvoeren.
     
     
-      
+      
       Bad working directory path
       Ongeldig pad voor huidige map 
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Werkmap %1 voor python taak %2 onleesbaar.
     
     
-      
+      
       Bad main script file
       Onjuist hoofdscriptbestand
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Hoofdscriptbestand %1 voor python taak %2 onleesbaar.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python fout in taak "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Voorbereiding mislukt
     
     
-      
+      
       Installation Failed
       Installatie Mislukt
     
     
-      
+      
       Would you like to paste the install log to the web?
       Wil je het installatielogboek plakken naar het web?
     
     
-      
+      
       Error
       Fout
     
     
-      
-      
+      
+      
       &Yes
       &ja
     
     
-      
-      
+      
+      
       &No
       &Nee
     
     
-      
+      
       &Close
       &Sluiten
     
     
-      
+      
       Install Log Paste URL
       URL voor het verzenden van het installatielogboek
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Het uploaden is mislukt. Web-plakken niet gedaan.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 Link gekopieerd naar klembord
     
     
-      
+      
       Calamares Initialization Failed
       Calamares Initialisatie mislukt
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 kan niet worden geïnstalleerd. Calamares kon niet alle geconfigureerde modules laden. Dit is een probleem met hoe Calamares wordt gebruikt door de distributie.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>The volgende modules konden niet worden geladen:
     
     
-      
+      
       Continue with setup?
       Doorgaan met installatie?
     
     
-      
+      
       Continue with installation?
       Doorgaan met installatie?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Het %1 voorbereidingsprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Het %1 installatieprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</strong>
     
     
-      
+      
       &Set up now
       Nu &Inrichten
     
     
-      
+      
       &Install now
       Nu &installeren
     
     
-      
+      
       Go &back
       Ga &terug
     
     
-      
+      
       &Set up
       &Inrichten
     
     
-      
+      
       &Install
       &Installeer
     
     
-      
+      
       Setup is complete. Close the setup program.
       De voorbereiding is voltooid. Sluit het voorbereidingsprogramma.
     
     
-      
+      
       The installation is complete. Close the installer.
       De installatie is voltooid. Sluit het installatie-programma.
     
     
-      
+      
       Cancel setup without changing the system.
       Voorbereiding afbreken zonder aanpassingen aan het systeem.
     
     
-      
+      
       Cancel installation without changing the system.
       Installatie afbreken zonder aanpassingen aan het systeem.
     
     
-      
+      
       &Next
       &Volgende
     
     
-      
+      
       &Back
       &Terug
     
     
-      
+      
       &Done
       Voltooi&d
     
     
-      
+      
       &Cancel
       &Afbreken
     
     
-      
+      
       Cancel setup?
       Voorbereiding afbreken?
     
     
-      
+      
       Cancel installation?
       Installatie afbreken?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Wil je het huidige voorbereidingsproces echt afbreken?
 Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Wil je het huidige installatieproces echt afbreken?
@@ -472,22 +472,22 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Onbekend uitzonderingstype
     
     
-      
+      
       unparseable Python error
       onuitvoerbare Python fout
     
     
-      
+      
       unparseable Python traceback
       onuitvoerbare Python traceback
     
     
-      
+      
       Unfetchable Python error.
       Onbekende Python fout.
     
@@ -505,6 +505,24 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       %1 Installatieprogramma
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Het installatieprogramma kon de partitietabel op schijf '%1' niet bijwerken .
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Formulier
     
     
-      
+      
       Select storage de&vice:
       Selecteer &opslagmedium:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Huidig:
     
     
-      
+      
       After:
       Na:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Handmatig partitioneren</strong><br/>Je maakt of wijzigt zelf de partities.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Hergebruik %1 als home-partitie voor %2
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selecteer een partitie om te verkleinen, en sleep vervolgens de onderste balk om het formaat te wijzigen</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 zal verkleind worden tot %2MiB en een nieuwe %3MiB partitie zal worden aangemaakt voor %4.
     
     
-      
+      
       Boot loader location:
       Bootloader locatie:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selecteer een partitie om op te installeren</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Er werd geen EFI systeempartitie gevonden op dit systeem. Gelieve terug te gaan en manueel te partitioneren om %1 in te stellen.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       De EFI systeempartitie op %1 zal gebruikt worden om %2 te starten.
     
     
-      
+      
       EFI system partition:
       EFI systeempartitie:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dit opslagmedium lijkt geen besturingssysteem te bevatten. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Wis schijf</strong><br/>Dit zal alle huidige gegevens op de geselecteerd opslagmedium <font color="red">verwijderen</font>.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installeer ernaast</strong><br/>Het installatieprogramma zal een partitie verkleinen om plaats te maken voor %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Vervang een partitie</strong><br/>Vervangt een partitie met %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dit opslagmedium bevat %1. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dit opslagmedium bevat reeds een besturingssysteem. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dit opslagmedium bevat meerdere besturingssystemen. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Dit opslagmedium bevat al een besturingssysteem, maar de partitietabel <strong>%1</strong> is anders dan het benodigde <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Dit opslagmedium heeft een van de partities <strong>gemount</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Dit opslagmedium maakt deel uit van een <strong>inactieve RAID</strong> apparaat.
     
     
-      
+      
       No Swap
       Geen wisselgeheugen
     
     
-      
+      
       Reuse Swap
       Wisselgeheugen hergebruiken
     
     
-      
+      
       Swap (no Hibernate)
       Wisselgeheugen (geen Sluimerstand)
     
     
-      
+      
       Swap (with Hibernate)
       Wisselgeheugen ( met Sluimerstand)
     
     
-      
+      
       Swap to file
       Wisselgeheugen naar bestand
     
@@ -699,12 +717,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Alle tijdelijke aankoppelpunten vrijgeven.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Kan geen lijst van tijdelijke aankoppelpunten verkrijgen.
     
     
-      
+      
       Cleared all temporary mounts.
       Alle tijdelijke aankoppelpunten zijn vrijgegeven.
     
@@ -731,27 +749,27 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Instellen toetsenbord model naar %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Instellen toetsenbord lay-out naar %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Zet tijdzone naar %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       De taal van het systeem zal worden ingesteld op %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       De getal- en datumnotatie worden ingesteld op %1.
     
@@ -875,6 +893,11 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Your passwords do not match!
       Je wachtwoorden komen niet overeen!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       The installation of %1 is complete.
       De installatie van %1 is afgerond.
     
+    
+      
+      Package Selection
+      Pakketselectie
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Kies een product van de lijst. Het geselecteerde product zal worden geïnstalleerd.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Vlaggen:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Versleutelen
     
     
-      
+      
       Logical
       Logisch
     
     
-      
+      
       Primary
       Primair
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Aankoppelpunt reeds in gebruik. Gelieve een andere te kiezen.
     
@@ -1005,43 +1048,43 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Maak nieuwe %1MiB partitie aan op %3 (%2) met onderdelen %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Maak nieuwe %1MiB partitie aan op %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Maak nieuwe %2MiB partitie aan op %4 (%3) met bestandsysteem %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Maak een nieuwe <strong>%1MiB</strong> partitie aan op <strong>%3</strong> (%2) met onderdelen <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Maak een nieuwe <strong>%1MiB</strong> partitie aan op <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Maak een nieuwe <strong>%2MiB</strong> partitie aan op <strong>%4</strong> (%3) met bestandsysteem <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Nieuwe %1 partitie aanmaken op %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Het installatieprogramma kon geen partitie aanmaken op schijf '%1'.
     
@@ -1092,7 +1135,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Nieuwe %1 partitietabel aanmaken op %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Het installatieprogramma kon geen partitietabel aanmaken op %1.
     
@@ -1331,7 +1374,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Vlaggen:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Aankoppelpunt reeds in gebruik. Gelieve een andere te kiezen.
     
@@ -1368,57 +1421,57 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Instellen partitie-informatie
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Installeer %1 op <strong>nieuwe</strong> %2 systeempartitie met features <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Installeer %1 op <strong>nieuwe</strong> %2 systeempartitie.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       <strong>Nieuwe</strong> %2 partitie voorbereiden met aankoppelpunt <strong>%1</strong> en features <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Maak <strong>nieuwe</strong> %2 partitie met aankoppelpunt <strong>%1</strong>%3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Installeer %2 op %3 systeempartitie <strong>%1</strong> met features <em>%4</em>
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Stel %3 partitie <strong>%1</strong> in met aankoppelpunt <strong>%2</strong> met features <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Stel %3 partitie <strong>%1</strong> in met aankoppelpunt <strong>%2</strong>%4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Installeer %2 op %3 systeempartitie <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Installeer bootloader op <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Aankoppelpunten instellen.
     
@@ -1831,6 +1884,14 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Locatie
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2048,29 +2109,29 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Selecteer uw voorkeurs regio, of gebruik de vooraf-ingestelde regio op basis van uw locatie.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Tijdzone: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Selecteer een voorkeurs tijdzone binnen uw regio.
     
     
-      
+      
       Zones
       Zones
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       U kunt hieronder gedetailleerde taal- en weergave-instellingen kiezen.
     
@@ -2386,7 +2447,7 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Pakketten
     
@@ -2567,33 +2628,38 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     PartitionModel
     
       
-      
+      
       Free Space
       Vrije ruimte
     
     
       
-      
+      
       New partition
       Nieuwe partitie
     
     
-      
+      
       Name
       Naam
     
     
-      
+      
       File System
       Bestandssysteem
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Aankoppelpunt
     
     
-      
+      
       Size
       Grootte
     
@@ -2679,117 +2745,117 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Systeeminformatie verzamelen...
     
     
-      
+      
       Partitions
       Partities
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Installeer %1 <strong>naast</strong> een ander besturingssysteem.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Wis</strong> schijf en installeer %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Vervang</strong> een partitie met %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Handmatig</strong> partitioneren.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Installeer %1 <strong>naast</strong> een ander besturingssysteem op schijf <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Wis</strong> schijf <strong>%2</strong> (%3) en installeer %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Vervang</strong> een partitie op schijf <strong>%2</strong> (%3) met %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Handmatig</strong> partitioneren van schijf <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Schijf <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Huidig:
     
     
-      
+      
       After:
       Na:
     
     
-      
+      
       No EFI system partition configured
       Geen EFI systeempartitie geconfigureerd
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Een EFI systeempartitie is vereist om %1 te starten.<br/><br/>Om een EFI systeempartitie in te stellen, ga terug en selecteer of maak een FAT32 bestandssysteem met de <strong>%3</strong>-vlag aangevinkt en aankoppelpunt <strong>%2</strong>.<br/><br/>Je kan verdergaan zonder een EFI systeempartitie, maar mogelijk start je systeem dan niet op.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Een EFI systeempartitie is vereist om %1 op te starten.<br/><br/>Een partitie is ingesteld met aankoppelpunt <strong>%2</strong>, maar de de <strong>%3</strong>-vlag is niet aangevinkt.<br/>Om deze vlag aan te vinken, ga terug en pas de partitie aan.<br/><br/>Je kan verdergaan zonder deze vlag, maar mogelijk start je systeem dan niet op.
     
     
-      
+      
       EFI system partition flag not set
       EFI-systeem partitievlag niet ingesteld.
     
     
-      
+      
       Option to use GPT on BIOS
       Optie om GPT te gebruiken in BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Een GPT-partitie is de beste optie voor alle systemen. Dit installatieprogramma ondersteund ook zulke installatie voor BIOS systemen.<br/><br/>Om een GPT-partitie te configureren, (als dit nog niet gedaan is) ga terug en stel de partitietavel in als GPT en maak daarna een 8 MB ongeformateerde partitie aan met de <strong>bios_grub</strong>-vlag ingesteld.<br/><br/>Een ongeformateerde 8 MB partitie is nodig om %1 te starten op BIOS-systemen met GPT. 
     
     
-      
+      
       Boot partition not encrypted
       Bootpartitie niet versleuteld
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Een aparte bootpartitie was ingesteld samen met een versleutelde rootpartitie, maar de bootpartitie zelf is niet versleuteld.<br/><br/>Dit is niet volledig veilig, aangezien belangrijke systeembestanden bewaard worden op een niet-versleutelde partitie.<br/>Je kan doorgaan als je wil, maar het ontgrendelen van bestandssystemen zal tijdens het opstarten later plaatsvinden.<br/>Om de bootpartitie toch te versleutelen: keer terug en maak de bootpartitie opnieuw, waarbij je <strong>Versleutelen</strong> aanvinkt in het venster partitie aanmaken. 
     
     
-      
+      
       has at least one disk device available.
       tenminste één schijfapparaat beschikbaar.
     
     
-      
+      
       There are no partitions to install on.
       Er zijn geen partities om op te installeren.
     
@@ -2979,17 +3045,17 @@ Uitvoer:
       Kon niet een willekeurig bestand <pre>%1</pre> aanmaken.
     
     
-      
+      
       No product
       Geen product
     
     
-      
+      
       No description provided.
       Geen beschrijving vermeld.
     
     
-      
+      
       (no mount point)
       (geen aankoppelpunt)
     
@@ -3248,12 +3314,12 @@ De installatie kan niet doorgaan.
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Voor de beste resultaten is het aangeraden dat deze computer:
     
     
-      
+      
       System requirements
       Systeemvereisten
     
@@ -3261,27 +3327,27 @@ De installatie kan niet doorgaan.
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Deze computer voldoet niet aan de minimumvereisten om %1 te installeren.<br/>De installatie kan niet doorgaan. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Deze computer voldoet niet aan de minimumvereisten om %1 te installeren.<br/>De installatie kan niet doorgaan. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Deze computer voldoet niet aan enkele van de aanbevolen specificaties om %1 te installeren.<br/>De installatie kan doorgaan, maar sommige functies kunnen uitgeschakeld zijn.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Deze computer voldoet niet aan enkele van de aanbevolen specificaties om %1 te installeren.<br/>De installatie kan doorgaan, maar sommige functies kunnen uitgeschakeld zijn.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Dit programma stelt je enkele vragen en installeert %2 op jouw computer.
     
@@ -3437,7 +3503,7 @@ De installatie kan niet doorgaan.
       Vlaggen <strong>%1</strong> op nieuwe partitie instellen.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Het installatieprogramma kon geen vlaggen instellen op partitie %1.
     
@@ -3580,12 +3646,12 @@ De installatie kan niet doorgaan.
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Dit is een overzicht van wat zal gebeuren wanneer je de installatieprocedure start.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Dit is een overzicht van wat zal gebeuren wanneer je de installatieprocedure start.
     
@@ -4149,107 +4215,127 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
       Kies je gebruikersnaam en wachtwoord om in te loggen en administratieve taken uit te voeren
     
     
-      
+      
       What is your name?
       Wat is je naam?
     
     
-      
+      
       Your Full Name
       Volledige naam
     
     
-      
+      
       What name do you want to use to log in?
       Welke naam wil je gebruiken om in te loggen?
     
     
-      
+      
       Login Name
       Inlognaam
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Alleen kleine letters, nummerse en (laag) streepjes zijn toegestaan.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Wat is de naam van deze computer?
     
     
-      
+      
       Computer Name
       Computer Naam
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Deze naam zal worden gebruikt als u de computer zichtbaar maakt voor anderen op een netwerk.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Kies een wachtwoord om uw account veilig te houden.
     
     
-      
+      
       Password
       Wachtwoord
     
     
-      
+      
       Repeat Password
       Herhaal wachtwoord
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten. Een goed wachtwoord bevat een combinatie van letters, cijfers en leestekens, is ten minste acht tekens lang, en zou regelmatig moeten worden gewijzigd.
     
     
-      
+      
       Validate passwords quality
       Controleer wachtwoorden op gelijkheid
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Wanneer dit vakje is aangevinkt, wachtwoordssterkte zal worden gecontroleerd en je zal geen zwak wachtwoord kunnen gebruiken.
     
     
-      
+      
       Log in automatically without asking for the password
       Automatisch aanmelden zonder wachtwoord te vragen
     
     
-      
+      
       Reuse user password as root password
       Hergebruik gebruikerswachtwoord als root (administratie) wachtwoord.
     
     
-      
+      
       Use the same password for the administrator account.
       Gebruik hetzelfde wachtwoord voor het administratoraccount.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Kies een root (administratie) wachtwoord om je account veilig te houden.
     
     
-      
+      
       Root Password
       Root (Administratie) Wachtwoord
     
     
-      
+      
       Repeat Root Password
       Herhaal Root Wachtwoord
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten.
     
diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts
index 51c6add859..0b952b9d17 100644
--- a/lang/calamares_pl.ts
+++ b/lang/calamares_pl.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record %1
     
     
-      
+      
       Boot Partition
       Partycja rozruchowa
     
     
-      
+      
       System Partition
       Partycja systemowa
     
     
-      
+      
       Do not install a boot loader
       Nie instaluj programu rozruchowego
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Wykonuję operację %1.
     
     
-      
+      
       Bad working directory path
       Niepoprawna ścieżka katalogu roboczego
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Katalog roboczy %1 dla zadań pythona %2 jest nieosiągalny.
     
     
-      
+      
       Bad main script file
       Niepoprawny główny plik skryptu
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Główny plik skryptu %1 dla zadań pythona %2 jest nieczytelny.
     
     
-      
+      
       Boost.Python error in job "%1".
       Wystąpił błąd Boost.Python w zadaniu "%1".
     
@@ -289,54 +289,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Nieudane ustawianie
     
     
-      
+      
       Installation Failed
       Wystąpił błąd instalacji
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Błąd
     
     
-      
-      
+      
+      
       &Yes
       &Tak
     
     
-      
-      
+      
+      
       &No
       &Nie
     
     
-      
+      
       &Close
       Zam&knij
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +345,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Błąd inicjacji programu Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 nie może zostać zainstalowany. Calamares nie mógł wczytać wszystkich skonfigurowanych modułów. Jest to problem ze sposobem, w jaki Calamares jest używany przez dystrybucję.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Następujące moduły nie mogły zostać wczytane:
     
     
-      
+      
       Continue with setup?
       Kontynuować z programem instalacyjnym?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instalator %1 zamierza przeprowadzić zmiany na Twoim dysku, aby zainstalować %2.<br/><strong>Nie będziesz mógł cofnąć tych zmian.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Zainstaluj teraz
     
     
-      
+      
       Go &back
       &Cofnij się
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       Za&instaluj
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalacja ukończona pomyślnie. Możesz zamknąć instalator.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Anuluj instalację bez dokonywania zmian w systemie.
     
     
-      
+      
       &Next
       &Dalej
     
     
-      
+      
       &Back
       &Wstecz
     
     
-      
+      
       &Done
       &Ukończono
     
     
-      
+      
       &Cancel
       &Anuluj
     
     
-      
+      
       Cancel setup?
       Anulować ustawianie?
     
     
-      
+      
       Cancel installation?
       Anulować instalację?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Czy na pewno chcesz anulować obecny proces instalacji?
@@ -471,22 +471,22 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Nieznany rodzaj wyjątku
     
     
-      
+      
       unparseable Python error
       nieparowalny błąd Pythona
     
     
-      
+      
       unparseable Python traceback
       nieparowalny traceback Pythona
     
     
-      
+      
       Unfetchable Python error.
       Nieosiągalny błąd Pythona.
     
@@ -504,6 +504,24 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Instalator %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Instalator nie mógł zaktualizować tablicy partycji na dysku '%1'.
+    
+  
   
     CheckerContainer
     
@@ -520,149 +538,149 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Formularz
     
     
-      
+      
       Select storage de&vice:
       &Wybierz urządzenie przechowywania:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Bieżący:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ręczne partycjonowanie</strong><br/>Możesz samodzielnie utworzyć lub zmienić rozmiar istniejących partycji.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Użyj ponownie %1 jako partycji domowej dla %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Wybierz partycję do zmniejszenia, a następnie przeciągnij dolny pasek, aby zmienić jej rozmiar</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Położenie programu rozruchowego:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Wybierz partycję, na której przeprowadzona będzie instalacja</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nigdzie w tym systemie nie można odnaleźć partycji systemowej EFI. Prosimy się cofnąć i użyć ręcznego partycjonowania dysku do ustawienia %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Partycja systemowa EFI na %1 będzie użyta do uruchamiania %2.
     
     
-      
+      
       EFI system partition:
       Partycja systemowa EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       To urządzenie pamięci masowej prawdopodobnie nie posiada żadnego systemu operacyjnego. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Wyczyść dysk</strong><br/>Ta operacja <font color="red">usunie</font> wszystkie dane obecnie znajdujące się na wybranym urządzeniu przechowywania.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Zainstaluj obok siebie</strong><br/>Instalator zmniejszy partycję, aby zrobić miejsce dla %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Zastąp partycję</strong><br/>Zastępowanie partycji poprzez %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       To urządzenie pamięci masowej posiada %1. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       To urządzenie pamięci masowej posiada już system operacyjny. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       To urządzenie pamięci masowej posiada kilka systemów operacyjnych. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Brak przestrzeni wymiany
     
     
-      
+      
       Reuse Swap
       Użyj ponownie przestrzeni wymiany
     
     
-      
+      
       Swap (no Hibernate)
       Przestrzeń wymiany (bez hibernacji)
     
     
-      
+      
       Swap (with Hibernate)
       Przestrzeń wymiany (z hibernacją)
     
     
-      
+      
       Swap to file
       Przestrzeń wymiany do pliku
     
@@ -698,12 +716,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Usuwanie wszystkich tymczasowych punktów montowania.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Nie można uzyskać listy tymczasowych montowań.
     
     
-      
+      
       Cleared all temporary mounts.
       Wyczyszczono wszystkie tymczasowe montowania.
     
@@ -730,27 +748,27 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Ustaw model klawiatury na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Ustaw model klawiatury na %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       Język systemu zostanie ustawiony na %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Format liczb i daty zostanie ustawiony na %1.
     
@@ -874,6 +892,11 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Your passwords do not match!
       Twoje hasła nie są zgodne!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -914,6 +937,16 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.The installation of %1 is complete.
       Instalacja %1 ukończyła się pomyślnie.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -976,27 +1009,37 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Flagi:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Zaszy%fruj
     
     
-      
+      
       Logical
       Logiczna
     
     
-      
+      
       Primary
       Podstawowa
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Punkt montowania jest już używany. Proszę wybrać inny.
     
@@ -1004,43 +1047,43 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Tworzenie nowej partycji %1 na %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Instalator nie mógł utworzyć partycji na dysku '%1'.
     
@@ -1091,7 +1134,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Tworzenie nowej tablicy partycji %1 na %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Instalator nie mógł utworzyć tablicy partycji na %1.
     
@@ -1330,7 +1373,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Flagi:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Punkt montowania jest już używany. Proszę wybrać inny.
     
@@ -1367,57 +1420,57 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Ustaw informacje partycji
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Zainstaluj %1 na <strong>nowej</strong> partycji systemowej %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Zainstaluj %2 na partycji systemowej %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Zainstaluj program rozruchowy na <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Ustawianie punktów montowania.
     
@@ -1830,6 +1883,14 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Położenie
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2047,29 +2108,29 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2403,7 +2464,7 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2584,33 +2645,38 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.PartitionModel
     
       
-      
+      
       Free Space
       Wolna powierzchnia
     
     
       
-      
+      
       New partition
       Nowa partycja
     
     
-      
+      
       Name
       Nazwa
     
     
-      
+      
       File System
       System plików
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Punkt montowania
     
     
-      
+      
       Size
       Rozmiar
     
@@ -2696,117 +2762,117 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Zbieranie informacji o systemie...
     
     
-      
+      
       Partitions
       Partycje
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Zainstaluj %1 <strong>obok</strong> innego systemu operacyjnego.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Wyczyść</strong> dysk i zainstaluj %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Zastąp</strong> partycję poprzez %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Ręczne</strong> partycjonowanie.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Zainstaluj %1 <strong>obok</strong> innego systemu operacyjnego na dysku <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Wyczyść</strong> dysk <strong>%2</strong> (%3) i zainstaluj %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Zastąp</strong> partycję na dysku <strong>%2</strong> (%3) poprzez %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Ręczne</strong> partycjonowanie na dysku <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Dysk <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Bieżący:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       No EFI system partition configured
       Nie skonfigurowano partycji systemowej EFI
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       Flaga partycji systemowej EFI nie została ustawiona
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Niezaszyfrowana partycja rozruchowa
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Oddzielna partycja rozruchowa została skonfigurowana razem z zaszyfrowaną partycją roota, ale partycja rozruchowa nie jest szyfrowana.<br/><br/>Nie jest to najbezpieczniejsze rozwiązanie, ponieważ ważne pliki systemowe znajdują się na niezaszyfrowanej partycji.<br/>Możesz kontynuować, ale odblokowywanie systemu nastąpi później, w trakcie uruchamiania.<br/>Aby zaszyfrować partycję rozruchową, wróć i utwórz ją ponownie zaznaczając opcję <strong>Szyfruj</strong> w oknie tworzenia partycji.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2996,17 +3062,17 @@ Wyjście:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       (brak punktu montowania)
     
@@ -3265,12 +3331,12 @@ i nie uruchomi się
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Dla osiągnięcia najlepszych rezultatów upewnij się, że ten komputer:
     
     
-      
+      
       System requirements
       Wymagania systemowe
     
@@ -3278,27 +3344,27 @@ i nie uruchomi się
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ten komputer nie spełnia minimalnych wymagań, niezbędnych do instalacji %1.<br/>Instalacja nie może być kontynuowana. <a href="#details">Szczegóły...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Ten komputer nie spełnia wszystkich, zalecanych do instalacji %1 wymagań.<br/>Instalacja może być kontynuowana, ale niektóre opcje mogą być niedostępne.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ten program zada Ci garść pytań i ustawi %2 na Twoim komputerze.
     
@@ -3454,7 +3520,7 @@ i nie uruchomi się
       Ustawianie flag <strong>%1</strong> na nowej partycji.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Instalator nie mógł ustawić flag na partycji %1.
     
@@ -3597,12 +3663,12 @@ i nie uruchomi się
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       To jest podsumowanie czynności, które zostaną wykonane po rozpoczęciu przez Ciebie instalacji.
     
@@ -4142,107 +4208,127 @@ i nie uruchomi się
       
     
     
-      
+      
       What is your name?
       Jak się nazywasz?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Jakiego imienia chcesz używać do logowania się?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Jaka jest nazwa tego komputera?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Wybierz hasło, aby chronić swoje konto.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Użyj tego samego hasła dla konta administratora.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index e6191cdbbd..842fe090b6 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record de %1
     
     
-      
+      
       Boot Partition
       Partição de Boot
     
     
-      
+      
       System Partition
       Partição de Sistema
     
     
-      
+      
       Do not install a boot loader
       Não instalar um gerenciador de inicialização
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Executando operação %1.
     
     
-      
+      
       Bad working directory path
       Caminho de diretório de trabalho ruim
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Diretório de trabalho %1 para a tarefa do python %2 não é legível.
     
     
-      
+      
       Bad main script file
       Arquivo de script principal ruim
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Arquivo de script principal %1 para a tarefa do python %2 não é legível.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python erro na tarefa "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       A Configuração Falhou
     
     
-      
+      
       Installation Failed
       Falha na Instalação
     
     
-      
+      
       Would you like to paste the install log to the web?
       Deseja colar o registro de instalação na web?
     
     
-      
+      
       Error
       Erro
     
     
-      
-      
+      
+      
       &Yes
       &Sim
     
     
-      
-      
+      
+      
       &No
       &Não
     
     
-      
+      
       &Close
       &Fechar
     
     
-      
+      
       Install Log Paste URL
       Colar URL de Registro de Instalação
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Não foi possível fazer o upload. Nenhuma colagem foi feita na web.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 Link copiado para a área de transferência
     
     
-      
+      
       Calamares Initialization Failed
       Falha na inicialização do Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 não pôde ser instalado. O Calamares não conseguiu carregar todos os módulos configurados. Este é um problema com o modo em que o Calamares está sendo utilizado pela distribuição.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Os seguintes módulos não puderam ser carregados:
     
     
-      
+      
       Continue with setup?
       Continuar com configuração?
     
     
-      
+      
       Continue with installation?
       Continuar com a instalação?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       O programa de configuração %1 está prestes a fazer mudanças no seu disco de modo a configurar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       O instalador %1 está prestes a fazer alterações no disco a fim de instalar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong>
     
     
-      
+      
       &Set up now
       &Configurar agora
     
     
-      
+      
       &Install now
       &Instalar agora
     
     
-      
+      
       Go &back
       &Voltar
     
     
-      
+      
       &Set up
       &Configurar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       A configuração está completa. Feche o programa de configuração.
     
     
-      
+      
       The installation is complete. Close the installer.
       A instalação está completa. Feche o instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancelar configuração sem alterar o sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar instalação sem modificar o sistema.
     
     
-      
+      
       &Next
       &Próximo
     
     
-      
+      
       &Back
       &Voltar
     
     
-      
+      
       &Done
       &Concluído
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       Cancelar a configuração?
     
     
-      
+      
       Cancel installation?
       Cancelar a instalação?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Você realmente quer cancelar o processo atual de configuração?
 O programa de configuração será fechado e todas as mudanças serão perdidas.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Você deseja realmente cancelar a instalação atual?
@@ -472,22 +472,22 @@ O instalador será fechado e todas as alterações serão perdidas.
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tipo de exceção desconhecida
     
     
-      
+      
       unparseable Python error
       erro inanalisável do Python
     
     
-      
+      
       unparseable Python traceback
       rastreamento inanalisável do Python
     
     
-      
+      
       Unfetchable Python error.
       Erro inbuscável do Python.
     
@@ -505,6 +505,24 @@ O instalador será fechado e todas as alterações serão perdidas.Instalador %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      O instalador falhou ao atualizar a tabela de partições no disco '%1'.
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ O instalador será fechado e todas as alterações serão perdidas.Formulário
     
     
-      
+      
       Select storage de&vice:
       Selecione o dispositivo de armazenamento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Atual:
     
     
-      
+      
       After:
       Depois:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionamento manual</strong><br/>Você pode criar ou redimensionar partições.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilizar %1 como partição home para %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selecione uma partição para reduzir, então arraste a barra de baixo para redimensionar</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 será reduzida para %2MiB e uma nova partição de %3MiB será criada para %4.
     
     
-      
+      
       Boot loader location:
       Local do gerenciador de inicialização:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selecione uma partição para instalação</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Uma partição de sistema EFI não pôde ser encontrada neste dispositivo. Por favor, volte e use o particionamento manual para gerenciar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       A partição de sistema EFI em %1 será utilizada para iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partição de sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Parece que não há um sistema operacional neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Apagar disco</strong><br/>Isto <font color="red">excluirá</font> todos os dados no dispositivo de armazenamento selecionado.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar lado a lado</strong><br/>O instalador reduzirá uma partição para liberar espaço para %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Substituir uma partição</strong><br/>Substitui uma partição com %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento possui %1 nele. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Já há um sistema operacional neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Há diversos sistemas operacionais neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       O dispositivo de armazenamento já possui um sistema operacional, mas a tabela de partições <strong>%1</strong> é diferente da necessária <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       O dispositivo de armazenamento tem uma de suas partições <strong>montada</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       O dispositivo de armazenamento é parte de um dispositivo <strong>RAID inativo</strong>.
     
     
-      
+      
       No Swap
       Sem swap
     
     
-      
+      
       Reuse Swap
       Reutilizar swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sem hibernação)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (com hibernação)
     
     
-      
+      
       Swap to file
       Swap em arquivo
     
@@ -699,12 +717,12 @@ O instalador será fechado e todas as alterações serão perdidas.Limpando todos os pontos de montagem temporários.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Não foi possível listar os pontos de montagens.
     
     
-      
+      
       Cleared all temporary mounts.
       Pontos de montagens temporários limpos.
     
@@ -731,27 +749,27 @@ O instalador será fechado e todas as alterações serão perdidas.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Definir o modelo de teclado para %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Definir o layout do teclado para %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Definir o fuso horário para %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       O idioma do sistema será definido como %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       A localidade dos números e datas será definida como %1.
     
@@ -875,6 +893,11 @@ O instalador será fechado e todas as alterações serão perdidas.Your passwords do not match!
       As senhas não estão iguais!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ O instalador será fechado e todas as alterações serão perdidas.The installation of %1 is complete.
       A instalação do %1 está completa.
     
+    
+      
+      Package Selection
+      Seleção de Pacote
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Por favor, escolha um produto da lista. O produto selecionado será instalado.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ O instalador será fechado e todas as alterações serão perdidas.Marcadores:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Criptografar
     
     
-      
+      
       Logical
       Lógica
     
     
-      
+      
       Primary
       Primária
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Ponto de montagem já em uso. Por favor, selecione outro.
     
@@ -1005,43 +1048,43 @@ O instalador será fechado e todas as alterações serão perdidas.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Criar nova partição de %1MiB em %3 (%2) com entradas %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Criar nova partição de %1MiB em %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Criar nova partição de %2MiB em %4 (%3) com o sistema de arquivos %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2) com entradas <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Criar nova partição de <strong>%2MiB</strong> em <strong>%4</strong> (%3) com o sistema de arquivos <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Criando nova partição %1 em %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       O instalador não conseguiu criar partições no disco '%1'.
     
@@ -1092,7 +1135,7 @@ O instalador será fechado e todas as alterações serão perdidas.Criando nova tabela de partições %1 em %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       O instalador não conseguiu criar uma tabela de partições em %1.
     
@@ -1331,7 +1374,17 @@ O instalador será fechado e todas as alterações serão perdidas.Marcadores:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Ponto de montagem já em uso. Por favor, selecione outro.
     
@@ -1368,57 +1421,57 @@ O instalador será fechado e todas as alterações serão perdidas.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Definir informações da partição
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Instalar %1 em <strong>nova</strong> partição do sistema %2 com recursos <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instalar %1 em <strong>nova</strong> partição %2 do sistema.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong> e recursos <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong>%3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Instalar %2 em partição do sistema %3 <strong>%1</strong> com recursos <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Configurar partição %3 <strong>%1</strong> com ponto de montagem <strong>%2</strong> e recursos <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Configurar partição %3 <strong>%1</strong> com ponto de montagem <strong>%2</strong>%4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instalar %2 na partição %3 do sistema <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instalar gerenciador de inicialização em <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Configurando pontos de montagem.
     
@@ -1831,6 +1884,14 @@ O instalador será fechado e todas as alterações serão perdidas.Localização
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ O instalador será fechado e todas as alterações serão perdidas.
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Selecione sua Região preferida, ou use a padrão baseada no seu local atual.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Fuso horário: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Selecione a sua Zona preferida dentro da sua Região.
     
     
-      
+      
       Zones
       Zonas
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Você pode ajustar as configurações de Idioma e Localidade abaixo.
     
@@ -2388,7 +2449,7 @@ O instalador será fechado e todas as alterações serão perdidas.
     PackageChooserViewStep
     
-      
+      
       Packages
       Pacotes
     
@@ -2569,33 +2630,38 @@ O instalador será fechado e todas as alterações serão perdidas.PartitionModel
     
       
-      
+      
       Free Space
       Espaço livre
     
     
       
-      
+      
       New partition
       Nova partição
     
     
-      
+      
       Name
       Nome
     
     
-      
+      
       File System
       Sistema de arquivos
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Ponto de montagem
     
     
-      
+      
       Size
       Tamanho
     
@@ -2681,117 +2747,117 @@ O instalador será fechado e todas as alterações serão perdidas.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Coletando informações do sistema...
     
     
-      
+      
       Partitions
       Partições
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instalar %1 <strong>ao lado de</strong> outro sistema operacional.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Apagar</strong> disco e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Substituir</strong> uma partição com %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Particionamento <strong>manual</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instalar %1 <strong>ao lado de</strong> outro sistema operacional no disco <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Apagar</strong> disco <strong>%2</strong> (%3) e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Substituir</strong> uma partição no disco <strong>%2</strong> (%3) com %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Particionamento <strong>manual</strong> no disco <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disco <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Atualmente:
     
     
-      
+      
       After:
       Depois:
     
     
-      
+      
       No EFI system partition configured
       Nenhuma partição de sistema EFI configurada
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte e selecione ou crie um sistema de arquivos FAT32 com o marcador <strong>%3</strong> ativado e o ponto de montagem <strong>%2</strong>.<br/><br/>Você pode continuar sem definir uma partição de sistema EFI, mas seu sistema poderá falhar ao iniciar.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas o marcador <strong>%3</strong> não foi definido.<br/>Para definir o marcador, volte e edite a partição.<br/><br/>Você pode continuar sem definir o marcador, mas seu sistema poderá falhar ao iniciar.
     
     
-      
+      
       EFI system partition flag not set
       Marcador da partição de sistema EFI não definido
     
     
-      
+      
       Option to use GPT on BIOS
       Opção para usar GPT no BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Uma tabela de partições GPT é a melhor opção para todos os sistemas. Este instalador suporta tal configuração para sistemas BIOS também.<br/><br/>Para configurar uma tabela de partições GPT no BIOS, (caso não tenha sido feito ainda) volte e defina a tabela de partições como GPT, depois crie uma partição sem formatação de 8 MB com o marcador <strong>bios_grub</strong> ativado.<br/><br/>Uma partição não formatada de 8 MB é necessária para iniciar %1 num sistema BIOS com o GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partição de boot não criptografada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Uma partição de inicialização separada foi configurada juntamente com uma partição raiz criptografada, mas a partição de inicialização não é criptografada.<br/><br/>Há preocupações de segurança quanto a esse tipo de configuração, porque arquivos de sistema importantes são mantidos em uma partição não criptografada.<br/>Você pode continuar se quiser, mas o desbloqueio do sistema de arquivos acontecerá mais tarde durante a inicialização do sistema.<br/>Para criptografar a partição de inicialização, volte e recrie-a, selecionando <strong>Criptografar</strong>  na janela de criação da partição.
     
     
-      
+      
       has at least one disk device available.
       tem pelo menos um dispositivo de disco disponível.
     
     
-      
+      
       There are no partitions to install on.
       Não há partições para instalar.
     
@@ -2981,17 +3047,17 @@ Saída:
       Não foi possível criar um novo arquivo aleatório <pre>%1</pre>.
     
     
-      
+      
       No product
       Sem produto
     
     
-      
+      
       No description provided.
       Nenhuma descrição disponível.
     
     
-      
+      
       (no mount point)
       (sem ponto de montagem)
     
@@ -3252,12 +3318,12 @@ Saída:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para melhores resultados, por favor, certifique-se de que este computador:
     
     
-      
+      
       System requirements
       Requisitos do sistema
     
@@ -3265,27 +3331,27 @@ Saída:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Este computador não satisfaz os requisitos mínimos para instalar %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas alguns recursos podem ser desativados.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Este computador não satisfaz alguns dos requisitos recomendados para instalar %1.<br/>A instalação pode continuar, mas alguns recursos podem ser desativados.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Este programa irá fazer-lhe algumas perguntas e configurar %2 no computador.
     
@@ -3441,7 +3507,7 @@ Saída:
       Definindo marcadores <strong>%1</strong> na nova partição.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       O instalador falhou em definir marcadores na partição %1.
     
@@ -3584,12 +3650,12 @@ Saída:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Esta é uma visão geral do que acontecerá quando você iniciar o procedimento de configuração.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Este é um resumo do que acontecerá assim que o processo de instalação for iniciado.
     
@@ -4165,107 +4231,127 @@ Saída:
       Escolha seu nome de usuário e credenciais para fazer login e executar tarefas de administrador
     
     
-      
+      
       What is your name?
       Qual é o seu nome?
     
     
-      
+      
       Your Full Name
       Seu nome completo
     
     
-      
+      
       What name do you want to use to log in?
       Qual nome você quer usar para entrar?
     
     
-      
+      
       Login Name
       Nome do Login
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Se mais de uma pessoa for usar este computador, você poderá criar múltiplas contas após a instalação.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      É permitido apenas letras minúsculas, números, sublinhado e hífen.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Qual é o nome deste computador?
     
     
-      
+      
       Computer Name
       Nome do computador
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Este nome será usado se você fizer o computador ficar visível para outros numa rede.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Escolha uma senha para manter a sua conta segura.
     
     
-      
+      
       Password
       Senha
     
     
-      
+      
       Repeat Password
       Repita a senha
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres, e deve ser alterada em intervalos regulares.
     
     
-      
+      
       Validate passwords quality
       Validar qualidade das senhas
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quando esta caixa estiver marcada, será feita a verificação da força da senha e você não poderá usar uma senha fraca.
     
     
-      
+      
       Log in automatically without asking for the password
       Entrar automaticamente sem perguntar pela senha
     
     
-      
+      
       Reuse user password as root password
       Reutilizar a senha de usuário como senha de root
     
     
-      
+      
       Use the same password for the administrator account.
       Usar a mesma senha para a conta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Escolha uma senha de root para manter sua conta segura.
     
     
-      
+      
       Root Password
       Senha de Root
     
     
-      
+      
       Repeat Root Password
       Repita a Senha de Root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação.
     
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index 97d628eb1b..a0bb6ca386 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record de %1
     
     
-      
+      
       Boot Partition
       Partição de arranque
     
     
-      
+      
       System Partition
       Partição do Sistema
     
     
-      
+      
       Do not install a boot loader
       Não instalar um carregador de arranque
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Operação %1 em execução.
     
     
-      
+      
       Bad working directory path
       Caminho do directório de  trabalho errado
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Directório de trabalho %1 para a tarefa python %2 não é legível.
     
     
-      
+      
       Bad main script file
       Ficheiro de script principal errado
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Ficheiro de script principal %1 para a tarefa python %2 não é legível.
     
     
-      
+      
       Boost.Python error in job "%1".
       Erro Boost.Python na tarefa "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Falha de Instalação
     
     
-      
+      
       Installation Failed
       Falha na Instalação
     
     
-      
+      
       Would you like to paste the install log to the web?
       Deseja colar o registo de instalação na Web?
     
     
-      
+      
       Error
       Erro
     
     
-      
-      
+      
+      
       &Yes
       &Sim
     
     
-      
-      
+      
+      
       &No
       &Não
     
     
-      
+      
       &Close
       &Fechar
     
     
-      
+      
       Install Log Paste URL
       Instalar o Registo Colar URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       O carregamento não teve êxito. Nenhuma pasta da web foi feita.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 Ligação copiada para a área de transferência
     
     
-      
+      
       Calamares Initialization Failed
       Falha na Inicialização do Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 não pode ser instalado. O Calamares não foi capaz de carregar todos os módulos configurados. Isto é um problema da maneira como o Calamares é usado pela distribuição.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Os módulos seguintes não puderam ser carregados:
     
     
-      
+      
       Continue with setup?
       Continuar com a configuração?
     
     
-      
+      
       Continue with installation?
       Continuar com a instalação?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       O programa de instalação %1 está prestes a fazer alterações no seu disco para configurar o %2.<br/><strong>Você não poderá desfazer essas alterações.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       O %1 instalador está prestes a fazer alterações ao seu disco em ordem para instalar %2.<br/><strong>Não será capaz de desfazer estas alterações.</strong>
     
     
-      
+      
       &Set up now
       &Instalar agora
     
     
-      
+      
       &Install now
       &Instalar agora
     
     
-      
+      
       Go &back
       Voltar &atrás
     
     
-      
+      
       &Set up
       &Instalar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       Instalação completa. Feche o programa de instalação.
     
     
-      
+      
       The installation is complete. Close the installer.
       A instalação está completa. Feche o instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancelar instalação sem alterar o sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar instalar instalação sem modificar o sistema.
     
     
-      
+      
       &Next
       &Próximo
     
     
-      
+      
       &Back
       &Voltar
     
     
-      
+      
       &Done
       &Feito
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       Cancelar instalação?
     
     
-      
+      
       Cancel installation?
       Cancelar a instalação?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Quer mesmo cancelar o processo de instalação atual?
 O programa de instalação irá fechar todas as alterações serão perdidas.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Tem a certeza que pretende cancelar o atual processo de instalação?
@@ -472,22 +472,22 @@ O instalador será encerrado e todas as alterações serão perdidas.
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tipo de exceção desconhecido
     
     
-      
+      
       unparseable Python error
       erro inanalisável do Python
     
     
-      
+      
       unparseable Python traceback
       rasto inanalisável do Python
     
     
-      
+      
       Unfetchable Python error.
       Erro inatingível do Python.
     
@@ -505,6 +505,24 @@ O instalador será encerrado e todas as alterações serão perdidas.%1 Instalador
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      A definir a identificação do sistema de ficheiros em %1
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      Definir a identificação do sistema de ficheiros <strong>%1</strong> para a partição <strong>%2</strong>.
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      O instalador falhou ao atualizar a tabela de partições no disco '%1'.
+    
+  
   
     CheckerContainer
     
@@ -521,149 +539,149 @@ O instalador será encerrado e todas as alterações serão perdidas.Formulário
     
     
-      
+      
       Select storage de&vice:
       Selecione o dis&positivo de armazenamento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Atual:
     
     
-      
+      
       After:
       Depois:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionamento manual</strong><br/>Pode criar ou redimensionar partições manualmente.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilizar %1 como partição home para %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selecione uma partição para encolher, depois arraste a barra de fundo para redimensionar</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 será encolhida para %2MiB e uma nova %3MiB partição será criada para %4.
     
     
-      
+      
       Boot loader location:
       Localização do carregador de arranque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selecione uma partição para instalar</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nenhuma partição de sistema EFI foi encontrada neste sistema. Por favor volte atrás e use o particionamento manual para configurar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       A partição de sistema EFI em %1 será usada para iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partição de sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento aparenta não ter um sistema operativo. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Apagar disco</strong><br/>Isto irá <font color="red">apagar</font> todos os dados atualmente apresentados no dispositivo de armazenamento selecionado.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar paralelamente</strong><br/>O instalador irá encolher a partição para arranjar espaço para %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Substituir a partição</strong><br/>Substitui a partição com %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento tem %1 nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento já tem um sistema operativo nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento tem múltiplos sistemas operativos nele, O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       O dispositivo de armazenamento já possui um sistema operativo, mas a tabela de partições <strong>%1</strong> é diferente da necessária <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       O dispositivo de armazenamento tem uma das suas partições <strong>montada</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       O dispositivo de armazenamento é parte de um dispositivo <strong>RAID inativo</strong>.
     
     
-      
+      
       No Swap
       Sem Swap
     
     
-      
+      
       Reuse Swap
       Reutilizar Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sem Hibernação)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (com Hibernação)
     
     
-      
+      
       Swap to file
       Swap para ficheiro
     
@@ -699,12 +717,12 @@ O instalador será encerrado e todas as alterações serão perdidas.A limpar todas as montagens temporárias.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Não é possível obter a lista de montagens temporárias.
     
     
-      
+      
       Cleared all temporary mounts.
       Limpou todas as montagens temporárias.
     
@@ -731,27 +749,27 @@ O instalador será encerrado e todas as alterações serão perdidas.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Definir o modelo do teclado para %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Definir esquema do teclado para %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Definir fuso horário para %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       A linguagem do sistema será definida para %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Os números e datas locais serão definidos para %1.
     
@@ -875,6 +893,11 @@ O instalador será encerrado e todas as alterações serão perdidas.Your passwords do not match!
       As suas palavras-passe não coincidem!
     
+    
+      
+      OK!
+      OK!
+    
     
       
       Setup Failed
@@ -915,6 +938,16 @@ O instalador será encerrado e todas as alterações serão perdidas.The installation of %1 is complete.
       A instalação de %1 está completa.
     
+    
+      
+      Package Selection
+      Seleção de pacote
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Por favor, escolha um produto da lista. O produto selecionado será instalado.
+    
   
   
     ContextualProcessJob
@@ -977,27 +1010,37 @@ O instalador será encerrado e todas as alterações serão perdidas.Flags:
     
     
-      
+      
+      Label for the filesystem
+      Identificação para o sistema de ficheiros
+    
+    
+      
+      FS Label:
+      Identificação do FS:
+    
+    
+      
       En&crypt
       En&criptar
     
     
-      
+      
       Logical
       Lógica
     
     
-      
+      
       Primary
       Primária
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Ponto de montagem já em uso. Por favor selecione outro.
     
@@ -1005,43 +1048,43 @@ O instalador será encerrado e todas as alterações serão perdidas.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Criar nova partição de %1MiB em %3 (%2) com entradas %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Criar nova partição de %1MiB em %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Criar nova partição de %2MiB em %4 (%3) com o sistema de ficheiros %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2) com entradas <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Criar nova partição de <strong>%1MiB</strong> em <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Criar nova partição de <strong>%2MiB</strong> em <strong>%4</strong> (%3) com o sistema de ficheiros <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Criando nova partição %1 em %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       O instalador falhou a criação da partição no disco '%1'.
     
@@ -1092,7 +1135,7 @@ O instalador será encerrado e todas as alterações serão perdidas.A criar nova %1 tabela de partições em %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       O instalador falhou a criação de uma tabela de partições em %1.
     
@@ -1331,7 +1374,17 @@ O instalador será encerrado e todas as alterações serão perdidas.Flags:
     
     
-      
+      
+      Label for the filesystem
+      Nome para o sistema de ficheiros
+    
+    
+      
+      FS Label:
+      Identificação do FS:
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Ponto de montagem já em uso. Por favor selecione outro.
     
@@ -1368,57 +1421,57 @@ O instalador será encerrado e todas as alterações serão perdidas.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Definir informação da partição
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Instalar %1 na <strong>nova</strong> partição do sistema %2 com funcionalidades <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instalar %1 na <strong>nova</strong> %2 partição de sistema.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong> e funcionalidades <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Configurar <strong>nova</strong> partição %2 com ponto de montagem <strong>%1</strong>%3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Instalar %2 em %3 partição do sistema <strong>%1</strong> com funcionalidades <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Configurar %3 partição <strong>%1</strong> com ponto de montagem <strong>%2</strong> e funcionalidades <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Configurar %3 partição <strong>%1</strong> com ponto de montagem <strong>%2</strong>%4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instalar %2 em %3 partição de sistema <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instalar carregador de arranque em <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Definindo pontos de montagem.
     
@@ -1831,6 +1884,14 @@ O instalador será encerrado e todas as alterações serão perdidas.Localização
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      Sair
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ O instalador será encerrado e todas as alterações serão perdidas.
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Selecione a sua Região preferida, ou utilize a predefinida baseada na sua localização atual.
+      
+      Select your preferred Region, or use the default settings.
+      Selecione a sua Região preferida, ou utilize as definições predefinidas.
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Fuso horário: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Selecione a sua Zona preferida dentro da sua Região.
     
     
-      
+      
       Zones
       Zonas
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Pode ajustar as definições de Idioma e Localização abaixo.
     
@@ -2388,7 +2449,7 @@ O instalador será encerrado e todas as alterações serão perdidas.
     PackageChooserViewStep
     
-      
+      
       Packages
       Pacotes
     
@@ -2569,33 +2630,38 @@ O instalador será encerrado e todas as alterações serão perdidas.PartitionModel
     
       
-      
+      
       Free Space
       Espaço Livre
     
     
       
-      
+      
       New partition
       Nova partição
     
     
-      
+      
       Name
       Nome
     
     
-      
+      
       File System
       Sistema de Ficheiros
     
     
-      
+      
+      File System Label
+      Identificação do sistema de ficheiros
+    
+    
+      
       Mount Point
       Ponto de Montagem
     
     
-      
+      
       Size
       Tamanho
     
@@ -2681,117 +2747,117 @@ O instalador será encerrado e todas as alterações serão perdidas.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       A recolher informações do sistema...
     
     
-      
+      
       Partitions
       Partições
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instalar %1 <strong>paralelamente</strong> a outro sistema operativo.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Apagar</strong> disco e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Substituir</strong> a partição com %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Particionamento <strong>Manual</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instalar %1 <strong>paralelamente</strong> a outro sistema operativo no disco <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Apagar</strong> disco <strong>%2</strong> (%3) e instalar %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Substituir</strong> a partição no disco <strong>%2</strong> (%3) com %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Particionamento <strong>Manual</strong> no disco <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disco <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Atual:
     
     
-      
+      
       After:
       Depois:
     
     
-      
+      
       No EFI system partition configured
       Nenhuma partição de sistema EFI configurada
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       É necessário uma partição de sistema EFI para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte atrás e faça a seleção ou crie um sistema de ficheiros FAT32 com a flag <strong>%3</strong> ativada e o ponto de montagem <strong>%2</strong>.<br/><br/>Pode continuar sem definir uma partição de sistema EFI, mas o seu sistema poderá falhar ao iniciar.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       É necessário uma partição de sistema EFI para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas não foi definida a flag <strong>%3</strong>.<br/>Para definir a flag, volte atrás e edite a partição.<br/><br/>Pode continuar sem definir a flag, mas o seu sistema poderá falhar ao iniciar.
     
     
-      
+      
       EFI system partition flag not set
       flag não definida da partição de sistema EFI
     
     
-      
+      
       Option to use GPT on BIOS
       Opção para utilizar GPT no BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Uma tabela de partições GPT é a melhor opção para todos os sistemas. Este instalador suporta tal configuração para sistemas BIOS também.<br/><br/>Para configurar uma tabela de partições GPT no BIOS, (caso não tenha sido feito ainda) volte atrás e defina a tabela de partições como GPT, depois crie uma partição sem formatação de 8 MB com o marcador <strong>bios_grub</strong> ativado.<br/><br/>Uma partição não formatada de 8 MB é necessária para iniciar %1 num sistema BIOS com o GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partição de arranque não encriptada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Foi preparada uma partição de arranque separada juntamente com uma partição root encriptada, mas a partição de arranque não está encriptada.<br/><br/>Existem preocupações de segurança com este tipo de configuração, por causa de importantes ficheiros de sistema serem guardados numa partição não encriptada.<br/>Se desejar pode continuar, mas o destrancar do sistema de ficheiros irá ocorrer mais tarde durante o arranque do sistema.<br/>Para encriptar a partição de arranque, volte atrás e recrie-a, e selecione <strong>Encriptar</strong> na janela de criação de partições.
     
     
-      
+      
       has at least one disk device available.
       tem pelo menos um dispositivo de disco disponível.
     
     
-      
+      
       There are no partitions to install on.
       Não há partições para instalar.
     
@@ -2981,17 +3047,17 @@ Saída de Dados:
       Não foi possível criar um novo ficheiro aleatório <pre>%1</pre>.
     
     
-      
+      
       No product
       Nenhum produto
     
     
-      
+      
       No description provided.
       Nenhuma descrição fornecida.
     
     
-      
+      
       (no mount point)
       (sem ponto de montagem)
     
@@ -3252,12 +3318,12 @@ Saída de Dados:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para melhores resultados, por favor certifique-se que este computador:
     
     
-      
+      
       System requirements
       Requisitos de sistema
     
@@ -3265,27 +3331,27 @@ Saída de Dados:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Este computador não satisfaz os requisitos mínimos para instalar %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas algumas funcionalidades podem ser desativadas.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Este computador não satisfaz alguns dos requisitos recomendados para instalar %1.<br/>A instalação pode continuar, mas algumas funcionalidades poderão ser desativadas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Este programa vai fazer-lhe algumas perguntas e configurar o %2 no seu computador.
     
@@ -3441,7 +3507,7 @@ Saída de Dados:
       A definir flags <strong>%1</strong> na nova partição.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       O instalador falhou ao definir flags na partição %1.
     
@@ -3584,12 +3650,12 @@ Saída de Dados:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Isto é uma visão geral do que acontecerá assim que iniciar o procedimento de configuração.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Isto é uma visão geral do que acontecerá assim que iniciar o procedimento de instalação.
     
@@ -4165,107 +4231,127 @@ Saída de Dados:
       Escolha o seu nome de utilizador e credenciais para iniciar sessão e executar tarefas de administrador
     
     
-      
+      
       What is your name?
       Qual é o seu nome?
     
     
-      
+      
       Your Full Name
       O seu nome completo
     
     
-      
+      
       What name do you want to use to log in?
       Que nome deseja usar para iniciar a sessão?
     
     
-      
+      
       Login Name
       Nome de utilizador
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Se mais do que uma pessoa utilizar este computador, poderá criar várias contas após a instalação.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Apenas letras minúsculas, números, underscore e hífen são permitidos.
+    
+    
+      
+      root is not allowed as username.
+      root não é permitido como nome de utilizador.
+    
+    
+      
       What is the name of this computer?
       Qual o nome deste computador?
     
     
-      
+      
       Computer Name
       Nome do computador
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Este nome será utilizado se tornar o computador visível a outros numa rede.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Apenas letras, números, sublinhado e hífen são permitidos, com um mínimo de dois caracteres.
+    
+    
+      
+      localhost is not allowed as hostname.
+      localhost não é permitido como "hostname".
+    
+    
+      
       Choose a password to keep your account safe.
       Escolha uma palavra-passe para manter a sua conta segura.
     
     
-      
+      
       Password
       Palavra-passe
     
     
-      
+      
       Repeat Password
       Repita a palavra-passe
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. Uma boa palavra-passe conterá uma mistura de letras, números e pontuação, deve ter pelo menos oito caracteres, e deve ser alterada a intervalos regulares.
     
     
-      
+      
       Validate passwords quality
       Validar qualidade das palavras-passe
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quando esta caixa é assinalada, a verificação da força da palavra-passe é feita e não será possível utilizar uma palavra-passe fraca.
     
     
-      
+      
       Log in automatically without asking for the password
       Iniciar sessão automaticamente sem pedir a palavra-passe
     
     
-      
+      
       Reuse user password as root password
       Reutilizar palavra-passe de utilizador como palavra-passe de root
     
     
-      
+      
       Use the same password for the administrator account.
       Usar a mesma palavra-passe para a conta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Escolha uma palavra-passe de root para manter a sua conta segura.
     
     
-      
+      
       Root Password
       Palavra-passe de root
     
     
-      
+      
       Repeat Root Password
       Repetir palavra-passe de root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita.
     
diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts
index 15dabc5489..d183cd42c5 100644
--- a/lang/calamares_ro.ts
+++ b/lang/calamares_ro.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master boot record (MBR) al %1
     
     
-      
+      
       Boot Partition
       Partiție de boot
     
     
-      
+      
       System Partition
       Partiție de sistem
     
     
-      
+      
       Do not install a boot loader
       Nu instala un bootloader
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Se rulează operațiunea %1.
     
     
-      
+      
       Bad working directory path
       Calea dosarului de lucru este proastă
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Dosarul de lucru %1 pentru sarcina python %2 nu este citibil.
     
     
-      
+      
       Bad main script file
       Fișierul script principal este prost
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Fișierul script peincipal %1 pentru sarcina Python %2 nu este citibil.
     
     
-      
+      
       Boost.Python error in job "%1".
       Eroare Boost.Python în sarcina „%1”.
     
@@ -287,54 +287,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Instalare eșuată
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Eroare
     
     
-      
-      
+      
+      
       &Yes
       &Da
     
     
-      
-      
+      
+      
       &No
       &Nu
     
     
-      
+      
       &Close
       În&chide
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +343,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Continuați configurarea?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Programul de instalare %1 este pregătit să facă schimbări pe discul dumneavoastră pentru a instala %2.<br/><strong>Nu veți putea anula aceste schimbări.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Instalează acum
     
     
-      
+      
       Go &back
       Î&napoi
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       Instalează
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalarea este completă. Închide instalatorul.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Anulează instalarea fără schimbarea sistemului.
     
     
-      
+      
       &Next
       &Următorul
     
     
-      
+      
       &Back
       &Înapoi
     
     
-      
+      
       &Done
       &Gata
     
     
-      
+      
       &Cancel
       &Anulează
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Anulez instalarea?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Doriți să anulați procesul curent de instalare?
@@ -469,22 +469,22 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Tip de excepție necunoscut
     
     
-      
+      
       unparseable Python error
       Eroare Python neanalizabilă
     
     
-      
+      
       unparseable Python traceback
       Traceback Python neanalizabil
     
     
-      
+      
       Unfetchable Python error.
       Eroare Python nepreluabilă
     
@@ -502,6 +502,24 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Program de instalare %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Programul de instalare nu a putut actualiza tabela de partiții pe discul „%1”.
+    
+  
   
     CheckerContainer
     
@@ -518,149 +536,149 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Formular
     
     
-      
+      
       Select storage de&vice:
       Selectează dispoziti&vul de stocare:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       După:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Partiționare manuală</strong><br/>Puteți crea sau redimensiona partițiile.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilizează %1 ca partiție home pentru %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selectează o partiție de micșorat, apoi trageți bara din jos pentru a redimensiona</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Locație boot loader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selectează o partiție pe care să se instaleze</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       O partiție de sistem EFI nu poate fi găsită nicăieri în acest sistem. Vă rugăm să reveniți și să partiționați manual pentru a seta %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Partiția de sistem EFI de la %1 va fi folosită pentru a porni %2.
     
     
-      
+      
       EFI system partition:
       Partiție de sistem EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Acest dispozitiv de stocare nu pare să aibă un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Șterge discul</strong><br/>Aceasta va <font color="red">șterge</font> toate datele prezente pe dispozitivul de stocare selectat.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalează laolaltă</strong><br/>Instalatorul va micșora o partiție pentru a face loc pentru %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Înlocuiește o partiție</strong><br/>Înlocuiește o partiție cu %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Acest dispozitiv de stocare are %1. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Acest dispozitiv de stocare are deja un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de se realiza schimbări pe dispozitivul de stocare.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Acest dispozitiv de stocare are mai multe sisteme de operare instalate. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de a se realiza schimbări pe dispozitivul de stocare.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -696,12 +714,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Se elimină toate montările temporare.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Nu se poate obține o listă a montărilor temporare.
     
     
-      
+      
       Cleared all temporary mounts.
       S-au eliminat toate montările temporare.
     
@@ -728,27 +746,27 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Setează modelul tastaturii la %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Setează aranjamentul de tastatură la %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       Limba sistemului va fi %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Formatul numerelor și datelor calendaristice va fi %1.
     
@@ -872,6 +890,11 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Your passwords do not match!
       Parolele nu se potrivesc!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -912,6 +935,16 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.The installation of %1 is complete.
       Instalarea este %1 completă.
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -974,27 +1007,37 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Flags:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Criptează
     
     
-      
+      
       Logical
       Logică
     
     
-      
+      
       Primary
       Primară
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Punct de montare existent. Vă rugăm alegeţi altul.
     
@@ -1002,43 +1045,43 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Se creează  nouă partiție %1 pe %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Programul de instalare nu a putut crea partiția pe discul „%1”.
     
@@ -1089,7 +1132,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Se creează o nouă tabelă de partiții %1 pe %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Programul de instalare nu a putut crea o tabelă de partiții pe %1.
     
@@ -1328,7 +1371,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Flags:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Punct de montare existent. Vă rugăm alegeţi altul.
     
@@ -1365,57 +1418,57 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Setează informația pentru partiție
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instalează %1 pe <strong>noua</strong> partiție de sistem %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instalează %2 pe partiția de sistem %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instalează bootloader-ul pe <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Se setează puncte de montare.
     
@@ -1828,6 +1881,14 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Locație
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2045,29 +2106,29 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2395,7 +2456,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2576,33 +2637,38 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.PartitionModel
     
       
-      
+      
       Free Space
       Spațiu liber
     
     
       
-      
+      
       New partition
       Partiție nouă
     
     
-      
+      
       Name
       Nume
     
     
-      
+      
       File System
       Sistem de fișiere
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Punct de montare
     
     
-      
+      
       Size
       Mărime
     
@@ -2688,117 +2754,117 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Se adună informații despre sistem...
     
     
-      
+      
       Partitions
       Partiții
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instalează %1 <strong>laolaltă</strong> cu un alt sistem de operare.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Șterge</strong> discul și instalează %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Înlocuiește</strong> o partiție cu %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Partiționare <strong>manuală</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instalează %1 <strong>laolaltă</strong> cu un alt sistem de operare pe discul <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Șterge</strong> discul <strong>%2</strong> (%3) și instalează %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Înlocuiește</strong> o partiție pe discul <strong>%2</strong> (%3) cu %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Partiționare <strong>manuală</strong> a discului <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Discul <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       După:
     
     
-      
+      
       No EFI system partition configured
       Nicio partiție de sistem EFI nu a fost configurată
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       Flag-ul de partiție de sistem pentru EFI nu a fost setat
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partiția de boot nu este criptată
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       A fost creată o partiție de boot împreună cu o partiție root criptată, dar partiția de boot nu este criptată.<br/><br/>Sunt potențiale probleme de securitate cu un astfel de aranjament deoarece importante fișiere de sistem sunt păstrate pe o partiție necriptată.<br/>Puteți continua dacă doriți, dar descuierea sistemului se va petrece mai târziu în timpul pornirii.<br/>Pentru a cripta partiția de boot, reveniți și recreați-o, alegând opțiunea <strong>Criptează</strong> din fereastra de creare de partiții.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2988,17 +3054,17 @@ Output
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3256,12 +3322,12 @@ Output
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Pentru rezultate optime, asigurați-vă că acest calculator:
     
     
-      
+      
       System requirements
       Cerințe de sistem
     
@@ -3269,27 +3335,27 @@ Output
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Acest calculator nu satisface cerințele minimale pentru instalarea %1.<br/>Instalarea nu poate continua. <a href="#details">Detalii...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Acest calculator nu satisface unele din cerințele recomandate pentru instalarea %1.<br/>Instalarea poate continua, dar unele funcții ar putea fi dezactivate.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Acest program vă va pune mai multe întrebări și va seta %2 pe calculatorul dumneavoastră.
     
@@ -3445,7 +3511,7 @@ Output
       Se setează flagurile <strong>%1</strong> pe noua partiție.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Programul de instalare a eșuat în setarea flag-urilor pentru partiția %1.
     
@@ -3588,12 +3654,12 @@ Output
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Acesta este un rezumat a ce se va întâmpla după ce începeți procedura de instalare.
     
@@ -4133,107 +4199,127 @@ Output
       
     
     
-      
+      
       What is your name?
       Cum vă numiți?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Ce nume doriți să utilizați pentru logare?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Care este numele calculatorului?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Alegeți o parolă pentru a menține contul în siguranță.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Folosește aceeași parolă pentru contul de administrator.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index 1cc038db7a..46c87aab6a 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Главная загрузочная запись %1
     
     
-      
+      
       Boot Partition
       Загрузочный раздел
     
     
-      
+      
       System Partition
       Системный раздел
     
     
-      
+      
       Do not install a boot loader
       Не устанавливать загрузчик
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Выполняется действие %1.
     
     
-      
+      
       Bad working directory path
       Неверный путь к рабочему каталогу
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Рабочий каталог %1 для задачи python %2 недоступен для чтения.
     
     
-      
+      
       Bad main script file
       Ошибочный главный файл сценария
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Главный файл сценария %1 для задачи python %2 недоступен для чтения.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python ошибка в задаче "%1".
     
@@ -289,54 +289,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Сбой установки
     
     
-      
+      
       Installation Failed
       Установка завершилась неудачей
     
     
-      
+      
       Would you like to paste the install log to the web?
       Разместить журнал установки в интернете?
     
     
-      
+      
       Error
       Ошибка
     
     
-      
-      
+      
+      
       &Yes
       &Да
     
     
-      
-      
+      
+      
       &No
       &Нет
     
     
-      
+      
       &Close
       &Закрыть
     
     
-      
+      
       Install Log Paste URL
       Адрес для отправки журнала установки
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Загрузка не удалась. Веб-вставка не была завершена.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Ошибка инициализации Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Не удалось установить %1. Calamares не удалось загрузить все сконфигурированные модули. Эта проблема вызвана тем, как ваш дистрибутив использует Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Не удалось загрузить следующие модули:
     
     
-      
+      
       Continue with setup?
       Продолжить установку?
     
     
-      
+      
       Continue with installation?
       Продолжить установку?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong>
     
     
-      
+      
       &Set up now
       &Настроить сейчас
     
     
-      
+      
       &Install now
       Приступить к &установке
     
     
-      
+      
       Go &back
       &Назад
     
     
-      
+      
       &Set up
       &Настроить
     
     
-      
+      
       &Install
       &Установить
     
     
-      
+      
       Setup is complete. Close the setup program.
       Установка завершена. Закройте программу установки.
     
     
-      
+      
       The installation is complete. Close the installer.
       Установка завершена. Закройте установщик.
     
     
-      
+      
       Cancel setup without changing the system.
       Отменить установку без изменения системы.
     
     
-      
+      
       Cancel installation without changing the system.
       Отменить установку без изменения системы.
     
     
-      
+      
       &Next
       &Далее
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       &Готово
     
     
-      
+      
       &Cancel
       О&тмена
     
     
-      
+      
       Cancel setup?
       Отменить установку?
     
     
-      
+      
       Cancel installation?
       Отменить установку?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Прервать процесс установки?
 Программа установки прекратит работу и все изменения будут потеряны.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Действительно прервать процесс установки? Программа установки сразу прекратит работу, все изменения будут потеряны.
@@ -471,22 +471,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Неизвестный тип исключения
     
     
-      
+      
       unparseable Python error
       неподдающаяся обработке ошибка Python
     
     
-      
+      
       unparseable Python traceback
       неподдающийся обработке traceback Python
     
     
-      
+      
       Unfetchable Python error.
       Неизвестная ошибка Python
     
@@ -504,6 +504,24 @@ The installer will quit and all changes will be lost.
       Программа установки %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Программе установки не удалось обновить таблицу разделов на диске '%1'.
+    
+  
   
     CheckerContainer
     
@@ -520,149 +538,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Выбрать устройство &хранения:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Текущий:
     
     
-      
+      
       After:
       После:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ручная разметка</strong><br/>Вы можете самостоятельно создавать разделы или изменять их размеры.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Использовать %1 как домашний раздел для %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Выберите раздел для уменьшения, затем двигайте ползунок, изменяя размер</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 будет уменьшен до %2MB и новый раздел %3MB будет создан для %4.
     
     
-      
+      
       Boot loader location:
       Расположение загрузчика:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Выберите раздел для установки</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Не найдено системного раздела EFI. Пожалуйста, вернитесь назад и выполните ручную разметку %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Системный раздел EFI на %1 будет использован для запуска %2.
     
     
-      
+      
       EFI system partition:
       Системный раздел EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Видимо, на этом устройстве нет операционной системы. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Стереть диск</strong><br/>Это <font color="red">удалит</font> все данные, которые сейчас находятся на выбранном устройстве.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Установить рядом</strong><br/>Программа установки уменьшит раздел, чтобы освободить место для %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Заменить раздел</strong><br/>Меняет раздел на %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На этом устройстве есть %1. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На этом устройстве уже есть операционная система. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На этом устройстве есть несколько операционных систем. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Без раздела подкачки
     
     
-      
+      
       Reuse Swap
       Использовать существующий раздел подкачки
     
     
-      
+      
       Swap (no Hibernate)
       Swap (без Гибернации)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (с Гибернацией)
     
     
-      
+      
       Swap to file
       Файл подкачки
     
@@ -698,12 +716,12 @@ The installer will quit and all changes will be lost.
       Освобождаются все временные точки монтирования.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Не удалось получить список временных точек монтирования.
     
     
-      
+      
       Cleared all temporary mounts.
       Освобождены все временные точки монтирования.
     
@@ -730,27 +748,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Установить модель клавиатуры на %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Установить раскладку клавиатуры на %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Установить часовой пояс на %1/%2
     
     
-      
+      
       The system language will be set to %1.
       Системным языком будет установлен %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Региональным форматом чисел и дат будет установлен %1.
     
@@ -874,6 +892,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       Пароли не совпадают!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -914,6 +937,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       Установка %1 завершена.
     
+    
+      
+      Package Selection
+      Выбор пакета
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Пожалуйста, выберите продукт из списка. Выбранный продукт будет установлен.
+    
   
   
     ContextualProcessJob
@@ -976,27 +1009,37 @@ The installer will quit and all changes will be lost.
       Флаги:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Шифровать
     
     
-      
+      
       Logical
       Логический
     
     
-      
+      
       Primary
       Основной
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Точка монтирования уже занята. Пожалуйста, выберете другую.
     
@@ -1004,43 +1047,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Создать новый раздел %2 MiB на %4 (%3) с файловой системой %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Создать новый раздел <strong>%2 MiB</strong> на <strong>%4</strong> (%3) с файловой системой <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Создается новый %1 раздел на %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Программа установки не смогла создать раздел на диске '%1'.
     
@@ -1091,7 +1134,7 @@ The installer will quit and all changes will be lost.
       Создается новая таблица разделов %1 на %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Программа установки не смогла создать таблицу разделов на %1.
     
@@ -1330,7 +1373,17 @@ The installer will quit and all changes will be lost.
       Флаги: 
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Точка монтирования уже занята. Пожалуйста, выберете другую.
     
@@ -1367,57 +1420,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Установить сведения о разделе
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Установить %1 на <strong>новый</strong> системный раздел %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Установить %2 на %3 системный раздел <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Установить загрузчик на <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Настраиваются точки монтирования.
     
@@ -1830,6 +1883,14 @@ The installer will quit and all changes will be lost.
       Местоположение
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2047,29 +2108,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Выберите ваш регион или используйте стандартный на основе вашего текущего местоположения. 
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Часовой пояс: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Выберите ваш предпочитаемый пояс в регионе
     
     
-      
+      
       Zones
       Пояса
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2403,7 +2464,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Пакеты
     
@@ -2584,33 +2645,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       Доступное место
     
     
       
-      
+      
       New partition
       Новый раздел
     
     
-      
+      
       Name
       Имя
     
     
-      
+      
       File System
       Файловая система
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Точка монтирования
     
     
-      
+      
       Size
       Размер
     
@@ -2696,117 +2762,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Сбор информации о системе...
     
     
-      
+      
       Partitions
       Разделы
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Установить %1 <strong>параллельно</strong> к другой операционной системе.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Очистить</strong> диск и установить %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Заменить</strong> раздел на %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Ручная</strong> разметка.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Установить %1 <strong>параллельно</strong> к другой операционной системе на диске <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Очистить</strong> диск <strong>%2</strong> (%3) и установить %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Заменить</strong> раздел на диске <strong>%2</strong> (%3) на %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Ручная</strong> разметка диска <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Диск <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Текущий:
     
     
-      
+      
       After:
       После:
     
     
-      
+      
       No EFI system partition configured
       Нет настроенного системного раздела EFI
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Для запуска %1 необходим системный раздел EFI.<br/><br/>Чтобы его настроить, вернитесь и выберите или создайте раздел FAT32 с установленным флагом <strong>%3</strong> и точкой монтирования <strong>%2</strong>.<br/><br/>Можно продолжить и без настройки системного раздела EFI, но ваша система может не загрузиться.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Для запуска %1 необходим системный раздел EFI.<br/><br/>Был настроен раздел с точкой монтирования <strong>%2</strong>, но у него отсутствует флаг <strong>%3</strong>.<br/>Чтобы установить флаг, вернитесь и отредактируйте раздел.<br/><br/>Можно продолжить и без установки флага, но ваша система может не загрузиться.
     
     
-      
+      
       EFI system partition flag not set
       Не установлен флаг системного раздела EFI
     
     
-      
+      
       Option to use GPT on BIOS
       Возможность для использования GPT в BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Таблица разделов GPT - наилучший вариант для всех систем. Этот установщик позволяет использовать таблицу разделов GPT для систем с BIOS. <br/> <br/> Чтобы установить таблицу разделов как GPT (если это еще не сделано) вернитесь назад и создайте таблицу разделов GPT, затем создайте 8 МБ Не форматированный раздел с включенным флагом <strong> bios-grub</strong> </ strong>. <br/> <br/> Не форматированный раздел в 8 МБ необходим для запуска %1 на системе с BIOS и таблицей разделов GPT.
     
     
-      
+      
       Boot partition not encrypted
       Загрузочный раздел не зашифрован
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Включено шифрование корневого раздела, но использован отдельный загрузочный раздел без шифрования.<br/><br/>При такой конфигурации возникают проблемы с безопасностью, потому что важные системные файлы хранятся на разделе без шифрования.<br/>Если хотите, можете продолжить, но файловая система будет разблокирована позднее во время загрузки системы.<br/>Чтобы включить шифрование загрузочного раздела, вернитесь назад и снова создайте его, отметив <strong>Шифровать</strong> в окне создания раздела.
     
     
-      
+      
       has at least one disk device available.
       имеет как минимум одно доступное дисковое устройство.
     
     
-      
+      
       There are no partitions to install on.
       Нет разделов для установки.
     
@@ -2996,17 +3062,17 @@ Output:
       Не удалось создать новый случайный файл <pre>%1</pre>.
     
     
-      
+      
       No product
       Нет продукта
     
     
-      
+      
       No description provided.
       Описание не предоставлено.
     
     
-      
+      
       (no mount point)
       (без точки монтирования)
     
@@ -3265,12 +3331,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Для наилучших результатов, убедитесь, что этот компьютер:
     
     
-      
+      
       System requirements
       Системные требования
     
@@ -3278,27 +3344,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Невозможно продолжить установку. <a href="#details">Подробнее...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Невозможно продолжить установку. <a href="#details">Подробнее...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Эта программа задаст вам несколько вопросов и поможет установить %2 на ваш компьютер.
     
@@ -3454,7 +3520,7 @@ Output:
       Установка флагов <strong>%1</strong> нового раздела.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Установщик не смог установить флаги на раздел %1.
     
@@ -3597,12 +3663,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Это обзор изменений, которые будут применены при запуске процедуры установки.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Это обзор изменений, которые будут применены при запуске процедуры установки.
     
@@ -4143,107 +4209,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       Как Вас зовут?
     
     
-      
+      
       Your Full Name
       Ваше полное имя
     
     
-      
+      
       What name do you want to use to log in?
       Какое имя Вы хотите использовать для входа?
     
     
-      
+      
       Login Name
       Имя пользователя
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Допускаются только строчные буквы, числа, символы подчёркивания и дефисы.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Какое имя у компьютера?
     
     
-      
+      
       Computer Name
       Имя компьютера
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Выберите пароль для защиты вашей учетной записи.
     
     
-      
+      
       Password
       Пароль
     
     
-      
+      
       Repeat Password
       Повторите пароль
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Когда этот флажок установлен, выполняется проверка надежности пароля, и вы не сможете использовать слабый пароль.
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       Использовать пароль пользователя как пароль суперпользователя
     
     
-      
+      
       Use the same password for the administrator account.
       Использовать тот же пароль для аккаунта администратора.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       Пароль суперпользователя
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ru_RU.ts b/lang/calamares_ru_RU.ts
index 2758604617..483e76a4eb 100644
--- a/lang/calamares_ru_RU.ts
+++ b/lang/calamares_ru_RU.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -289,54 +289,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +345,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -470,22 +470,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -503,6 +503,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -519,149 +537,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -697,12 +715,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -729,27 +747,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -873,6 +891,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -913,6 +936,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -975,27 +1008,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1003,43 +1046,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1090,7 +1133,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1329,7 +1372,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1366,57 +1419,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1829,6 +1882,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2046,29 +2107,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2402,7 +2463,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2583,33 +2644,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2695,117 +2761,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2992,17 +3058,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3260,12 +3326,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3273,27 +3339,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3449,7 +3515,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3592,12 +3658,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4137,107 +4203,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts
index f6ac64656d..84c821a151 100644
--- a/lang/calamares_si.ts
+++ b/lang/calamares_si.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index 2c2fb3fc8c..aaba86b91a 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Hlavný zavádzací záznam (MBR) zariadenia %1
     
     
-      
+      
       Boot Partition
       Zavádzací oddiel
     
     
-      
+      
       System Partition
       Systémový oddiel
     
     
-      
+      
       Do not install a boot loader
       Neinštalovať zavádzač
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Spúšťa sa operácia %1.
     
     
-      
+      
       Bad working directory path
       Nesprávna cesta k pracovnému adresáru
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Pracovný adresár %1 pre úlohu jazyka python %2 nie je možné čítať.
     
     
-      
+      
       Bad main script file
       Nesprávny súbor hlavného skriptu
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Súbor hlavného skriptu %1 pre úlohu jazyka python %2 nie je možné čítať.
     
     
-      
+      
       Boost.Python error in job "%1".
       Chyba knižnice Boost.Python v úlohe „%1“.
     
@@ -289,54 +289,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Inštalácia zlyhala
     
     
-      
+      
       Installation Failed
       Inštalácia zlyhala
     
     
-      
+      
       Would you like to paste the install log to the web?
       Chceli by ste vložiť záznam z inštalácie na web?
     
     
-      
+      
       Error
       Chyba
     
     
-      
-      
+      
+      
       &Yes
       Án&o
     
     
-      
-      
+      
+      
       &No
       &Nie
     
     
-      
+      
       &Close
       &Zavrieť
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Odovzdanie nebolo úspešné. Nebolo dokončené žiadne webové vloženie.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Zlyhala inicializácia inštalátora Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Nie je možné nainštalovať %1. Calamares nemohol načítať všetky konfigurované moduly. Je problém s tým, ako sa Calamares používa pri distribúcii.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Nebolo možné načítať nasledujúce moduly
     
     
-      
+      
       Continue with setup?
       Pokračovať v inštalácii?
     
     
-      
+      
       Continue with installation?
       Pokračovať v inštalácii?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Inštalačný program distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Inštalátor distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</strong>
     
     
-      
+      
       &Set up now
       &Inštalovať teraz
     
     
-      
+      
       &Install now
       &Inštalovať teraz
     
     
-      
+      
       Go &back
       Prejsť s&päť
     
     
-      
+      
       &Set up
       &Inštalovať
     
     
-      
+      
       &Install
       &Inštalovať
     
     
-      
+      
       Setup is complete. Close the setup program.
       Inštalácia je dokončená. Zavrite inštalačný program.
     
     
-      
+      
       The installation is complete. Close the installer.
       Inštalácia je dokončená. Zatvorí inštalátor.
     
     
-      
+      
       Cancel setup without changing the system.
       Zrušenie inštalácie bez zmien v systéme.
     
     
-      
+      
       Cancel installation without changing the system.
       Zruší inštaláciu bez zmeny systému.
     
     
-      
+      
       &Next
       Ď&alej
     
     
-      
+      
       &Back
       &Späť
     
     
-      
+      
       &Done
       &Dokončiť
     
     
-      
+      
       &Cancel
       &Zrušiť
     
     
-      
+      
       Cancel setup?
       Zrušiť inštaláciu?
     
     
-      
+      
       Cancel installation?
       Zrušiť inštaláciu?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Naozaj chcete zrušiť aktuálny priebeh inštalácie?
 Inštalačný program bude ukončený a zmeny budú stratené.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Skutočne chcete zrušiť aktuálny priebeh inštalácie?
@@ -472,22 +472,22 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Neznámy typ výnimky
     
     
-      
+      
       unparseable Python error
       Neanalyzovateľná chyba jazyka Python
     
     
-      
+      
       unparseable Python traceback
       Neanalyzovateľný ladiaci výstup jazyka  Python
     
     
-      
+      
       Unfetchable Python error.
       Nezískateľná chyba jazyka Python.
     
@@ -505,6 +505,24 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Inštalátor distribúcie %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Inštalátor zlyhal pri aktualizovaní tabuľky oddielov na disku „%1“.
+    
+  
   
     CheckerContainer
     
@@ -521,150 +539,150 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Forma
     
     
-      
+      
       Select storage de&vice:
       Vyberte úložné &zariadenie:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Teraz:
     
     
-      
+      
       After:
       Potom:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ručné rozdelenie oddielov</strong><br/>Môžete vytvoriť alebo zmeniť veľkosť oddielov podľa seba.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Opakované použitie oddielu %1 ako domovského pre distribúciu %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Vyberte oddiel na zmenšenie a potom potiahnutím spodného pruhu zmeňte veľkosť</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       Oddiel %1 bude zmenšený na %2MiB a nový %3MiB oddiel bude vytvorený pre distribúciu %4.
     
     
-      
+      
       Boot loader location:
       Umiestnenie zavádzača:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Vyberte oddiel, na ktorý sa má inštalovať</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Oddiel systému EFI sa nedá v tomto počítači nájsť. Prosím, prejdite späť a použite ručné rozdelenie oddielov na inštaláciu distribúcie %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Oddie lsystému EFI na %1 bude použitý na spustenie distribúcie %2.
     
     
-      
+      
       EFI system partition:
       Oddiel systému EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Zdá sa, že toto úložné zariadenie neobsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Vymazanie disku</strong><br/>Týmto sa <font color="red">odstránia</font> všetky údaje momentálne sa nachádzajúce na vybranom úložnom zariadení.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Inštalácia popri súčasnom systéme</strong><br/>Inštalátor zmenší oddiel a uvoľní miesto pre distribúciu %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Nahradenie oddielu</strong><br/>Nahradí oddiel distribúciou %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Toto úložné zariadenie obsahuje operačný systém %1. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Toto úložné zariadenie už obsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Toto úložné zariadenie obsahuje viacero operačných systémov. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Toto úložné zariadenie už obsahuje operačný systém, ale tabuľka oddielov <strong>%1</strong> sa líši od požadovanej <strong>%2</strong>.
 <br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Toto úložné zariadenie má jeden zo svojich oddielov <strong>pripojený</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Toto úložné zariadenie je súčasťou zariadenia s <strong>neaktívnym RAIDom</strong>.
     
     
-      
+      
       No Swap
       Bez odkladacieho priestoru
     
     
-      
+      
       Reuse Swap
       Znovu použiť odkladací priestor
     
     
-      
+      
       Swap (no Hibernate)
       Odkladací priestor (bez hibernácie)
     
     
-      
+      
       Swap (with Hibernate)
       Odkladací priestor (s hibernáciou)
     
     
-      
+      
       Swap to file
       Odkladací priestor v súbore
     
@@ -700,12 +718,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Vymazávajú sa všetky dočasné pripojenia.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Nedá sa získať zoznam dočasných pripojení.
     
     
-      
+      
       Cleared all temporary mounts.
       Vymazané všetky dočasné pripojenia.
     
@@ -732,27 +750,27 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Nastavenie modelu klávesnice na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Nastavenie rozloženia klávesnice na %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Nastavenie časovej zóny na %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       Jazyk systému bude nastavený na %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Miestne nastavenie čísel a dátumov bude nastavené na %1.
     
@@ -876,6 +894,11 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Your passwords do not match!
       Vaše heslá sa nezhodujú!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -916,6 +939,16 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       The installation of %1 is complete.
       Inštalácia distribúcie %1s je dokončená.
     
+    
+      
+      Package Selection
+      Výber balíkov
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Prosím, vyberte produkt zo zoznamu. Vybraný produkt bude nainštalovaný.
+    
   
   
     ContextualProcessJob
@@ -978,27 +1011,37 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Príznaky:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Zaši&frovať
     
     
-      
+      
       Logical
       Logický
     
     
-      
+      
       Primary
       Primárny
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Bod pripojenia sa už používa. Prosím, vyberte iný.
     
@@ -1006,43 +1049,43 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Vytvorenie nového %2MiB oddielu na zariadení %4 (%3) so systémom súborov %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Vytvorenie nového <strong>%2MiB</strong> oddielu na zariadení <strong>%4</strong> (%3) so systémom súborov <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Vytvára sa nový %1 oddiel na zariadení %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Inštalátor zlyhal pri vytváraní oddielu na disku „%1“.
     
@@ -1093,7 +1136,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Vytvára sa nová tabuľka oddielov typu %1 na zariadení %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Inštalátor zlyhal pri vytváraní tabuľky oddielov na zariadení %1.
     
@@ -1332,7 +1375,17 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Príznaky:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Bod pripojenia sa už používa. Prosím, vyberte iný.
     
@@ -1369,57 +1422,57 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Nastaviť informácie o oddieli
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Inštalovať distribúciu %1 na <strong>novom</strong> %2 systémovom oddieli.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Inštalovať distribúciu %2 na %3 systémovom oddieli <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Inštalovať zavádzač do <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Nastavujú sa body pripojení.
     
@@ -1832,6 +1885,14 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Umiestnenie
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Vyberte vami uprednostňovanú oblasť, alebo použite predvolenú, založenú na vašom aktuálnom umiestnení.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Časová zóna: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Vyberte uprednostňovanú zónu vo vašej oblasti.
     
     
-      
+      
       Zones
       Zóny
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Nižšie môžete doladiť nastavenia jazyka a miestne nastavenia.
     
@@ -2406,7 +2467,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Balíky
     
@@ -2587,33 +2648,38 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     PartitionModel
     
       
-      
+      
       Free Space
       Voľné miesto
     
     
       
-      
+      
       New partition
       Nový oddiel
     
     
-      
+      
       Name
       Názov
     
     
-      
+      
       File System
       Systém súborov
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Bod pripojenia
     
     
-      
+      
       Size
       Veľkosť
     
@@ -2699,117 +2765,117 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Zbierajú sa informácie o počítači...
     
     
-      
+      
       Partitions
       Oddiely
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Inštalácia distribúcie %1 <strong>popri</strong> inom operačnom systéme.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Vymazanie</strong> disku a inštalácia distribúcie %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Nahradenie</strong> oddielu distribúciou %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Ručné</strong> rozdelenie oddielov.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Inštalácia distribúcie %1 <strong>popri</strong> inom operačnom systéme na disku <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Vymazanie</strong> disku <strong>%2</strong> (%3) a inštalácia distribúcie %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Nahradenie</strong> oddielu na disku <strong>%2</strong> (%3) distribúciou %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Ručné</strong> rozdelenie oddielov na disku <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disk <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Teraz:
     
     
-      
+      
       After:
       Potom:
     
     
-      
+      
       No EFI system partition configured
       Nie je nastavený žiadny oddiel systému EFI
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Oddiel systému EFI je potrebný pre spustenie distribúcie %1.<br/><br/>Na nastavenie oddielu systému EFI prejdite späť a vyberte, alebo vytvorte systém súborov FAT32 s povoleným príznakom <strong>%3</strong> a bod pripojenia <strong>%2</strong>.<br/><br/>Môžete pokračovať bez nastavenia oddielu systému EFI, ale váš systém môže pri spustení zlyhať.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Oddiel systému EFI je potrebný pre spustenie distribúcie %1.<br/><br/>Oddiel bol nastavený s bodom pripojenia <strong>%2</strong>, ale nemá nastavený príznak <strong>%3</strong>.<br/>Na nastavenie príznaku prejdite späť a upravte oddiel.<br/><br/>Môžete pokračovať bez nastavenia príznaku, ale váš systém môže pri spustení zlyhať.
     
     
-      
+      
       EFI system partition flag not set
       Príznak oddielu systému EFI nie je nastavený
     
     
-      
+      
       Option to use GPT on BIOS
       Voľba na použitie tabuľky GPT s BIOSom
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Tabuľka oddielov GPT je najlepšou voľbou pre všetky systémy. Inštalátor podporuje taktiež inštaláciu pre systémy s BIOSom.<br/><br/>Pre nastavenie tabuľky oddielov GPT s BIOSom, (ak ste tak už neučinili) prejdite späť a nastavte tabuľku oddielov na GPT, a potom vytvorte nenaformátovaný oddiel o veľkosti 8 MB s povoleným príznakom <strong>bios_grub</strong>.<br/><br/>Nenaformátovaný oddiel o veľkosti 8 MB je potrebný na spustenie distribúcie %1 na systéme s BIOSom a tabuľkou GPT.
     
     
-      
+      
       Boot partition not encrypted
       Zavádzací oddiel nie je zašifrovaný
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Spolu so zašifrovaným koreňovým oddielom bol nainštalovaný oddelený zavádzací oddiel, ktorý ale nie je zašifrovaný.<br/><br/>S týmto typom inštalácie je ohrozená bezpečnosť, pretože dôležité systémové súbory sú uchovávané na nezašifrovanom oddieli.<br/>Ak si to želáte, môžete pokračovať, ale neskôr, počas spúšťania systému sa vykoná odomknutie systému súborov.<br/>Na zašifrovanie zavádzacieho oddielu prejdite späť a vytvorte ju znovu vybraním voľby <strong>Zašifrovať</strong> v okne vytvárania oddielu.
     
     
-      
+      
       has at least one disk device available.
       má dostupné aspoň jedno diskové zariadenie.
     
     
-      
+      
       There are no partitions to install on.
       Neexistujú žiadne oddiely, na ktoré je možné vykonať inštaláciu.
     
@@ -2999,17 +3065,17 @@ Výstup:
       Nepodarilo sa vytvoriť nový náhodný súbor <pre>%1</pre>.
     
     
-      
+      
       No product
       Žiadny produkt
     
     
-      
+      
       No description provided.
       Nie je poskytnutý żiadny popis.
     
     
-      
+      
       (no mount point)
       (žiadny bod pripojenia)
     
@@ -3270,12 +3336,12 @@ Výstup:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Pre čo najlepší výsledok, sa prosím, uistite, že tento počítač:
     
     
-      
+      
       System requirements
       Systémové požiadavky
     
@@ -3283,27 +3349,27 @@ Výstup:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Tento počítač nespĺňa minimálne požiadavky pre inštaláciu distribúcie %1.<br/>Inštalácia nemôže pokračovať. <a href="#details">Podrobnosti...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Tento počítač nespĺňa minimálne požiadavky pre inštaláciu distribúcie %1.<br/>Inštalácia nemôže pokračovať. <a href="#details">Podrobnosti...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Tento počítač nespĺňa niektoré z odporúčaných požiadaviek pre inštaláciu distribúcie %1.<br/>Inštalácia môže pokračovať, ale niektoré funkcie môžu byť zakázané.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Tento počítač nespĺňa niektoré z odporúčaných požiadaviek pre inštaláciu distribúcie %1.<br/>Inštalácia môže pokračovať, ale niektoré funkcie môžu byť zakázané.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Tento program vám položí niekoľko otázok a nainštaluje distribúciu %2 do vášho počítača.
     
@@ -3459,7 +3525,7 @@ Výstup:
       Nastavujú sa príznaky <strong>%1</strong> na novom oddieli.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Inštalátor zlyhal pri nastavovaní príznakov na oddieli %1.
     
@@ -3602,12 +3668,12 @@ Výstup:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Toto je prehľad toho, čo sa stane, keď spustíte inštaláciu.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Toto je prehľad toho, čo sa stane, keď spustíte inštaláciu.
     
@@ -4160,107 +4226,127 @@ Výstup:
       Vyberte vaše používateľské meno a poverenia na prihlásenie a vykonávanie administrátorských úloh
     
     
-      
+      
       What is your name?
       Aké je vaše meno?
     
     
-      
+      
       Your Full Name
       Vaše celé meno
     
     
-      
+      
       What name do you want to use to log in?
       Aké meno chcete použiť na prihlásenie?
     
     
-      
+      
       Login Name
       Prihlasovacie meno
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Ak bude tento počítač používať viac ako jedna osoba, môžete po inštalácii vytvoriť viacero účtov.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Sú povolené iba malé písmená, číslice, podtržníky a pomlčky.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Aký je názov tohto počítača?
     
     
-      
+      
       Computer Name
       Názov počítača
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Tento názov bude použitý, keď zviditeľníte počítač ostatným v sieti.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Zvoľte heslo pre zachovanie vášho účtu v bezpečí.
     
     
-      
+      
       Password
       Heslo
     
     
-      
+      
       Repeat Password
       Zopakovanie hesla
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom. Dobré heslo by malo obsahovať mix písmen, čísel a diakritiky, malo by mať dĺžku aspoň osem znakov a malo by byť pravidelne menené.
     
     
-      
+      
       Validate passwords quality
       Overiť kvalitu hesiel
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Keď je zaškrtnuté toto políčko, kontrola kvality hesla bude ukončená a nebudete môcť použiť slabé heslo.
     
     
-      
+      
       Log in automatically without asking for the password
       Prihlásiť automaticky bez pýtania hesla
     
     
-      
+      
       Reuse user password as root password
       Znovu použiť používateľské heslo ako heslo správcu
     
     
-      
+      
       Use the same password for the administrator account.
       Použiť rovnaké heslo pre účet správcu.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Zvoľte heslo správcu pre zachovanie vášho účtu v bezpečí.
     
     
-      
+      
       Root Password
       Heslo správcu
     
     
-      
+      
       Repeat Root Password
       Zopakovanie hesla správcu
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom.
     
diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts
index d173238707..c5f8eb2654 100644
--- a/lang/calamares_sl.ts
+++ b/lang/calamares_sl.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       Zagonski razdelek
     
     
-      
+      
       System Partition
       Sistemski razdelek
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       Nepravilna pot delovne mape
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Ni mogoče brati delovne mape %1 za pythonovo opravilo %2.
     
     
-      
+      
       Bad main script file
       Nepravilna datoteka glavnega skripta
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Ni mogoče brati datoteke %1 glavnega skripta za pythonovo opravilo %2.
     
     
-      
+      
       Boost.Python error in job "%1".
       Napaka Boost.Python v opravilu "%1".
     
@@ -289,54 +289,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Namestitev je spodletela
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Napaka
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +345,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Naprej
     
     
-      
+      
       &Back
       &Nazaj
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Preklic namestitve?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Ali res želite preklicati trenutni namestitveni proces?
@@ -471,22 +471,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Neznana vrsta izjeme
     
     
-      
+      
       unparseable Python error
       nerazčlenljiva napaka Python
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -504,6 +504,24 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       %1 Namestilnik
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Namestilniku ni uspelo posodobiti razpredelnice razdelkov na disku '%1'.
+    
+  
   
     CheckerContainer
     
@@ -520,149 +538,149 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       Oblika
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       Potem:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -698,12 +716,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       Ni možno dobiti seznama začasnih priklopov.
     
     
-      
+      
       Cleared all temporary mounts.
       Vsi začasni priklopi so bili počiščeni.
     
@@ -730,27 +748,27 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Nastavi model tipkovnice na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Nastavi razporeditev tipkovnice na %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -874,6 +892,11 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -914,6 +937,16 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -976,27 +1009,37 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       Zastavice:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       Logičen
     
     
-      
+      
       Primary
       Primaren
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1004,43 +1047,43 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Namestilniku ni uspelo ustvariti razdelka na disku '%1'.
     
@@ -1091,7 +1134,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Namestilniku ni uspelo ustvariti razpredelnice razdelkov na %1.
     
@@ -1330,7 +1373,17 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       Zastavice:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1367,57 +1420,57 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Nastavi informacije razdelka
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1830,6 +1883,14 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       Položaj
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2047,29 +2108,29 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2403,7 +2464,7 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2584,33 +2645,38 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
     PartitionModel
     
       
-      
+      
       Free Space
       Razpoložljiv prostor
     
     
       
-      
+      
       New partition
       Nov razdelek
     
     
-      
+      
       Name
       Ime
     
     
-      
+      
       File System
       Datotečni sistem
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Priklopna točka
     
     
-      
+      
       Size
       Velikost
     
@@ -2696,117 +2762,117 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Zbiranje informacij o sistemu ...
     
     
-      
+      
       Partitions
       Razdelki
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       Potem:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2993,17 +3059,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3261,12 +3327,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Za najboljše rezultate se prepričajte, da vaš računalnik izpolnjuje naslednje zahteve:
     
     
-      
+      
       System requirements
       
     
@@ -3274,27 +3340,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3450,7 +3516,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3593,12 +3659,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4138,107 +4204,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       Vaše ime?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Katero ime želite uporabiti za prijavljanje?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Ime računalnika?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Izberite geslo za zaščito vašega računa.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts
index e5270710a6..339579e76b 100644
--- a/lang/calamares_sq.ts
+++ b/lang/calamares_sq.ts
@@ -6,7 +6,7 @@
     
       
       Manage auto-mount settings
-      
+      Administroni rregullime vetëmontimi
     
   
   
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record për %1
     
     
-      
+      
       Boot Partition
       Pjesë Nisjesh
     
     
-      
+      
       System Partition
       Pjesë Sistemi
     
     
-      
+      
       Do not install a boot loader
       Mos instalo ngarkues nisjesh
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -104,22 +104,22 @@
     
       
       Crashes Calamares, so that Dr. Konqui can look at it.
-      
+      Vithis Calamares-in, që kështu Dr. Konqui të mund t’i hedhë një sy.
     
     
       
       Reloads the stylesheet from the branding directory.
-      
+      Ringarkon fletëstilin prej drejtorisë së markës.
     
     
       
       Uploads the session log to the configured pastebin.
-      
+      Ngarkon regjistrin e sesionit te pastebin-i i formësuar.
     
     
       
       Send Session Log
-      
+      Dërgo Regjistër Sesioni
     
     
       
@@ -129,7 +129,7 @@
     
       
       Displays the tree of widget names in the log (for stylesheet debugging).
-      
+      Shfaq pemën e emrave të widget-eve në regjistër (për diagnostikim fletëstili).
     
     
       
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Po xhirohet %1 veprim.
     
     
-      
+      
       Bad working directory path
       Shteg i gabuar drejtorie pune
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Drejtoria e punës %1 për aktin python %2 s’është e lexueshme.
     
     
-      
+      
       Bad main script file
       Kartelë kryesore programthi e dëmtuar
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Kartela kryesore e programthit file %1 për aktin python %2 s’është e lexueshme.
     
     
-      
+      
       Boost.Python error in job "%1".
       Gabim Boost.Python tek akti \"%1\".
     
@@ -285,180 +285,184 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Rregullimi Dështoi
     
     
-      
+      
       Installation Failed
       Instalimi Dështoi
     
     
-      
+      
       Would you like to paste the install log to the web?
       Do të donit të hidhet në web regjistri i instalimit?
     
     
-      
+      
       Error
       Gabim
     
     
-      
-      
+      
+      
       &Yes
       &Po
     
     
-      
-      
+      
+      
       &No
       &Jo
     
     
-      
+      
       &Close
       &Mbylle
     
     
-      
+      
       Install Log Paste URL
       URL Ngjitjeje Regjistri Instalimi
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Ngarkimi s’qe i suksesshëm. S’u bë hedhje në web.
     
     
-      
+      
       Install log posted to
 
 %1
 
 Link copied to clipboard
-      
+      Regjistri i instalimit u postua te
+
+%1
+
+Lidhja u kopjua në të papastër
     
     
-      
+      
       Calamares Initialization Failed
       Gatitja e Calamares-it Dështoi
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 s’mund të instalohet. Calamares s’qe në gjendje të ngarkonte krejt modulet e formësuar. Ky është një problem që lidhet me mënyrën se si përdoret Calamares nga shpërndarja.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>S’u ngarkuan dot modulet vijues:
     
     
-      
+      
       Continue with setup?
       Të vazhdohet me rregullimin?
     
     
-      
+      
       Continue with installation?
       Të vazhdohet me instalimin?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Programi i rregullimit %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të rregullojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instaluesi %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të instalojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong>
     
     
-      
+      
       &Set up now
       &Rregulloje tani
     
     
-      
+      
       &Install now
       &Instaloje tani
     
     
-      
+      
       Go &back
       Kthehu &mbrapsht
     
     
-      
+      
       &Set up
       &Rregulloje
     
     
-      
+      
       &Install
       &Instaloje
     
     
-      
+      
       Setup is complete. Close the setup program.
       Rregullimi është i plotë. Mbylleni programin e rregullimit.
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalimi u plotësua. Mbylleni instaluesin.
     
     
-      
+      
       Cancel setup without changing the system.
       Anuloje rregullimin pa ndryshuar sistemin.
     
     
-      
+      
       Cancel installation without changing the system.
       Anuloje instalimin pa ndryshuar sistemin.
     
     
-      
+      
       &Next
       Pas&uesi
     
     
-      
+      
       &Back
       &Mbrapsht
     
     
-      
+      
       &Done
       &U bë
     
     
-      
+      
       &Cancel
       &Anuloje
     
     
-      
+      
       Cancel setup?
       Të anulohet rregullimi?
     
     
-      
+      
       Cancel installation?
       Të anulohet instalimi?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Doni vërtet të anulohet procesi i tanishëm i rregullimit?
 Programi i rregullimit do të mbyllet dhe krejt ndryshimet do të humbin.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Doni vërtet të anulohet procesi i tanishëm i instalimit?
@@ -468,22 +472,22 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Lloj i panjohur përjashtimi
     
     
-      
+      
       unparseable Python error
       gabim kodi Python të papërtypshëm
     
     
-      
+      
       unparseable Python traceback
       <i>traceback</i> Python i papërtypshëm
     
     
-      
+      
       Unfetchable Python error.
       Gabim Python mosprurjeje kodi.
     
@@ -501,6 +505,24 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Instalues %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      Caktoni etiketë sistemi kartelash në %1.
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      Caktoni etiketë sistemi kartelash <strong>%1</strong> te pjesa <strong>%2</strong>.
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Instaluesi s’arriti të përditësojë tabelë ndarjesh në diskun '%1'.
+    
+  
   
     CheckerContainer
     
@@ -517,149 +539,149 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Formular
     
     
-      
+      
       Select storage de&vice:
       Përzgjidhni &pajisje depozitimi:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       E tanishmja:
     
     
-      
+      
       After:
       Më Pas:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Pjesëzim dorazi</strong><br/>Pjesët mund t’i krijoni dhe ripërmasoni ju vetë.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Ripërdore %1 si pjesën shtëpi për %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Përzgjidhni një pjesë që të zvogëlohet, mandej tërhiqni shtyllën e poshtme që ta ripërmasoni</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 do të zvogëlohet në %2MiB dhe për %4 do të krijohet një pjesë e re %3MiB.
     
     
-      
+      
       Boot loader location:
       Vendndodhje ngarkuesi nisjesh:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Përzgjidhni një pjesë ku të instalohet</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Në këtë sistem s’gjendet gjëkundi një pjesë EFI sistemi. Ju lutemi, kthehuni mbrapsht dhe përdorni pjesëtimin dorazi që të rregulloni %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Për nisjen e %2 do të përdoret pjesa EFI e sistemit te %1.
     
     
-      
+      
       EFI system partition:
       Pjesë EFI sistemi:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Kjo pajisje depozitimi përmban %1 në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Fshije diskun</strong><br/>Kështu do të <font color=\"red\">fshihen</font> krejt të dhënat të pranishme tani në pajisjen e përzgjedhur.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instaloje në krah të tij</strong><br/>Instaluesi do të zvogëlojë një pjesë për të bërë vend për %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Zëvendëso një pjesë</strong><br/>Zëvendëson një pjesë me %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Kjo pajisje depozitimi përmban %1 në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Kjo pajisje depozitimi ka tashmë një sistem operativ në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Kjo pajisje depozitimi ka disa sisteme operativë në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Kjo pajisje depozitimi ka tashmë një sistem operativ në të, por tabela e saj e pjesëve <strong>%1</strong> është e ndryshme nga ajo e duhura <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Kjo pajisje depozitimi ka një nga pjesët e saj <strong>të montuar</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Kjo pajisje depozitimi është pjesë e një pajisje <strong>RAID jo aktive</strong> device.
     
     
-      
+      
       No Swap
       Pa Swap
     
     
-      
+      
       Reuse Swap
       Ripërdor Swap-in
     
     
-      
+      
       Swap (no Hibernate)
       Swap (pa Hibernate)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (me Hibernate)
     
     
-      
+      
       Swap to file
       Swap në kartelë
     
@@ -695,12 +717,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Po hiqen krejt montimet e përkohshme.
     
     
-      
+      
       Cannot get list of temporary mounts.
       S’merret dot lista e montimeve të përkohshme.
     
     
-      
+      
       Cleared all temporary mounts.
       U hoqën krejt montimet e përkohshme.
     
@@ -727,27 +749,27 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Si model tastiere do të caktohet %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Si model tastiere do të caktohet %1%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Si zonë kohore cakto %1/%2
     
     
-      
+      
       The system language will be set to %1.
       Si gjuhë sistemi do të caktohet %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Si vendore për numra dhe data do të vihet %1.
     
@@ -764,12 +786,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
     
       
       Network Installation. (Disabled: Internal error)
-      
+      Instalim Nga Rrjeti. (I çaktivizuar: Gabim i brendshëm)
     
     
       
       Network Installation. (Disabled: No package list)
-      
+      Instalim Nga Rrjeti. (I çaktivizuar: S’ka listë paketash)
     
     
       
@@ -871,6 +893,11 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Your passwords do not match!
       Fjalëkalimet tuaj s’përputhen!
     
+    
+      
+      OK!
+      OK!
+    
     
       
       Setup Failed
@@ -884,12 +911,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
     
       
       The setup of %1 did not complete successfully.
-      
+      Ujdisja e %1 s’u plotësua me sukses.
     
     
       
       The installation of %1 did not complete successfully.
-      
+      Instalimi i %1 s’u plotësua me sukses.
     
     
       
@@ -911,6 +938,16 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       The installation of %1 is complete.
       Instalimi i %1 u plotësua.
     
+    
+      
+      Package Selection
+      Përzgjedhje Pakete
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Ju lutemi, zgjidhni prej listës një produkt. Produkti i përzgjedhur do të instalohet.
+    
   
   
     ContextualProcessJob
@@ -973,27 +1010,37 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Parametra:
     
     
-      
+      
+      Label for the filesystem
+      Etiketë për sistemin e kartelave
+    
+    
+      
+      FS Label:
+      Etiketë FS-je:
+    
+    
+      
       En&crypt
       &Fshehtëzoje
     
     
-      
+      
       Logical
       Logjik
     
     
-      
+      
       Primary
       Parësor
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Pikë montimi tashmë e përdorur. Ju lutemi, përzgjidhni një tjetër.
     
@@ -1001,43 +1048,43 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
-      
+      Krijo pjesë të re %1MiB te %3 (%2) me zëra %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
-      
+      Krijo pjesë të re %1MiB te %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Krijo pjesë të re %2MiB te %4 (%3) me sistem kartelash %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
-      
+      Krijo pjesë të re <strong>%1MiB</strong> te <strong>%3</strong> (%2) me zërat <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
-      
+      Krijo pjesë të re <strong>%1MiB</strong> te <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Krijo pjesë të re <strong>%2MiB</strong> te <strong>%4</strong> (%3) me sistem kartelash <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Po krijohet pjesë e re %1 te %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Instaluesi s’arriti të krijojë pjesë në diskun '%1'.
     
@@ -1088,7 +1135,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Po krijohet tabelë e re pjesësh %1 te %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Instaluesi s’arriti të krijojë tabelë pjesësh në diskun %1.
     
@@ -1327,7 +1374,17 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Parametra:
     
     
-      
+      
+      Label for the filesystem
+      Etiketë për sistemin e kartelave
+    
+    
+      
+      FS Label:
+      Etiketë FS-je:
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Pikë montimi tashmë e përdorur. Ju lutemi, përzgjidhni një tjetër.
     
@@ -1364,57 +1421,57 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Caktoni të dhëna pjese
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
-      
+      Instalo %1 te pjesë e <strong>re</strong> %2 sistemi, me veçoritë <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Instaloje %1 në pjesë sistemi <strong>të re</strong> %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
-      
+      Ujdisni pjesë të <strong>re</strong> %2, me pikë montimi <strong>%1</strong> dhe veçori <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
-      
+      Ujdisni pjesë të <strong>re</strong> %2, me pikë montimi <strong>%1</strong>%3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
-      
+      Instalo %2 në pjesë sistemi %3 <strong>%1</strong>, me veçoritë <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
-      
+      Ujdisni pjesë %3 <strong>%1</strong>, me pikë montimi <strong>%2</strong> dhe veçori <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
-      
+      Ujdisni pjesë %3 <strong>%1</strong> me pikë montimi <strong>%2</strong>%4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Instaloje %2 te pjesa e sistemit %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Instalo ngarkues nisjesh në <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Po rregullohen pika montimesh.
     
@@ -1827,6 +1884,14 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Vendndodhje
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      Dil
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2109,29 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Përzgjidhni Rajonin tuaj të parapëlqyer, ose përdorni atë parazgjedhje, bazuar në në vendndodhjen tuaj të tanishme.
+      
+      Select your preferred Region, or use the default settings.
+      Përzgjidhni Rajonin tuaj të parapëlqyer, ose përdorni rregullimet parazgjedhje.
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Zonë kohore: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Përzgjidhni brenda Rajonit tuaj Zonën tuaj të parapëlqyer.
     
     
-      
+      
       Zones
       Zona
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Më poshtë mund të përimtoni rregullimet për Gjuhën dhe Vendoren.
     
@@ -2382,7 +2447,7 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paketa
     
@@ -2563,33 +2628,38 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
     PartitionModel
     
       
-      
+      
       Free Space
       Hapësirë e Lirë
     
     
       
-      
+      
       New partition
       Pjesë e re
     
     
-      
+      
       Name
       Emër
     
     
-      
+      
       File System
       Sistem Kartelash
     
     
-      
+      
+      File System Label
+      Etiketë Sistemi Kartelash
+    
+    
+      
       Mount Point
       Pikë Montimi
     
     
-      
+      
       Size
       Madhësi
     
@@ -2675,117 +2745,117 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Po grumbullohen të dhëna mbi sistemin…
     
     
-      
+      
       Partitions
       Pjesë
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Instalojeni %1 <strong>në krah</strong> të një tjetër sistemi operativ.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Fshije</strong> diskun dhe instalo %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Zëvendësojeni</strong> një pjesë me %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Pjesëtim <strong>dorazi</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Instaloje %1 <strong>në krah</strong> të një tjetri sistemi operativ në diskun <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Fshije</strong> diskun <strong>%2</strong> (%3) dhe instalo %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Zëvendëso</strong> një pjesë te disku <strong>%2</strong> (%3) me %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Pjesëtim <strong>dorazi</strong> në diskun <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disku <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       E tanishmja:
     
     
-      
+      
       After:
       Më Pas:
     
     
-      
+      
       No EFI system partition configured
       S’ka të formësuar pjesë sistemi EFI
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Një pjesë EFI sistemi është e nevojshme për nisjen e %1.<br/><br/>Që të formësoni një pjesë EFI sistemi, kthehuni mbrapsht dhe përzgjidhni ose krijoni një sistem kartelash FAT32 me parametrin <strong>%3</strong> të aktivizuar dhe me pikë montimi <strong>%2</strong>.<br/><br/>Mund të vazhdoni pa ujdisur një pjesë EFI sistemi, por nisja nën sistemi juaj mund të dështojë.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Një pjesë EFI sistemi është e nevojshme për nisjen e %1.<br/><br/>Qe formësuar një pikë montimi <strong>%2</strong>, por parametri <strong>%3</strong> për të s’është ujdisur.<br/>Për të ujdisur parametrin, kthehuni mbrapsht dhe përpunoni pjesën.<br/><br/>Mund të vazhdoni pa ujdisur një pjesë EFI sistemi, por nisja nën sistemin tuaj mund të dështojë.
     
     
-      
+      
       EFI system partition flag not set
       S’i është vënë parametër pjese EFI sistemi
     
     
-      
+      
       Option to use GPT on BIOS
       Mundësi për përdorim GTP-je në BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Një tabelë pjesësh GPT është mundësia më e mirë për krejt sistemet. Ky instalues mbulon gjithashtu një ujdisje të tillë edhe për sisteme BIOS.<br/><br/>Që të formësoni një tabelë pjesësh GPT në BIOS, (nëse s’është bërë ende) kthehuni dhe ujdiseni tabelën e pjesëve si  GPT, më pas krijoni një ndarje të paformatuar 8 MB me shenjën <strong>bios_grub</strong> të aktivizuar.<br/><br/>Një pjesë e paformatuar 8 MB është e nevojshme për të nisur %1 në një sistem BIOS me GPT.
     
     
-      
+      
       Boot partition not encrypted
       Pjesë nisjesh e pafshehtëzuar
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Tok me pjesën e fshehtëzuar <em>root</em> qe rregulluar edhe një pjesë <em>boot</em> veçmas, por pjesa <em>boot</em> s’është e fshehtëzuar.<br/><br/>Ka preokupime mbi sigurinë e këtij lloj rregullimi, ngaqë kartela të rëndësishme sistemi mbahen në një pjesë të pafshehtëzuar.<br/>Mund të vazhdoni, nëse doni, por shkyçja e sistemit të kartelave do të ndodhë më vonë, gjatë nisjes së sistemit.<br/>Që të fshehtëzoni pjesën <em>boot</em>, kthehuni mbrapsht dhe rikrijojeni, duke përzgjedhur te skena e krijimit të pjesës <strong>Fshehtëzoje</strong>.
     
     
-      
+      
       has at least one disk device available.
       ka të paktën një pajisje disku për përdorim.
     
     
-      
+      
       There are no partitions to install on.
       S’ka pjesë ku të instalohet.
     
@@ -2975,17 +3045,17 @@ Përfundim:
       S’u krijua dot kartelë e re kuturu <pre>%1</pre>.
     
     
-      
+      
       No product
       S’ka produkt
     
     
-      
+      
       No description provided.
       S’u dha përshkrim.
     
     
-      
+      
       (no mount point)
       (s’ka pikë montimi)
     
@@ -3246,12 +3316,12 @@ Përfundim:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Për përfundime më të mira, ju lutemi, garantoni që ky kompjuter:
     
     
-      
+      
       System requirements
       Sistem i domosdoshëm
     
@@ -3259,27 +3329,27 @@ Përfundim:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Ky kompjuter s’i plotëson kërkesat minimum për rregullimin e %1.<br/>Rregullimi s’mund të vazhdojë. <a href=\"#details\">Hollësi…</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ky kompjuter s’i plotëson kërkesat minimum për instalimin e %1.<br/>Instalimi s’mund të vazhdojë. <a href=\"#details\">Hollësi…</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Ky kompjuter s’i plotëson disa nga domosdoshmëritë e rekomanduara për rregullimin e %1.<br/>Rregullimi mund të vazhdojë, por disa veçori mund të përfundojnë të çaktivizuara.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Ky kompjuter s’i plotëson disa nga domosdoshmëritë e rekomanduara për instalimin e %1.<br/>Instalimi mund të vazhdojë, por disa veçori mund të përfundojnë të çaktivizuara.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ky program do t’ju bëjë disa pyetje dhe do të rregullojë %2 në kompjuterin tuaj.
     
@@ -3435,7 +3505,7 @@ Përfundim:
       Po vihen parametrat <strong>%1</strong> në pjesën e re.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Instaluesi s’arriti të vërë parametra në pjesën %1.
     
@@ -3578,12 +3648,12 @@ Përfundim:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Kjo është një përmbledhje e asaj që do të ndodhë sapo të nisni procedurën e rregullimit.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Kjo është një përmbledhje e asaj që do të ndodhë sapo të nisni procedurën e instalimit.
     
@@ -3988,29 +4058,31 @@ Përfundim:
     
       
       Installation Completed
-      
+      Instalimi u Plotësua
     
     
       
       %1 has been installed on your computer.<br/>
             You may now restart into your new system, or continue using the Live environment.
-      
+      %1 është instaluar në kompjuterin tuaj.<br/>
+            Tani mundeni ta rinisni me sistemin tuaj të ri, ose të vazhdoni përdorimin e mjedisit Live.
     
     
       
       Close Installer
-      
+      Mbylle Instaluesin
     
     
       
       Restart System
-      
+      Rinis Sistemin
     
     
       
       <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
             This log is copied to /var/log/installation.log of the target system.</p>
-      
+      <p>Një regjistër i plotë i instalimit gjendet si installation.log, te drejtoria shtëpi e përdoruesit Live.<br/>
+           Te sistemi i synuar, ky regjistër është kopjuar te /var/log/installation.log.</p>
     
   
   
@@ -4157,107 +4229,127 @@ Përfundim:
       Zgjidhni emrin tuaj të përdoruesit dhe kredencialet për të bërë hyrje dhe kryer veprime përgjegjësi
     
     
-      
+      
       What is your name?
       Cili është emri juaj?
     
     
-      
+      
       Your Full Name
       Emri Juaj i Plotë
     
     
-      
+      
       What name do you want to use to log in?
       Ç’emër doni të përdorni për t’u futur?
     
     
-      
+      
       Login Name
       Emër Hyrjeje
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni llogari të shumta pas instalimit.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Lejohen vetëm shkronja të vogla, numra, nënvijë dhe vijë ndarëse.
+    
+    
+      
+      root is not allowed as username.
+      “root” nuk lejohet si emër përdoruesi.
+    
+    
+      
       What is the name of this computer?
       Cili është emri i këtij kompjuteri?
     
     
-      
+      
       Computer Name
       Emër Kompjuteri
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Ky emër do të përdoret nëse e bëni kompjuterin të dukshëm për të tjerët në një rrjet.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. minimumi dy shenja.
+    
+    
+      
+      localhost is not allowed as hostname.
+      “localhost” s’lejohet si strehëemër.
+    
+    
+      
       Choose a password to keep your account safe.
       Zgjidhni një fjalëkalim për ta mbajtur llogarinë tuaj të parrezikuar.
     
     
-      
+      
       Password
       Fjalëkalim
     
     
-      
+      
       Repeat Password
       Ripërsëritni Fjalëkalimin
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Jepeni të njëjtin fjalëkalim dy herë, që të kontrollohet për gabime shkrimi. Një fjalëkalim i mirë do të përmbante një përzierje shkronjash, numrash dhe shenjash pikësimi, do të duhej të ishte të paktën tetë shenja i gjatë, dhe do të duhej të ndryshohej periodikisht.
     
     
-      
+      
       Validate passwords quality
       Vlerëso cilësi fjalëkalimi
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Kur i vihet shenjë kësaj kutize, bëhet kontroll fortësie fjalëkalimi dhe s’do të jeni në gjendje të përdorni një fjalëkalim të dobët.
     
     
-      
+      
       Log in automatically without asking for the password
       Kryej hyrje vetvetiu, pa kërkuar fjalëkalimin.
     
     
-      
+      
       Reuse user password as root password
       Ripërdor fjalëkalim përdoruesi si fjalëkalim përdoruesi rrënjë
     
     
-      
+      
       Use the same password for the administrator account.
       Përdor të njëjtin fjalëkalim për llogarinë e përgjegjësit.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Që ta mbani llogarinë tuaj të parrezik, zgjidhni një fjalëkalim rrënje 
     
     
-      
+      
       Root Password
       Fjalëkalim Rrënje
     
     
-      
+      
       Repeat Root Password
       Përsëritni Fjalëkalim Rrënje
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Jepeni të njëjtin fjalëkalim dy herë, që të mund të kontrollohet për gabime shkrimi.
     
diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts
index c86c45f022..70e92f84f9 100644
--- a/lang/calamares_sr.ts
+++ b/lang/calamares_sr.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       Подизна партиција
     
     
-      
+      
       System Partition
       Системска партиција
     
     
-      
+      
       Do not install a boot loader
       Не инсталирај подизни учитавач
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Извршавам %1 операцију.
     
     
-      
+      
       Bad working directory path
       Лоша путања радног директоријума
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Радни директоријум %1 за питонов посао %2 није читљив.
     
     
-      
+      
       Bad main script file
       Лош фајл главне скрипте
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Фајл главне скрипте %1 за питонов посао %2 није читљив.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python грешка у послу „%1“.
     
@@ -287,54 +287,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Инсталација није успела
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Грешка
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +343,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Наставити са подешавањем?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Инсталирај сада
     
     
-      
+      
       Go &back
       Иди &назад
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Следеће
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       &Откажи
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Отказати инсталацију?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Да ли стварно желите да прекинете текући процес инсталације?
@@ -469,22 +469,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Непознат тип изузетка
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -502,6 +502,24 @@ The installer will quit and all changes will be lost.
       %1 инсталер
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Инсталација није успела да ажурира табелу партиција на диску '%1'.
+    
+  
   
     CheckerContainer
     
@@ -518,149 +536,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Изаберите у&ређај за смештање:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Тренутно:
     
     
-      
+      
       After:
       После:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ручно партиционисање</strong><br/>Сами можете креирати или мењати партције.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Подизни учитавач на:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -696,12 +714,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -728,27 +746,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       Системски језик биће постављен на %1
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -872,6 +890,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       Лозинке се не поклапају!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -912,6 +935,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -974,27 +1007,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       Логичка
     
     
-      
+      
       Primary
       Примарна
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1002,43 +1045,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Инсталација није успела да направи партицију на диску  '%1'.
     
@@ -1089,7 +1132,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Инсталација није успела да направи табелу партиција на %1.
     
@@ -1328,7 +1371,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1365,57 +1418,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1828,6 +1881,14 @@ The installer will quit and all changes will be lost.
       Локација
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2045,29 +2106,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2392,7 +2453,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2573,33 +2634,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       Назив
     
     
-      
+      
       File System
       Фајл систем
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2685,117 +2751,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       Тренутно:
     
     
-      
+      
       After:
       После:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2982,17 +3048,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3250,12 +3316,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       За најбоље резултате обезбедите да овај рачунар:
     
     
-      
+      
       System requirements
       Системски захтеви
     
@@ -3263,27 +3329,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3439,7 +3505,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3582,12 +3648,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4127,107 +4193,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       Како се зовете?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Како ћете звати ваш рачунар?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Изаберите лозинку да обезбедите свој налог.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts
index 229b98bd7d..d6174a76e9 100644
--- a/lang/calamares_sr@latin.ts
+++ b/lang/calamares_sr@latin.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record na %1
     
     
-      
+      
       Boot Partition
       Particija za pokretanje sistema
     
     
-      
+      
       System Partition
       Sistemska particija
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       Neispravna putanja do radne datoteke
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Nemoguće pročitati radnu datoteku %1 za funkciju %2 u Python-u.
     
     
-      
+      
       Bad main script file
       Neispravan glavna datoteka za skriptu
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Glavna datoteka za skriptu %1 za Python funkciju %2 se ne može pročitati.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python greška u funkciji %1
     
@@ -287,54 +287,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Neuspješna instalacija
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Greška
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +343,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Dalje
     
     
-      
+      
       &Back
       &Nazad
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       &Prekini
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Prekini instalaciju?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Da li stvarno želite prekinuti trenutni proces instalacije?
@@ -469,22 +469,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Nepoznat tip izuzetka
     
     
-      
+      
       unparseable Python error
       unparseable Python error
     
     
-      
+      
       unparseable Python traceback
       unparseable Python traceback
     
     
-      
+      
       Unfetchable Python error.
       Unfetchable Python error.
     
@@ -502,6 +502,24 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       %1 Instaler
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Instaler ne može promjeniti tabelu particija na disku '%1'.
+    
+  
   
     CheckerContainer
     
@@ -518,149 +536,149 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       Poslije:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -696,12 +714,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -728,27 +746,27 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -872,6 +890,11 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       Your passwords do not match!
       Vaše lozinke se ne poklapaju
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -912,6 +935,16 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -974,27 +1007,37 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       Logička
     
     
-      
+      
       Primary
       Primarna
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1002,43 +1045,43 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Instaler nije uspeo napraviti particiju na disku '%1'.
     
@@ -1089,7 +1132,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Instaler nije uspjeo da napravi tabelu particija na %1.
     
@@ -1328,7 +1371,17 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1365,57 +1418,57 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1828,6 +1881,14 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       Lokacija
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2045,29 +2106,29 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2392,7 +2453,7 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2573,33 +2634,38 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
     PartitionModel
     
       
-      
+      
       Free Space
       Slobodan prostor
     
     
       
-      
+      
       New partition
       Nova particija
     
     
-      
+      
       Name
       Naziv
     
     
-      
+      
       File System
       Fajl sistem
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       Veličina
     
@@ -2685,117 +2751,117 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       Particije
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       Poslije:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2982,17 +3048,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3250,12 +3316,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Za najbolje rezultate, uvjetite se da li ovaj računar:
     
     
-      
+      
       System requirements
       
     
@@ -3263,27 +3329,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3439,7 +3505,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3582,12 +3648,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4127,107 +4193,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       Kako se zovete?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Koje ime želite koristiti da se prijavite?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Kako želite nazvati ovaj računar?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Odaberite lozinku da biste zaštitili Vaš korisnički nalog.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 1206b29001..4e4cbaff00 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record på %1
     
     
-      
+      
       Boot Partition
       Startpartition
     
     
-      
+      
       System Partition
       Systempartition
     
     
-      
+      
       Do not install a boot loader
       Installera inte någon starthanterare
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Kör %1-operation
     
     
-      
+      
       Bad working directory path
       Arbetskatalogens sökväg är ogiltig
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Arbetskatalog %1 för pythonuppgift %2 är inte läsbar.
     
     
-      
+      
       Bad main script file
       Ogiltig huvudskriptfil
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Huvudskriptfil %1 för pythonuppgift %2 är inte läsbar.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python-fel i uppgift "%'1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Inställningarna misslyckades
     
     
-      
+      
       Installation Failed
       Installationen misslyckades
     
     
-      
+      
       Would you like to paste the install log to the web?
       Vill du ladda upp installationsloggen på webben?
     
     
-      
+      
       Error
       Fel
     
     
-      
-      
+      
+      
       &Yes
       &Ja
     
     
-      
-      
+      
+      
       &No
       &Nej
     
     
-      
+      
       &Close
       &Stäng
     
     
-      
+      
       Install Log Paste URL
       URL till installationslogg
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Sändningen misslyckades. Ingenting sparades på webbplatsen.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +345,123 @@ Link copied to clipboard
 Länken kopierades till urklipp
     
     
-      
+      
       Calamares Initialization Failed
       Initieringen av Calamares misslyckades
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 kan inte installeras. Calamares kunde inte ladda alla konfigurerade moduler. Detta är ett problem med hur Calamares används av distributionen.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Följande moduler kunde inte hämtas:
     
     
-      
+      
       Continue with setup?
       Fortsätt med installation?
     
     
-      
+      
       Continue with installation?
       Vill du fortsätta med installationen?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1-installeraren är på väg att göra ändringar på disk för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1-installeraren är på väg att göra ändringar för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</strong>
     
     
-      
+      
       &Set up now
       &Installera nu 
     
     
-      
+      
       &Install now
       &Installera nu
     
     
-      
+      
       Go &back
       Gå &bakåt
     
     
-      
+      
       &Set up
       &Installera
     
     
-      
+      
       &Install
       &Installera
     
     
-      
+      
       Setup is complete. Close the setup program.
       Installationen är klar. Du kan avsluta installationsprogrammet.
     
     
-      
+      
       The installation is complete. Close the installer.
       Installationen är klar. Du kan avsluta installationshanteraren.
     
     
-      
+      
       Cancel setup without changing the system.
       Avbryt inställningarna utan att förändra systemet.
     
     
-      
+      
       Cancel installation without changing the system.
       Avbryt installationen utan att förändra systemet.
     
     
-      
+      
       &Next
       &Nästa
     
     
-      
+      
       &Back
       &Bakåt
     
     
-      
+      
       &Done
       &Klar
     
     
-      
+      
       &Cancel
       Avbryt
     
     
-      
+      
       Cancel setup?
       Avbryt inställningarna?
     
     
-      
+      
       Cancel installation?
       Avbryt installation?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Vill du verkligen avbryta den nuvarande uppstartsprocessen? Uppstartsprogrammet kommer avsluta och alla ändringar kommer förloras.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Är du säker på att du vill avsluta installationen i förtid?
@@ -471,22 +471,22 @@ Alla ändringar kommer att gå förlorade.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Okänd undantagstyp
     
     
-      
+      
       unparseable Python error
       Otolkbart Pythonfel
     
     
-      
+      
       unparseable Python traceback
       Otolkbar Python-traceback
     
     
-      
+      
       Unfetchable Python error.
       Ohämtbart Pythonfel
     
@@ -504,6 +504,24 @@ Alla ändringar kommer att gå förlorade.
       %1-installationsprogram
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Installationsprogrammet misslyckades med att uppdatera partitionstabellen på disk '%1'.
+    
+  
   
     CheckerContainer
     
@@ -520,149 +538,149 @@ Alla ändringar kommer att gå förlorade.
       Formulär
     
     
-      
+      
       Select storage de&vice:
       Välj lagringsenhet:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Nuvarande:
     
     
-      
+      
       After:
       Efter:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuell partitionering</strong><br/>Du kan själv skapa och ändra storlek på partitionerna.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Återanvänd %1 som hempartition för %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Välj en partition att minska, sen dra i nedre fältet för att ändra storlek</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 kommer att förminskas till %2MiB och en ny %3MiB partition kommer att skapas för %4.
     
     
-      
+      
       Boot loader location:
       Sökväg till starthanterare:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Välj en partition att installera på</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Ingen EFI-partition kunde inte hittas på systemet. Gå tillbaka och partitionera din lagringsenhet manuellt för att ställa in %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI-partitionen %1 kommer att användas för att starta %2.
     
     
-      
+      
       EFI system partition:
       EFI-partition:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Denna lagringsenhet ser inte ut att ha ett operativsystem installerat. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringseneheten.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Rensa lagringsenhet</strong><br/>Detta kommer <font color="red">radera</font> all existerande data på den valda lagringsenheten.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installera på sidan om</strong><br/>Installationshanteraren kommer krympa en partition för att göra utrymme för %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ersätt en partition</strong><br/>Ersätter en partition med %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Denna lagringsenhet har %1 på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringsenheten.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Denna lagringsenhet har redan ett operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Denna lagringsenhet har flera operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Denna lagringsenhet har redan ett operativsystem installerat på sig, men partitionstabellen <strong>%1</strong> skiljer sig från den som behövs <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Denna lagringsenhet har en av dess partitioner <strong>monterad</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Denna lagringsenhet är en del av en <strong>inaktiv RAID</strong>enhet.    
     
     
-      
+      
       No Swap
       Ingen Swap
     
     
-      
+      
       Reuse Swap
       Återanvänd Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (utan viloläge)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (med viloläge)
     
     
-      
+      
       Swap to file
       Använd en fil som växlingsenhet
     
@@ -698,12 +716,12 @@ Alla ändringar kommer att gå förlorade.
       Rensar alla tillfälliga monteringspunkter.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Kunde inte hämta tillfälliga monteringspunkter.
     
     
-      
+      
       Cleared all temporary mounts.
       Rensade alla tillfälliga monteringspunkter
     
@@ -730,27 +748,27 @@ Alla ändringar kommer att gå förlorade.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Sätt tangenbordsmodell till %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Sätt tangentbordslayout till %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Sätt tidszon till %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       Systemspråket kommer ändras till %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Systemspråket för siffror och datum kommer sättas till %1.
     
@@ -874,6 +892,11 @@ Alla ändringar kommer att gå förlorade.
       Your passwords do not match!
       Lösenorden överensstämmer inte!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -914,6 +937,16 @@ Alla ändringar kommer att gå förlorade.
       The installation of %1 is complete.
       Installationen av %1 är klar.
     
+    
+      
+      Package Selection
+      Paketval
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Välj en produkt från listan. Den valda produkten kommer att installeras.
+    
   
   
     ContextualProcessJob
@@ -976,27 +1009,37 @@ Alla ändringar kommer att gå förlorade.
       Flaggor:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Kr%yptera
     
     
-      
+      
       Logical
       Logisk
     
     
-      
+      
       Primary
       Primär
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Monteringspunkt används redan. Välj en annan.
     
@@ -1004,43 +1047,43 @@ Alla ändringar kommer att gå förlorade.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Skapa ny %1MiB partition på  %3 (%2) med poster %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Skapa ny %1MiB partition på %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Skapa ny %2MiB partition på %4 (%3) med filsystem %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Skapa ny <strong>%1MiB</strong> partition på <strong>%3</strong> (%2) med poster <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Skapa ny <strong>%1MiB</strong> partition på <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Skapa ny <strong>%2MiB</strong>partition på <strong>%4</strong> (%3) med filsystem <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Skapar ny %1 partition på %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Installationsprogrammet kunde inte skapa partition på disk '%1'.
     
@@ -1091,7 +1134,7 @@ Alla ändringar kommer att gå förlorade.
       Skapar ny %1 partitionstabell på %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Installationsprogrammet kunde inte skapa en partitionstabell på %1.
     
@@ -1330,7 +1373,17 @@ Alla ändringar kommer att gå förlorade.
       Flaggor:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Monteringspunkt används redan. Välj en annan.
     
@@ -1367,57 +1420,57 @@ Alla ändringar kommer att gå förlorade.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Ange partitionsinformation
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Installera %1 på <strong>ny</strong> %2 system partition med funktioner <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Installera %1 på <strong>ny</strong> %2 system partition.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Skapa <strong>ny</strong>%2  partition med monteringspunkt <strong>%1</strong> och funktioner <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Skapa <strong>ny</strong> %2 partition med monteringspunkt <strong>%1</strong>%3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Installera %2 på %3 system partition <strong>%1</strong> med funktioner <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Skapa %3 partition <strong>%1</strong>med monteringspunkt <strong>%2</strong>och funktioner <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Skapa %3 partition <strong>%1</strong> med monteringspunkt <strong>%2</strong> %4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Installera %2 på %3 system partition <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Installera uppstartshanterare på <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Ställer in monteringspunkter.
     
@@ -1830,6 +1883,14 @@ Alla ändringar kommer att gå förlorade.
       Plats
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2050,29 +2111,29 @@ Sök på kartan genom att dra
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Välj din föredragna Region, eller använd den som är standard baserad på din nuvarande plats.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Tidszon: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Välj din föredragna Zon inom din region.
     
     
-      
+      
       Zones
       Zoner
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Du kan finjustera språk och Nationella inställningar nedan.
     
@@ -2388,7 +2449,7 @@ Sök på kartan genom att dra
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paket
     
@@ -2569,33 +2630,38 @@ Sök på kartan genom att dra
     PartitionModel
     
       
-      
+      
       Free Space
       Ledigt utrymme
     
     
       
-      
+      
       New partition
       Ny partition
     
     
-      
+      
       Name
       Namn
     
     
-      
+      
       File System
       Filsystem
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Monteringspunkt
     
     
-      
+      
       Size
       Storlek
     
@@ -2681,117 +2747,117 @@ Sök på kartan genom att dra
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Samlar systeminformation...
     
     
-      
+      
       Partitions
       Partitioner
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Installera %1 <strong>bredvid</strong> ett annat operativsystem.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Rensa</strong> disken och installera %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Ersätt</strong> en partition med %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Manuell</strong> partitionering.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Installera %1 <strong>bredvid</strong> ett annat operativsystem på disken <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Rensa</strong> disken <strong>%2</strong> (%3) och installera %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Ersätt</strong> en partition på disken <strong>%2</strong> (%3) med %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Manuell</strong> partitionering på disken <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disk <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Nuvarande:
     
     
-      
+      
       After:
       Efter:
     
     
-      
+      
       No EFI system partition configured
       Ingen EFI system partition konfigurerad
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       En EFI-systempartition krävs för att starta %1. <br/><br/> För att konfigurera en EFI-systempartition, gå tillbaka och välj eller skapa ett FAT32-filsystem med <strong>%3</strong>-flaggan satt och monteringspunkt <strong>%2</strong>. <br/><br/>Du kan fortsätta utan att ställa in en EFI-systempartition, men ditt system kanske misslyckas med att starta.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       En EFI-systempartition krävs för att starta %1. <br/><br/>En partition är konfigurerad med monteringspunkt <strong>%2</strong>, men dess <strong>%3</strong>-flagga är inte satt.<br/>För att sätta flaggan, gå tillbaka och redigera partitionen.<br/><br/>Du kan fortsätta utan att sätta flaggan, men ditt system kanske misslyckas med att starta
     
     
-      
+      
       EFI system partition flag not set
       EFI system partitionsflagga inte satt
     
     
-      
+      
       Option to use GPT on BIOS
       Alternativ för att använda GPT på BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       En GPT-partitionstabell är det bästa alternativet för alla system. Detta installationsprogram stödjer det för system med BIOS också.<br/><br/>För att konfigurera en GPT-partitionstabell på BIOS (om det inte redan är gjort), gå tillbaka och sätt partitionstabell till GPT, skapa sedan en oformaterad partition på 8MB med <strong>bios_grub</strong>-flaggan satt.<br/><br/>En oformaterad partition på 8MB är nödvändig för att starta %1 på ett BIOS-system med GPT.
     
     
-      
+      
       Boot partition not encrypted
       Boot partition inte krypterad
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       En separat uppstartspartition skapades tillsammans med den krypterade rootpartitionen, men uppstartspartitionen är inte krypterad.<br/><br/>Det finns säkerhetsproblem med den här inställningen, eftersom viktiga systemfiler sparas på en okrypterad partition.<br/>Du kan fortsätta om du vill, men upplåsning av filsystemet kommer hända senare under uppstart av systemet.<br/>För att kryptera uppstartspartitionen, gå tillbaka och återskapa den, och välj <strong>Kryptera</strong> i fönstret när du skapar partitionen.
     
     
-      
+      
       has at least one disk device available.
       har åtminstone en diskenhet tillgänglig.
     
     
-      
+      
       There are no partitions to install on.
       Det finns inga partitioner att installera på.
     
@@ -2981,17 +3047,17 @@ Utdata:
       Kunde inte skapa ny slumpmässig fil <pre>%1</pre>.
     
     
-      
+      
       No product
       Ingen produkt
     
     
-      
+      
       No description provided.
       Ingen beskrivning tillhandahålls.
     
     
-      
+      
       (no mount point)
       (ingen monteringspunkt)
     
@@ -3252,12 +3318,12 @@ Installationen kan inte fortsätta.</p>
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       För bästa resultat, vänligen se till att datorn:
     
     
-      
+      
       System requirements
       Systemkrav
     
@@ -3265,27 +3331,27 @@ Installationen kan inte fortsätta.</p>
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Datorn uppfyller inte minimikraven för inställning av %1.<br/>Inga inställningar kan inte göras. <a href="#details">Detaljer...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Denna dator uppfyller inte minimikraven för att installera %1.<br/>Installationen kan inte fortsätta. <a href="#details">Detaljer...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Några av kraven för inställning av %1 uppfylls inte av datorn.<br/>Inställningarna kan ändå göras men vissa funktioner kommer kanske inte att kunna användas.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Denna dator uppfyller inte alla rekommenderade krav för att installera %1.<br/>Installationen kan fortsätta, men alla alternativ och funktioner kanske inte kan användas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Detta program kommer att ställa dig några frågor och installera %2 på din dator.
     
@@ -3441,7 +3507,7 @@ Installationen kan inte fortsätta.</p>
       Sätter flaggor <strong>%1</strong> på ny partition
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Installationsprogrammet misslyckades med att sätta flaggor på partition %1. 
     
@@ -3584,12 +3650,12 @@ Installationen kan inte fortsätta.</p>
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Detta är en översikt över vad som kommer hända när du startar installationsprocessen.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Detta är en överblick av vad som kommer att ske när du startar installationsprocessen.
     
@@ -4165,107 +4231,127 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
       Välj ditt användarnamn och inloggningsuppgifter för att logga in och utföra admin-uppgifter
     
     
-      
+      
       What is your name?
       Vad heter du?
     
     
-      
+      
       Your Full Name
       Ditt Fullständiga namn 
     
     
-      
+      
       What name do you want to use to log in?
       Vilket namn vill du använda för att logga in?
     
     
-      
+      
       Login Name
       Inloggningsnamn
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Om mer än en person skall använda datorn så kan du skapa flera användarkonton efter installationen. 
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Endast små bokstäver, nummer, understreck och bindestreck är tillåtet.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Vad är namnet på datorn?
     
     
-      
+      
       Computer Name
       Datornamn
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Detta namn kommer användas om du gör datorn synlig för andra i ett nätverk.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Välj ett lösenord för att hålla ditt konto säkert.
     
     
-      
+      
       Password
       Lösenord
     
     
-      
+      
       Repeat Password
       Repetera Lösenord
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel. Ett bra lösenord innehåller en blandning av bokstäver, nummer och interpunktion, bör vara minst åtta tecken långt, och bör ändras regelbundet.
     
     
-      
+      
       Validate passwords quality
       Validera lösenords kvalite
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       När den här rutan är förkryssad kommer kontroll av lösenordsstyrka att genomföras, och du kommer inte kunna använda ett svagt lösenord.
     
     
-      
+      
       Log in automatically without asking for the password
       Logga in automatiskt utan att fråga efter ett lösenord.
     
     
-      
+      
       Reuse user password as root password
       Återanvänd användarlösenord som root lösenord
     
     
-      
+      
       Use the same password for the administrator account.
       Använd samma lösenord för administratörskontot.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Välj ett root lösenord för att hålla ditt konto säkert.
     
     
-      
+      
       Root Password
       Root Lösenord
     
     
-      
+      
       Repeat Root Password
       Repetera Root Lösenord
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel.
     
diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts
index 2b8af99bfb..d351b57d91 100644
--- a/lang/calamares_te.ts
+++ b/lang/calamares_te.ts
@@ -31,27 +31,27 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 యొక్క మాస్టర్ బూట్ రికార్డ్
     
     
-      
+      
       Boot Partition
       బూట్ పార్టిషన్
     
     
-      
+      
       System Partition
       సిస్టమ్ పార్టిషన్
     
     
-      
+      
       Do not install a boot loader
       బూట్ లోడర్‌ను ఇన్‌స్టాల్ చేయవద్దు
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -207,32 +207,32 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -287,54 +287,54 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       లోపం
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +343,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -468,22 +468,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -501,6 +501,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -695,12 +713,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -727,27 +745,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -871,6 +889,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1001,43 +1044,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1088,7 +1131,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1327,7 +1370,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1364,57 +1417,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       విభజన సమాచారం ఏర్పాటు
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1827,6 +1880,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2105,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2382,7 +2443,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2563,33 +2624,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2675,117 +2741,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2972,17 +3038,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3240,12 +3306,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3253,27 +3319,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3429,7 +3495,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3572,12 +3638,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4117,107 +4183,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       మీ పేరు ఏమిటి ?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       ప్రవేశించడానికి ఈ పేరుని ఉపయోగిస్తారు 
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       మీ ఖాతా ను భద్రపరుచుకోవడానికి ఒక మంత్రమును ఎంచుకోండి 
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts
index 9b69b06f6c..13cb112c24 100644
--- a/lang/calamares_tg.ts
+++ b/lang/calamares_tg.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Сабти роҳандозии асосӣ барои %1
     
     
-      
+      
       Boot Partition
       Қисми диски роҳандозӣ
     
     
-      
+      
       System Partition
       Қисми диски низомӣ
     
     
-      
+      
       Do not install a boot loader
       Боркунандаи роҳандозӣ насб карда нашавад
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Иҷрокунии амалиёти %1.
     
     
-      
+      
       Bad working directory path
       Масири феҳристи корӣ нодуруст аст
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Феҳристи кории %1 барои вазифаи "python"-и %2 хонда намешавад.
     
     
-      
+      
       Bad main script file
       Файли нақши асосӣ нодуруст аст
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Файли нақши асосии %1 барои вазифаи "python"-и %2 хонда намешавад.
     
     
-      
+      
       Boost.Python error in job "%1".
       Хатои "Boost.Python" дар вазифаи "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Танзимкунӣ қатъ шуд
     
     
-      
+      
       Installation Failed
       Насбкунӣ қатъ шуд
     
     
-      
+      
       Would you like to paste the install log to the web?
       Шумо мехоҳед, ки сабти рӯйдодҳои насбро ба шабака нусха бардоред?
     
     
-      
+      
       Error
       Хато
     
     
-      
-      
+      
+      
       &Yes
       &Ҳа
     
     
-      
-      
+      
+      
       &No
       &Не
     
     
-      
+      
       &Close
       &Пӯшидан
     
     
-      
+      
       Install Log Paste URL
       Гузоштани нишонии URL-и сабти рӯйдодҳои насб
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Боркунӣ иҷро нашуд. Гузариш ба шабака иҷро нашуд.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +341,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Омодашавии Calamares қатъ шуд
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 насб карда намешавад. Calamares ҳамаи модулҳои танзимкардашударо бор карда натавонист. Ин мушкилие мебошад, ки бо ҳамин роҳ Calamares дар дистрибутиви ҷорӣ кор мекунад.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Модулҳои зерин бор карда намешаванд:
     
     
-      
+      
       Continue with setup?
       Танзимкуниро идома медиҳед?
     
     
-      
+      
       Continue with installation?
       Насбкуниро идома медиҳед?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Барномаи танзимкунии %1 барои танзим кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Насбкунандаи %1 барои насб кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</strong>
     
     
-      
+      
       &Set up now
       &Ҳозир танзим карда шавад
     
     
-      
+      
       &Install now
       &Ҳозир насб карда шавад
     
     
-      
+      
       Go &back
       &Бозгашт
     
     
-      
+      
       &Set up
       &Танзим кардан
     
     
-      
+      
       &Install
       &Насб кардан
     
     
-      
+      
       Setup is complete. Close the setup program.
       Танзим ба анҷом расид. Барномаи танзимкуниро пӯшед.
     
     
-      
+      
       The installation is complete. Close the installer.
       Насб ба анҷом расид. Барномаи насбкуниро пӯшед.
     
     
-      
+      
       Cancel setup without changing the system.
       Бекор кардани танзимкунӣ бе тағйирдиҳии низом.
     
     
-      
+      
       Cancel installation without changing the system.
       Бекор кардани насбкунӣ бе тағйирдиҳии низом.
     
     
-      
+      
       &Next
       &Навбатӣ
     
     
-      
+      
       &Back
       &Ба қафо
     
     
-      
+      
       &Done
       &Анҷоми кор
     
     
-      
+      
       &Cancel
       &Бекор кардан
     
     
-      
+      
       Cancel setup?
       Танзимкуниро бекор мекунед?
     
     
-      
+      
       Cancel installation?
       Насбкуниро бекор мекунед?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Шумо дар ҳақиқат мехоҳед, ки раванди танзимкунии ҷориро бекор намоед?
 Барномаи танзимкунӣ хомӯш карда мешавад ва ҳамаи тағйирот гум карда мешаванд.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Шумо дар ҳақиқат мехоҳед, ки раванди насбкунии ҷориро бекор намоед?
@@ -468,22 +468,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Навъи истисноии номаълум
     
     
-      
+      
       unparseable Python error
       Хатои таҳлилнашавандаи Python
     
     
-      
+      
       unparseable Python traceback
       Барориши таҳлилнашавандаи Python
     
     
-      
+      
       Unfetchable Python error.
       Хатои кашиданашавандаи Python.
     
@@ -501,6 +501,24 @@ The installer will quit and all changes will be lost.
       Насбкунандаи %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -517,149 +535,149 @@ The installer will quit and all changes will be lost.
       Шакл
     
     
-      
+      
       Select storage de&vice:
       Интихоби дастгоҳи &захирагоҳ:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Танзимоти ҷорӣ:
     
     
-      
+      
       After:
       Баъд аз тағйир:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Қисмбандии диск ба таври дастӣ</strong><br/>Шумо худатон метавонед қисмҳои дискро эҷод кунед ё андозаи онҳоро иваз намоед.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Дубора истифода бурдани %1 ҳамчун диски асосӣ барои %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Қисми дискеро, ки мехоҳед хурдтар кунед, интихоб намоед, пас лавҳаи поёнро барои ивази андоза кашед</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 то андозаи %2MiB хурдтар мешавад ва қисми диски нав бо андозаи %3MiB барои %4 эҷод карда мешавад.
     
     
-      
+      
       Boot loader location:
       Ҷойгиршавии боркунандаи роҳандозӣ:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Қисми дискеро барои насб интихоб намоед</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Қисми диски низомии EFI дар дохили низоми ҷорӣ ёфт нашуд. Лутфан, ба қафо гузаред ва барои танзим кардани %1 аз имкони қисмбандии диск ба таври дастӣ истифода баред.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Қисми диски низомии EFI дар %1 барои оғоз кардани %2 истифода бурда мешавад.
     
     
-      
+      
       EFI system partition:
       Қисми диски низомии:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Чунин менамояд, ки ин захирагоҳ низоми амалкунандаро дар бар намегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Пок кардани диск</strong><br/>Ин амал ҳамаи иттилооти ҷориро дар дастгоҳи захирагоҳи интихобшуда <font color="red">нест мекунад</font>.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Насбкунии паҳлуӣ</strong><br/>Насбкунанда барои %1 фазоро омода карда, қисми дискеро хурдтар мекунад.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ивазкунии қисми диск</strong><br/>Қисми дисекро бо %1 иваз мекунад.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ин захирагоҳ %1-ро дар бар мегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ин захирагоҳ аллакай низоми амалкунандаро дар бар мегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ин захирагоҳ якчанд низоми амалкунандаро дар бар мегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Ин дастгоҳи захирагоҳ аллакай дорои низоми амалкунанда мебошад, аммо ҷадвали қисми диски <strong>%1</strong> аз диски лозимии <strong>%2</strong> фарқ мекунад.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Яке аз қисмҳои диски ин дастгоҳи захирагоҳ <strong>васлшуда</strong> мебошад.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Ин дастгоҳи захирагоҳ қисми дасгоҳи <strong>RAID-и ғайрифаъол</strong> мебошад.
     
     
-      
+      
       No Swap
       Бе мубодила
     
     
-      
+      
       Reuse Swap
       Истифодаи муҷаддади мубодила
     
     
-      
+      
       Swap (no Hibernate)
       Мубодила (бе реҷаи Нигаҳдорӣ)
     
     
-      
+      
       Swap (with Hibernate)
       Мубодила (бо реҷаи Нигаҳдорӣ)
     
     
-      
+      
       Swap to file
       Мубодила ба файл
     
@@ -695,12 +713,12 @@ The installer will quit and all changes will be lost.
       Поксозии ҳамаи васлҳои муваққатӣ.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Рӯйхати васлҳои муваққатӣ гирифта нашуд.
     
     
-      
+      
       Cleared all temporary mounts.
       Ҳамаи васлҳои муваққатӣ пок карда шуданд.
     
@@ -727,27 +745,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Намунаи клавиатура ба %1 танзим карда мешавад.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Тарҳбандии клавиатура ба %1 %1/%2 танзим карда мешавад.
     
     
-      
+      
       Set timezone to %1/%2.
       Минтақаи вақт ба %1/%2 танзим карда мешавад.
     
     
-      
+      
       The system language will be set to %1.
       Забони низом ба %1 танзим карда мешавад.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Низоми рақамҳо ва санаҳо ба %1 танзим карда мешавад.
     
@@ -871,6 +889,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       Ниҳонвожаҳои шумо мувофиқат намекунанд!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -911,6 +934,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       Насбкунии %1 ба анҷом расид.
     
+    
+      
+      Package Selection
+      Интихоби бастаҳо
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Лутфан, маҳсулеро аз рӯйхат интихоб намоед. Маҳсули интихобшуда насб карда мешавад.
+    
   
   
     ContextualProcessJob
@@ -973,27 +1006,37 @@ The installer will quit and all changes will be lost.
       Нишонҳо:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Рамзгузорӣ
     
     
-      
+      
       Logical
       Мантиқӣ
     
     
-      
+      
       Primary
       Асосӣ
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Нуқтаи васл аллакай дар истифода аст. Лутфан, нуқтаи васли дигареро интихоб намоед.
     
@@ -1001,43 +1044,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Қисми диски нав бо ҳаҷми %2MiB дар %4 (%3) бо низоми файлии %1 эҷод карда мешавад.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Қисми диски нав бо ҳаҷми <strong>%2MiB</strong> дар <strong>%4</strong> (%3) бо низоми файлии <strong>%1</strong> эҷод карда мешавад.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Эҷодкунии қисми диски нави %1 дар %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Насбкунанда қисми дискро дар '%1' эҷод карда натавонист.
     
@@ -1088,7 +1131,7 @@ The installer will quit and all changes will be lost.
       Эҷодкунии ҷадвали қисми диски нави %1 дар %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Насбкунанда ҷадвали қисми дискро дар '%1' эҷод карда натавонист.
     
@@ -1327,7 +1370,17 @@ The installer will quit and all changes will be lost.
       Нишонҳо:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Нуқтаи васл аллакай дар истифода аст. Лутфан, нуқтаи васли дигареро интихоб намоед.
     
@@ -1364,57 +1417,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Танзими иттилооти қисми диск
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Насбкунии %1 дар қисми диски низомии <strong>нави</strong> %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Насбкунии %2 дар қисми диски низомии %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Боркунандаи роҳандозӣ дар <strong>%1</strong> насб карда мешавад.
     
     
-      
+      
       Setting up mount points.
       Танзимкунии нуқтаҳои васл.
     
@@ -1827,6 +1880,14 @@ The installer will quit and all changes will be lost.
       Ҷойгиршавӣ
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2046,29 +2107,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Минтақаи пазируфтаи худро интихоб намоед ё минтақаи стандартиро дар асоси ҷойгиршавии ҷории худ истифода баред.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Минтақаи вақт: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Шаҳри пазируфтаи худро дар ҳудуди минтақаи худ интихоб намоед.
     
     
-      
+      
       Zones
       Шаҳрҳо
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Шумо метавонед танзимоти забон ва маҳаллисозиро дар зер дуруст кунед.
     
@@ -2384,7 +2445,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Бастаҳо
     
@@ -2565,33 +2626,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       Фазои озод
     
     
       
-      
+      
       New partition
       Қисми диски нав
     
     
-      
+      
       Name
       Ном
     
     
-      
+      
       File System
       Низоми файлӣ
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Нуқтаи васл
     
     
-      
+      
       Size
       Андоза
     
@@ -2677,117 +2743,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Ҷамъкунии иттилооти низомӣ...
     
     
-      
+      
       Partitions
       Қисмҳои диск
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Низоми %1 <strong>ҳамроҳи</strong> низоми амалкунандаи дигар насб карда мешавад.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Пок кардани</strong> диск ва насб кардани %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Иваз кардани</strong> қисми диск бо %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Ба таври дастӣ</strong> эҷод кардани қисмҳои диск.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Низоми %1 <strong>ҳамроҳи</strong> низоми амалкунандаи дигар дар диски <strong>%2</strong> (%3) насб карда мешавад.
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Пок кардани</strong> диски <strong>%2</strong> (%3) ва насб кардани %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Иваз кардани</strong> қисми диск дар диски <strong>%2</strong> (%3) бо %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>Ба таври дастӣ</strong> эҷод кардани қисмҳои диск дар диски <strong>%1</strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Диски <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Танзимоти ҷорӣ:
     
     
-      
+      
       After:
       Баъд аз тағйир:
     
     
-      
+      
       No EFI system partition configured
       Ягон қисми диски низомии EFI танзим нашуд
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Қисми диски низомии EFI барои оғоз кардани %1 лозим аст.<br/><br/>Барои танзим кардани қисми диски низомии EFI, ба қафо гузаред ва низоми файлии FAT32-ро бо нишони фаъолшудаи <strong>%3</strong> ва нуқтаи васли <strong>%2</strong> интихоб кунед ё эҷод намоед.<br/><br/>Шумо метавонед бе танзимкунии қисми диски низомии EFI идома диҳед, аммо низоми шумо метавонад оғоз карда нашавад.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Қисми диски низомии EFI барои оғоз кардани %1 лозим аст.<br/><br/>Қисми диск бо нуқтаи васли <strong>%2</strong> танзим карда шуд, аммо нишони он бо имкони <strong>%3</strong> танзим карда нашуд.<br/>Барои танзим кардани нишон ба қафо гузаред ва қисми дискро таҳрир кунед.<br/><br/>Шумо метавонед бе танзимкунии нишон идома диҳед, аммо низоми шумо метавонад оғоз карда нашавад.
     
     
-      
+      
       EFI system partition flag not set
       Нишони қисми диск дар низоми EFI танзим карда нашуд
     
     
-      
+      
       Option to use GPT on BIOS
       Имкони истифодаи GPT дар BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Ҷадвали қисми диски GPT барои ҳамаи низомҳо интихоби беҳтарин мебошад. Насбкунандаи ҷорӣ инчунин барои низомҳои BIOS чунин танзимро дастгирӣ менамояд.<br/><br/>Барои танзим кардани ҷадвали қисми диски GPT дар BIOS, (агар то ҳол танзим накарда бошед) як қадам ба қафо гузаред ва ҷадвали қисми дискро ба GPT танзим кунед, пас қисми диски шаклбандинашударо бо ҳаҷми 8 МБ бо нишони фаъолшудаи <strong>bios_grub</strong> эҷод намоед.<br/><br/>Қисми диски шаклбандинашуда бо ҳаҷми 8 МБ барои оғоз кардани %1 дар низоми BIOS бо GPT лозим аст.
     
     
-      
+      
       Boot partition not encrypted
       Қисми диски роҳандозӣ рамзгузорӣ нашудааст
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Қисми диски роҳандозии алоҳида дар як ҷой бо қисми диски реша (root)-и рамзгузоришуда танзим карда шуд, аммо қисми диски роҳандозӣ рамзгузорӣ нашудааст.<br/><br/>Барои ҳамин навъи танзимкунӣ масъалаи амниятӣ аҳамият дорад, зеро ки файлҳои низомии муҳим дар қисми диски рамзгузоринашуда нигоҳ дошта мешаванд.<br/>Агар шумо хоҳед, метавонед идома диҳед, аммо қулфкушоии низоми файлӣ дертар ҳангоми оғози кори низом иҷро карда мешавад.<br/>Барои рамзгзорӣ кардани қисми диски роҳандозӣ ба қафо гузаред ва бо интихоби тугмаи <strong>Рамзгузорӣ</strong> дар равзанаи эҷодкунии қисми диск онро аз нав эҷод намоед.
     
     
-      
+      
       has at least one disk device available.
       ақаллан як дастгоҳи диск дастрас аст.
     
     
-      
+      
       There are no partitions to install on.
       Ягон қисми диск барои насб вуҷуд надорад.
     
@@ -2977,17 +3043,17 @@ Output:
       Файл тасодуфии нави <pre>%1</pre> эҷод карда нашуд.
     
     
-      
+      
       No product
       Ягон маҳсул нест
     
     
-      
+      
       No description provided.
       Ягон тафсилот нест
     
     
-      
+      
       (no mount point)
       (бе нуқтаи васл)
     
@@ -3248,12 +3314,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Барои натиҷаҳои беҳтарин, мутмаин шавед, ки дар ин компютер:
     
     
-      
+      
       System requirements
       Талаботи низом
     
@@ -3261,27 +3327,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Ин компютер ба талаботи камтарин барои танзимкунии %1 ҷавобгӯ намебошад.<br/>Танзимот идома дода намешавад. <a href="#details">Тафсилот...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ин компютер ба талаботи камтарин барои насбкунии %1 ҷавобгӯ намебошад..<br/>Насбкунӣ идома дода намешавад. <a href="#details">Тафсилот...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Ин компютер ба баъзеи талаботи тавсияшуда барои насбкунии %1 ҷавобгӯ намебошад.<br/>Танзимот идома дода мешавад, аммо баъзеи хусусиятҳо ғайрифаъол карда мешаванд.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Ин компютер ба баъзеи талаботи тавсияшуда барои насбкунии %1 ҷавобгӯ намебошад.<br/>Насбкунӣ идома дода мешавад, аммо баъзеи хусусиятҳо ғайрифаъол карда мешаванд.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ин барнома аз Шумо якчанд савол мепурсад ва %2-ро дар компютери шумо танзим мекунад.
     
@@ -3437,7 +3503,7 @@ Output:
       Танзимкунии нишонҳои <strong>%1</strong> дар қисми диски нав
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Насбкунанда нишонҳоро дар қисми диски %1 танзим карда натавонист.
     
@@ -3580,12 +3646,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Дар ин ҷамъбаст шумо мебинед, ки чӣ мешавад пас аз он ки шумо раванди танзимкуниро оғоз мекунед.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Дар ин ҷамъбаст шумо мебинед, ки чӣ мешавад пас аз он ки шумо раванди насбкуниро оғоз мекунед.
     
@@ -4159,107 +4225,127 @@ Output:
       Барои ворид шудан ба низом ва иҷро кардани вазифаҳои маъмурӣ, номи корбар ва маълумоти корбариро муайян кунед.
     
     
-      
+      
       What is your name?
       Номи шумо чист?
     
     
-      
+      
       Your Full Name
       Номи пурраи шумо
     
     
-      
+      
       What name do you want to use to log in?
       Кадом номро барои ворид шудан ба низом истифода мебаред?
     
     
-      
+      
       Login Name
       Номи корбар
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Шумо метавонед танҳо ҳарфҳои хурд, рақамҳо, зерхат ва нимтиреро истифода баред.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Номи ин компютер чист?
     
     
-      
+      
       Computer Name
       Номи компютери шумо
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Ин ном истифода мешавад, агар шумо компютери худро барои дигарон дар шабака намоён кунед.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаеро интихоб намоед.
     
     
-      
+      
       Password
       Ниҳонвожаро ворид намоед
     
     
-      
+      
       Repeat Password
       Ниҳонвожаро тасдиқ намоед
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. Ниҳонвожаи хуб бояд дар омезиш калимаҳо, рақамҳо ва аломатҳои китобатиро дар бар гирад, ақаллан аз ҳашт аломат иборат шавад ва мунтазам иваз карда шавад.
     
     
-      
+      
       Validate passwords quality
       Санҷиши сифати ниҳонвожаҳо
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Агар шумо ин имконро интихоб кунед, қувваи ниҳонвожа тафтиш карда мешавад ва шумо ниҳонвожаи заифро истифода карда наметавонед.
     
     
-      
+      
       Log in automatically without asking for the password
       Ба таври худкор бе дархости ниҳонвожа ворид карда шавад
     
     
-      
+      
       Reuse user password as root password
       Ниҳонвожаи корбар ҳам барои ниҳонвожаи root истифода карда шавад
     
     
-      
+      
       Use the same password for the administrator account.
       Ниҳонвожаи ягона барои ҳисоби маъмурӣ истифода бурда шавад.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаи root-ро интихоб намоед.
     
     
-      
+      
       Root Password
       Ниҳонвожаи root
     
     
-      
+      
       Repeat Root Password
       Ниҳонвожаи root-ро тасдиқ намоед
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад.
     
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index 5fc69ea822..f52e8f80a7 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Master Boot Record ของ %1
     
     
-      
+      
       Boot Partition
       พาร์ทิชัน Boot
     
     
-      
+      
       System Partition
       พาร์ทิชันระบบ
     
     
-      
+      
       Do not install a boot loader
       ไม่ต้องติดตั้งบูตโหลดเดอร์
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       การปฏิบัติการ %1 กำลังทำงาน
     
     
-      
+      
       Bad working directory path
       เส้นทางไดเรคทอรีที่ใช้ทำงานไม่ถูกต้อง
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       ไม่สามารถอ่านไดเรคทอรีที่ใช้ทำงาน %1 สำหรับ python %2 ได้
     
     
-      
+      
       Bad main script file
       ไฟล์สคริปต์หลักไม่ถูกต้อง
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       ไม่สามารถอ่านไฟล์สคริปต์หลัก %1 สำหรับ python %2 ได้
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python ผิดพลาดที่งาน "%1".
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       การติดตั้งล้มเหลว
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       ข้อผิดพลาด
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       ดำเนินการติดตั้งต่อหรือไม่?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       ตัวติดตั้ง %1 กำลังพยายามที่จะทำการเปลี่ยนแปลงในดิสก์ของคุณเพื่อติดตั้ง %2<br/><strong>คุณจะไม่สามารถยกเลิกการเปลี่ยนแปลงเหล่านี้ได้</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &ติดตั้งตอนนี้
     
     
-      
+      
       Go &back
       กลั&บไป
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &N ถัดไป
     
     
-      
+      
       &Back
       &B ย้อนกลับ
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       &C ยกเลิก
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       ยกเลิกการติดตั้ง?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       คุณต้องการยกเลิกกระบวนการติดตั้งที่กำลังดำเนินการอยู่หรือไม่?
@@ -465,22 +465,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       ข้อผิดพลาดไม่ทราบประเภท
     
     
-      
+      
       unparseable Python error
       ข้อผิดพลาด unparseable Python
     
     
-      
+      
       unparseable Python traceback
       ประวัติย้อนหลัง unparseable Python
     
     
-      
+      
       Unfetchable Python error.
       ข้อผิดพลาด Unfetchable Python
     
@@ -498,6 +498,24 @@ The installer will quit and all changes will be lost.
       ตัวติดตั้ง %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      ตัวติดตั้งไม่สามารถอัพเดทตารางพาร์ทิชันบนดิสก์ '%1'
+    
+  
   
     CheckerContainer
     
@@ -514,149 +532,149 @@ The installer will quit and all changes will be lost.
       ฟอร์ม
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       ปัจจุบัน:
     
     
-      
+      
       After:
       หลัง:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>กำหนดพาร์ทิชันด้วยตนเอง</strong><br/>คุณสามารถสร้างหรือเปลี่ยนขนาดของพาร์ทิชันได้ด้วยตนเอง
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       ที่อยู่บูตโหลดเดอร์:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       ไม่พบพาร์ทิชันสำหรับระบบ EFI อยู่ที่ไหนเลยในระบบนี้ กรุณากลับไปเลือกใช้การแบ่งพาร์ทิชันด้วยตนเอง เพื่อติดตั้ง %1
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       พาร์ทิชันสำหรับระบบ EFI ที่ %1 จะถูกใช้เพื่อเริ่มต้น %2
     
     
-      
+      
       EFI system partition:
       พาร์ทิชันสำหรับระบบ EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>ติดตั้งควบคู่กับระบบปฏิบัติการเดิม</strong><br/>ตัวติดตั้งจะลดเนื้อที่พาร์ทิชันเพื่อให้มีเนื้อที่สำหรับ %1
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>แทนที่พาร์ทิชัน</strong><br/>แทนที่พาร์ทิชันด้วย %1
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       อุปกรณ์จัดเก็บนี้มีระบบปฏิบัติการ %1 อยู่ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บของคุณ
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       อุปกรณ์จัดเก็บนี้มีระบบปฏิบัติการอยู่แล้ว คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บของคุณ
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       อุปกรณ์จัดเก็บนี้มีหลายระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บของคุณ
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -692,12 +710,12 @@ The installer will quit and all changes will be lost.
       กำลังล้างจุดเชื่อมต่อชั่วคราวทุกจุด
     
     
-      
+      
       Cannot get list of temporary mounts.
       ไม่สามารถดึงรายการจุดเชื่อมต่อชั่วคราวได้
     
     
-      
+      
       Cleared all temporary mounts.
       จุดเชื่อมต่อชั่วคราวทั้งหมดถูกล้างแล้ว
     
@@ -724,27 +742,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       ตั้งค่าโมเดลแป้นพิมพ์เป็น %1<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       ตั้งค่าแบบแป้นพิมพ์เป็น %1/%2
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       ภาษาของระบบจะถูกตั้งค่าเป็น %1
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -868,6 +886,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       รหัสผ่านของคุณไม่ตรงกัน!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -908,6 +931,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       การติดตั้ง %1 เสร็จสิ้น
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -970,27 +1003,37 @@ The installer will quit and all changes will be lost.
       Flags:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       โลจิคอล
     
     
-      
+      
       Primary
       หลัก
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -998,43 +1041,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       ตัวติดตั้งไม่สามารถสร้างพาร์ทิชันบนดิสก์ '%1'
     
@@ -1085,7 +1128,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       ตัวติดตั้งไม่สามารถสร้างตารางพาร์ทิชันบน %1
     
@@ -1324,7 +1367,17 @@ The installer will quit and all changes will be lost.
       Flags:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1361,57 +1414,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       ตั้งค่าข้อมูลพาร์ทิชัน
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1824,6 +1877,14 @@ The installer will quit and all changes will be lost.
       ตำแหน่ง
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2041,29 +2102,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2370,7 +2431,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2551,33 +2612,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       พื้นที่ว่าง
     
     
       
-      
+      
       New partition
       พาร์ทิชันใหม่
     
     
-      
+      
       Name
       ชื่อ
     
     
-      
+      
       File System
       ระบบไฟล์
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       จุดเชื่อมต่อ
     
     
-      
+      
       Size
       ขนาด
     
@@ -2663,117 +2729,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       กำลังรวบรวมข้อมูลของระบบ...
     
     
-      
+      
       Partitions
       พาร์ทิชัน
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       ติดตั้ง %1 <strong>ควบคู่</strong>กับระบบปฏิบัติการเดิม
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       ปัจจุบัน:
     
     
-      
+      
       After:
       หลัง:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2960,17 +3026,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       ไม่ได้ระบุคำอธิบาย
     
     
-      
+      
       (no mount point)
       
     
@@ -3228,12 +3294,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       สำหรับผลลัพธ์ที่ดีขึ้น โปรดตรวจสอบให้แน่ใจว่าคอมพิวเตอร์เครื่องนี้:
     
     
-      
+      
       System requirements
       ความต้องการของระบบ
     
@@ -3241,27 +3307,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       ขณะที่กำลังติดตั้ง ตัวติดตั้งฟ้องว่า คอมพิวเตอร์นี้มีความต้องการไม่เพียงพอที่จะติดตั้ง %1.<br/>ไม่สามารถทำการติดตั้งต่อไปได้ <a href="#details">รายละเอียด...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       คอมพิวเตอร์มีความต้องการไม่เพียงพอที่จะติดตั้ง %1<br/>สามารถทำการติดตั้งต่อไปได้ แต่ฟีเจอร์บางอย่างจะถูกปิดไว้
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       โปรแกรมนี้จะถามคุณบางอย่าง เพื่อติดตั้ง %2 ไว้ในคอมพิวเตอร์ของคุณ
     
@@ -3417,7 +3483,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3560,12 +3626,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4105,107 +4171,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       ชื่อของคุณคือ?
     
     
-      
+      
       Your Full Name
       ชื่อเต็มของคุณ
     
     
-      
+      
       What name do you want to use to log in?
       ชื่อที่คุณต้องการใช้ในการล็อกอิน?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       คอมพิวเตอร์เครื่องนี้ชื่อ?
     
     
-      
+      
       Computer Name
       ชื่อคอมพิวเตอร์
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       เลือกรหัสผ่านเพื่อรักษาบัญชีผู้ใช้ของคุณให้ปลอดภัย
     
     
-      
+      
       Password
       รหัสผ่าน
     
     
-      
+      
       Repeat Password
       กรอกรหัสผ่านซ้ำ
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts
index d289683cbb..c2f8ab21ef 100644
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 Üzerine Önyükleyici Kur
     
     
-      
+      
       Boot Partition
       Önyükleyici Disk Bölümü
     
     
-      
+      
       System Partition
       Sistem Disk Bölümü
     
     
-      
+      
       Do not install a boot loader
       Bir önyükleyici kurmayın
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       %1 işlemleri yapılıyor.
     
     
-      
+      
       Bad working directory path
       Dizin yolu kötü çalışıyor
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       %2 python işleri için %1 dizinleme çalışırken okunamadı.
     
     
-      
+      
       Bad main script file
       Sorunlu betik dosyası
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       %2 python işleri için %1 sorunlu betik okunamadı.
     
     
-      
+      
       Boost.Python error in job "%1".
       Boost.Python iş hatası "%1".
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Kurulum Başarısız
     
     
-      
+      
       Installation Failed
       Kurulum Başarısız
     
     
-      
+      
       Would you like to paste the install log to the web?
       Kurulum günlüğünü web'e yapıştırmak ister misiniz?
     
     
-      
+      
       Error
       Hata
     
     
-      
-      
+      
+      
       &Yes
       &Evet
     
     
-      
-      
+      
+      
       &No
       &Hayır
     
     
-      
+      
       &Close
       &Kapat
     
     
-      
+      
       Install Log Paste URL
       Günlük Yapıştırma URL'sini Yükle
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Yükleme başarısız oldu. Web yapıştırması yapılmadı.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +345,124 @@ Link copied to clipboard
 link panoya kopyalandı 
     
     
-      
+      
       Calamares Initialization Failed
       Calamares Başlatılamadı
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 yüklenemedi. Calamares yapılandırılmış modüllerin bazılarını yükleyemedi. Bu, Calamares'in kullandığınız dağıtıma uyarlamasından kaynaklanan bir sorundur.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Aşağıdaki modüller yüklenemedi:
     
     
-      
+      
       Continue with setup?
       Kuruluma devam et?
     
     
-      
+      
       Continue with installation?
       Kurulum devam etsin mi?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 sistem kurulum uygulaması,%2 ayarlamak için diskinizde değişiklik yapmak üzere. <br/><strong>Bu değişiklikleri geri alamayacaksınız.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 sistem yükleyici %2 yüklemek için diskinizde değişiklik yapacak.<br/><strong>Bu değişiklikleri geri almak mümkün olmayacak.</strong>
     
     
-      
+      
       &Set up now
       &Şimdi kur
     
     
-      
+      
       &Install now
       &Şimdi yükle
     
     
-      
+      
       Go &back
       Geri &git
     
     
-      
+      
       &Set up
       &Kur
     
     
-      
+      
       &Install
       &Yükle
     
     
-      
+      
       Setup is complete. Close the setup program.
       Kurulum tamamlandı. Kurulum programını kapatın.
     
     
-      
+      
       The installation is complete. Close the installer.
       Yükleme işi tamamlandı. Sistem yükleyiciyi kapatın.
     
     
-      
+      
       Cancel setup without changing the system.
       Sistemi değiştirmeden kurulumu iptal edin.
     
     
-      
+      
       Cancel installation without changing the system.
       Sistemi değiştirmeden kurulumu iptal edin.
     
     
-      
+      
       &Next
       &Sonraki
     
     
-      
+      
       &Back
       &Geri
     
     
-      
+      
       &Done
       &Tamam
     
     
-      
+      
       &Cancel
       &Vazgeç
     
     
-      
+      
       Cancel setup?
       Kurulum iptal edilsin mi?
     
     
-      
+      
       Cancel installation?
       Yüklemeyi iptal et?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Mevcut kurulum işlemini gerçekten iptal etmek istiyor musunuz?
 Kurulum uygulaması sonlandırılacak ve tüm değişiklikler kaybedilecek.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Yükleme işlemini gerçekten iptal etmek istiyor musunuz?
@@ -472,22 +472,22 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Bilinmeyen Özel Durum Tipi
     
     
-      
+      
       unparseable Python error
       Python hata ayıklaması
     
     
-      
+      
       unparseable Python traceback
       Python geri çekme ayıklaması
     
     
-      
+      
       Unfetchable Python error.
       Okunamayan Python hatası.
     
@@ -505,6 +505,24 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.
       %1 Yükleniyor
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Yükleyici '%1' diskinde bölümleme tablosunu güncelleyemedi.
+    
+  
   
     CheckerContainer
     
@@ -521,150 +539,150 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.
       Biçim
     
     
-      
+      
       Select storage de&vice:
       Depolama ay&gıtı seç:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Geçerli:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Elle bölümleme</strong><br/>Bölümler oluşturabilir ve boyutlandırabilirsiniz.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
 %2 ev bölümü olarak %1 yeniden kullanılsın.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Küçültmek için bir bölüm seçip alttaki çubuğu sürükleyerek boyutlandır</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1, %2MB'a küçülecek ve %4 için yeni bir %3MB disk bölümü oluşturulacak.
     
     
-      
+      
       Boot loader location:
       Önyükleyici konumu:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Yükleyeceğin disk bölümünü seç</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Bu sistemde EFI disk bölümü bulunamadı. Lütfen geri dönün ve %1 kurmak için gelişmiş kurulum seçeneğini kullanın.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 EFI sistem bölümü %2 başlatmak için kullanılacaktır.
     
     
-      
+      
       EFI system partition:
       EFI sistem bölümü:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu depolama aygıtı üzerinde yüklü herhangi bir işletim sistemi tespit etmedik. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Diski sil</strong><br/>Seçili depolama bölümündeki mevcut veriler şu anda <font color="red">silinecektir.</font>
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Yanına yükleyin</strong><br/>Sistem yükleyici disk bölümünü küçülterek %1 için yer açacak.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Varolan bir disk bölümüne kur</strong><br/>Varolan bir disk bölümü üzerine %1 kur.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu depolama aygıtı üzerinde %1 vardır. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu depolama aygıtı üzerinde bir işletim sistemi yüklü. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu depolama aygıtı üzerinde birden fazla işletim sistemi var. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Bu depolama aygıtının üzerinde zaten bir işletim sistemi var, ancak <strong>%1</strong> bölüm tablosu, gerekli <strong>%2</strong>'den farklı. <br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Bu depolama aygıtının disk bölümlerinden biri <strong>bağlı</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Bu depolama aygıtı, <strong>etkin olmayan bir RAID</strong> cihazının parçasıdır.
     
     
-      
+      
       No Swap
       Takas alanı yok
     
     
-      
+      
       Reuse Swap
       Yeniden takas alanı
     
     
-      
+      
       Swap (no Hibernate)
       Takas Alanı (uyku modu yok)
     
     
-      
+      
       Swap (with Hibernate)
       Takas Alanı (uyku moduyla)
     
     
-      
+      
       Swap to file
       Takas alanı dosyası
     
@@ -700,12 +718,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.
       Geçici olarak bağlananlar temizleniyor.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Geçici bağların listesi alınamadı.
     
     
-      
+      
       Cleared all temporary mounts.
       Tüm geçici bağlar temizlendi.
     
@@ -732,27 +750,27 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       %1 Klavye düzeni olarak seçildi.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Alt klavye türevi olarak %1/%2 seçildi.
     
     
-      
+      
       Set timezone to %1/%2.
       %1/%2 Zaman dilimi ayarla.
     
     
-      
+      
       The system language will be set to %1.
       Sistem dili %1 olarak ayarlanacak.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Sayılar ve günler için sistem yereli %1 olarak ayarlanacak.
     
@@ -878,6 +896,11 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.Your passwords do not match!
       Parolanız eşleşmiyor!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -918,6 +941,16 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.The installation of %1 is complete.
       Kurulum %1 oranında tamamlandı.
     
+    
+      
+      Package Selection
+      Paket seçimi
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Lütfen listeden bir ürün seçin. Seçilen ürün yüklenecek.
+    
   
   
     ContextualProcessJob
@@ -980,27 +1013,37 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.Bayraklar:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       Şif&rele
     
     
-      
+      
       Logical
       Mantıksal
     
     
-      
+      
       Primary
       Birincil
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Bağlama noktası zaten kullanımda. Lütfen diğerini seçiniz.
     
@@ -1008,43 +1051,43 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       %3 (%2) üzerinde %4 girdisi ile yeni bir %1MiB bölüm oluşturun.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       %3 (%2) üzerinde yeni bir %1MiB bölüm oluşturun.
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       %4 üzerinde (%3) ile %1 dosya sisteminde %2MB disk bölümü oluştur.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       <strong>%3</strong> (%2) üzerinde <em>%4</em> girdisi ile yeni bir <strong>%1MiB</strong> bölüm oluşturun.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       <strong>%3</strong> (%2) üzerinde yeni bir <strong>%1MiB</strong> bölüm oluşturun.
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       <strong>%4</strong> üzerinde (%3) ile <strong>%1</strong> dosya sisteminde <strong>%2MB</strong> disk bölümü oluştur.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       %2 üzerinde %1 yeni disk bölümü oluştur.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Yükleyici '%1' diski üzerinde yeni bölüm oluşturamadı.
     
@@ -1095,7 +1138,7 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.%2 üzerinde %1 yeni disk tablosu oluştur.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Yükleyici %1 üzerinde yeni bir bölüm tablosu oluşturamadı.
     
@@ -1334,7 +1377,17 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.Bayraklar:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Bağlama noktası zaten kullanımda. Lütfen diğerini seçiniz.
     
@@ -1371,57 +1424,57 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Bölüm bilgilendirmesini ayarla
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       <em>%3</em> özelliklerine sahip <strong>yeni</strong> %2 sistem bölümüne %1 yükleyin
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       %2 <strong>yeni</strong> sistem diskine %1 yükle.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       <strong>%1</strong> bağlama noktası ve <em>%3</em> özelliklerine sahip <strong>yeni</strong> %2 bölümü kurun.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Bağlama noktası <strong>%1</strong> %3 olan <strong>yeni</strong> %2 bölümü kurun.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       <em>%4</em> özelliklerine sahip %3 sistem bölümü <strong>%1</strong> üzerine %2 yükleyin.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Bağlama noktası <strong>%2</strong> ve özellikleri <em>%4</em> ile %3 bölümüne <strong>%1</strong> kurun.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       <strong>%2</strong> %4 bağlama noktası ile %3 bölümüne <strong>%1</strong> kurun.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       %3 <strong>%1</strong> sistem diskine %2 yükle.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       <strong>%1</strong> üzerine sistem ön yükleyiciyi kur.
     
     
-      
+      
       Setting up mount points.
       Bağlama noktalarını ayarla.
     
@@ -1835,6 +1888,14 @@ Sistem güç kaynağına bağlı değil.
       Sistem Yereli
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2054,29 +2115,29 @@ Sistem güç kaynağına bağlı değil.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Tercih ettiğiniz Bölgeyi seçin veya mevcut konumunuza bağlı olarak varsayılanı kullanın.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Zaman dilimi: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Konumunuzda tercih ettiğiniz Bölgeyi seçin.
     
     
-      
+      
       Zones
       Bölge
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Aşağıda Dil ve Yerel Ayar ayarlarında ince ayar yapabilirsiniz.
     
@@ -2392,7 +2453,7 @@ Sistem güç kaynağına bağlı değil.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Paketler
     
@@ -2573,33 +2634,38 @@ Sistem güç kaynağına bağlı değil.
     PartitionModel
     
       
-      
+      
       Free Space
       Boş Alan
     
     
       
-      
+      
       New partition
       Yeni bölüm
     
     
-      
+      
       Name
       İsim
     
     
-      
+      
       File System
       Dosya Sistemi
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Bağlama Noktası
     
     
-      
+      
       Size
       Boyut
     
@@ -2685,118 +2751,118 @@ Sistem güç kaynağına bağlı değil.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sistem bilgileri toplanıyor...
     
     
-      
+      
       Partitions
       Disk Bölümleme
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Diğer işletim sisteminin <strong>yanına</strong> %1 yükle.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       Diski <strong>sil</strong> ve %1 yükle.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       %1 ile disk bölümünün üzerine <strong>yaz</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>Manuel</strong> bölümleme.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       <strong>%2</strong> (%3) diskindeki diğer işletim sisteminin <strong>yanına</strong> %1 yükle.
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>%2</strong> (%3) diski <strong>sil</strong> ve %1 yükle.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>%2</strong> (%3) disk bölümünün %1 ile <strong>üzerine yaz</strong>.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       <strong>%1</strong> (%2) disk bölümünü <strong>manuel</strong> bölümle.
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Disk <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Geçerli:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       No EFI system partition configured
       EFI sistem bölümü yapılandırılmamış
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       %1 başlatmak için bir EFI sistem disk bölümü gereklidir.<br/><br/>Bir EFI sistem disk bölümü yapılandırmak için geri dönün ve <strong>%3</strong> bayrağı etkin ve  <strong>%2</strong>bağlama noktası ile bir FAT32 dosya sistemi seçin veya oluşturun.<br/><br/>Bir EFI sistem disk bölümü kurmadan devam edebilirsiniz, ancak sisteminiz başlatılamayabilir.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       %1 başlatmak için bir EFI sistem disk bölümü gereklidir.<br/><br/>Bir disk bölümü bağlama noktası <strong>%2</strong> olarak yapılandırıldı fakat <strong>%3</strong>bayrağı ayarlanmadı.<br/>Bayrağı ayarlamak için, geri dönün ve disk bölümü düzenleyin.<br/><br/>Sen bayrağı ayarlamadan devam edebilirsin fakat işletim sistemi başlatılamayabilir.
     
     
-      
+      
       EFI system partition flag not set
       EFI sistem bölümü bayrağı ayarlanmadı
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS'ta GPT kullanma seçeneği
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT disk bölümü tablosu tüm sistemler için en iyi seçenektir. Bu yükleyici klasik BIOS sistemler için de böyle bir kurulumu destekler. <br/><br/>Klasik BIOS sistemlerde disk bölümü tablosu GPT tipinde yapılandırmak için (daha önce yapılmadıysa) geri gidin ve disk bölümü tablosu GPT olarak ayarlayın ve ardından <strong>bios_grub</strong> bayrağı ile etiketlenmiş 8 MB biçimlendirilmemiş bir disk bölümü oluşturun.<br/> <br/>GPT disk yapısı ile kurulan klasik BIOS sistemi %1 başlatmak için biçimlendirilmemiş 8 MB bir disk bölümü gereklidir.
     
     
-      
+      
       Boot partition not encrypted
       Önyükleme yani boot diski şifrelenmedi
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Ayrı bir önyükleme yani boot disk bölümü, şifrenmiş bir kök bölüm ile birlikte ayarlandı, fakat önyükleme bölümü şifrelenmedi.<br/><br/>Bu tip kurulumun güvenlik endişeleri vardır, çünkü önemli sistem dosyaları şifrelenmemiş bir bölümde saklanır.<br/>İsterseniz kuruluma devam edebilirsiniz, fakat dosya sistemi kilidi daha sonra sistem başlatılırken açılacak.<br/>
 Önyükleme bölümünü şifrelemek için geri dönün ve bölüm oluşturma penceresinde <strong>Şifreleme</strong>seçeneği ile yeniden oluşturun.
     
     
-      
+      
       has at least one disk device available.
       Mevcut en az bir disk aygıtı var.
     
     
-      
+      
       There are no partitions to install on.
       Kurulacak disk bölümü yok.
     
@@ -2986,17 +3052,17 @@ Output:
       <pre>%1</pre>yeni rasgele dosya oluşturulamadı.
     
     
-      
+      
       No product
       Ürün yok
     
     
-      
+      
       No description provided.
       Açıklama bulunamadı.
     
     
-      
+      
       (no mount point)
       (bağlama noktası yok)
     
@@ -3257,12 +3323,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       En iyi sonucu elde etmek için bilgisayarınızın aşağıdaki gereksinimleri karşıladığından emin olunuz:
     
     
-      
+      
       System requirements
       Sistem gereksinimleri
     
@@ -3270,29 +3336,29 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Bu bilgisayar %1 kurulumu için minimum gereksinimleri karşılamıyor.<br/>Kurulum devam etmeyecek. <a href="#details">Detaylar...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Bu bilgisayara %1 yüklemek için minimum gereksinimler karşılanamadı.
 Kurulum devam edemiyor. <a href="#detaylar">Detaylar...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Bu bilgisayar %1 kurulumu için önerilen gereksinimlerin bazılarına uymuyor. Kurulum devam edebilirsiniz ancak bazı özellikler devre dışı bırakılabilir.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Bu bilgisayara %1 yüklemek için önerilen gereksinimlerin bazıları karşılanamadı.<br/>
 Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Bu program size bazı sorular soracak ve bilgisayarınıza %2 kuracak.
     
@@ -3448,7 +3514,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Yeni disk bölümüne  <strong>%1</strong> bayrağı ayarlanıyor.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Yükleyici %1 bölüm bayraklarını ayarlamakta başarısız oldu.
     
@@ -3591,12 +3657,12 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Bu, kurulum prosedürü başlatıldıktan sonra ne gibi değişiklikler dair olacağına genel bir bakış.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Yükleme işlemleri başladıktan sonra yapılacak işlere genel bir bakış.
     
@@ -4172,107 +4238,127 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Oturum açmak ve yönetici görevlerini gerçekleştirmek için kullanıcı adınızı ve kimlik bilgilerinizi seçin
     
     
-      
+      
       What is your name?
       Adınız nedir?
     
     
-      
+      
       Your Full Name
       Tam Adınız
     
     
-      
+      
       What name do you want to use to log in?
       Giriş için hangi adı kullanmak istersiniz?
     
     
-      
+      
       Login Name
       Kullanıcı adı
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Bu bilgisayarı birden fazla kişi kullanacaksa, kurulumdan sonra birden fazla hesap oluşturabilirsiniz.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Sadece küçük harflere, sayılara, alt çizgi ve kısa çizgilere izin verilir.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Bu bilgisayarın adı nedir?
     
     
-      
+      
       Computer Name
       Bilgisayar Adı
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Bilgisayarı ağ üzerinde herkese görünür yaparsanız bu ad kullanılacaktır.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Hesabınızın güvenliğini sağlamak için bir parola belirleyiniz.
     
     
-      
+      
       Password
       Şifre
     
     
-      
+      
       Repeat Password
       Şifreyi Tekrarla
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin. İyi bir şifre, harflerin, sayıların ve noktalama işaretlerinin bir karışımını içerecektir, en az sekiz karakter uzunluğunda olmalı ve düzenli aralıklarla değiştirilmelidir.
     
     
-      
+      
       Validate passwords quality
       Parola kalitesini doğrulayın
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Bu kutu işaretlendiğinde parola gücü kontrolü yapılır ve zayıf bir parola kullanamazsınız.
     
     
-      
+      
       Log in automatically without asking for the password
       Parola sormadan otomatik olarak oturum açın
     
     
-      
+      
       Reuse user password as root password
       Kullanıcı şifresini yetkili kök şifre olarak kullan
     
     
-      
+      
       Use the same password for the administrator account.
       Yönetici ile kullanıcı aynı şifreyi kullansın.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Hesabınızı güvende tutmak için bir kök şifre seçin.
     
     
-      
+      
       Root Password
       Kök Şifre
     
     
-      
+      
       Repeat Root Password
       Kök Şifresini Tekrarla
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin.
     
diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts
index b5a94cf863..6d11746b6f 100644
--- a/lang/calamares_uk.ts
+++ b/lang/calamares_uk.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Головний Завантажувальний Запис (Master Boot Record) %1
     
     
-      
+      
       Boot Partition
       Завантажувальний розділ
     
     
-      
+      
       System Partition
       Системний розділ
     
     
-      
+      
       Do not install a boot loader
       Не встановлювати завантажувач
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Запуск операції %1.
     
     
-      
+      
       Bad working directory path
       Неправильний шлях робочого каталогу
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Неможливо прочитати робочу директорію %1 для завдання python %2.
     
     
-      
+      
       Bad main script file
       Неправильний файл головного сценарію
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Неможливо прочитати файл головного сценарію %1 для завдання python %2.
     
     
-      
+      
       Boost.Python error in job "%1".
       Помилка Boost.Python у завданні "%1".
     
@@ -289,54 +289,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Помилка встановлення
     
     
-      
+      
       Installation Failed
       Помилка під час встановлення
     
     
-      
+      
       Would you like to paste the install log to the web?
       Хочете викласти журнал встановлення у мережі?
     
     
-      
+      
       Error
       Помилка
     
     
-      
-      
+      
+      
       &Yes
       &Так
     
     
-      
-      
+      
+      
       &No
       &Ні
     
     
-      
+      
       &Close
       &Закрити
     
     
-      
+      
       Install Log Paste URL
       Адреса для вставлення журналу встановлення
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Не вдалося вивантажити дані.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -349,124 +349,124 @@ Link copied to clipboard
 Посилання скопійовано до буфера обміну
     
     
-      
+      
       Calamares Initialization Failed
       Помилка ініціалізації Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 неможливо встановити. Calamares не зміг завантажити всі налаштовані модулі. Ця проблема зв'язана з тим, як Calamares використовується дистрибутивом.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Не вдалося завантажити наступні модулі:
     
     
-      
+      
       Continue with setup?
       Продовжити встановлення?
     
     
-      
+      
       Continue with installation?
       Продовжити встановлення?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Програма налаштування %1 збирається внести зміни до вашого диска, щоб налаштувати %2. <br/><strong> Ви не зможете скасувати ці зміни.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Засіб встановлення %1 має намір внести зміни до розподілу вашого диска, щоб встановити %2.<br/><strong>Ці зміни неможливо буде скасувати.</strong>
     
     
-      
+      
       &Set up now
       &Налаштувати зараз
     
     
-      
+      
       &Install now
       &Встановити зараз
     
     
-      
+      
       Go &back
       Перейти &назад
     
     
-      
+      
       &Set up
       &Налаштувати
     
     
-      
+      
       &Install
       &Встановити
     
     
-      
+      
       Setup is complete. Close the setup program.
       Встановлення виконано. Закрити програму встановлення.
     
     
-      
+      
       The installation is complete. Close the installer.
       Встановлення виконано. Завершити роботу засобу встановлення.
     
     
-      
+      
       Cancel setup without changing the system.
       Скасувати налаштування без зміни системи.
     
     
-      
+      
       Cancel installation without changing the system.
       Скасувати встановлення без зміни системи.
     
     
-      
+      
       &Next
       &Вперед
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       &Закінчити
     
     
-      
+      
       &Cancel
       &Скасувати
     
     
-      
+      
       Cancel setup?
       Скасувати налаштування?
     
     
-      
+      
       Cancel installation?
       Скасувати встановлення?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Ви насправді бажаєте скасувати поточну процедуру налаштовування?
 Роботу програми для налаштовування буде завершено, а усі зміни буде втрачено.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Чи ви насправді бажаєте скасувати процес встановлення?
@@ -476,22 +476,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Невідомий тип виключної ситуації
     
     
-      
+      
       unparseable Python error
       нерозбірлива помилка Python
     
     
-      
+      
       unparseable Python traceback
       нерозбірливе відстеження помилки Python
     
     
-      
+      
       Unfetchable Python error.
       Помилка Python, інформацію про яку неможливо отримати.
     
@@ -509,6 +509,24 @@ The installer will quit and all changes will be lost.
       Засіб встановлення %1
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      Встановити мітку файлової системи для %1.
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      Встановити мітку файлової системи <strong>%1</strong> для розділу <strong>%2</strong>.
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      Установник зазнав невдачі під час оновлення таблиці розділів на диску '%1'.
+    
+  
   
     CheckerContainer
     
@@ -525,149 +543,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Обрати &пристрій зберігання:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Зараз:
     
     
-      
+      
       After:
       Після:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Розподілення вручну</strong><br/>Ви можете створити або змінити розмір розділів власноруч.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Використати %1 як домашній розділ (home) для %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Оберіть розділ для зменшення, потім тягніть повзунок, щоб змінити розмір</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 буде стиснуто до %2 МіБ. Натомість буде створено розділ розміром %3 МіБ для %4.
     
     
-      
+      
       Boot loader location:
       Розташування завантажувача:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Оберіть розділ, на який встановити</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       В цій системі не знайдено жодного системного розділу EFI. Щоб встановити %1, будь ласка, поверніться та оберіть розподілення вручну.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Системний розділ EFI %1 буде використано для встановлення %2.
     
     
-      
+      
       EFI system partition:
       Системний розділ EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Цей пристрій зберігання, схоже, не має жодної операційної системи. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Очистити диск</strong><br/>Це <font color="red">знищить</font> всі данні, присутні на обраному пристрої зберігання.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Встановити поруч</strong><br/>Засіб встановлення зменшить розмір розділу, щоб вивільнити простір для %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Замінити розділ</strong><br/>Замінити розділу на %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На цьому пристрої зберігання є %1. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На цьому пристрої зберігання вже є операційна система. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На цьому пристрої зберігання вже є декілька операційних систем. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       На пристрої для зберігання даних може бути інша операційна система, але його таблиця розділів <strong>%1</strong> не є потрібною — <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       На цьому пристрої для зберігання даних <strong>змонтовано</strong> один із його розділів.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Цей пристрій для зберігання даних є частиною пристрою <strong>неактивного RAID</strong>.
     
     
-      
+      
       No Swap
       Без резервної пам'яті
     
     
-      
+      
       Reuse Swap
       Повторно використати резервну пам'ять
     
     
-      
+      
       Swap (no Hibernate)
       Резервна пам'ять (без присипляння)
     
     
-      
+      
       Swap (with Hibernate)
       Резервна пам'ять (із присиплянням)
     
     
-      
+      
       Swap to file
       Резервна пам'ять у файлі
     
@@ -703,12 +721,12 @@ The installer will quit and all changes will be lost.
       Очищення всіх тимчасових точок підключення.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Неможливо отримати список тимчасових точок підключення.
     
     
-      
+      
       Cleared all temporary mounts.
       Очищено всі тимчасові точки підключення.
     
@@ -735,27 +753,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Встановити модель клавіатури як %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Встановити розкладку клавіатури як %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Встановити часовий пояс %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       Мову %1 буде встановлено як системну.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       %1 буде встановлено як локаль чисел та дат.
     
@@ -879,6 +897,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       Паролі не збігаються!
     
+    
+      
+      OK!
+      Гаразд!
+    
     
       
       Setup Failed
@@ -919,6 +942,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       Встановлення %1 завершено.
     
+    
+      
+      Package Selection
+      Вибір пакетів
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Будь ласка, виберіть продукт зі списку. Буде встановлено вибраний продукт.
+    
   
   
     ContextualProcessJob
@@ -981,27 +1014,37 @@ The installer will quit and all changes will be lost.
       Прапорці:
     
     
-      
+      
+      Label for the filesystem
+      Мітка файлової системи
+    
+    
+      
+      FS Label:
+      Мітка ФС:
+    
+    
+      
       En&crypt
       За&шифрувати
     
     
-      
+      
       Logical
       Логічний
     
     
-      
+      
       Primary
       Основний
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Точка підключення наразі використовується. Оберіть, будь ласка, іншу.
     
@@ -1009,43 +1052,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       Створити розділ %1МіБ на %3 (%2) із записами %4.
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       Створити розділ %1МіБ на %3 (%2).
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Створити розділ у %2 МіБ на %4 (%3) із файловою системою %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       Створити розділ <strong>%1МіБ</strong> на <strong>%3</strong> (%2) із записами <em>%4</em>.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       Створити розділ <strong>%1МіБ</strong> на <strong>%3</strong> (%2).
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Створити розділ у <strong>%2 МіБ</strong> на <strong>%4</strong> (%3) із файловою системою <strong>%1</strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Створення нового розділу %1 на %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Засобу встановлення не вдалося створити розділ на диску «%1».
     
@@ -1096,7 +1139,7 @@ The installer will quit and all changes will be lost.
       Створення нової таблиці розділів %1 на %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Засобу встановлення не вдалося створити таблицю розділів на %1.
     
@@ -1335,7 +1378,17 @@ The installer will quit and all changes will be lost.
       Прапорці:
     
     
-      
+      
+      Label for the filesystem
+      Мітка файлової системи
+    
+    
+      
+      FS Label:
+      Мітка ФС:
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Точка підключення наразі використовується. Оберіть, будь ласка, іншу.
     
@@ -1372,57 +1425,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Ввести інформацію про розділ
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       Встановити %1 на <strong>новий</strong> системний розділ %2 із можливостями <em>%3</em>
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Встановити %1 на <strong>новий</strong> системний розділ %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       Налаштувати  <strong>новий</strong> розділ %2 із точкою монтування <strong>%1</strong> і можливостями <em>%3</em>.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       Налаштувати <strong>новий</strong> розділ %2 із точкою монтування <strong>%1</strong>%3.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       Встановити %2 на системний розділ %3 <strong>%1</strong> із можливостями <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       Налаштувати розділ %3 <strong>%1</strong> із точкою монтування <strong>%2</strong> і можливостями <em>%4</em>.
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       Налаштувати розділ %3 <strong>%1</strong> із точкою монтування <strong>%2</strong>%4.
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Встановити %2 на системний розділ %3 <strong>%1</strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Встановити завантажувач на <strong>%1</strong>.
     
     
-      
+      
       Setting up mount points.
       Налаштування точок підключення.
     
@@ -1835,6 +1888,14 @@ The installer will quit and all changes will be lost.
       Розташування
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      Вийти
+    
+  
   
     LocaleViewStep
     
@@ -2054,29 +2115,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Виберіть бажаний для вас регіон або скористатися типовим на основі даних щодо вашого поточного місця перебування
+      
+      Select your preferred Region, or use the default settings.
+      Виберіть ваш бажаний регіон або скористайтеся типовими параметрами.
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Часовий пояс: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Виберіть бажану для вас зону у межах вашого регіону.
     
     
-      
+      
       Zones
       Зони
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Нижче ви можете скоригувати параметри мови і локалі.
     
@@ -2411,7 +2472,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Пакунки
     
@@ -2592,33 +2653,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       Вільний простір
     
     
       
-      
+      
       New partition
       Новий розділ
     
     
-      
+      
       Name
       Назва
     
     
-      
+      
       File System
       Файлова система
     
     
-      
+      
+      File System Label
+      Мітка файлової системи
+    
+    
+      
       Mount Point
       Точка підключення
     
     
-      
+      
       Size
       Розмір
     
@@ -2704,117 +2770,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Збір інформації про систему...
     
     
-      
+      
       Partitions
       Розділи
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Встановити %1 <strong>поруч</strong> з іншою операційною системою.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>Очистити</strong> диск та встановити %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>Замінити</strong> розділ на %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Розподіл диска <strong>вручну</strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Встановити %1 <strong>поруч</strong> з іншою операційною системою на диск <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>Очистити</strong> диск <strong>%2</strong> (%3) та встановити %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong>Замінити</strong> розділ на диску <strong>%2</strong> (%3) на %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Розподіл диска <strong>%1</strong> (%2) <strong>вручну</strong>.
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Диск <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Зараз:
     
     
-      
+      
       After:
       Після:
     
     
-      
+      
       No EFI system partition configured
       Не налаштовано жодного системного розділу EFI
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Щоб запустити %1, потрібен системний розділ EFI.<br/><br/>Щоб налаштувати системний розділ EFI, поверніться і виберіть або створіть файлову систему FAT32 з увімкненим параметром <strong>%3</strong> та точкою монтування <strong>%2</strong>.<br/><br/>Ви можете продовжити, не налаштовуючи системний розділ EFI, але тоді у вашої системи можуть виникнути проблеми із запуском.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Для запуску %1 потрібен системний розділ EFI.<br/><br/>Розділ налаштовано з точкою підключення <strong>%2</strong>, але опція <strong>%3</strong> не встановлено.<br/>Щоб встановити опцію, поверніться та відредагуйте розділ.<br/><br/>Ви можете продовжити не налаштовуючи цю опцію, але ваша система може не запускатись.
     
     
-      
+      
       EFI system partition flag not set
       Опцію системного розділу EFI не встановлено
     
     
-      
+      
       Option to use GPT on BIOS
       Варіант із використанням GPT на BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Таблиця розділів GPT є найкращим варіантом для усіх систем. У цьому засобі встановлення передбачено підтримку відповідних налаштувань і для систем BIOS.<br/><br/>Щоб скористатися таблицею розділів GPT у системі з BIOS, (якщо цього ще не було зроблено) поверніться назад і встановіть для таблиці розділів значення GPT, далі створіть неформатований розділ розміром 8 МБ з увімкненим прапорцем <strong>bios_grub</strong>.<br/><br/>Неформатований розділ розміром 8 МБ потрібен для запуску %1 на системі з BIOS за допомогою GPT.
     
     
-      
+      
       Boot partition not encrypted
       Завантажувальний розділ незашифрований
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Було налаштовано окремий завантажувальний розділ поряд із зашифрованим кореневим розділом, але завантажувальний розділ незашифрований.<br/><br/>Існують проблеми з безпекою такого типу, оскільки важливі системні файли зберігаються на незашифрованому розділі.<br/>Ви можете продовжувати, якщо бажаєте, але розблокування файлової системи відбудеться пізніше під час запуску системи.<br/>Щоб зашифрувати завантажувальний розділ, поверніться і створіть його знов, обравши <strong>Зашифрувати</strong> у вікні створення розділів.
     
     
-      
+      
       has at least one disk device available.
       має принаймні один доступний дисковий пристрій.
     
     
-      
+      
       There are no partitions to install on.
       Немає розділів для встановлення.
     
@@ -3004,17 +3070,17 @@ Output:
       Не вдалося створити випадковий файл <pre>%1</pre>.
     
     
-      
+      
       No product
       Немає продукту
     
     
-      
+      
       No description provided.
       Опису не надано.
     
     
-      
+      
       (no mount point)
       (немає точки монтування)
     
@@ -3275,12 +3341,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Щоб отримати найкращий результат, будь ласка, переконайтеся, що цей комп'ютер:
     
     
-      
+      
       System requirements
       Вимоги до системи
     
@@ -3288,27 +3354,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Цей комп'ютер не задовольняє мінімальні вимоги для налаштовування %1.<br/>Налаштовування неможливо продовжити. <a href="#details">Докладніше...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Цей комп'ютер не задовольняє мінімальні вимоги для встановлення %1.<br/>Встановлення неможливо продовжити. <a href="#details">Докладніше...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Цей комп'ютер не задовольняє рекомендовані вимоги щодо налаштовування %1. Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Цей комп'ютер не задовольняє рекомендовані вимоги для встановлення %1.<br/>Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ця програма поставить кілька питань та встановить %2 на ваш комп'ютер.
     
@@ -3464,7 +3530,7 @@ Output:
       Встановлюємо прапорці <strong>%1</strong> для нового розділу.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Засобу встановлення не вдалося встановити прапорці для розділу %1.
     
@@ -3607,12 +3673,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Це огляд того, що трапиться коли ви почнете процедуру налаштовування.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Це огляд того, що трапиться коли ви почнете процедуру встановлення.
     
@@ -4187,107 +4253,127 @@ Output:
       Виберіть ім'я користувача та реєстраційні дані для виконання адміністративних завдань у системі
     
     
-      
+      
       What is your name?
       Ваше ім'я?
     
     
-      
+      
       Your Full Name
       Ваше ім'я повністю
     
     
-      
+      
       What name do you want to use to log in?
       Яке ім'я ви бажаєте використовувати для входу?
     
     
-      
+      
       Login Name
       Запис для входу
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після встановлення.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Можна використовувати лише латинські літери нижнього регістру, цифри, символи підкреслювання та дефіси.
+    
+    
+      
+      root is not allowed as username.
+      Не можна використовувати ім'я користувача «root».
+    
+    
+      
       What is the name of this computer?
       Назва цього комп'ютера?
     
     
-      
+      
       Computer Name
       Назва комп'ютера
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Цю назву буде використано, якщо ви зробите комп'ютер видимим іншим у мережі.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Можна використовувати лише латинські літери, цифри, символи підкреслювання та дефіси; не менше двох символів.
+    
+    
+      
+      localhost is not allowed as hostname.
+      «localhost» не можна використовувати як назву вузла.
+    
+    
+      
       Choose a password to keep your account safe.
       Оберіть пароль, щоб тримати ваш обліковий рахунок у безпеці.
     
     
-      
+      
       Password
       Пароль
     
     
-      
+      
       Repeat Password
       Повторіть пароль
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Введіть один й той самий пароль двічі, для перевірки щодо помилок введення. Надійному паролю слід містити суміш літер, чисел та розділових знаків, бути довжиною хоча б вісім символів та регулярно змінюватись.
     
     
-      
+      
       Validate passwords quality
       Перевіряти якість паролів
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Якщо позначено цей пункт, буде виконано перевірку складності пароля. Ви не зможете скористатися надто простим паролем.
     
     
-      
+      
       Log in automatically without asking for the password
       Входити автоматично без пароля
     
     
-      
+      
       Reuse user password as root password
       Використати пароль користувача як пароль root
     
     
-      
+      
       Use the same password for the administrator account.
       Використовувати той самий пароль і для облікового рахунку адміністратора.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Виберіть пароль root для захисту вашого облікового запису.
     
     
-      
+      
       Root Password
       Пароль root
     
     
-      
+      
       Repeat Root Password
       Повторіть пароль root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Введіть один й той самий пароль двічі, щоб убезпечитися від помилок при введенні.
     
diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts
index 2a9c67dcab..57df8714be 100644
--- a/lang/calamares_ur.ts
+++ b/lang/calamares_ur.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -285,54 +285,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -466,22 +466,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -499,6 +499,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -693,12 +711,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -725,27 +743,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -869,6 +887,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -999,43 +1042,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1086,7 +1129,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1325,7 +1368,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1362,57 +1415,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1825,6 +1878,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2042,29 +2103,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2380,7 +2441,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2561,33 +2622,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2673,117 +2739,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,17 +3036,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3238,12 +3304,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3251,27 +3317,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3427,7 +3493,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3570,12 +3636,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4115,107 +4181,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts
index dc5c7a4ca8..9617b5f935 100644
--- a/lang/calamares_uz.ts
+++ b/lang/calamares_uz.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -464,22 +464,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -497,6 +497,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -513,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -691,12 +709,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -723,27 +741,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -867,6 +885,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -907,6 +930,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -969,27 +1002,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -997,43 +1040,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1084,7 +1127,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1323,7 +1366,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1360,57 +1413,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1823,6 +1876,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2040,29 +2101,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2369,7 +2430,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2550,33 +2611,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2662,117 +2728,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2959,17 +3025,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3227,12 +3293,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3240,27 +3306,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3416,7 +3482,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3559,12 +3625,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4104,107 +4170,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts
index 5ac35384cd..b380bf741c 100644
--- a/lang/calamares_vi.ts
+++ b/lang/calamares_vi.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       Bản ghi khởi động chính của %1
     
     
-      
+      
       Boot Partition
       Phân vùng khởi động
     
     
-      
+      
       System Partition
       Phân vùng hệ thống
     
     
-      
+      
       Do not install a boot loader
       Không cài đặt bộ tải khởi động
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       Đang chạy %1 thao tác.
     
     
-      
+      
       Bad working directory path
       Sai đường dẫn thư mục làm việc
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Không thể đọc thư mục làm việc %1 của công việc python %2.
     
     
-      
+      
       Bad main script file
       Sai tệp kịch bản chính
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Không thể đọc tập tin kịch bản chính %1 của công việc python %2.
     
     
-      
+      
       Boost.Python error in job "%1".
       Lỗi Boost.Python trong công việc "%1".
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Thiết lập không thành công
     
     
-      
+      
       Installation Failed
       Cài đặt thất bại
     
     
-      
+      
       Would you like to paste the install log to the web?
       Bạn có muốn gửi nhật ký cài đặt lên web không?
     
     
-      
+      
       Error
       Lỗi
     
     
-      
-      
+      
+      
       &Yes
       &Có
     
     
-      
-      
+      
+      
       &No
       &Không
     
     
-      
+      
       &Close
       Đón&g
     
     
-      
+      
       Install Log Paste URL
       URL để gửi nhật ký cài đặt
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Tải lên không thành công. Không có quá trình gửi lên web nào được thực hiện.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Khởi tạo không thành công
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 không thể được cài đặt.Không thể tải tất cả các mô-đun đã định cấu hình. Đây là vấn đề với cách phân phối sử dụng.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/> Không thể tải các mô-đun sau:
     
     
-      
+      
       Continue with setup?
       Tiếp tục thiết lập?
     
     
-      
+      
       Continue with installation?
       Tiếp tục cài đặt?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Chương trình thiết lập %1 sắp thực hiện các thay đổi đối với đĩa của bạn để thiết lập %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Trình cài đặt %1 sắp thực hiện các thay đổi đối với đĩa của bạn để cài đặt %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </strong>
     
     
-      
+      
       &Set up now
       &Thiết lập ngay
     
     
-      
+      
       &Install now
       &Cài đặt ngay
     
     
-      
+      
       Go &back
       &Quay lại
     
     
-      
+      
       &Set up
       &Thiết lập
     
     
-      
+      
       &Install
       &Cài đặt
     
     
-      
+      
       Setup is complete. Close the setup program.
       Thiết lập hoàn tất. Đóng chương trình cài đặt.
     
     
-      
+      
       The installation is complete. Close the installer.
       Quá trình cài đặt hoàn tất. Đóng trình cài đặt.
     
     
-      
+      
       Cancel setup without changing the system.
       Hủy thiết lập mà không thay đổi hệ thống.
     
     
-      
+      
       Cancel installation without changing the system.
       Hủy cài đặt mà không thay đổi hệ thống.
     
     
-      
+      
       &Next
       &Tiếp
     
     
-      
+      
       &Back
       &Quay lại
     
     
-      
+      
       &Done
       &Xong
     
     
-      
+      
       &Cancel
       &Hủy
     
     
-      
+      
       Cancel setup?
       Hủy thiết lập?
     
     
-      
+      
       Cancel installation?
       Hủy cài đặt?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Bạn có thực sự muốn hủy quá trình thiết lập hiện tại không?
 Chương trình thiết lập sẽ thoát và tất cả các thay đổi sẽ bị mất.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Bạn có thực sự muốn hủy quá trình cài đặt hiện tại không?
@@ -466,22 +466,22 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       Không nhận ra kiểu của ngoại lệ
     
     
-      
+      
       unparseable Python error
       lỗi không thể phân tích cú pháp Python
     
     
-      
+      
       unparseable Python traceback
       truy vết không thể phân tích cú pháp Python
     
     
-      
+      
       Unfetchable Python error.
       Lỗi Python không thể try cập.
     
@@ -499,6 +499,24 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       %1 cài đặt hệ điều hành
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -515,149 +533,149 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Biểu mẫu
     
     
-      
+      
       Select storage de&vice:
       &Chọn thiết bị lưu trữ:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Hiện tại:
     
     
-      
+      
       After:
       Sau khi cài đặt:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong> Phân vùng thủ công </strong> <br/> Bạn có thể tự tạo hoặc thay đổi kích thước phân vùng.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Sử dụng lại %1 làm phân vùng chính cho %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong> Chọn một phân vùng để thu nhỏ, sau đó kéo thanh dưới cùng để thay đổi kích thước </strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 sẽ được thu nhỏ thành %2MiB và phân vùng %3MiB mới sẽ được tạo cho %4.
     
     
-      
+      
       Boot loader location:
       Vị trí bộ tải khởi động:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong> Chọn phân vùng để cài đặt </strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Không thể tìm thấy phân vùng hệ thống EFI ở bất kỳ đâu trên hệ thống này. Vui lòng quay lại và sử dụng phân vùng thủ công để thiết lập %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Phân vùng hệ thống EFI tại %1 sẽ được sử dụng để bắt đầu %2.
     
     
-      
+      
       EFI system partition:
       Phân vùng hệ thống EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Thiết bị lưu trữ này dường như không có hệ điều hành trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem xét và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong> Xóa đĩa </strong> <br/> Thao tác này sẽ <font color = "red"> xóa </font> tất cả dữ liệu hiện có trên thiết bị lưu trữ đã chọn.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong> Cài đặt cùng với </strong> <br/> Trình cài đặt sẽ thu nhỏ phân vùng để nhường chỗ cho %1.
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong> Thay thế phân vùng </strong> <br/> Thay thế phân vùng bằng %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Thiết bị lưu trữ này có %1 trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Thiết bị lưu trữ này đã có hệ điều hành trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Thiết bị lưu trữ này có nhiều hệ điều hành trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Thiết bị lưu trữ này đã có sẵn hệ điều hành, nhưng bảng phân vùng <strong> %1 </strong> khác với bảng <strong> %2 </strong> cần thiết. <br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Thiết bị lưu trữ này có một trong các phân vùng được <strong> gắn kết </strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Thiết bị lưu trữ này là một phần của thiết bị <strong> RAID không hoạt động </strong>.
     
     
-      
+      
       No Swap
       Không hoán đổi
     
     
-      
+      
       Reuse Swap
       Sử dụng lại Hoán đổi
     
     
-      
+      
       Swap (no Hibernate)
       Hoán đổi (không ngủ đông)
     
     
-      
+      
       Swap (with Hibernate)
       Hoán đổi (ngủ đông)
     
     
-      
+      
       Swap to file
       Hoán đổi sang tệp
     
@@ -693,12 +711,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Đang xóa tất cả các gắn kết tạm thời.
     
     
-      
+      
       Cannot get list of temporary mounts.
       Không thể lấy danh sách các gắn kết tạm thời.
     
     
-      
+      
       Cleared all temporary mounts.
       Xóa tất cả các gắn kết tạm thời.
     
@@ -725,27 +743,27 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Thiệt lập bàn phím kiểu %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Thiết lập bố cục bàn phím thành %1/%2.
     
     
-      
+      
       Set timezone to %1/%2.
       Thiết lập múi giờ sang %1/%2.
     
     
-      
+      
       The system language will be set to %1.
       Ngôn ngữ hệ thống sẽ được đặt thành %1.
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       Định dạng ngôn ngữ của số và ngày tháng sẽ được chuyển thành %1.
     
@@ -869,6 +887,11 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Your passwords do not match!
       Mật khẩu nhập lại không khớp!
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -909,6 +932,16 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       The installation of %1 is complete.
       Cài đặt của %1 đã xong.
     
+    
+      
+      Package Selection
+      Lựa chọn gói
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      Vui lòng chọn một sản phẩm từ danh sách. Sản phẩm đã chọn sẽ được cài đặt.
+    
   
   
     ContextualProcessJob
@@ -971,27 +1004,37 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Cờ:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       &Mã hóa
     
     
-      
+      
       Logical
       Lô-gic
     
     
-      
+      
       Primary
       Sơ cấp
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       Điểm gắn kết đã được sử dụng. Vui lòng chọn một cái khác.
     
@@ -999,43 +1042,43 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       Tạo phân vùng %2MiB mới trên %4 (%3) với hệ thống tệp %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       Tạo phân vùng <strong>%2MiB </strong> mới trên <strong>%4 </strong> (%3) với hệ thống tệp <strong>%1 </strong>.
     
     
+      
       
-      
       Creating new %1 partition on %2.
       Tạo phân vùng %1 mới trên %2.
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       Trình cài đặt không tạo được phân vùng trên đĩa '%1'.
     
@@ -1086,7 +1129,7 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Tạo bảng phân vùng %1 mới trên %2.
     
     
-      
+      
       The installer failed to create a partition table on %1.
       Trình cài đặt không tạo được bảng phân vùng trên %1.
     
@@ -1325,7 +1368,17 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Cờ:
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       Điểm gắn kết đã được sử dụng. Vui lòng chọn một cái khác.
     
@@ -1362,57 +1415,57 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       Đặt thông tin phân vùng
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       Cài đặt %1 trên phân vùng hệ thống <strong> mới </strong> %2.
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       Cài đặt %2 trên phân vùng hệ thống %3 <strong> %1 </strong>.
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       Cài đặt trình tải khởi động trên <strong> %1 </strong>.
     
     
-      
+      
       Setting up mount points.
       Thiết lập điểm gắn kết.
     
@@ -1825,6 +1878,14 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Vị trí
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2044,29 +2105,29 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      Chọn khu vực ưa thích của bạn hoặc sử dụng khu vực mặc định dựa trên vị trí hiện tại của bạn.
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       Múi giờ: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       Chọn vùng ưa thích của bạn trong khu vực của bạn.
     
     
-      
+      
       Zones
       Vùng
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       Bạn có thể tinh chỉnh cài đặt Ngôn ngữ và Bản địa bên dưới.
     
@@ -2373,7 +2434,7 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     PackageChooserViewStep
     
-      
+      
       Packages
       Gói
     
@@ -2554,33 +2615,38 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
     PartitionModel
     
       
-      
+      
       Free Space
       Không gian trống
     
     
       
-      
+      
       New partition
       Phân vùng mới
     
     
-      
+      
       Name
       Tên
     
     
-      
+      
       File System
       Tập tin hệ thống
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       Điểm gắn kết
     
     
-      
+      
       Size
       Kích cỡ
     
@@ -2666,117 +2732,117 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Thu thập thông tin hệ thống ...
     
     
-      
+      
       Partitions
       Phân vùng
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       Cài đặt %1 <strong> cùng với </strong> hệ điều hành khác.
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong> Xóa </strong> đĩa và cài đặt %1.
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       <strong>thay thế</strong> một phân vùng với %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       Phân vùng <strong> thủ công </strong>.
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       Cài đặt %1 <strong> cùng với </strong> hệ điều hành khác trên đĩa <strong>%2</strong> (%3).
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong> Xóa </strong> đĩa <strong>%2 </strong> (%3) và cài đặt %1.
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       <strong> Thay thế </strong> phân vùng trên đĩa <strong>%2 </strong> (%3) bằng %1.
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       Phân vùng <strong> thủ công </strong> trên đĩa <strong>%1 </strong> (%2).
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       Đĩa <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       Hiện tại:
     
     
-      
+      
       After:
       Sau:
     
     
-      
+      
       No EFI system partition configured
       Không có hệ thống phân vùng EFI được cài đặt
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       Cần có phân vùng hệ thống EFI để khởi động %1. <br/> <br/> Để định cấu hình phân vùng hệ thống EFI, hãy quay lại và chọn hoặc tạo hệ thống tệp FAT32 với cờ <strong> %3 </strong> được bật và gắn kết point <strong> %2 </strong>. <br/> <br/> Bạn có thể tiếp tục mà không cần thiết lập phân vùng hệ thống EFI nhưng hệ thống của bạn có thể không khởi động được.
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       Một phân vùng hệ thống EFI là cần thiết để bắt đầu %1. <br/> <br/> Một phân vùng đã được định cấu hình với điểm gắn kết <strong> %2 </strong> nhưng cờ <strong> %3 </strong> của nó không được đặt . <br/> Để đặt cờ, hãy quay lại và chỉnh sửa phân vùng. <br/> <br/> Bạn có thể tiếp tục mà không cần đặt cờ nhưng hệ thống của bạn có thể không khởi động được.
     
     
-      
+      
       EFI system partition flag not set
       Cờ phân vùng hệ thống EFI chưa được đặt
     
     
-      
+      
       Option to use GPT on BIOS
       Lựa chọn dùng GPT trên BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Bảng phân vùng GPT là lựa chọn tốt nhất cho tất cả các hệ thống. Trình cài đặt này cũng hỗ trợ thiết lập như vậy cho các hệ thống BIOS. <br/> <br/> Để định cấu hình bảng phân vùng GPT trên BIOS, (nếu chưa thực hiện xong) hãy quay lại và đặt bảng phân vùng thành GPT, tiếp theo tạo 8 MB phân vùng chưa định dạng với cờ <strong> bios_grub </strong> được bật. <br/> <br/> Cần có phân vùng 8 MB chưa được định dạng để khởi động %1 trên hệ thống BIOS có GPT.
     
     
-      
+      
       Boot partition not encrypted
       Phân vùng khởi động không được mã hóa
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Một phân vùng khởi động riêng biệt đã được thiết lập cùng với một phân vùng gốc được mã hóa, nhưng phân vùng khởi động không được mã hóa. <br/> <br/> Có những lo ngại về bảo mật với loại thiết lập này, vì các tệp hệ thống quan trọng được lưu giữ trên một phân vùng không được mã hóa . <br/> Bạn có thể tiếp tục nếu muốn, nhưng việc mở khóa hệ thống tệp sẽ diễn ra sau trong quá trình khởi động hệ thống. <br/> Để mã hóa phân vùng khởi động, hãy quay lại và tạo lại nó, chọn <strong> Mã hóa </strong> trong phân vùng cửa sổ tạo.
     
     
-      
+      
       has at least one disk device available.
       có sẵn ít nhất một thiết bị đĩa.
     
     
-      
+      
       There are no partitions to install on.
       Không có phân vùng để cài đặt.
     
@@ -2966,17 +3032,17 @@ Output:
       Không thể tạo tập tin ngẫu nhiên <pre>%1</pre>.
     
     
-      
+      
       No product
       Không có sản phẩm
     
     
-      
+      
       No description provided.
       Không có mô tả được cung cấp.
     
     
-      
+      
       (no mount point)
       (không có điểm gắn kết)
     
@@ -3237,12 +3303,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Để có kết quả tốt nhất, hãy đảm bảo rằng máy tính này:
     
     
-      
+      
       System requirements
       Yêu cầu hệ thống
     
@@ -3250,27 +3316,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Máy tính này không đáp ứng các yêu cầu tối thiểu để thiết lập %1. <br/> Không thể tiếp tục thiết lập. <a href="#details"> Chi tiết ... </a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Máy tính này không đáp ứng các yêu cầu tối thiểu để cài đặt %1. <br/> Không thể tiếp tục cài đặt. <a href="#details"> Chi tiết ... </a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Máy tính này không đáp ứng một số yêu cầu được khuyến nghị để thiết lập %1. <br/> Quá trình thiết lập có thể tiếp tục nhưng một số tính năng có thể bị tắt.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Máy tính này không đáp ứng một số yêu cầu được khuyến nghị để cài đặt %1. <br/> Quá trình cài đặt có thể tiếp tục, nhưng một số tính năng có thể bị tắt.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Chương trình này sẽ hỏi bạn một số câu hỏi và thiết lập %2 trên máy tính của bạn.
     
@@ -3426,7 +3492,7 @@ Output:
       Chọn cờ <strong>%1</strong> trong phân vùng mới.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       Không thể tạo cờ cho phân vùng %1.
     
@@ -3569,12 +3635,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       Đây là tổng quan về những gì sẽ xảy ra khi bạn bắt đầu quy trình thiết lập.
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       Đây là tổng quan về những gì sẽ xảy ra khi bạn bắt đầu quy trình cài đặt.
     
@@ -4147,107 +4213,127 @@ Output:
       Chọn tên bạn và chứng chỉ để đăng nhập và thực hiện các tác vụ quản trị
     
     
-      
+      
       What is your name?
       Hãy cho Vigo biết tên đầy đủ của bạn?
     
     
-      
+      
       Your Full Name
       Tên đầy đủ
     
     
-      
+      
       What name do you want to use to log in?
       Bạn muốn dùng tên nào để đăng nhập máy tính?
     
     
-      
+      
       Login Name
       Tên đăng nhập
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Tạo nhiều tài khoản sau khi cài đặt nếu có nhiều người dùng chung.
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      Chỉ cho phép các chữ cái viết thường, số, gạch dưới và gạch nối.
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       Tên của máy tính này là?
     
     
-      
+      
       Computer Name
       Tên máy tính
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Tên này sẽ hiển thị khi bạn kết nối vào một mạng.
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       Chọn mật khẩu để giữ máy tính an toàn.
     
     
-      
+      
       Password
       Mật khẩu
     
     
-      
+      
       Repeat Password
       Lặp lại mật khẩu
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Nhập lại mật khẩu hai lần để kiểm tra. Một mật khẩu tốt phải có ít nhất 8 ký tự và bao gồm chữ, số, ký hiệu đặc biệt. Nên được thay đổi thường xuyên.
     
     
-      
+      
       Validate passwords quality
       Xác thực chất lượng mật khẩu
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Khi tích chọn, bạn có thể chọn mật khẩu yếu.
     
     
-      
+      
       Log in automatically without asking for the password
       Tự động đăng nhập không hỏi mật khẩu
     
     
-      
+      
       Reuse user password as root password
       Dùng lại mật khẩu người dùng như mật khẩu quản trị
     
     
-      
+      
       Use the same password for the administrator account.
       Dùng cùng một mật khẩu cho tài khoản quản trị.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Chọn mật khẩu quản trị để giữ máy tính an toàn.
     
     
-      
+      
       Root Password
       Mật khẩu quản trị
     
     
-      
+      
       Repeat Root Password
       Lặp lại mật khẩu quản trị
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Nhập lại mật khẩu hai lần để kiểm tra.
     
diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts
index f910b6faac..3ce8df3229 100644
--- a/lang/calamares_zh.ts
+++ b/lang/calamares_zh.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       
     
     
-      
+      
       Boot Partition
       
     
     
-      
+      
       System Partition
       
     
     
-      
+      
       Do not install a boot loader
       
     
     
-      
+      
       %1 (%2)
       
     
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       
     
     
-      
+      
       Bad working directory path
       
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       
     
     
-      
+      
       Bad main script file
       
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       
     
     
-      
+      
       Boost.Python error in job "%1".
       
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
+      
       &Yes
       
     
     
-      
-      
+      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -464,22 +464,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       
     
     
-      
+      
       unparseable Python error
       
     
     
-      
+      
       unparseable Python traceback
       
     
     
-      
+      
       Unfetchable Python error.
       
     
@@ -497,6 +497,24 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
   
     CheckerContainer
     
@@ -513,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -691,12 +709,12 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Cannot get list of temporary mounts.
       
     
     
-      
+      
       Cleared all temporary mounts.
       
     
@@ -723,27 +741,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
     
-      
+      
       Set timezone to %1/%2.
       
     
     
-      
+      
       The system language will be set to %1.
       
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       
     
@@ -867,6 +885,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -907,6 +930,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       
     
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
   
   
     ContextualProcessJob
@@ -969,27 +1002,37 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       
     
     
-      
+      
       Logical
       
     
     
-      
+      
       Primary
       
     
     
-      
+      
       GPT
       
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -997,43 +1040,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       
     
     
+      
       
-      
       Creating new %1 partition on %2.
       
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       
     
@@ -1084,7 +1127,7 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       The installer failed to create a partition table on %1.
       
     
@@ -1323,7 +1366,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       
     
@@ -1360,57 +1413,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       
     
     
-      
+      
       Setting up mount points.
       
     
@@ -1823,6 +1876,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2040,29 +2101,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
+      
+      Select your preferred Region, or use the default settings.
       
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       
     
     
-      
+      
       Select your preferred Zone within your Region.
       
     
     
-      
+      
       Zones
       
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       
     
@@ -2369,7 +2430,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       
     
@@ -2550,33 +2611,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       
     
     
       
-      
+      
       New partition
       
     
     
-      
+      
       Name
       
     
     
-      
+      
       File System
       
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       
     
     
-      
+      
       Size
       
     
@@ -2662,117 +2728,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       
     
     
-      
+      
       EFI system partition flag not set
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2959,17 +3025,17 @@ Output:
       
     
     
-      
+      
       No product
       
     
     
-      
+      
       No description provided.
       
     
     
-      
+      
       (no mount point)
       
     
@@ -3227,12 +3293,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
@@ -3240,27 +3306,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
@@ -3416,7 +3482,7 @@ Output:
       
     
     
-      
+      
       The installer failed to set flags on partition %1.
       
     
@@ -3559,12 +3625,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       
     
@@ -4104,107 +4170,127 @@ Output:
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index c2a0c2d028..9119483ab8 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -31,27 +31,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       主引导记录 %1
     
     
-      
+      
       Boot Partition
       引导分区
     
     
-      
+      
       System Partition
       系统分区
     
     
-      
+      
       Do not install a boot loader
       不要安装引导程序
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -206,32 +206,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       正在运行 %1 个操作。
     
     
-      
+      
       Bad working directory path
       错误的工作目录路径
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       用于 python 任务 %2 的工作目录 %1 不可读。
     
     
-      
+      
       Bad main script file
       错误的主脚本文件
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       用于 python 任务 %2 的主脚本文件 %1 不可读。
     
     
-      
+      
       Boost.Python error in job "%1".
       任务“%1”出现 Boost.Python 错误。
     
@@ -284,54 +284,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       安装失败
     
     
-      
+      
       Installation Failed
       安装失败
     
     
-      
+      
       Would you like to paste the install log to the web?
       需要将安装日志粘贴到网页吗？
     
     
-      
+      
       Error
       错误
     
     
-      
-      
+      
+      
       &Yes
       &是
     
     
-      
-      
+      
+      
       &No
       &否
     
     
-      
+      
       &Close
       &关闭
     
     
-      
+      
       Install Log Paste URL
       安装日志粘贴 URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       上传失败，未完成网页粘贴。
     
     
-      
+      
       Install log posted to
 
 %1
@@ -340,124 +340,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Calamares初始化失败
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       ％1无法安装。 Calamares无法加载所有已配置的模块。这个问题是发行版配置Calamares不当导致的。
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>无法加载以下模块：
     
     
-      
+      
       Continue with setup?
       要继续安装吗？
     
     
-      
+      
       Continue with installation?
       继续安装？
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       为了安装%2, %1 安装程序即将对磁盘进行更改。<br/><strong>这些更改无法撤销。</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 安装程序将在您的磁盘上做出变更以安装 %2。<br/><strong>您将无法复原这些变更。</strong>
     
     
-      
+      
       &Set up now
       现在安装(&S)
     
     
-      
+      
       &Install now
       现在安装 (&I)
     
     
-      
+      
       Go &back
       返回 (&B)
     
     
-      
+      
       &Set up
       安装(&S)
     
     
-      
+      
       &Install
       安装(&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       安装完成。关闭安装程序。
     
     
-      
+      
       The installation is complete. Close the installer.
       安装已完成。请关闭安装程序。
     
     
-      
+      
       Cancel setup without changing the system.
       取消安装，保持系统不变。
     
     
-      
+      
       Cancel installation without changing the system.
       取消安装，并不做任何更改。
     
     
-      
+      
       &Next
       下一步(&N)
     
     
-      
+      
       &Back
       后退(&B)
     
     
-      
+      
       &Done
       &完成
     
     
-      
+      
       &Cancel
       取消(&C)
     
     
-      
+      
       Cancel setup?
       取消安装？
     
     
-      
+      
       Cancel installation?
       取消安装？
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       确定要取消当前安装吗?
 安装程序将会退出，所有修改都会丢失。
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       确定要取消当前的安装吗？
@@ -467,22 +467,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       未知异常类型
     
     
-      
+      
       unparseable Python error
       无法解析的 Python 错误
     
     
-      
+      
       unparseable Python traceback
       无法解析的 Python 回溯
     
     
-      
+      
       Unfetchable Python error.
       无法获取的 Python 错误。
     
@@ -500,6 +500,24 @@ The installer will quit and all changes will be lost.
       %1 安装程序
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      安装程序更新磁盘“%1”分区表失败。
+    
+  
   
     CheckerContainer
     
@@ -516,149 +534,149 @@ The installer will quit and all changes will be lost.
       表单
     
     
-      
+      
       Select storage de&vice:
       选择存储器(&V)：
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       当前：
     
     
-      
+      
       After:
       之后：
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>手动分区</strong><br/>您可以自行创建或重新调整分区大小。
     
     
-      
+      
       Reuse %1 as home partition for %2.
       重复使用 %1 作为 %2 的 home 分区。
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>选择要缩小的分区，然后拖动底栏改变大小</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 将会缩减未 %2MiB，然后为 %4 创建一个 %3MiB 分区。
     
     
-      
+      
       Boot loader location:
       引导程序位置：
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>选择要安装到的分区</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       在此系统上找不到任何 EFI 系统分区。请后退到上一步并使用手动分区配置 %1。
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 处的 EFI 系统分区将被用来启动 %2。
     
     
-      
+      
       EFI system partition:
       EFI 系统分区：
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       这个存储器上似乎还没有操作系统。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>抹除磁盘</strong><br/>这将会<font color="red">删除</font>目前选定的存储器上所有的数据。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>并存安装</strong><br/>安装程序将会缩小一个分区，为 %1 腾出空间。
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>取代一个分区</strong><br/>以 %1 <strong>替代</strong>一个分区。
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       这个存储器上已经有 %1 了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       这个存储器上已经有一个操作系统了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       这个存储器上已经有多个操作系统了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       此存储设备已经有操作系统，但是分区表 <strong>%1</strong> 与所需的 <strong>%2</strong>.<br/>不同。
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       此存储设备 <strong>已挂载</strong>其中一个分区。
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       该存储设备是 <strong>非活动RAID</strong> 设备的一部分。
     
     
-      
+      
       No Swap
       无交换分区
     
     
-      
+      
       Reuse Swap
       重用交换分区
     
     
-      
+      
       Swap (no Hibernate)
       交换分区(无休眠)
     
     
-      
+      
       Swap (with Hibernate)
       交换分区(带休眠)
     
     
-      
+      
       Swap to file
       交换到文件
     
@@ -694,12 +712,12 @@ The installer will quit and all changes will be lost.
       正在清除所有临时挂载点。
     
     
-      
+      
       Cannot get list of temporary mounts.
       无法获取临时挂载点列表。
     
     
-      
+      
       Cleared all temporary mounts.
       所有临时挂载点都已经清除。
     
@@ -726,27 +744,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       设置键盘型号为 %1。<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       设置键盘布局为 %1/%2。
     
     
-      
+      
       Set timezone to %1/%2.
       将时区设置为 %1/%2 。
     
     
-      
+      
       The system language will be set to %1.
       系统语言将设置为 %1。
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       数字和日期地域将设置为 %1。
     
@@ -872,6 +890,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       密码不匹配！
     
+    
+      
+      OK!
+      
+    
     
       
       Setup Failed
@@ -912,6 +935,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       %1 的安装操作已完成。
     
+    
+      
+      Package Selection
+      软件包选择
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      请在列表中选一个产品。被选中的产品将会被安装。
+    
   
   
     ContextualProcessJob
@@ -974,27 +1007,37 @@ The installer will quit and all changes will be lost.
       标记：
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       En&crypt
       加密(&C)
     
     
-      
+      
       Logical
       逻辑分区
     
     
-      
+      
       Primary
       主分区
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       挂载点已被占用。请选择另一个。
     
@@ -1002,43 +1045,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       在 %4 (%3) 上创建新的 %2MiB 分区，文件系统为 %1.
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       在<strong>%4</strong>(%3)上创建一个<strong>%2MiB</strong>的%1分区。
     
     
+      
       
-      
       Creating new %1 partition on %2.
       正在 %2 上创建新的 %1 分区。
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       安装程序在磁盘“%1”创建分区失败。
     
@@ -1089,7 +1132,7 @@ The installer will quit and all changes will be lost.
       正在 %2 上创建新的 %1 分区表。
     
     
-      
+      
       The installer failed to create a partition table on %1.
       安装程序于 %1 创建分区表失败。
     
@@ -1329,7 +1372,17 @@ The installer will quit and all changes will be lost.
       标记：
     
     
-      
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
       Mountpoint already in use. Please select another one.
       挂载点已被占用。请选择另一个。
     
@@ -1366,57 +1419,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       设置分区信息
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       在 <strong>新的</strong>系统分区 %2 上安装 %1。
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       设置%3 分区的挂载点
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       在 %3 系统割区 <strong>%1</strong> 上安装 %2。
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       在 <strong>%1</strong>上安装引导程序。
     
     
-      
+      
       Setting up mount points.
       正在设置挂载点。
     
@@ -1829,6 +1882,14 @@ The installer will quit and all changes will be lost.
       位置
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
   
     LocaleViewStep
     
@@ -2048,29 +2109,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      请选择一个地区或者使用基于您当前位置的默认值。
+      
+      Select your preferred Region, or use the default settings.
+      
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       时区: %1
     
     
-      
+      
       Select your preferred Zone within your Region.
       在您的区域中选择您的首选区域。
     
     
-      
+      
       Zones
       区域
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       您可以在下面微调“语言”和“区域设置”。
     
@@ -2377,7 +2438,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       软件包
     
@@ -2558,33 +2619,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       空闲空间
     
     
       
-      
+      
       New partition
       新建分区
     
     
-      
+      
       Name
       名称
     
     
-      
+      
       File System
       文件系统
     
     
-      
+      
+      File System Label
+      
+    
+    
+      
       Mount Point
       挂载点
     
     
-      
+      
       Size
       大小
     
@@ -2670,117 +2736,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       正在收集系统信息...
     
     
-      
+      
       Partitions
       分区
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       将 %1 安装在其他操作系统<strong>旁边</strong>。
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>抹除</strong>磁盘并安装 %1。
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       以 %1 <strong>替代</strong>一个分区。
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>手动</strong>分区
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       将 %1 安装在磁盘 <strong>%2</strong> (%3) 上的另一个操作系统<strong>旁边</strong>。
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>抹除</strong> 磁盘 <strong>%2</strong> (%3) 并且安装 %1。
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       以 %1 <strong>替代</strong> 一个在磁盘 <strong>%2</strong> (%3) 上的分区。
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       在磁盘 <strong>%1</strong> (%2) 上<strong>手动</strong>分区。
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       磁盘 <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       当前：
     
     
-      
+      
       After:
       之后：
     
     
-      
+      
       No EFI system partition configured
       未配置 EFI 系统分区
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       必须有 EFI 系统分区才能启动 %1 。<br/><br/>要配置 EFI 系统分区，后退一步，然后创建或选中一个 FAT32 分区并为之设置 <strong>%3</strong> 标记及挂载点 <strong>%2</strong>。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       必须有 EFI 系统分区才能启动 %1 。<br/><br/>已有挂载点为 <strong>%2</strong> 的分区，但是未设置 <strong>%3</strong> 标记。<br/>要设置此标记，后退并编辑分区。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。
     
     
-      
+      
       EFI system partition flag not set
       未设置 EFI 系统分区标记
     
     
-      
+      
       Option to use GPT on BIOS
       在 BIOS 上使用 GPT
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT 分区表对于所有系统来说都是最佳选项。本安装程序支持在 BIOS 模式下设置 GPT 分区表。<br/><br/>要在 BIOS 模式下配置 GPT 分区表，（若你尚未配置好）返回并设置分区表为 GPT，然后创建一个 8MB 的、未经格式化的、启用<strong>bios_grub</strong> 标记的分区。<br/><br/>一个未格式化的 8MB 的分区对于在 BIOS 模式下使用 GPT 启动 %1 来说是非常有必要的。
     
     
-      
+      
       Boot partition not encrypted
       引导分区未加密
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       您尝试用单独的引导分区配合已加密的根分区使用，但引导分区未加密。<br/><br/>这种配置方式可能存在安全隐患，因为重要的系统文件存储在了未加密的分区上。<br/>您可以继续保持此配置，但是系统解密将在系统启动时而不是引导时进行。<br/>要加密引导分区，请返回上一步并重新创建此分区，并在分区创建窗口选中 <strong>加密</strong> 选项。
     
     
-      
+      
       has at least one disk device available.
       有至少一个可用的磁盘设备。
     
     
-      
+      
       There are no partitions to install on.
       无可用于安装的分区。
     
@@ -2970,17 +3036,17 @@ Output:
       无法创建新的随机文件 <pre>%1</pre>.
     
     
-      
+      
       No product
       无产品
     
     
-      
+      
       No description provided.
       未提供描述信息
     
     
-      
+      
       (no mount point)
       （无挂载点）
     
@@ -3241,12 +3307,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       为了更好的体验，请确保这台电脑: 
     
     
-      
+      
       System requirements
       系统需求
     
@@ -3254,29 +3320,29 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       此计算机不满足安装 %1 的某些推荐配置。
 安装可以继续，但是一些特性可能被禁用。
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       此电脑未满足安装 %1 的最低需求。<br/>安装无法继续。<a href="#details">详细信息...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       此计算机不满足安装 %1 的某些推荐配置。
 安装可以继续，但是一些特性可能被禁用。
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       此电脑未满足一些安装 %1 的推荐需求。<br/>可以继续安装，但一些功能可能会被停用。
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       本程序将会问您一些问题并在您的电脑上安装及设置 %2 。
     
@@ -3432,7 +3498,7 @@ Output:
       正在将新分区标记为 <strong>%1</strong>.
     
     
-      
+      
       The installer failed to set flags on partition %1.
       安装程序没有成功设置分区 %1 的标记.
     
@@ -3575,12 +3641,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       预览——当你启动安装过程，以下行为将被执行
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       这是您开始安装后所会发生的事情的概览。
     
@@ -4157,107 +4223,127 @@ Output:
       选择您的用户名和凭据登录并执行管理任务
     
     
-      
+      
       What is your name?
       您的姓名？
     
     
-      
+      
       Your Full Name
       全名
     
     
-      
+      
       What name do you want to use to log in?
       您想要使用的登录用户名是？
     
     
-      
+      
       Login Name
       登录名
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       如果有多人要使用此计算机，您可以在安装后创建多个账户。
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      只允许小写字母、数组、下划线"_" 和 连字符"-"
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
       What is the name of this computer?
       计算机名称为？
     
     
-      
+      
       Computer Name
       计算机名称
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       将计算机设置为对其他网络上计算机可见时将使用此名称。
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
       Choose a password to keep your account safe.
       选择一个密码来保证您的账户安全。
     
     
-      
+      
       Password
       密码
     
     
-      
+      
       Repeat Password
       重复密码
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       输入相同密码两次，以检查输入错误。好的密码包含字母，数字，标点的组合，应当至少为 8 个字符长，并且应按一定周期更换。
     
     
-      
+      
       Validate passwords quality
       验证密码质量
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       若选中此项，密码强度检测会开启，你将不被允许使用弱密码。
     
     
-      
+      
       Log in automatically without asking for the password
       不询问密码自动登录
     
     
-      
+      
       Reuse user password as root password
       重用用户密码作为 root 密码
     
     
-      
+      
       Use the same password for the administrator account.
       为管理员帐号使用同样的密码。
     
     
-      
+      
       Choose a root password to keep your account safe.
       选择一个 root 密码来保证您的账户安全。
     
     
-      
+      
       Root Password
       Root 密码
     
     
-      
+      
       Repeat Root Password
       重复 Root 密码
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       输入相同密码两次，以检查输入错误。
     
diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts
index c0f0c73c8a..9e2e2904c0 100644
--- a/lang/calamares_zh_TW.ts
+++ b/lang/calamares_zh_TW.ts
@@ -30,27 +30,27 @@
   
     BootLoaderModel
     
-      
+      
       Master Boot Record of %1
       %1 的主要開機紀錄 (MBR)
     
     
-      
+      
       Boot Partition
       開機分割區
     
     
-      
+      
       System Partition
       系統分割區
     
     
-      
+      
       Do not install a boot loader
       無法安裝開機載入器
     
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -104,22 +104,22 @@
     
       
       Crashes Calamares, so that Dr. Konqui can look at it.
-      
+      讓 Calamares 當機，這樣 Dr. Konqui 就能檢視。
     
     
       
       Reloads the stylesheet from the branding directory.
-      
+      重新自品牌目錄載入樣式表。
     
     
       
       Uploads the session log to the configured pastebin.
-      
+      將工作階段紀錄檔上傳到設定好的 pastebin。
     
     
       
       Send Session Log
-      
+      傳送工作階段紀錄檔
     
     
       
@@ -129,7 +129,7 @@
     
       
       Displays the tree of widget names in the log (for stylesheet debugging).
-      
+      在紀錄檔中顯示小工具名稱樹（供樣式表除錯使用）。
     
     
       
@@ -205,32 +205,32 @@
   
     Calamares::PythonJob
     
-      
+      
       Running %1 operation.
       正在執行 %1 操作。
     
     
-      
+      
       Bad working directory path
       不良的工作目錄路徑
     
     
-      
+      
       Working directory %1 for python job %2 is not readable.
       Python 行程 %2 作用中的目錄 %1 不具讀取權限。
     
     
-      
+      
       Bad main script file
       錯誤的主要腳本檔
     
     
-      
+      
       Main script file %1 for python job %2 is not readable.
       Python 行程 %2 的主要腳本檔 %1 無法讀取。
     
     
-      
+      
       Boost.Python error in job "%1".
       行程 %1 中 Boost.Python 錯誤。
     
@@ -283,54 +283,54 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       設定失敗
     
     
-      
+      
       Installation Failed
       安裝失敗
     
     
-      
+      
       Would you like to paste the install log to the web?
       想要將安裝紀錄檔貼到網路上嗎？
     
     
-      
+      
       Error
       錯誤
     
     
-      
-      
+      
+      
       &Yes
       是(&Y)
     
     
-      
-      
+      
+      
       &No
       否(&N)
     
     
-      
+      
       &Close
       關閉(&C)
     
     
-      
+      
       Install Log Paste URL
       安裝紀錄檔張貼 URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       上傳不成功。並未完成網路張貼。
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,124 +343,124 @@ Link copied to clipboard
 連結已複製到剪貼簿
     
     
-      
+      
       Calamares Initialization Failed
       Calamares 初始化失敗
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 無法安裝。Calamares 無法載入所有已設定的模組。散佈版使用 Calamares 的方式有問題。
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>以下的模組無法載入：
     
     
-      
+      
       Continue with setup?
       繼續安裝？
     
     
-      
+      
       Continue with installation?
       繼續安裝？
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 設定程式將在您的磁碟上做出變更以設定 %2。<br/><strong>您將無法復原這些變更。</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 安裝程式將在您的磁碟上做出變更以安裝 %2。<br/><strong>您將無法復原這些變更。</strong>
     
     
-      
+      
       &Set up now
       馬上進行設定 (&S)
     
     
-      
+      
       &Install now
       現在安裝 (&I)
     
     
-      
+      
       Go &back
       上一步 (&B)
     
     
-      
+      
       &Set up
       設定 (&S)
     
     
-      
+      
       &Install
       安裝(&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       設定完成。關閉設定程式。
     
     
-      
+      
       The installation is complete. Close the installer.
       安裝完成。關閉安裝程式。
     
     
-      
+      
       Cancel setup without changing the system.
       取消安裝，不更改系統。
     
     
-      
+      
       Cancel installation without changing the system.
       不變更系統並取消安裝。
     
     
-      
+      
       &Next
       下一步 (&N)
     
     
-      
+      
       &Back
       返回 (&B)
     
     
-      
+      
       &Done
       完成(&D)
     
     
-      
+      
       &Cancel
       取消(&C)
     
     
-      
+      
       Cancel setup?
       取消設定？
     
     
-      
+      
       Cancel installation?
       取消安裝？
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       真的想要取消目前的設定程序嗎？
 設定程式將會結束，所有變更都將會遺失。
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       您真的想要取消目前的安裝程序嗎？
@@ -470,22 +470,22 @@ The installer will quit and all changes will be lost.
   
     CalamaresPython::Helper
     
-      
+      
       Unknown exception type
       未知的例外型別
     
     
-      
+      
       unparseable Python error
       無法解析的 Python 錯誤
     
     
-      
+      
       unparseable Python traceback
       無法解析的 Python 回溯紀錄
     
     
-      
+      
       Unfetchable Python error.
       無法讀取的 Python 錯誤。
     
@@ -503,6 +503,24 @@ The installer will quit and all changes will be lost.
       %1 安裝程式
     
   
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      在 %1 上設定檔案系統標籤。
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      設定檔案系統標籤 <strong>%1</strong> 到分割區 <strong>%2</strong>。
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      安裝程式在磁碟 '%1' 上更新分割區表格失敗。
+    
+  
   
     CheckerContainer
     
@@ -519,149 +537,149 @@ The installer will quit and all changes will be lost.
       表單
     
     
-      
+      
       Select storage de&vice:
       選取儲存裝置(&V)：
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       目前：
     
     
-      
+      
       After:
       之後：
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>手動分割</strong><br/>可以自行建立或重新調整分割區大小。
     
     
-      
+      
       Reuse %1 as home partition for %2.
       重新使用 %1 作為 %2 的家目錄分割區。
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>選取要縮減的分割區，然後拖曳底部條狀物來調整大小</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 會縮減到 %2MiB，並且會為 %4 建立新的 %3MiB 分割區。
     
     
-      
+      
       Boot loader location:
       開機載入器位置：
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>選取分割區以安裝在其上</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       在這個系統找不到 EFI 系統分割區。請回到上一步並使用手動分割以設定 %1。
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       在 %1 的 EFI 系統分割區將會在開始 %2 時使用。
     
     
-      
+      
       EFI system partition:
       EFI 系統分割區：
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       這個儲存裝置上似乎還沒有作業系統。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>抹除磁碟</strong><br/>這將會<font color="red">刪除</font>目前選取的儲存裝置所有的資料。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>並存安裝</strong><br/>安裝程式會縮小一個分割區，以讓出空間給 %1。
     
     
-      
       
-      
-      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>取代一個分割區</strong><br/>用 %1 取代一個分割區。
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       這個儲存裝置上已經有 %1 了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       這個儲存裝置上已經有一個作業系統了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       這個儲存裝置上已經有多個作業系統了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       此儲存裝置上已有作業系統，但分割表 <strong>%1</strong> 與需要的 <strong>%2</strong> 不同。<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       此裝置<strong>已掛載</strong>其中一個分割區。
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       此儲存裝置是<strong>非作用中 RAID</strong> 裝置的一部份。
     
     
-      
+      
       No Swap
       沒有 Swap
     
     
-      
+      
       Reuse Swap
       重用 Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap（沒有冬眠）
     
     
-      
+      
       Swap (with Hibernate)
       Swap（有冬眠）
     
     
-      
+      
       Swap to file
       Swap 到檔案
     
@@ -697,12 +715,12 @@ The installer will quit and all changes will be lost.
       正在清除所有暫時掛載。
     
     
-      
+      
       Cannot get list of temporary mounts.
       無法取得暫時掛載的列表。
     
     
-      
+      
       Cleared all temporary mounts.
       已清除所有暫時掛載。
     
@@ -729,27 +747,27 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       設定鍵盤型號為 %1 。<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       設定鍵盤佈局為 %1/%2 。
     
     
-      
+      
       Set timezone to %1/%2.
       設定時區為 %1/%2。
     
     
-      
+      
       The system language will be set to %1.
       系統語言會設定為%1。
     
     
-      
+      
       The numbers and dates locale will be set to %1.
       數字與日期語系會設定為%1。
     
@@ -766,12 +784,12 @@ The installer will quit and all changes will be lost.
     
       
       Network Installation. (Disabled: Internal error)
-      
+      網路安裝。（已停用：內部錯誤）
     
     
       
       Network Installation. (Disabled: No package list)
-      
+      網路安裝。（已停用：無軟體包清單）
     
     
       
@@ -873,6 +891,11 @@ The installer will quit and all changes will be lost.
       Your passwords do not match!
       密碼不符！
     
+    
+      
+      OK!
+      確定！
+    
     
       
       Setup Failed
@@ -913,6 +936,16 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
       %1 的安裝已完成。
     
+    
+      
+      Package Selection
+      軟體包選擇
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      請從清單中挑選產品。將會安裝選定的產品。
+    
   
   
     ContextualProcessJob
@@ -975,27 +1008,37 @@ The installer will quit and all changes will be lost.
       旗標：
     
     
-      
+      
+      Label for the filesystem
+      檔案系統標籤
+    
+    
+      
+      FS Label:
+      檔案系統標籤：
+    
+    
+      
       En&crypt
       加密(&C)
     
     
-      
+      
       Logical
       邏輯磁區
     
     
-      
+      
       Primary
       主要磁區
     
     
-      
+      
       GPT
       GPT
     
     
-      
+      
       Mountpoint already in use. Please select another one.
       掛載點使用中。請選擇其他的。
     
@@ -1003,43 +1046,43 @@ The installer will quit and all changes will be lost.
   
     CreatePartitionJob
     
-      
+      
       Create new %1MiB partition on %3 (%2) with entries %4.
       在 %3 (%2) 上使用項目 %4 建立新的 %1MiB 分割區。
     
     
-      
+      
       Create new %1MiB partition on %3 (%2).
       在 %3 (%2) 上建立新的 %1MiB 分割區。
     
     
-      
+      
       Create new %2MiB partition on %4 (%3) with file system %1.
       使用檔案系統 %1 在 %4 (%3) 建立新的 %2MiB 分割區。
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
       在 <strong>%3</strong> (%2) 上使用項目 <em>%4</em> 建立新的 <strong>%1MiB</strong> 分割區。
     
     
-      
+      
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
       在 <strong>%3</strong> (%2) 上建立新的 <strong>%1MiB</strong> 分割區。
     
     
-      
+      
       Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
       使用檔案系統 <strong>%1</strong> 在 <strong>%4</strong> (%3) 建立新的 <strong>%2MiB</strong> 分割區。
     
     
+      
       
-      
       Creating new %1 partition on %2.
       正在於 %2 建立新的 %1 分割區。
     
     
-      
+      
       The installer failed to create partition on disk '%1'.
       安裝程式在磁碟 '%1' 上建立分割區失敗。
     
@@ -1090,7 +1133,7 @@ The installer will quit and all changes will be lost.
       正在於 %2 建立新的 %1 分割表。
     
     
-      
+      
       The installer failed to create a partition table on %1.
       安裝程式在 %1 上建立分割區表格失敗。
     
@@ -1329,7 +1372,17 @@ The installer will quit and all changes will be lost.
       旗標：
     
     
-      
+      
+      Label for the filesystem
+      檔案系統標籤
+    
+    
+      
+      FS Label:
+      檔案系統標籤：
+    
+    
+      
       Mountpoint already in use. Please select another one.
       掛載點使用中。請選擇其他的。
     
@@ -1366,57 +1419,57 @@ The installer will quit and all changes will be lost.
   
     FillGlobalStorageJob
     
-      
+      
       Set partition information
       設定分割區資訊
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
       在有 <em>%3</em> 功能的<strong>新</strong> %2 系統分割區上安裝 %1
     
     
-      
+      
       Install %1 on <strong>new</strong> %2 system partition.
       在 <strong>新的</strong>系統分割區 %2 上安裝 %1。
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
       設定有掛載點 <strong>%1</strong> 與 <em>%3</em> 的<strong>新</strong> %2 分割區。
     
     
-      
+      
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
       設定有掛載點 <strong>%1</strong> %3 的<strong>新</strong> %2 分割區。
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
       在有功能 <em>%4</em> 的 %3 系統分割區 <strong>%1</strong> 上安裝 %2。
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
       為分割區 %3  <strong>%1</strong> 設定掛載點 <strong>%2</strong> 與功能 <em>%4</em>。
     
     
-      
+      
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
       為分割區 %3  <strong>%1</strong> 設定掛載點 <strong>%2</strong> %4。
     
     
-      
+      
       Install %2 on %3 system partition <strong>%1</strong>.
       在 %3 系統分割區 <strong>%1</strong> 上安裝 %2。
     
     
-      
+      
       Install boot loader on <strong>%1</strong>.
       安裝開機載入器於 <strong>%1</strong>。
     
     
-      
+      
       Setting up mount points.
       正在設定掛載點。
     
@@ -1829,6 +1882,14 @@ The installer will quit and all changes will be lost.
       位置
     
   
+  
+    LocaleTests
+    
+      
+      Quit
+      結束
+    
+  
   
     LocaleViewStep
     
@@ -2048,29 +2109,29 @@ The installer will quit and all changes will be lost.
   
     Offline
     
-      
-      Select your preferred Region, or use the default one based on your current location.
-      選取您偏好的區域，或是使用以您目前位置為基礎的預設值。
+      
+      Select your preferred Region, or use the default settings.
+      選取您偏好的區域，或是使用預設設定。
     
     
-      
-      
-      
+      
+      
+      
       Timezone: %1
       時區：%1
     
     
-      
+      
       Select your preferred Zone within your Region.
       在您的區域中選取您偏好的時區。
     
     
-      
+      
       Zones
       時區
     
     
-      
+      
       You can fine-tune Language and Locale settings below.
       您可以在下方微調語言與語系設定。
     
@@ -2377,7 +2438,7 @@ The installer will quit and all changes will be lost.
   
     PackageChooserViewStep
     
-      
+      
       Packages
       軟體包
     
@@ -2558,33 +2619,38 @@ The installer will quit and all changes will be lost.
     PartitionModel
     
       
-      
+      
       Free Space
       剩餘空間
     
     
       
-      
+      
       New partition
       新分割區
     
     
-      
+      
       Name
       名稱
     
     
-      
+      
       File System
       檔案系統
     
     
-      
+      
+      File System Label
+      檔案系統標籤
+    
+    
+      
       Mount Point
       掛載點
     
     
-      
+      
       Size
       大小
     
@@ -2670,117 +2736,117 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       蒐集系統資訊中...
     
     
-      
+      
       Partitions
       分割區
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system.
       將 %1 安裝在其他作業系統<strong>旁邊</strong>。
     
     
-      
+      
       <strong>Erase</strong> disk and install %1.
       <strong>抹除</strong>磁碟並安裝 %1。
     
     
-      
+      
       <strong>Replace</strong> a partition with %1.
       以 %1 <strong>取代</strong>一個分割區。
     
     
-      
+      
       <strong>Manual</strong> partitioning.
       <strong>手動</strong>分割
     
     
-      
+      
       Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
       將 %1 安裝在磁碟 <strong>%2</strong> (%3) 上的另一個作業系統<strong>旁邊</strong>。
     
     
-      
+      
       <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
       <strong>抹除</strong> 磁碟 <strong>%2</strong> (%3) 並且安裝 %1。
     
     
-      
+      
       <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
       以 %1 <strong>取代</strong> 一個在磁碟 <strong>%2</strong> (%3) 上的分割區。
     
     
-      
+      
       <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
       在磁碟 <strong>%1</strong> (%2) 上<strong>手動</strong>分割。
     
     
-      
+      
       Disk <strong>%1</strong> (%2)
       磁碟 <strong>%1</strong> (%2)
     
     
-      
+      
       Current:
       目前：
     
     
-      
+      
       After:
       之後：
     
     
-      
+      
       No EFI system partition configured
       未設定 EFI 系統分割區
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
       需要 EFI 系統分割區以啟動 %1。<br/><br/>要設定 EFI 系統分割區，回到上一步並選取或建立一個包含啟用 <strong>%3</strong> 旗標以及掛載點位於 <strong>%2</strong> 的 FAT32 檔案系統。<br/><br/>您也可以不設定 EFI 系統分割區並繼續，但是您的系統可能會無法啟動。
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
       需要 EFI 系統分割區以啟動 %1。<br/><br/>有一個分割區的掛載點設定為 <strong>%2</strong>，但未設定 <strong>%3</strong> 旗標。<br/>要設定此旗標，回到上一步並編輯分割區。<br/><br/>您也可以不設定旗標並繼續，但您的系統可能會無法啟動。
     
     
-      
+      
       EFI system partition flag not set
       未設定 EFI 系統分割區旗標
     
     
-      
+      
       Option to use GPT on BIOS
       在 BIOS 上使用 GPT 的選項
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT 分割表對所有系統都是最佳選項。此安裝程式同時也支援 BIOS 系統。<br/><br/>要在 BIOS 上設定 GPT 分割表，（如果還沒有完成的話）請回上一步並將分割表設定為 GPT，然後建立 8 MB 的未格式化分割區，並啟用 <strong>bios_grub</strong> 旗標。<br/>要在 BIOS 系統上使用 GPT 分割區啟動 %1 則必須使用未格式化的 8MB 分割區。
     
     
-      
+      
       Boot partition not encrypted
       開機分割區未加密
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       設定了單獨的開機分割區以及加密的根分割區，但是開機分割區並不會被加密。<br/><br/>這種設定可能會造成安全問題，因為重要的系統檔案是放在未加密的分割區中。<br/>您也可以繼續，但是檔案系統的解鎖會在系統啟動後才發生。<br/>要加密開機分割區，回到上一頁並重新建立它，並在分割區建立視窗選取<strong>加密</strong>。
     
     
-      
+      
       has at least one disk device available.
       有至少一個可用的磁碟裝置。
     
     
-      
+      
       There are no partitions to install on.
       沒有可用於安裝的分割區。
     
@@ -2970,17 +3036,17 @@ Output:
       無法建立新的隨機檔案 <pre>%1</pre>。
     
     
-      
+      
       No product
       沒有產品
     
     
-      
+      
       No description provided.
       未提供描述。
     
     
-      
+      
       (no mount point)
       (沒有掛載點)
     
@@ -3241,12 +3307,12 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       為了得到最佳的結果，請確保此電腦：
     
     
-      
+      
       System requirements
       系統需求
     
@@ -3254,27 +3320,27 @@ Output:
   
     ResultsListWidget
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       此電腦未滿足安裝 %1 的最低配備。<br/>設定無法繼續。<a href="#details">詳細資訊...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       此電腦未滿足安裝 %1 的最低配備。<br/>安裝無法繼續。<a href="#details">詳細資訊...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       此電腦未滿足一些安裝 %1 的推薦需求。<br/>設定可以繼續，但部份功能可能會被停用。
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       此電腦未滿足一些安裝 %1 的推薦需求。<br/>安裝可以繼續，但部份功能可能會被停用。
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       本程式會問您一些問題，然後在您的電腦安裝及設定 %2。
     
@@ -3430,7 +3496,7 @@ Output:
       正在設定新分割區的 <strong>%1</strong> 旗標。
     
     
-      
+      
       The installer failed to set flags on partition %1.
       安裝程式未能在分割區 %1 設定旗標。
     
@@ -3573,12 +3639,12 @@ Output:
   
     SummaryPage
     
-      
+      
       This is an overview of what will happen once you start the setup procedure.
       這是開始安裝後所會發生的事的概覽。
     
     
-      
+      
       This is an overview of what will happen once you start the install procedure.
       這是您開始安裝後所會發生的事的概覽。
     
@@ -4154,107 +4220,127 @@ Output:
       挑選您的使用者名稱與憑證以登入並執行管理工作
     
     
-      
+      
       What is your name?
       該如何稱呼您？
     
     
-      
+      
       Your Full Name
       您的全名
     
     
-      
+      
       What name do you want to use to log in?
       您想使用何種登入名稱？
     
     
-      
+      
       Login Name
       登入名稱
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       若有多於一個人使用此電腦，您可以在安裝後建立多個帳號。
     
     
-      
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      僅允許小寫字母、數字、底線與連接號。
+    
+    
+      
+      root is not allowed as username.
+      不允許使用 root 作為使用者名稱。
+    
+    
+      
       What is the name of this computer?
       這部電腦的名字是？
     
     
-      
+      
       Computer Name
       電腦名稱
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       若您將此電腦設定為讓網路上的其他電腦可見時將會使用此名稱。
     
     
-      
+      
+      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
+      僅允許字母、數字、底線與連接號，最少兩個字元。
+    
+    
+      
+      localhost is not allowed as hostname.
+      不允許使用 localhost 作為主機名稱。
+    
+    
+      
       Choose a password to keep your account safe.
       輸入密碼以確保帳號的安全性。
     
     
-      
+      
       Password
       密碼
     
     
-      
+      
       Repeat Password
       確認密碼
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       輸入同一個密碼兩次，以檢查輸入錯誤。一個好的密碼包含了字母、數字及標點符號的組合、至少八個字母長，且按一固定週期更換。
     
     
-      
+      
       Validate passwords quality
       驗證密碼品質
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       當此勾選框被勾選，密碼強度檢查即完成，您也無法再使用弱密碼。
     
     
-      
+      
       Log in automatically without asking for the password
       自動登入，無需輸入密碼
     
     
-      
+      
       Reuse user password as root password
       重用使用者密碼為 root 密碼
     
     
-      
+      
       Use the same password for the administrator account.
       為管理員帳號使用同樣的密碼。
     
     
-      
+      
       Choose a root password to keep your account safe.
       選擇 root 密碼來維護您的帳號安全。
     
     
-      
+      
       Root Password
       Root 密碼
     
     
-      
+      
       Repeat Root Password
       確認 Root 密碼
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       輸入同樣的密碼兩次，這樣可以檢查輸入錯誤。
     

From afedc8475d236d4352cf3cc6bc06cc0af1b6a25f Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Wed, 14 Jul 2021 00:06:31 +0200
Subject: [PATCH 280/492] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python.pot                               | 183 ++++---
 lang/python/ar/LC_MESSAGES/python.po          | 439 +++++++++-------
 lang/python/as/LC_MESSAGES/python.po          | 455 ++++++++--------
 lang/python/ast/LC_MESSAGES/python.po         | 447 ++++++++--------
 lang/python/az/LC_MESSAGES/python.po          | 469 +++++++++--------
 lang/python/az_AZ/LC_MESSAGES/python.po       | 469 +++++++++--------
 lang/python/be/LC_MESSAGES/python.po          | 467 +++++++++--------
 lang/python/bg/LC_MESSAGES/python.po          | 373 +++++++------
 lang/python/bn/LC_MESSAGES/python.po          | 397 +++++++-------
 lang/python/ca/LC_MESSAGES/python.po          | 478 +++++++++--------
 lang/python/ca@valencia/LC_MESSAGES/python.po | 467 +++++++++--------
 lang/python/cs_CZ/LC_MESSAGES/python.po       | 473 +++++++++--------
 lang/python/da/LC_MESSAGES/python.po          | 461 ++++++++--------
 lang/python/de/LC_MESSAGES/python.po          | 469 +++++++++--------
 lang/python/el/LC_MESSAGES/python.po          | 359 +++++++------
 lang/python/en_GB/LC_MESSAGES/python.po       | 373 +++++++------
 lang/python/eo/LC_MESSAGES/python.po          | 373 +++++++------
 lang/python/es/LC_MESSAGES/python.po          | 473 +++++++++--------
 lang/python/es_MX/LC_MESSAGES/python.po       | 471 +++++++++--------
 lang/python/es_PE/LC_MESSAGES/python.po       | 357 +++++++------
 lang/python/es_PR/LC_MESSAGES/python.po       | 357 +++++++------
 lang/python/et/LC_MESSAGES/python.po          | 399 +++++++-------
 lang/python/eu/LC_MESSAGES/python.po          | 405 +++++++-------
 lang/python/fa/LC_MESSAGES/python.po          | 459 ++++++++--------
 lang/python/fi_FI/LC_MESSAGES/python.po       | 459 ++++++++--------
 lang/python/fr/LC_MESSAGES/python.po          | 469 +++++++++--------
 lang/python/fr_CH/LC_MESSAGES/python.po       | 357 +++++++------
 lang/python/fur/LC_MESSAGES/python.po         | 467 +++++++++--------
 lang/python/gl/LC_MESSAGES/python.po          | 405 +++++++-------
 lang/python/gu/LC_MESSAGES/python.po          | 357 +++++++------
 lang/python/he/LC_MESSAGES/python.po          | 479 +++++++++--------
 lang/python/hi/LC_MESSAGES/python.po          | 457 ++++++++--------
 lang/python/hr/LC_MESSAGES/python.po          | 467 +++++++++--------
 lang/python/hu/LC_MESSAGES/python.po          | 461 ++++++++--------
 lang/python/id/LC_MESSAGES/python.po          | 407 +++++++-------
 lang/python/id_ID/LC_MESSAGES/python.po       | 353 +++++++------
 lang/python/ie/LC_MESSAGES/python.po          | 421 ++++++++-------
 lang/python/is/LC_MESSAGES/python.po          | 365 +++++++------
 lang/python/it_IT/LC_MESSAGES/python.po       | 469 +++++++++--------
 lang/python/ja/LC_MESSAGES/python.po          | 453 ++++++++--------
 lang/python/kk/LC_MESSAGES/python.po          | 357 +++++++------
 lang/python/kn/LC_MESSAGES/python.po          | 357 +++++++------
 lang/python/ko/LC_MESSAGES/python.po          | 453 ++++++++--------
 lang/python/lo/LC_MESSAGES/python.po          | 353 +++++++------
 lang/python/lt/LC_MESSAGES/python.po          | 485 +++++++++--------
 lang/python/lv/LC_MESSAGES/python.po          | 361 +++++++------
 lang/python/mk/LC_MESSAGES/python.po          | 393 +++++++-------
 lang/python/ml/LC_MESSAGES/python.po          | 363 +++++++------
 lang/python/mr/LC_MESSAGES/python.po          | 357 +++++++------
 lang/python/nb/LC_MESSAGES/python.po          | 359 +++++++------
 lang/python/ne/LC_MESSAGES/python.po          | 357 +++++++------
 lang/python/ne_NP/LC_MESSAGES/python.po       | 357 +++++++------
 lang/python/nl/LC_MESSAGES/python.po          | 473 +++++++++--------
 lang/python/pl/LC_MESSAGES/python.po          | 481 +++++++++--------
 lang/python/pt_BR/LC_MESSAGES/python.po       | 463 ++++++++--------
 lang/python/pt_PT/LC_MESSAGES/python.po       | 483 +++++++++--------
 lang/python/ro/LC_MESSAGES/python.po          | 377 +++++++------
 lang/python/ru/LC_MESSAGES/python.po          | 439 +++++++++-------
 lang/python/ru_RU/LC_MESSAGES/python.po       | 365 +++++++------
 lang/python/si/LC_MESSAGES/python.po          | 357 +++++++------
 lang/python/sk/LC_MESSAGES/python.po          | 465 ++++++++--------
 lang/python/sl/LC_MESSAGES/python.po          | 365 +++++++------
 lang/python/sq/LC_MESSAGES/python.po          | 480 +++++++++--------
 lang/python/sr/LC_MESSAGES/python.po          | 405 +++++++-------
 lang/python/sr@latin/LC_MESSAGES/python.po    | 361 +++++++------
 lang/python/sv/LC_MESSAGES/python.po          | 463 ++++++++--------
 lang/python/te/LC_MESSAGES/python.po          | 357 +++++++------
 lang/python/tg/LC_MESSAGES/python.po          | 467 +++++++++--------
 lang/python/th/LC_MESSAGES/python.po          | 353 +++++++------
 lang/python/tr_TR/LC_MESSAGES/python.po       | 463 ++++++++--------
 lang/python/uk/LC_MESSAGES/python.po          | 496 ++++++++++--------
 lang/python/ur/LC_MESSAGES/python.po          | 357 +++++++------
 lang/python/uz/LC_MESSAGES/python.po          | 353 +++++++------
 lang/python/vi/LC_MESSAGES/python.po          | 453 ++++++++--------
 lang/python/zh/LC_MESSAGES/python.po          | 353 +++++++------
 lang/python/zh_CN/LC_MESSAGES/python.po       | 453 ++++++++--------
 lang/python/zh_TW/LC_MESSAGES/python.po       | 459 ++++++++--------
 77 files changed, 17374 insertions(+), 14638 deletions(-)

diff --git a/lang/python.pot b/lang/python.pot
index d2ae8b0346..0831515634 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
-#
+# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -12,104 +12,108 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
-msgstr ""
+msgstr "Install bootloader."
 
 #: src/modules/bootloader/main.py:502
 msgid "Bootloader installation error"
-msgstr ""
+msgstr "Bootloader installation error"
 
 #: src/modules/bootloader/main.py:503
 msgid ""
-"The bootloader could not be installed. The installation command 
    {!s} returned error code {!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
-msgstr ""
+msgstr "Cannot write KDM configuration file"
 
 #: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
-msgstr ""
+msgstr "KDM config file {!s} does not exist"
 
 #: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
-msgstr ""
+msgstr "Cannot write LXDM configuration file"
 
 #: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
-msgstr ""
+msgstr "LXDM config file {!s} does not exist"
 
 #: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
-msgstr ""
+msgstr "Cannot write LightDM configuration file"
 
 #: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
-msgstr ""
+msgstr "LightDM config file {!s} does not exist"
 
 #: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
-msgstr ""
+msgstr "Cannot configure LightDM"
 
 #: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
-msgstr ""
+msgstr "No LightDM greeter installed."
 
 #: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
-msgstr ""
+msgstr "Cannot write SLIM configuration file"
 
 #: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
-msgstr ""
+msgstr "SLIM config file {!s} does not exist"
 
 #: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
-msgstr ""
+msgstr "No display managers selected for the displaymanager module."
 
 #: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
-msgstr ""
+msgstr "Display manager configuration was incomplete"
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
-msgstr ""
+msgstr "Creating initramfs with dracut."
 
 #: src/modules/dracut/main.py:49
 msgid "Failed to run dracut on the target"
-msgstr ""
+msgstr "Failed to run dracut on the target"
 
 #: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
 msgid "The exit code was {}"
-msgstr ""
+msgstr "The exit code was {}"
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
-msgstr ""
+msgstr "Dummy python job."
 
 #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
 #: src/modules/dummypython/main.py:94
 msgid "Dummy python step {}"
-msgstr ""
+msgstr "Dummy python step {}"
 
 #: src/modules/fstab/main.py:29
 msgid "Writing fstab."
-msgstr ""
+msgstr "Writing fstab."
 
 #: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
 #: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
@@ -120,263 +124,282 @@ msgstr ""
 #: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
 #: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
 msgid "Configuration Error"
-msgstr ""
+msgstr "Configuration Error"
 
 #: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
 #: src/modules/initramfscfg/main.py:86
 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
 #: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
+msgstr "No partitions are defined for 
    {!s}
     to use."
 
 #: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
 #: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91 src/modules/networkcfg/main.py:40
-#: src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr ""
+msgstr "No root mount point is given for 
    {!s}
     to use."
 
 #: src/modules/fstab/main.py:389
 msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+msgstr "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
-msgstr ""
+msgstr "Configure GRUB."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
-msgstr ""
+msgstr "Setting hardware clock."
 
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
-msgstr ""
+msgstr "Configuring mkinitcpio."
 
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
-msgstr ""
+msgstr "Configuring initramfs."
 
 #: src/modules/localecfg/main.py:30
 msgid "Configuring locales."
-msgstr ""
+msgstr "Configuring locales."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
-msgstr ""
+msgstr "Configuring encrypted swap."
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr ""
+msgstr "Creating initramfs with mkinitfs."
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr ""
+msgstr "Failed to run mkinitfs on the target"
 
 #: src/modules/mount/main.py:30
 msgid "Mounting partitions."
-msgstr ""
+msgstr "Mounting partitions."
 
 #: src/modules/networkcfg/main.py:28
 msgid "Saving network configuration."
-msgstr ""
+msgstr "Saving network configuration."
 
 #: src/modules/openrcdmcryptcfg/main.py:26
 msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+msgstr "Configuring OpenRC dmcrypt service."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
 msgid "Install packages."
-msgstr ""
+msgstr "Install packages."
 
 #: src/modules/packages/main.py:57
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
+msgstr "Processing packages (%(count)d / %(total)d)"
 
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Installing one package."
+msgstr[1] "Installing %(num)d packages."
 
 #: src/modules/packages/main.py:65
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Removing one package."
+msgstr[1] "Removing %(num)d packages."
 
 #: src/modules/packages/main.py:588 src/modules/packages/main.py:600
 #: src/modules/packages/main.py:628
 msgid "Package Manager error"
-msgstr ""
+msgstr "Package Manager error"
 
 #: src/modules/packages/main.py:589
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 
 #: src/modules/packages/main.py:601
 msgid ""
-"The package manager could not update the system. The command 
    {!s}
     "
-"returned error code {!s}."
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 
 #: src/modules/packages/main.py:629
 msgid ""
 "The package manager could make changes to the installed system. The command "
 "
    {!s}
     returned error code {!s}."
 msgstr ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 
 #: src/modules/plymouthcfg/main.py:27
 msgid "Configure Plymouth theme"
-msgstr ""
+msgstr "Configure Plymouth theme"
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
-msgstr ""
+msgstr "Installing data."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
-msgstr ""
+msgstr "Configure OpenRC services"
 
 #: src/modules/services-openrc/main.py:57
 msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
+msgstr "Cannot add service {name!s} to run-level {level!s}."
 
 #: src/modules/services-openrc/main.py:59
 msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
+msgstr "Cannot remove service {name!s} from run-level {level!s}."
 
 #: src/modules/services-openrc/main.py:61
 msgid ""
 "Unknown service-action {arg!s} for service {name!s} in run-"
 "level {level!s}."
 msgstr ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 
 #: src/modules/services-openrc/main.py:93
 #: src/modules/services-systemd/main.py:59
 msgid "Cannot modify service"
-msgstr ""
+msgstr "Cannot modify service"
 
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 
 #: src/modules/services-openrc/main.py:101
 msgid "Target runlevel does not exist"
-msgstr ""
+msgstr "Target runlevel does not exist"
 
 #: src/modules/services-openrc/main.py:102
 msgid ""
 "The path for runlevel {level!s} is {path!s}, which does not "
 "exist."
 msgstr ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 
 #: src/modules/services-openrc/main.py:110
 msgid "Target service does not exist"
-msgstr ""
+msgstr "Target service does not exist"
 
 #: src/modules/services-openrc/main.py:111
 msgid ""
-"The path for service {name!s} is {path!s}, which does not exist."
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 
 #: src/modules/services-systemd/main.py:26
 msgid "Configure systemd services"
-msgstr ""
+msgstr "Configure systemd services"
 
 #: src/modules/services-systemd/main.py:60
 msgid ""
 "systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 
 #: src/modules/services-systemd/main.py:63
 #: src/modules/services-systemd/main.py:67
 msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+msgstr "Cannot enable systemd service {name!s}."
 
 #: src/modules/services-systemd/main.py:65
 msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+msgstr "Cannot enable systemd target {name!s}."
 
 #: src/modules/services-systemd/main.py:69
 msgid "Cannot disable systemd target {name!s}."
-msgstr ""
+msgstr "Cannot disable systemd target {name!s}."
 
 #: src/modules/services-systemd/main.py:71
 msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
+msgstr "Cannot mask systemd unit {name!s}."
 
 #: src/modules/services-systemd/main.py:73
 msgid ""
-"Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 
 #: src/modules/umount/main.py:31
 msgid "Unmount file systems."
-msgstr ""
+msgstr "Unmount file systems."
 
 #: src/modules/unpackfs/main.py:35
 msgid "Filling up filesystems."
-msgstr ""
+msgstr "Filling up filesystems."
 
 #: src/modules/unpackfs/main.py:255
 msgid "rsync failed with error code {}."
-msgstr ""
+msgstr "rsync failed with error code {}."
 
 #: src/modules/unpackfs/main.py:300
 msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
+msgstr "Unpacking image {}/{}, file {}/{}"
 
 #: src/modules/unpackfs/main.py:315
 msgid "Starting to unpack {}"
-msgstr ""
+msgstr "Starting to unpack {}"
 
 #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
 msgid "Failed to unpack image \"{}\""
-msgstr ""
+msgstr "Failed to unpack image \"{}\""
 
 #: src/modules/unpackfs/main.py:431
 msgid "No mount point for root partition"
-msgstr ""
+msgstr "No mount point for root partition"
 
 #: src/modules/unpackfs/main.py:432
 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
+msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 
 #: src/modules/unpackfs/main.py:437
 msgid "Bad mount point for root partition"
-msgstr ""
+msgstr "Bad mount point for root partition"
 
 #: src/modules/unpackfs/main.py:438
 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
 
 #: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
 #: src/modules/unpackfs/main.py:478
 msgid "Bad unsquash configuration"
-msgstr ""
+msgstr "Bad unsquash configuration"
 
 #: src/modules/unpackfs/main.py:455
 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 
 #: src/modules/unpackfs/main.py:459
 msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+msgstr "The source filesystem \"{}\" does not exist"
 
 #: src/modules/unpackfs/main.py:465
 msgid ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed"
 msgstr ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 
 #: src/modules/unpackfs/main.py:479
 msgid "The destination \"{}\" in the target system is not a directory"
-msgstr ""
+msgstr "The destination \"{}\" in the target system is not a directory"
diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po
index e6dbf1b966..41650c1882 100644
--- a/lang/python/ar/LC_MESSAGES/python.po
+++ b/lang/python/ar/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: aboodilankaboot, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
@@ -22,201 +22,229 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "تثبيت محمل الإقلاع"
+
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "جاري تركيب الأقسام"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "خطأ في الضبط"
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr "فشلت كتابة ملف ضبط KDM."
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr "ملف ضبط KDM {!s} غير موجود"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "تعديل خدمات systemd"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr "فشلت كتابة ملف ضبط LXDM."
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "لا يمكن تعديل الخدمة"
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr "ملف ضبط LXDM {!s} غير موجود"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr "فشلت كتابة ملف ضبط LightDM."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr "ملف ضبط LightDM {!s} غير موجود"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr "فشل ضبط LightDM"
+
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr "لم يتم تصيب LightDM"
+
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr "فشلت كتابة ملف ضبط SLIM."
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr "ملف ضبط SLIM {!s} غير موجود"
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr "إعداد مدير العرض لم يكتمل"
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "الغاء تحميل ملف النظام"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "كود الخروج كان {}"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "جاري ملئ أنظمة الملفات"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "عملية بايثون دميه"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "فشل rsync مع رمز الخطأ {}."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "عملية  دميه خطوه بايثون {}"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "خطأ في الضبط"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "جاري إعداد ساعة الهاردوير"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
-msgstr "فشلت كتابة ملف ضبط KDM."
-
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
-msgstr "ملف ضبط KDM {!s} غير موجود"
-
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
-msgstr "فشلت كتابة ملف ضبط LXDM."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
-msgstr "ملف ضبط LXDM {!s} غير موجود"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "جاري تركيب الأقسام"
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
-msgstr "فشلت كتابة ملف ضبط LightDM."
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "جاري حفظ الإعدادات"
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
-msgstr "ملف ضبط LightDM {!s} غير موجود"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
-msgstr "فشل ضبط LightDM"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "تثبيت الحزم"
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
-msgstr "لم يتم تصيب LightDM"
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "جاري تحميل الحزم (%(count)d/%(total)d)"
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
-msgstr "فشلت كتابة ملف ضبط SLIM."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
-msgstr "ملف ضبط SLIM {!s} غير موجود"
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/packages/main.py:589
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
-msgstr "إعداد مدير العرض لم يكتمل"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -241,6 +269,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "لا يمكن تعديل الخدمة"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -266,95 +299,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "تعديل خدمات systemd"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "تثبيت الحزم"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "جاري تحميل الحزم (%(count)d/%(total)d)"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "تثبيت محمل الإقلاع"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "جاري إعداد ساعة الهاردوير"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "الغاء تحميل ملف النظام"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "جاري ملئ أنظمة الملفات"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "فشل rsync مع رمز الخطأ {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "كود الخروج كان {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "عملية بايثون دميه"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "عملية  دميه خطوه بايثون {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "جاري حفظ الإعدادات"
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po
index 234569f18e..4c3df677fc 100644
--- a/lang/python/as/LC_MESSAGES/python.po
+++ b/lang/python/as/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Deep Jyoti Choudhury , 2020\n"
 "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n"
@@ -21,207 +21,223 @@ msgstr ""
 "Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB কনফিগাৰ কৰক।"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "বিভাজন মাউন্ট্ কৰা।"
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "কনফিগাৰেচন ত্ৰুটি"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
    ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
-"অজ্ঞাত systemd কমাণ্ড্।"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ফাইল চিছটেম​বোৰ মাউণ্টৰ পৰা আতৰাওক।"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ফাইল চিছটেম​বোৰ পূৰণ কৰা হৈ আছে।"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync ক্ৰুটি কোড {}ৰ সৈতে বিফল হ'ল।"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "ইমেজ \"{}\" খোলাত ব্যৰ্থ হ'ল"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "ৰুট বিভাজনত কোনো মাউণ্ট পইণ্ট্ নাই"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ত rootMountPoint key নাই, একো কৰিব পৰা নাযায়"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "মুল বিভাজনৰ বাবে বেয়া মাউন্ট্ পইন্ট্"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint হ'ল \"{}\", যিটো উপস্থিত নাই, একো কৰিব পৰা নাযায়"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "বেয়া unsquash কনফিগাৰেচন"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" ফাইল চিছটেম উপস্থিত নাই"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs বিচৰাত ব্যৰ্থ হ'ল, নিশ্চিত কৰক যে আপুনি squashfs-tools ইন্স্তল "
-"কৰিছে"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "KDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "LXDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "LightDM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "LightDM কনফিগাৰ কৰিব নোৱাৰি"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "কোনো LightDM স্ৱাগতকৰ্তা ইন্স্তল নাই।"
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "SLIM কনফিগাৰেচন ফাইলত লিখিব নোৱাৰি"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM কনফিগ্ ফাইল {!s} উপস্থিত নাই"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "displaymanager মডিউলৰ বাবে কোনো ডিস্প্লে প্ৰবন্ধক নাই।"
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "এক্সিড্ কোড্ আছিল {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "ডামী Pythonৰ কায্য"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "ডামী Pythonৰ পদক্ষেপ {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab লিখি আছে।"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "কনফিগাৰেচন ত্ৰুটি"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
    ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "ব্যৱহাৰৰ বাবে 
    {!s}
    ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB কনফিগাৰ কৰক।"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "এন্ক্ৰিপ্টেড স্ৱেপ কন্ফিগাৰ কৰি আছে।"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "বিভাজন মাউন্ট্ কৰা।"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "পেকেজ ইন্স্তল কৰক।"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "ডাটা ইন্স্তল কৰি আছে।"
@@ -246,6 +262,11 @@ msgstr ""
 "ৰান-লেভেল {level!s}ত সেৱা {name!s}ৰ বাবে অজ্ঞাত সেৱা কাৰ্য্য "
 "{arg!s} ।"
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -272,87 +293,101 @@ msgid ""
 "exist."
 msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "পেকেজ ইন্স্তল কৰক।"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
+"অজ্ঞাত systemd কমাণ্ড্।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ফাইল চিছটেম​বোৰ মাউণ্টৰ পৰা আতৰাওক।"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ফাইল চিছটেম​বোৰ পূৰণ কৰা হৈ আছে।"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync ক্ৰুটি কোড {}ৰ সৈতে বিফল হ'ল।"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "এক্সিড্ কোড্ আছিল {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "ইমেজ \"{}\" খোলাত ব্যৰ্থ হ'ল"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "ৰুট বিভাজনত কোনো মাউণ্ট পইণ্ট্ নাই"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ত rootMountPoint key নাই, একো কৰিব পৰা নাযায়"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "মুল বিভাজনৰ বাবে বেয়া মাউন্ট্ পইন্ট্"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint হ'ল \"{}\", যিটো উপস্থিত নাই, একো কৰিব পৰা নাযায়"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab লিখি আছে।"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "বেয়া unsquash কনফিগাৰেচন"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ডামী Pythonৰ কায্য"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "ডামী Pythonৰ পদক্ষেপ {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" ফাইল চিছটেম উপস্থিত নাই"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs বিচৰাত ব্যৰ্থ হ'ল, নিশ্চিত কৰক যে আপুনি squashfs-tools ইন্স্তল "
+"কৰিছে"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po
index 61bd860db2..9deca93cb4 100644
--- a/lang/python/ast/LC_MESSAGES/python.po
+++ b/lang/python/ast/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: enolp , 2020\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -21,206 +21,223 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nun pue modificase'l serviciu"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontaxe de sistemes de ficheros."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Rellenando los sistemes de ficheros."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falló col códigu de fallu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Fallu al desempaquetar la imaxe «{}»"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nun hai un puntu de montaxe pa la partición del raigañu"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nun contién una clave «rootMountPoint». Nun va facese nada"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "El puntu de montaxe ye incorreutu pa la partición del raigañu"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "La configuración d'espardimientu ye incorreuta"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalando'l xestor d'arrinque."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de ficheros d'orixe «{}» nun esiste"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Fallu al alcontrar unsquashfs, asegúrate que tienes instaláu'l paquete "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Nun pue escribise'l ficheru de configuración de KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Nun esiste'l ficheru de configuración de KDM {!s}"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Nun pue escribise'l ficheru de configuración de LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Nun esiste'l ficheru de configuración de LXDM {!s}"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Nun pue escribise'l ficheru de configuración de LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Nun esiste'l ficheru de configuración de LightDM {!s}"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Nun pue configurase LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Nun s'instaló nengún saludador de LightDM."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Nun pue escribise'l ficheru de configuración de SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Nun esiste'l ficheru de configuración de SLIM {!s}"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Nun s'esbillaron xestores de pantalles pal módulu displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del xestor de pantalles nun se completó"
 
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Fallu al executar dracut nel destín"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El códigu de salida foi {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabayu maniquín en Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pasu maniquín {} en Python"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando'l reló de hardware."
+
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Configurando mkinitcpio."
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locales."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando l'intercambéu cifráu."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalación de paquetes."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando %(num)d paquetes."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Desaniciando un paquete."
+msgstr[1] "Desaniciando %(num)d paquetes."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando datos."
@@ -244,6 +261,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Nun pue modificase'l serviciu"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -269,87 +291,100 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalación de paquetes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando %(num)d paquetes."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Desaniciando un paquete."
-msgstr[1] "Desaniciando %(num)d paquetes."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalando'l xestor d'arrinque."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando'l reló de hardware."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El códigu de salida foi {}"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontaxe de sistemes de ficheros."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Rellenando los sistemes de ficheros."
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Fallu al executar dracut nel destín"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falló col códigu de fallu {}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Fallu al desempaquetar la imaxe «{}»"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nun hai un puntu de montaxe pa la partición del raigañu"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"globalstorage nun contién una clave «rootMountPoint». Nun va facese nada"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabayu maniquín en Python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "El puntu de montaxe ye incorreutu pa la partición del raigañu"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pasu maniquín {} en Python"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "La configuración d'espardimientu ye incorreuta"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de ficheros d'orixe «{}» nun esiste"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Fallu al alcontrar unsquashfs, asegúrate que tienes instaláu'l paquete "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu"
diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index 7c06bf7291..54541da9a9 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: xxmn77 , 2020\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
@@ -21,187 +21,65 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Tənzimləmə xətası"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fayl sistemini ayırmaq."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fayl sistemlərini doldurmaq."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync uğursuz oldu, xəta kodu: {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
-"{}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Tərkiblərini açmağa başladılır {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
-"əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash xətalı tənzimlənməsi"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "KDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "LXDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "LightDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "LightDM tənzimlənə bilmir"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "LightDM qarşılama quraşdırılmayıb."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "SLİM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -209,27 +87,160 @@ msgstr ""
 "Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
 "da boşdur və ya təyin olunmamışdır."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ilə initramfs yaratmaq."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hədəfdə dracut başladılmadı"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab yazılır."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Tənzimləmə xətası"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs tənzimlənir."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Quraşdırılma tarixi."
@@ -254,6 +265,11 @@ msgstr ""
 "{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
 "{arg!s} xidmət fəaliyyəti."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -282,87 +298,106 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fayl sistemini ayırmaq."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fayl sistemlərini doldurmaq."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync uğursuz oldu, xəta kodu: {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ilə initramfs yaratmaq."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
+"{}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hədəfdə dracut başladılmadı"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Tərkiblərini açmağa başladılır {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
+"əməliyyat getmir"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash xətalı tənzimlənməsi"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index 0c13ae5c41..b016560e73 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: xxmn77 , 2020\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
@@ -21,187 +21,65 @@ msgstr ""
 "Language: az_AZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Tənzimləmə xətası"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fayl sistemini ayırmaq."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fayl sistemlərini doldurmaq."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync uğursuz oldu, xəta kodu: {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
-"{}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Tərkiblərini açmağa başladılır {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
-"əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash xətalı tənzimlənməsi"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "KDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "LXDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "LightDM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "LightDM tənzimlənə bilmir"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "LightDM qarşılama quraşdırılmayıb."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "SLİM tənzimləmə faylı yazıla bilmir"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLİM tənzimləmə faylı {!s} mövcud deyil"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "displaymanager modulu üçün ekran menecerləri seçilməyib."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -209,27 +87,160 @@ msgstr ""
 "Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
 "da boşdur və ya təyin olunmamışdır."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ilə initramfs yaratmaq."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hədəfdə dracut başladılmadı"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab yazılır."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Tənzimləmə xətası"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs tənzimlənir."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Quraşdırılma tarixi."
@@ -254,6 +265,11 @@ msgstr ""
 "{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
 "{arg!s} xidmət fəaliyyəti."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -282,87 +298,106 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fayl sistemini ayırmaq."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fayl sistemlərini doldurmaq."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync uğursuz oldu, xəta kodu: {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ilə initramfs yaratmaq."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
+"{}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hədəfdə dracut başladılmadı"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Tərkiblərini açmağa başladılır {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
+"əməliyyat getmir"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash xətalı tənzimlənməsi"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po
index f6c46cf059..3e90116c88 100644
--- a/lang/python/be/LC_MESSAGES/python.po
+++ b/lang/python/be/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Źmicier Turok , 2020\n"
 "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n"
@@ -21,182 +21,65 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Наладзіць GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Мантаванне раздзелаў."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Памылка канфігурацыі"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Раздзелы для 
    {!s}
     не вызначаныя."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Наладзіць службы systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Немагчыма наладзіць службу"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Немагчыма ўключыць службу systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Немагчыма ўключыць мэту systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Немагчыма выключыць мэту systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Усталяваць загрузчык."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Невядомыя systemd загады {command!s} і {suffix!s} "
-"для адзінкі {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Адмантаваць файлавыя сістэмы."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Запаўненне файлавых сістэм."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "памылка rsync з кодам {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Распакоўванне вобраза {}/{}, файл {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Запуск распакоўвання {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Не атрымалася распакаваць вобраз \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Для каранёвага раздзела няма пункта мантавання"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage не змяшчае ключа \"rootMountPoint\", нічога не выконваецца"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Хібны пункт мантавання для каранёвага раздзела"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" не існуе, нічога не выконваецца"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Хібная канфігурацыя unsquash"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Файлавая сістэма для \"{}\" ({}) не падтрымліваецца вашым бягучым ядром"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Зыходная файлавая сістэма \"{}\" не існуе"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Не атрымалася знайсці unsquashfs, праверце ці ўсталяваны ў вас пакунак "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Немагчыма запісаць файл канфігурацыі KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Файл канфігурацыі KDM {!s} не існуе"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Немагчыма запісаць файл канфігурацыі LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Файл канфігурацыі LXDM {!s} не існуе"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Немагчыма запісаць файл канфігурацыі LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Файл канфігурацыі LightDM {!s} не існуе"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Немагчыма наладзіць LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "LightDM greeter не ўсталяваны."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Немагчыма запісаць файл канфігурацыі SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Файл канфігурацыі SLIM {!s} не існуе"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "У модулі дысплейных кіраўнікоў нічога не абрана."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -204,26 +87,163 @@ msgstr ""
 "Спіс дысплейных кіраўнікоў пусты альбо не вызначаны ў both globalstorage і "
 "displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Наладка дысплейнага кіраўніка не завершаная."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Наладка mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Стварэнне initramfs з dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не атрымалася запусціць dracut у пункце прызначэння"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхаду {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Задача Dummy python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Крок Dummy python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Запіс fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Памылка канфігурацыі"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Раздзелы для 
    {!s}
     не вызначаныя."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Каранёвы пункт мантавання для
    {!s}
     не пададзены."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Наладзіць GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Наладка апаратнага гадзінніка."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Наладка mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Наладка initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Наладка лакаляў."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Наладка зашыфраванага swap."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Стварэнне initramfs праз mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Мантаванне раздзелаў."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Захаванне сеткавай канфігурацыі."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Наладка OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Усталяваць пакункі."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Апрацоўка пакункаў (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Усталёўка аднаго пакунка."
+msgstr[1] "Усталёўка %(num)d пакункаў."
+msgstr[2] "Усталёўка %(num)d пакункаў."
+msgstr[3] "Усталёўка%(num)d пакункаў."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Выдаленне аднаго пакунка."
+msgstr[1] "Выдаленне %(num)d пакункаў."
+msgstr[2] "Выдаленне %(num)d пакункаў."
+msgstr[3] "Выдаленне %(num)d пакункаў."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Наладзіць тэму Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Усталёўка даных."
@@ -248,6 +268,11 @@ msgstr ""
 "Невядомае дзеянне {arg!s} для службы {name!s} на ўзроўні "
 "запуску {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Немагчыма наладзіць службу"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -274,91 +299,101 @@ msgid ""
 "exist."
 msgstr "Шлях {path!s} да службы {level!s} не існуе."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Наладзіць тэму Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Наладзіць службы systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Усталяваць пакункі."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Апрацоўка пакункаў (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Немагчыма ўключыць службу systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Усталёўка аднаго пакунка."
-msgstr[1] "Усталёўка %(num)d пакункаў."
-msgstr[2] "Усталёўка %(num)d пакункаў."
-msgstr[3] "Усталёўка%(num)d пакункаў."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Немагчыма ўключыць мэту systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Выдаленне аднаго пакунка."
-msgstr[1] "Выдаленне %(num)d пакункаў."
-msgstr[2] "Выдаленне %(num)d пакункаў."
-msgstr[3] "Выдаленне %(num)d пакункаў."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Немагчыма выключыць мэту systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Усталяваць загрузчык."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Наладка апаратнага гадзінніка."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Невядомыя systemd загады {command!s} і {suffix!s} "
+"для адзінкі {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Стварэнне initramfs праз mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Адмантаваць файлавыя сістэмы."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Запаўненне файлавых сістэм."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхаду {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "памылка rsync з кодам {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Стварэнне initramfs з dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Распакоўванне вобраза {}/{}, файл {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не атрымалася запусціць dracut у пункце прызначэння"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Запуск распакоўвання {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Наладка initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Не атрымалася распакаваць вобраз \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Наладка OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Для каранёвага раздзела няма пункта мантавання"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запіс fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage не змяшчае ключа \"rootMountPoint\", нічога не выконваецца"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Задача Dummy python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Хібны пункт мантавання для каранёвага раздзела"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Крок Dummy python {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" не існуе, нічога не выконваецца"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Наладка лакаляў."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Хібная канфігурацыя unsquash"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Захаванне сеткавай канфігурацыі."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Файлавая сістэма для \"{}\" ({}) не падтрымліваецца вашым бягучым ядром"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Зыходная файлавая сістэма \"{}\" не існуе"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Не атрымалася знайсці unsquashfs, праверце ці ўсталяваны ў вас пакунак "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po
index de59004dac..68333564d0 100644
--- a/lang/python/bg/LC_MESSAGES/python.po
+++ b/lang/python/bg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Georgi Georgiev (Жоро) , 2020\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтирай файловите системи."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фиктивна задача на python."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фиктивна стъпка на python {}"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Инсталирай пакетите."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработване на пакетите (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Инсталиране на един пакет."
+msgstr[1] "Инсталиране на %(num)d пакети."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Премахване на един пакет."
+msgstr[1] "Премахване на %(num)d пакети."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,87 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Инсталирай пакетите."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обработване на пакетите (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Инсталиране на един пакет."
-msgstr[1] "Инсталиране на %(num)d пакети."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Премахване на един пакет."
-msgstr[1] "Премахване на %(num)d пакети."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтирай файловите системи."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фиктивна задача на python."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фиктивна стъпка на python {}"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po
index 934f294582..9f8642a63a 100644
--- a/lang/python/bn/LC_MESSAGES/python.po
+++ b/lang/python/bn/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n"
 "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n"
@@ -21,202 +21,221 @@ msgstr ""
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "কনফিগার করুন জিআরইউবি।"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "মাউন্ট করছে পার্টিশনগুলো।"
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "কনফিগারেশন ত্রুটি"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
    {!এস}
     ব্যবহার করার জন্য।"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "সেবা পরিবর্তন করতে পারে না"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:503
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।"
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।"
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}"
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "আনপ্যাক করা শুরু করছে {}"
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\""
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "কনফিগারেশন ত্রুটি"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
    {!এস}
     ব্যবহার করার জন্য।"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "কনফিগার করুন জিআরইউবি।"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "মাউন্ট করছে পার্টিশনগুলো।"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -241,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "সেবা পরিবর্তন করতে পারে না"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -266,87 +290,98 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "আনপ্যাক করা শুরু করছে {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po
index 87643308e3..3fe5d14654 100644
--- a/lang/python/ca/LC_MESSAGES/python.po
+++ b/lang/python/ca/LC_MESSAGES/python.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Davidmp , 2020
+# Davidmp , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Davidmp , 2020\n"
+"Last-Translator: Davidmp , 2021\n"
 "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,185 +21,68 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Es munten les particions."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Error de configuració"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No s'han definit particions perquè les usi 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Ordres desconegudes de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmunta els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "S'omplen els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Ha fallat rsync amb el codi d'error {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Es desempaqueta la imatge {}/{}, fitxer {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Es comença a desempaquetar {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ha fallat desempaquetar la imatge \"{}\"."
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No hi ha punt de muntatge per a la partició d'arrel."
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punt de muntatge incorrecte per a la partició d'arrel"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "El punt de muntatge d'arrel és \"{}\", que no existeix. No es fa res."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuració incorrecta d'unsquash."
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "El sistema de fitxers per a {} ({}) no és admès pel nucli actual."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "S'instal·la el carregador d'arrencada."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de fitxers font \"{}\" no existeix."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Error d'instal·lació del carregador d'arrencada"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Ha fallat trobar unsquashfs, assegureu-vos que tingueu el paquet squashfs-"
-"tools instal·lat."
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
+"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
+"
    {!s}
    ha retornat el codi d'error {!s}."
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "No es pot escriure el fitxer de configuració del KDM."
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "El fitxer de configuració del KDM {!s} no existeix."
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "No es pot escriure el fitxer de configuració del LightDM."
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "El fitxer de configuració del LightDM {!s} no existeix."
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "No es pot configurar el LightDM."
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "No hi ha benvinguda instal·lada per al LightDM."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 "No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -207,27 +90,167 @@ msgstr ""
 "La llista de gestors de pantalla és buida o no definida ni a globalstorage "
 "ni a displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Es configura mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Es creen initramfs amb dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Ha fallat executar dracut a la destinació."
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi de sortida ha estat {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python fictícia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python fitctici {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "S'escriu fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Error de configuració"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No s'han definit particions perquè les usi 
    {!s}
    ."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No s'ha proporcionat el punt de muntatge perquè l'usi 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"No hi ha cap configuració de 
    {!s}
     perquè la usi 
    {!s}
    ."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "S'estableix el rellotge del maquinari."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Es configura mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Es configuren initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Es configuren les llengües."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Es configura l'intercanvi encriptat."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Es creen initramfs amb mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ha fallat executar mkinitfs a la destinació."
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Es munten les particions."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Es desa la configuració de la xarxa."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Es configura el sevei OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instal·la els paquets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Es processen paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'instal·la un paquet."
+msgstr[1] "S'instal·len %(num)d paquets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se suprimeix un paquet."
+msgstr[1] "Se suprimeixen %(num)d paquets."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Error del gestor de paquets"
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut preparar les actualitzacions. "
+"L'ordre
    {!s}
     ha retornat el codi d'error {!s}."
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
+"
    {!s}
     ha retornat el codi d'error {!s}."
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"El gestor de paquets podria fer canvis al sistema instal·lat. L'ordre "
+"
    {!s}
     ha retornat el codi d'error {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "S'instal·len dades."
@@ -253,6 +276,11 @@ msgstr ""
 "Servei - acció desconeguda {arg!s} per al servei {name!s} al "
 "nivell d'execució {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -283,87 +311,103 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instal·la els paquets."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Es processen paquets (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'instal·la un paquet."
-msgstr[1] "S'instal·len %(num)d paquets."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se suprimeix un paquet."
-msgstr[1] "Se suprimeixen %(num)d paquets."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "S'instal·la el carregador d'arrencada."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "S'estableix el rellotge del maquinari."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ordres desconegudes de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Es creen initramfs amb mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmunta els sistemes de fitxers."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ha fallat executar mkinitfs a la destinació."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "S'omplen els sistemes de fitxers."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi de sortida ha estat {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Ha fallat rsync amb el codi d'error {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Es creen initramfs amb dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Es desempaqueta la imatge {}/{}, fitxer {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Ha fallat executar dracut a la destinació."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Es comença a desempaquetar {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ha fallat desempaquetar la imatge \"{}\"."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Es configura el sevei OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No hi ha punt de muntatge per a la partició d'arrel."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "S'escriu fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python fictícia."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punt de muntatge incorrecte per a la partició d'arrel"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python fitctici {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "El punt de muntatge d'arrel és \"{}\", que no existeix. No es fa res."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Es configuren les llengües."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuració incorrecta d'unsquash."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Es desa la configuració de la xarxa."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "El sistema de fitxers per a {} ({}) no és admès pel nucli actual."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de fitxers font \"{}\" no existeix."
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ha fallat trobar unsquashfs, assegureu-vos que tingueu el paquet squashfs-"
+"tools instal·lat."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po
index 042a7b6a5f..466e1dc910 100644
--- a/lang/python/ca@valencia/LC_MESSAGES/python.po
+++ b/lang/python/ca@valencia/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Raul , 2021\n"
 "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n"
@@ -21,187 +21,66 @@ msgstr ""
 "Language: ca@valencia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "S'estan muntant les particions."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "S'ha produït un error en la configuració."
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No s'han definit particions perquè les use 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Es desconeixen les ordres de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmunta els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "S'estan emplenant els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Ha fallat rsync amb el codi d'error {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "S’està començant a desempaquetar {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No s’ha pogut desempaquetar la imatge \"{}\"."
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No hi ha cap punt de muntatge per a la partició d'arrel."
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage no conté cap clau de \"rootMountPoint\". No s'està fent res."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "El punt de muntatge per a la partició d'arrel és incorrecte."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instal·la el carregador d'arrancada."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"El punt de muntatge d'arrel és \"{}\", que no existeix. No s’està fent res."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "La configuració d'unsquash és incorrecta."
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "El nucli actual no admet el sistema de fitxers per a \"{}\" ({})."
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de fitxers font \"{}\" no existeix."
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"No s’ha pogut trobar unsquashfs. Assegureu-vos que teniu el paquet squashfs-"
-"tools instal·lat."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinació \"{}\" en el sistema de destinació no és un directori."
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "No es pot escriure el fitxer de configuració del KDM."
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "El fitxer de configuració del KDM {!s} no existeix."
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "No es pot escriure el fitxer de configuració de l'LXDM."
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "El fitxer de configuració de l'LXDM {!s} no existeix."
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "No es pot escriure el fitxer de configuració del LightDM."
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "El fitxer de configuració del LightDM {!s} no existeix."
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "No es pot configurar el LightDM."
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "No hi ha benvinguda instal·lada per al LightDM."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "No es pot escriure el fitxer de configuració de l'SLIM."
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "El fitxer de configuració de l'SLIM {!s} no existeix."
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 "No hi ha cap gestor de pantalla seleccionat per al mòdul displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -209,27 +88,160 @@ msgstr ""
 "La llista de gestors de pantalla està buida o no està definida ni en "
 "globalstorage ni en displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "S'està configurant mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creació d’initramfs amb dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "No s’ha pogut executar dracut en la destinació."
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi d'eixida ha estat {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python de proves."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python de proves {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escriptura d’fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "S'ha produït un error en la configuració."
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No s'han definit particions perquè les use 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No s'ha proporcionat el punt de muntatge perquè l'use 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuració del rellotge del maquinari."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "S'està configurant mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Es configuren initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuració d’idioma."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "S’està configurant l'intercanvi encriptat."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creació d’initramfs amb mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No s’ha pogut executar mkinitfs en la destinació."
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "S'estan muntant les particions."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "S'està guardant la configuració de la xarxa."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuració del servei OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instal·la els paquets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'està instal·lant un paquet."
+msgstr[1] "S'està instal·lant %(num)d paquets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "S’està eliminant un paquet."
+msgstr[1] "S’està eliminant %(num)d paquets."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "S'estan instal·lant les dades."
@@ -255,6 +267,11 @@ msgstr ""
 "Servei - acció desconeguda {arg!s} per al servei {name!s} al "
 "nivell d'execució {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -285,87 +302,105 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instal·la els paquets."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'està instal·lant un paquet."
-msgstr[1] "S'està instal·lant %(num)d paquets."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "S’està eliminant un paquet."
-msgstr[1] "S’està eliminant %(num)d paquets."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instal·la el carregador d'arrancada."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuració del rellotge del maquinari."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Es desconeixen les ordres de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creació d’initramfs amb mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmunta els sistemes de fitxers."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No s’ha pogut executar mkinitfs en la destinació."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "S'estan emplenant els sistemes de fitxers."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi d'eixida ha estat {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Ha fallat rsync amb el codi d'error {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creació d’initramfs amb dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "No s’ha pogut executar dracut en la destinació."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "S’està començant a desempaquetar {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No s’ha pogut desempaquetar la imatge \"{}\"."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuració del servei OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No hi ha cap punt de muntatge per a la partició d'arrel."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escriptura d’fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage no conté cap clau de \"rootMountPoint\". No s'està fent res."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python de proves."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "El punt de muntatge per a la partició d'arrel és incorrecte."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python de proves {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"El punt de muntatge d'arrel és \"{}\", que no existeix. No s’està fent res."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuració d’idioma."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "La configuració d'unsquash és incorrecta."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "S'està guardant la configuració de la xarxa."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "El nucli actual no admet el sistema de fitxers per a \"{}\" ({})."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de fitxers font \"{}\" no existeix."
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"No s’ha pogut trobar unsquashfs. Assegureu-vos que teniu el paquet squashfs-"
+"tools instal·lat."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinació \"{}\" en el sistema de destinació no és un directori."
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index 18d8327c09..c2a0d8d6cb 100644
--- a/lang/python/cs_CZ/LC_MESSAGES/python.po
+++ b/lang/python/cs_CZ/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pavel Borecki , 2020\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@@ -23,185 +23,65 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Nastavování zavaděče GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Připojování oddílů."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Chyba nastavení"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Pro 
    {!s}
     nejsou zadány žádné oddíly."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Nastavit služby systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Službu se nedaří upravit"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedaří se vypnout systemd cíl {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedaří se maskovat systemd jednotku {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Neznámé systemd příkazy {command!s} a {suffix!s} "
-"pro jednotku {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odpojit souborové systémy."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Naplňování souborových systémů."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync se nezdařilo s chybových kódem {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Rozbalování obrazu {}/{}, soubor {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Zahajování rozbalení {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Nepodařilo se rozbalit obraz „{}“"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Žádný přípojný bot pro kořenový oddíl"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage neobsahuje klíč „rootMountPoint“ – nic se nebude dělat"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Chybný přípojný bod pro kořenový oddíl"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "kořenovýPřípojnýBod je „{}“, který neexistuje – nic se nebude dělat"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Chybná nastavení unsquash"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalace zavaděče systému."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Souborový systém „{}“ ({}) není jádrem systému, které právě používáte, "
-"podporován"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Zdrojový souborový systém „{}“ neexistuje"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nepodařilo se nalézt unsquashfs – ověřte, že máte nainstalovaný balíček "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Cíl „{}“ v cílovém systému není složka"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Nedaří se zapsat soubor s nastaveními pro KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Soubor s nastaveními pro KDM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Nedaří se zapsat soubor s nastaveními pro LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Soubor s nastaveními pro LXDM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Nedaří se zapsat soubor s nastaveními pro LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Soubor s nastaveními pro LightDM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Nedaří se nastavit LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Není nainstalovaný žádný LightDM přivítač"
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Nedaří se zapsat soubor s nastaveními pro SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Soubor s nastaveními pro SLIM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Pro modul správce sezení nejsou vybrány žádní správci sezení."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -209,26 +89,163 @@ msgstr ""
 "Seznam správců displejů je prázdný nebo není definován v jak "
 "bothglobalstorage, tak v displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Nastavení správce displeje nebylo úplné"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Nastavování mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváření initramfs s dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Na cíli se nepodařilo spustit dracut"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Návratový kód byl {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testovací úloha python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testovací krok {} python."
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisování fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Chyba nastavení"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Pro 
    {!s}
     nejsou zadány žádné oddíly."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Pro 
    {!s}
     není zadán žádný přípojný bod."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Nastavování zavaděče GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavování hardwarových hodin."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Nastavování mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Nastavování initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Nastavování místních a jazykových nastavení."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Nastavování šifrovaného prostoru pro odkládání stránek paměti."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Vytváření initramfs s mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Na cíli se nepodařilo spustit mkinitfs"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Připojování oddílů."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Ukládání nastavení sítě."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Nastavování služby OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalovat balíčky."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Je instalován jeden balíček."
+msgstr[1] "Jsou instalovány %(num)d balíčky."
+msgstr[2] "Je instalováno %(num)d balíčků."
+msgstr[3] "Je instalováno %(num)d balíčků."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Odebírá se jeden balíček."
+msgstr[1] "Odebírají se %(num)d balíčky."
+msgstr[2] "Odebírá se %(num)d balíčků."
+msgstr[3] "Odebírá se %(num)d balíčků."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Nastavit téma vzhledu pro Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalace dat."
@@ -255,6 +272,11 @@ msgstr ""
 "Neznámá akce služby {arg!s} pro službu {name!s} v úrovni chodu "
 "(runlevel) {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Službu se nedaří upravit"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -285,91 +307,104 @@ msgstr ""
 "Popis umístění pro službu {name!s} je {path!s}, která "
 "neexistuje."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Nastavit téma vzhledu pro Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Nastavit služby systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalovat balíčky."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Je instalován jeden balíček."
-msgstr[1] "Jsou instalovány %(num)d balíčky."
-msgstr[2] "Je instalováno %(num)d balíčků."
-msgstr[3] "Je instalováno %(num)d balíčků."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Odebírá se jeden balíček."
-msgstr[1] "Odebírají se %(num)d balíčky."
-msgstr[2] "Odebírá se %(num)d balíčků."
-msgstr[3] "Odebírá se %(num)d balíčků."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedaří se vypnout systemd cíl {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalace zavaděče systému."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedaří se maskovat systemd jednotku {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavování hardwarových hodin."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Neznámé systemd příkazy {command!s} a {suffix!s} "
+"pro jednotku {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Vytváření initramfs s mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojit souborové systémy."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Na cíli se nepodařilo spustit mkinitfs"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Naplňování souborových systémů."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Návratový kód byl {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync se nezdařilo s chybových kódem {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Vytváření initramfs s dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbalování obrazu {}/{}, soubor {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Na cíli se nepodařilo spustit dracut"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Zahajování rozbalení {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Nastavování initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepodařilo se rozbalit obraz „{}“"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Nastavování služby OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Žádný přípojný bot pro kořenový oddíl"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisování fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage neobsahuje klíč „rootMountPoint“ – nic se nebude dělat"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testovací úloha python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Chybný přípojný bod pro kořenový oddíl"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testovací krok {} python."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "kořenovýPřípojnýBod je „{}“, který neexistuje – nic se nebude dělat"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Nastavování místních a jazykových nastavení."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Chybná nastavení unsquash"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Ukládání nastavení sítě."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Souborový systém „{}“ ({}) není jádrem systému, které právě používáte, "
+"podporován"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový souborový systém „{}“ neexistuje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nepodařilo se nalézt unsquashfs – ověřte, že máte nainstalovaný balíček "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Cíl „{}“ v cílovém systému není složka"
diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po
index 7da9d8ca6c..abf1983f41 100644
--- a/lang/python/da/LC_MESSAGES/python.po
+++ b/lang/python/da/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: scootergrisen, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
@@ -22,184 +22,66 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurer GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Monterer partitioner."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Fejl ved konfiguration"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Der er ikke angivet nogle partitioner som 
    {!s}
     kan bruge."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurer systemd-tjenester"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Kan ikke redigere tjeneste"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installér bootloader."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kan ikke aktivere systemd-målet {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kan ikke deaktivere systemd-målet {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan ikke maskere systemd-enheden {name!s}."
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Ukendte systemd-kommandoer {command!s} og "
-"{suffix!s} til enheden {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Afmonter filsystemer."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Udfylder filsystemer."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync mislykkede med fejlkoden {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Udpakker aftrykket {}/{}, filen {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Begynder at udpakke {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Kunne ikke udpakke aftrykket \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Intet monteringspunkt til rodpartition"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage indeholder ikke en \"rootMountPoint\"-nøgle, gør intet"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Dårligt monteringspunkt til rodpartition"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Dårlig unsquash-konfiguration"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Filsystemet til \"{}\" ({}) understøttes ikke af din nuværende kerne"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Kildefilsystemet \"{}\" findes ikke"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Kunne ikke finde unsquashfs, sørg for at pakken squashfs-tools er "
-"installeret"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Kan ikke skrive KDM-konfigurationsfil"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM-konfigurationsfil {!s} findes ikke"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Kan ikke skrive LXDM-konfigurationsfil"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM-konfigurationsfil {!s} findes ikke"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Kan ikke skrive LightDM-konfigurationsfil"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM-konfigurationsfil {!s} findes ikke"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Kan ikke konfigurere LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Der er ikke installeret nogen LightDM greeter."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Kan ikke skrive SLIM-konfigurationsfil"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM-konfigurationsfil {!s} findes ikke"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 "Der er ikke valgt nogen displayhåndteringer til displayhåndtering-modulet."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -207,27 +89,160 @@ msgstr ""
 "Displayhåndteringerlisten er tom eller udefineret i både globalstorage og "
 "displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Displayhåndtering-konfiguration er ikke komplet"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerer mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Opretter initramfs med dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Kunne ikke køre dracut på målet"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Afslutningskoden var {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python-job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python-trin {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Fejl ved konfiguration"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Der er ikke angivet nogle partitioner som 
    {!s}
     kan bruge."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Der er ikke angivet noget rodmonteringspunkt som 
    {!s}
     kan bruge."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurer GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Indstiller hardwareur."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerer mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerer initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerer lokaliteter."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurerer krypteret swap."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Opretter initramfs med mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kunne ikke køre mkinitfs på målet"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterer partitioner."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Gemmer netværkskonfiguration."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installér pakker."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Forarbejder pakker (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerer én pakke."
+msgstr[1] "Installerer %(num)d pakker."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjerner én pakke."
+msgstr[1] "Fjerner %(num)d pakker."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurer Plymouth-tema"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installerer data."
@@ -252,6 +267,11 @@ msgstr ""
 "Ukendt tjenestehandling {arg!s} til tjenesten {name!s} i "
 "kørselsniveauet {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Kan ikke redigere tjeneste"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -281,87 +301,102 @@ msgid ""
 msgstr ""
 "Stien til tjenesten {name!s} er {path!s}, som ikke findes."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurer Plymouth-tema"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurer systemd-tjenester"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installér pakker."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Forarbejder pakker (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerer én pakke."
-msgstr[1] "Installerer %(num)d pakker."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kan ikke aktivere systemd-målet {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjerner én pakke."
-msgstr[1] "Fjerner %(num)d pakker."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kan ikke deaktivere systemd-målet {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installér bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan ikke maskere systemd-enheden {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Indstiller hardwareur."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ukendte systemd-kommandoer {command!s} og "
+"{suffix!s} til enheden {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Opretter initramfs med mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Afmonter filsystemer."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Kunne ikke køre mkinitfs på målet"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Udfylder filsystemer."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Afslutningskoden var {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync mislykkede med fejlkoden {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Opretter initramfs med dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Udpakker aftrykket {}/{}, filen {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Kunne ikke køre dracut på målet"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Begynder at udpakke {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerer initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Kunne ikke udpakke aftrykket \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Intet monteringspunkt til rodpartition"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage indeholder ikke en \"rootMountPoint\"-nøgle, gør intet"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python-job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Dårligt monteringspunkt til rodpartition"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python-trin {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerer lokaliteter."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dårlig unsquash-konfiguration"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Gemmer netværkskonfiguration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Filsystemet til \"{}\" ({}) understøttes ikke af din nuværende kerne"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Kildefilsystemet \"{}\" findes ikke"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Kunne ikke finde unsquashfs, sørg for at pakken squashfs-tools er "
+"installeret"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index 8603688714..1aea8ca5d5 100644
--- a/lang/python/de/LC_MESSAGES/python.po
+++ b/lang/python/de/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Andreas Eitel , 2020\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
@@ -23,187 +23,65 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurieren."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Hänge Partitionen ein."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Konfigurationsfehler"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Für 
    {!s}
     sind keine zu verwendenden Partitionen definiert."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriere systemd-Dienste"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Der Dienst kann nicht geändert werden."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
-"zurück."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Unbekannte systemd-Befehle {command!s} und "
-"{suffix!s} für Einheit {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dateisysteme aushängen."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Befüllen von Dateisystemen."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync fehlgeschlagen mit Fehlercode {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Beginn des Entpackens {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kein Einhängepunkt für die Root-Partition"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage enthält keinen Schlüssel namens \"rootMountPoint\", tue nichts"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ungültiger Einhängepunkt für die Root-Partition"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Ungültige unsquash-Konfiguration"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installiere Bootloader."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Das Dateisystem für \"{}\" ({}) wird von Ihrem aktuellen Kernel nicht "
-"unterstützt"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Das Quelldateisystem \"{}\" existiert nicht"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Konnte unsquashfs nicht finden, stellen Sie sicher, dass Sie das Paket "
-"namens squashfs-tools installiert haben"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Schreiben der KDM-Konfigurationsdatei nicht möglich"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM-Konfigurationsdatei {!s} existiert nicht"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Schreiben der LXDM-Konfigurationsdatei nicht möglich"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM-Konfigurationsdatei {!s} existiert nicht"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Schreiben der LightDM-Konfigurationsdatei nicht möglich"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM-Konfigurationsdatei {!s} existiert nicht"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Konfiguration von LightDM ist nicht möglich"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Keine Benutzeroberfläche für LightDM installiert."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Schreiben der SLIM-Konfigurationsdatei nicht möglich"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM-Konfigurationsdatei {!s} existiert nicht"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Keine Displaymanager für das Displaymanager-Modul ausgewählt."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -211,28 +89,161 @@ msgstr ""
 "Die Liste der Displaymanager ist leer oder weder in globalstorage noch in "
 "displaymanager.conf definiert."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Die Konfiguration des Displaymanager war unvollständig."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriere mkinitcpio. "
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Erstelle initramfs mit dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Ausführen von dracut auf dem Ziel schlug fehl"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Der Exit-Code war {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy Python-Job"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy Python-Schritt {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Schreibe fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Konfigurationsfehler"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Für 
    {!s}
     sind keine zu verwendenden Partitionen definiert."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Für 
    {!s}
     wurde kein Einhängepunkt für die Root-Partition "
 "angegeben."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurieren."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Einstellen der Hardware-Uhr."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriere mkinitcpio. "
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriere initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriere Lokalisierungen."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfiguriere verschlüsselten Auslagerungsspeicher."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Erstelle initramfs mit mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Hänge Partitionen ein."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Speichere Netzwerkkonfiguration."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Pakete installieren "
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installiere ein Paket"
+msgstr[1] "Installiere %(num)d Pakete."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Entferne ein Paket"
+msgstr[1] "Entferne %(num)d Pakete."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguriere Plymouth-Thema"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installiere Daten."
@@ -257,6 +268,11 @@ msgstr ""
 "Unbekannte Aktion {arg!s} für Dienst {name!s} in Runlevel "
 "{level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Der Dienst kann nicht geändert werden."
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -288,87 +304,106 @@ msgstr ""
 "Der Pfad für den Dienst {name!s} is {path!s}, welcher nicht "
 "existiert."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguriere Plymouth-Thema"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriere systemd-Dienste"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Pakete installieren "
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
+"zurück."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installiere ein Paket"
-msgstr[1] "Installiere %(num)d Pakete."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Entferne ein Paket"
-msgstr[1] "Entferne %(num)d Pakete."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installiere Bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Einstellen der Hardware-Uhr."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Unbekannte systemd-Befehle {command!s} und "
+"{suffix!s} für Einheit {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Erstelle initramfs mit mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dateisysteme aushängen."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Befüllen von Dateisystemen."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Der Exit-Code war {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync fehlgeschlagen mit Fehlercode {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Erstelle initramfs mit dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Ausführen von dracut auf dem Ziel schlug fehl"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Beginn des Entpackens {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriere initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kein Einhängepunkt für die Root-Partition"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Schreibe fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage enthält keinen Schlüssel namens \"rootMountPoint\", tue nichts"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy Python-Job"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ungültiger Einhängepunkt für die Root-Partition"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy Python-Schritt {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriere Lokalisierungen."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ungültige unsquash-Konfiguration"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Speichere Netzwerkkonfiguration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Das Dateisystem für \"{}\" ({}) wird von Ihrem aktuellen Kernel nicht "
+"unterstützt"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Das Quelldateisystem \"{}\" existiert nicht"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Konnte unsquashfs nicht finden, stellen Sie sicher, dass Sie das Paket "
+"namens squashfs-tools installiert haben"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po
index 1d29a1ae10..09352f4185 100644
--- a/lang/python/el/LC_MESSAGES/python.po
+++ b/lang/python/el/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Efstathios Iosifidis , 2017\n"
 "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "εγκατάσταση πακέτων."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,87 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "εγκατάσταση πακέτων."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index 618f1c1c7a..36e32abe5b 100644
--- a/lang/python/en_GB/LC_MESSAGES/python.po
+++ b/lang/python/en_GB/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jason Collins , 2018\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount file systems."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Install packages."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processing packages (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "Installing %(num)d packages."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "Removing %(num)d packages."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,87 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount file systems."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po
index 278f61970b..bafb73d9e8 100644
--- a/lang/python/eo/LC_MESSAGES/python.po
+++ b/lang/python/eo/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kurt Ankh Phoenix , 2018\n"
 "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Demeti dosieraj sistemoj."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Formala python laboro."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Formala python paŝo {}"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instali pakaĵoj."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalante unu pakaĵo."
+msgstr[1] "Instalante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Forigante unu pakaĵo."
+msgstr[1] "Forigante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,87 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instali pakaĵoj."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalante unu pakaĵo."
-msgstr[1] "Instalante %(num)d pakaĵoj."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Forigante unu pakaĵo."
-msgstr[1] "Forigante %(num)d pakaĵoj."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demeti dosieraj sistemoj."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Formala python laboro."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Formala python paŝo {}"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index 898221725f..4ce37e51ce 100644
--- a/lang/python/es/LC_MESSAGES/python.po
+++ b/lang/python/es/LC_MESSAGES/python.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pier Jose Gotta Perez , 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
@@ -26,217 +26,227 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB - menú de arranque multisistema -"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando particiones"
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Error de configuración"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No hay definidas particiones en 1{!s}1 para usar."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar servicios de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La orden  systemctl {arg!s}  en chroot  devolvió el código de "
-"error  {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede activar el servicio de systemd  {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No se puede activar el objetivo de systemd  {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No se puede desactivar el objetivo de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No se puede enmascarar la unidad de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Órdenes desconocidas de systemd  {command!s} y "
-"{suffix!s} para la/s unidad /es {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de archivos."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Rellenando los sistemas de archivos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Falló la sincronización  mediante rsync  con el código de error {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Iniciando el desempaquetado {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No se pudo desempaquetar la imagen «{}»"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-"No especificó un punto de montaje para la  partición raíz - / o root -"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"No se hace nada porque el almacenamiento no contiene una clave de  "
-"\"rootMountPoint\" punto de montaje para la raíz."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punto de montaje no válido para una partición raíz,"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "Como el punto de montaje raíz es \"{}\", y no existe, no se hace nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuración de \"unsquash\" no válida"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar gestor de arranque."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
-"actual"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de archivos de origen  \"{}\" no existe"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"No se encontró unsquashfs; cerciórese de que tenga instalado el paquete "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destino \"{}\" en el sistema escogido  no es una carpeta"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "No se puede escribir el archivo de configuración KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "El archivo de configuración {!s} de KDM no existe"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "No se puede escribir el archivo de configuración LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "El archivo de configuracion {!s} de LXDM no existe"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "No se puede escribir el archivo de configuración de LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "El archivo de configuración {!s} de LightDM no existe"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "No se puede configurar LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "No está instalado el menú de bienvenida LightDM"
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "No se puede escribir el archivo de configuración de SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "El archivo de configuración {!s} de SLIM no existe"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 "No se ha seleccionado ningún gestor de pantalla para el modulo "
 "displaymanager"
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio - sistema de arranque básico -."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+"Creando initramfs - sistema de arranque - con dracut - su constructor -."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Falló en ejecutar dracut - constructor de arranques - en el objetivo"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarea de python ficticia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso {} de python ficticio"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiendo la tabla de particiones fstab"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No hay definidas particiones en 1{!s}1 para usar."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No se facilitó un punto de montaje raíz utilizable para 
    {!s}
     "
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB - menú de arranque multisistema -"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj de la computadora."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio - sistema de arranque básico -."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs - sistema de inicio -."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando especificaciones locales o regionales."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando la memoria de intercambio - swap - encriptada."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Guardando la  configuración de red."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar paquetes."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando %(num)d paquetes."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Eliminando un paquete."
+msgstr[1] "Eliminando %(num)d paquetes."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure el tema de Plymouth - menú de bienvenida."
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando datos."
@@ -265,6 +275,11 @@ msgstr ""
 "Acción desconocida d/e el/los servicio/s {arg!s} para el/los "
 "servicio/s {name!s} en el/los rango/s de ejecución {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -295,88 +310,108 @@ msgstr ""
 "La ruta hacia el/los servicio/s {name!s} es {path!s}, y no "
 "existe."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure el tema de Plymouth - menú de bienvenida."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar paquetes."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar servicios de systemd"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La orden  systemctl {arg!s}  en chroot  devolvió el código de "
+"error  {num!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando %(num)d paquetes."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede activar el servicio de systemd  {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Eliminando un paquete."
-msgstr[1] "Eliminando %(num)d paquetes."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No se puede activar el objetivo de systemd  {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar gestor de arranque."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No se puede desactivar el objetivo de systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj de la computadora."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad de systemd {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Órdenes desconocidas de systemd  {command!s} y "
+"{suffix!s} para la/s unidad /es {name!s}."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivos."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Rellenando los sistemas de archivos."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Falló la sincronización  mediante rsync  con el código de error {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Iniciando el desempaquetado {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No se pudo desempaquetar la imagen «{}»"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
-"Creando initramfs - sistema de arranque - con dracut - su constructor -."
+"No especificó un punto de montaje para la  partición raíz - / o root -"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Falló en ejecutar dracut - constructor de arranques - en el objetivo"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"No se hace nada porque el almacenamiento no contiene una clave de  "
+"\"rootMountPoint\" punto de montaje para la raíz."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs - sistema de inicio -."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punto de montaje no válido para una partición raíz,"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "Como el punto de montaje raíz es \"{}\", y no existe, no se hace nada"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiendo la tabla de particiones fstab"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuración de \"unsquash\" no válida"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarea de python ficticia."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
+"actual"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso {} de python ficticio"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos de origen  \"{}\" no existe"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando especificaciones locales o regionales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"No se encontró unsquashfs; cerciórese de que tenga instalado el paquete "
+"squashfs-tools"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Guardando la  configuración de red."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destino \"{}\" en el sistema escogido  no es una carpeta"
diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po
index 6942a78595..c4ed2cf7c5 100644
--- a/lang/python/es_MX/LC_MESSAGES/python.po
+++ b/lang/python/es_MX/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Erland Huaman , 2021\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
@@ -23,188 +23,65 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando particiones."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Error de configuración"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No hay particiones definidas para que 
    {!s}
     use."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura los servicios de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La llamada de: systemctl {arg!s} en chroot retorna código de "
-"error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede habilitar el servicio {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No se puede habilitar el objetivo {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-"No se puede deshabilitar el objetivo {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No se puede enmascarar la unidad {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"systemd no reconoce los comandos {command!s} y "
-"{suffix!s}para la unidad {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de archivo."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Llenando sistema de archivos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falló con código de error {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Iniciando a desempaquetar {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Se falló en la desempaquetización de la imagen \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No existe punto de montaje para la partición raíz"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Mal punto de montaje para la partición raíz"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Mala configuración del paquete unsquash"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar el cargador de arranque."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" "
-"({})"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de archivos fuente \"{}\" no existe"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools "
-"instalado"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "No se puede escribir el archivo de configuración de KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "El archivo de configuración de KDM {!s} no existe"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "No se puede escribir el archivo de configuración de LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "El archivo de configuración de LXDM {!s} no existe"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "No se puede escribir el archivo de configuración de LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "El archivo de configuración de LightDM {!s} no existe"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "No se puede configurar LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "LightDM greeter no está instalado."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "No se puede escribir el archivo de configuración de SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "No se seleccionaron gestores para el módulo de gestor de pantalla."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -212,26 +89,159 @@ msgstr ""
 "La lista de gestores de pantalla está vacía o indefinida tanto en el "
 "globalstorage como en el displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creando initramfs con dracut"
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Se falló al intentar correr dracut en el objetivo"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabajo python ficticio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso python ficticio {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiento fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No hay particiones definidas para que 
    {!s}
     use."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj del hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locales."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando la swap encriptada."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creando initramfs con mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Se falló al intentar correr mkinitfs en el objetivo"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Guardando configuración de red."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio OpenRc dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar paquetes."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando%(num)d paquetes."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removiendo un paquete."
+msgstr[1] "Removiendo %(num)dpaquetes."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurando el tema de Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando data."
@@ -254,6 +264,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio."
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -279,87 +294,107 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurando el tema de Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura los servicios de systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar paquetes."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La llamada de: systemctl {arg!s} en chroot retorna código de "
+"error {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d/%(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede habilitar el servicio {name!s} de systemd."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando%(num)d paquetes."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No se puede habilitar el objetivo {name!s} de systemd."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removiendo un paquete."
-msgstr[1] "Removiendo %(num)dpaquetes."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"No se puede deshabilitar el objetivo {name!s} de systemd."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar el cargador de arranque."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad {name!s} de systemd."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj del hardware."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"systemd no reconoce los comandos {command!s} y "
+"{suffix!s}para la unidad {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creando initramfs con mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivo."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Se falló al intentar correr mkinitfs en el objetivo"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Llenando sistema de archivos."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falló con código de error {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creando initramfs con dracut"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Se falló al intentar correr dracut en el objetivo"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Iniciando a desempaquetar {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Se falló en la desempaquetización de la imagen \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio OpenRc dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No existe punto de montaje para la partición raíz"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiento fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabajo python ficticio."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Mal punto de montaje para la partición raíz"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso python ficticio {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mala configuración del paquete unsquash"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Guardando configuración de red."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" "
+"({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos fuente \"{}\" no existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools "
+"instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
diff --git a/lang/python/es_PE/LC_MESSAGES/python.po b/lang/python/es_PE/LC_MESSAGES/python.po
index 20096e12cd..eba343ac1a 100644
--- a/lang/python/es_PE/LC_MESSAGES/python.po
+++ b/lang/python/es_PE/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Spanish (Peru) (https://www.transifex.com/calamares/teams/20061/es_PE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po
index a78dbcabad..ef354d34a6 100644
--- a/lang/python/es_PR/LC_MESSAGES/python.po
+++ b/lang/python/es_PR/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: es_PR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po
index cc010ec734..fd98759135 100644
--- a/lang/python/et/LC_MESSAGES/python.po
+++ b/lang/python/et/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Madis Otenurm, 2019\n"
 "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr "KDM-konfiguratsioonifaili ei saa kirjutada"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM-konfiguratsioonifail {!s} puudub"
+
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM-konfiguratsioonifaili ei saa kirjutada"
+
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM-konfiguratsioonifail {!s} puudub"
+
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM-konfiguratsioonifaili ei saa kirjutada"
+
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM-konfiguratsioonifail {!s} puudub"
+
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr "LightDM seadistamine ebaõnnestus"
+
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM-konfiguratsioonifaili ei saa kirjutada"
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM-konfiguratsioonifail {!s} puudub"
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testiv python'i töö."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Haagi failisüsteemid lahti."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testiv python'i aste {}"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
-msgstr "KDM-konfiguratsioonifaili ei saa kirjutada"
-
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM-konfiguratsioonifail {!s} puudub"
-
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM-konfiguratsioonifaili ei saa kirjutada"
-
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM-konfiguratsioonifail {!s} puudub"
-
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM-konfiguratsioonifaili ei saa kirjutada"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM-konfiguratsioonifail {!s} puudub"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
-msgstr "LightDM seadistamine ebaõnnestus"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paigalda paketid."
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
-msgstr ""
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakkide töötlemine (%(count)d / %(total)d)"
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM-konfiguratsioonifaili ei saa kirjutada"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Paigaldan ühe paketi."
+msgstr[1] "Paigaldan %(num)d paketti."
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM-konfiguratsioonifail {!s} puudub"
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Eemaldan ühe paketi."
+msgstr[1] "Eemaldan %(num)d paketti."
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/packages/main.py:589
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
-msgstr ""
-
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,87 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paigalda paketid."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakkide töötlemine (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Paigaldan ühe paketi."
-msgstr[1] "Paigaldan %(num)d paketti."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Eemaldan ühe paketi."
-msgstr[1] "Eemaldan %(num)d paketti."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Haagi failisüsteemid lahti."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testiv python'i töö."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testiv python'i aste {}"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po
index 87f335bb69..1fb9125b4a 100644
--- a/lang/python/eu/LC_MESSAGES/python.po
+++ b/lang/python/eu/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Ander Elortondo, 2019\n"
 "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
@@ -21,202 +21,222 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr "Ezin da KDM konfigurazio fitxategia idatzi"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM konfigurazio fitxategia {!s} ez da existitzen"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr "Ezin da LXDM konfigurazio fitxategia idatzi"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM konfigurazio fitxategia {!s} ez da existitzen"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr "Ezin da LightDM konfigurazio fitxategia idatzi"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM konfigurazio fitxategia {!s} ez da existitzen"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr "Ezin da LightDM konfiguratu"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr "Ez dago LightDM harrera instalatua."
+
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr "Ezin da SLIM konfigurazio fitxategia idatzi"
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM konfigurazio fitxategia {!s} ez da existitzen"
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"Ez da pantaila kudeatzailerik aukeratu pantaila-kudeatzaile modulurako."
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fitxategi sistemak desmuntatu."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python lana."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python urratsa {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
-msgstr "Ezin da KDM konfigurazio fitxategia idatzi"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM konfigurazio fitxategia {!s} ez da existitzen"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
-msgstr "Ezin da LXDM konfigurazio fitxategia idatzi"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM konfigurazio fitxategia {!s} ez da existitzen"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
-msgstr "Ezin da LightDM konfigurazio fitxategia idatzi"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM konfigurazio fitxategia {!s} ez da existitzen"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
-msgstr "Ezin da LightDM konfiguratu"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalatu paketeak"
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
-msgstr "Ez dago LightDM harrera instalatua."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paketeak prozesatzen (%(count)d/ %(total)d) "
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
-msgstr "Ezin da SLIM konfigurazio fitxategia idatzi"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Pakete bat instalatzen."
+msgstr[1] "%(num)dpakete instalatzen."
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM konfigurazio fitxategia {!s} ez da existitzen"
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Pakete bat kentzen."
+msgstr[1] "%(num)dpakete kentzen."
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
-"Ez da pantaila kudeatzailerik aukeratu pantaila-kudeatzaile modulurako."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/packages/main.py:589
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
-msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -241,6 +261,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -266,87 +291,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalatu paketeak"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketeak prozesatzen (%(count)d/ %(total)d) "
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Pakete bat instalatzen."
-msgstr[1] "%(num)dpakete instalatzen."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Pakete bat kentzen."
-msgstr[1] "%(num)dpakete kentzen."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fitxategi sistemak desmuntatu."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python lana."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python urratsa {}"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po
index 14b5d0b5f3..eb4253986c 100644
--- a/lang/python/fa/LC_MESSAGES/python.po
+++ b/lang/python/fa/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: alireza jamshidi , 2020\n"
 "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
@@ -22,207 +22,223 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "در حال پیکربندی گراب."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "در حال سوار کردن افرازها."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "خطای پیکربندی"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "هیچ افرازی برای استفادهٔ 
    {!s}
     تعریف نشده."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "در حال پیکربندی خدمات سیستم‌دی"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "نمی‌توان خدمت را دستکاری کرد"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "نصب بارکنندهٔ راه‌اندازی."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
-"برگرداند."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
-"{suffix!s} برای واحد {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "پیاده کردن سامانه‌های پرونده."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "در حال پر کردن سامانه‌پرونده‌ها."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "آرسینک با رمز خطای {} شکست خورد."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "در حال بسته‌گشایی تصویر {}/{}، پروندهٔ {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "در حال شروع بسته‌گشایی {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "شکست در بسته‌گشایی تصویر {}"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمی‌شود"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمی‌شود"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "پیکربندی بد unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "کرنل کنونیتان از سامانه‌پروندهٔ {} ({}) پشتیبانی نمی‌کند"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "شکست در یافتن unsquashfs. مطمئن شوید بستهٔ squashfs-tools نصب است"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "نمی‌توان پروندهٔ پیکربندی KDM را نوشت"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "نمی‌توان پروندهٔ پیکربندی LXDM را نوشت"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "نمی‌توان LightDM را پیکربندی کرد"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "هیچ خوش‌آمدگوی LightDMای نصب نشده."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "نمی‌توان پروندهٔ پیکربندی LightDM را نوشت"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "پروندهٔ پیکربندی {!s} وجود ندارد"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "هیچ مدیر نمایشی برای پیمانهٔ displaymanager گزیده نشده."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "پیکربندی مدیر نمایش کامل نبود"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "پیکربندی mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "در حال ایجاد initramfs با dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "شکست در اجرای dracut روی هدف"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "رمز خروج {} بود"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "کار پایتونی الکی."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "گام پایتونی الکی {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "در حال نوشتن fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "خطای پیکربندی"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "هیچ افرازی برای استفادهٔ 
    {!s}
     تعریف نشده."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
    {!s}
     داده نشده."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "در حال پیکربندی گراب."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "در حال تنظیم ساعت سخت‌افزاری."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "پیکربندی mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "در حال پیکربندی initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "پیکربندی مکانها"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "در حال پیکربندی مبادلهٔ رمزشده."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "در حال سوار کردن افرازها."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "در حال ذخیرهٔ پیکربندی شبکه."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "نصب بسته‌ها."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "در حال پردازش بسته‌ها (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "در حال نصب یک بسته."
+msgstr[1] "در حال نصب %(num)d بسته."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "در حال برداشتن یک بسته."
+msgstr[1] "در حال برداشتن %(num)d بسته."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "داده‌های نصب"
@@ -245,6 +261,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "نمی‌توان خدمت را دستکاری کرد"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -270,87 +291,101 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "نصب بسته‌ها."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "در حال پیکربندی خدمات سیستم‌دی"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "در حال پردازش بسته‌ها (%(count)d/%(total)d)"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
+"برگرداند."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "در حال نصب یک بسته."
-msgstr[1] "در حال نصب %(num)d بسته."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "در حال برداشتن یک بسته."
-msgstr[1] "در حال برداشتن %(num)d بسته."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "نصب بارکنندهٔ راه‌اندازی."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "در حال تنظیم ساعت سخت‌افزاری."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
+"{suffix!s} برای واحد {name!s}."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "پیاده کردن سامانه‌های پرونده."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "رمز خروج {} بود"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "در حال پر کردن سامانه‌پرونده‌ها."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "در حال ایجاد initramfs با dracut."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "آرسینک با رمز خطای {} شکست خورد."
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "شکست در اجرای dracut روی هدف"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "در حال بسته‌گشایی تصویر {}/{}، پروندهٔ {}/{}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "در حال پیکربندی initramfs."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "در حال شروع بسته‌گشایی {}"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "شکست در بسته‌گشایی تصویر {}"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "در حال نوشتن fstab."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "کار پایتونی الکی."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمی‌شود"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "گام پایتونی الکی {}"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "پیکربندی مکانها"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمی‌شود"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "در حال ذخیرهٔ پیکربندی شبکه."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "پیکربندی بد unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "کرنل کنونیتان از سامانه‌پروندهٔ {} ({}) پشتیبانی نمی‌کند"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "شکست در یافتن unsquashfs. مطمئن شوید بستهٔ squashfs-tools نصب است"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po
index 1526d5b45a..ae0b10775b 100644
--- a/lang/python/fi_FI/LC_MESSAGES/python.po
+++ b/lang/python/fi_FI/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kimmo Kujansuu , 2021\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
@@ -21,182 +21,65 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Määritä GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Yhdistä osiot."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Määritysvirhe"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Ei ole määritetty käyttämään osioita 
    {!s}
     ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Määritä systemd palvelut"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Palvelua ei voi muokata"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd-palvelua ei saa käyttöön {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd-kohdetta ei saa käyttöön {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd-kohdetta ei-voi poistaa käytöstä {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ei voi peittää systemd-yksikköä {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Asenna bootloader."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Tuntematon systemd komento {command!s} ja "
-"{suffix!s} laite {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Irrota tiedostojärjestelmät käytöstä."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Paikannetaan tiedostojärjestelmiä."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync epäonnistui virhekoodilla {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Pakkauksen purkaminen alkaa {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Kuvan purkaminen epäonnistui \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ei liitoskohtaa juuri root osiolle"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ei sisällä \"rootMountPoint\" avainta, eikä tee mitään"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Huono kiinnityspiste root-osioon"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint on \"{}\", jota ei ole, eikä tee mitään"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Huono epäpuhdas kokoonpano"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Tiedostojärjestelmä \"{}\" ({}) ei tue sinun nykyistä kerneliä "
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Lähde tiedostojärjestelmää \"{}\" ei ole olemassa"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti "
-"asennettuna"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Kohdejärjestelmän \"{}\" kohde ei ole hakemisto"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "KDM-määritystiedostoa ei voi kirjoittaa"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM-määritystiedostoa {!s} ei ole olemassa"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "LXDM-määritystiedostoa ei voi kirjoittaa"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM-määritystiedostoa {!s} ei ole olemassa"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "LightDM-määritystiedostoa ei voi kirjoittaa"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM-määritystiedostoa {!s} ei ole olemassa"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "LightDM määritysvirhe"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "LightDM ei ole asennettu."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "SLIM-määritystiedostoa ei voi kirjoittaa"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM-määritystiedostoa {!s} ei ole olemassa"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Displaymanager-moduulia varten ei ole valittu näyttönhallintaa."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -204,27 +87,160 @@ msgstr ""
 "Luettelo on tyhjä tai määrittelemätön, sekä globalstorage, että "
 "displaymanager.conf tiedostossa."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Näytönhallinnan kokoonpano oli puutteellinen"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Määritetään mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Initramfs luominen dracut:lla."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Dracut-ohjelman suorittaminen ei onnistunut"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Poistumiskoodi oli {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Harjoitus python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Harjoitus python vaihe {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab kirjoittaminen."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Määritysvirhe"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Ei ole määritetty käyttämään osioita 
    {!s}
     ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Root-juuri kiinnityspistettä  
    {!s}
     ei ole annettu käytettäväksi."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Määritä GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Laitteiston kellon asettaminen."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Määritetään mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Määritetään initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Määritetään locales."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Salatun swapin määrittäminen."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Initramfs luominen mkinitfs avulla."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kohteen mkinitfs-suoritus epäonnistui."
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Yhdistä osiot."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Tallennetaan verkon määrityksiä."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt-palvelun määrittäminen."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Asenna paketit."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakettien käsittely (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Asentaa "
+msgstr[1] "Asentaa %(num)d paketteja."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "Poistaa %(num)d paketteja."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Määritä Plymouthin teema"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Asennetaan tietoja."
@@ -249,6 +265,11 @@ msgstr ""
 "Tuntematon  huoltotoiminto{arg!s} palvelun {name!s} "
 "palvelutasolle  {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Palvelua ei voi muokata"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -276,87 +297,101 @@ msgid ""
 msgstr ""
 "Palvelun polku {name!s} on {path!s},  jota ei ole olemassa."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Määritä Plymouthin teema"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Määritä systemd palvelut"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Asenna paketit."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakettien käsittely (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd-palvelua ei saa käyttöön {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Asentaa "
-msgstr[1] "Asentaa %(num)d paketteja."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd-kohdetta ei saa käyttöön {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Poistaa %(num)d paketteja."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd-kohdetta ei-voi poistaa käytöstä {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Asenna bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ei voi peittää systemd-yksikköä {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Laitteiston kellon asettaminen."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Tuntematon systemd komento {command!s} ja "
+"{suffix!s} laite {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Initramfs luominen mkinitfs avulla."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Irrota tiedostojärjestelmät käytöstä."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Kohteen mkinitfs-suoritus epäonnistui."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Paikannetaan tiedostojärjestelmiä."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Poistumiskoodi oli {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync epäonnistui virhekoodilla {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Initramfs luominen dracut:lla."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Dracut-ohjelman suorittaminen ei onnistunut"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Pakkauksen purkaminen alkaa {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Määritetään initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Kuvan purkaminen epäonnistui \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt-palvelun määrittäminen."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ei liitoskohtaa juuri root osiolle"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab kirjoittaminen."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ei sisällä \"rootMountPoint\" avainta, eikä tee mitään"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Harjoitus python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Huono kiinnityspiste root-osioon"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Harjoitus python vaihe {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint on \"{}\", jota ei ole, eikä tee mitään"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Määritetään locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Huono epäpuhdas kokoonpano"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Tallennetaan verkon määrityksiä."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Tiedostojärjestelmä \"{}\" ({}) ei tue sinun nykyistä kerneliä "
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Lähde tiedostojärjestelmää \"{}\" ei ole olemassa"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti "
+"asennettuna"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Kohdejärjestelmän \"{}\" kohde ei ole hakemisto"
diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index 66b598cf9e..469799254a 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: roxfr , 2021\n"
 "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
@@ -30,189 +30,67 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configuration du GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montage des partitions."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Erreur de configuration"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-"Aucune partition n'est définie pour être utilisée par 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurer les services systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impossible de modifier le service"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
-"{num!s}"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossible d'activer le service systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossible d'activer la cible systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Impossible de désactiver la cible systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossible de masquer l'unit systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Commandes systemd {command!s} et {suffix!s} "
-"inconnues pour l'unit {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Démonter les systèmes de fichiers"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Remplir les systèmes de fichiers."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync a échoué avec le code d'erreur {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Décompression de l'image {}/{}, fichier {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Commencer à décompresser {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Impossible de décompresser l'image \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Pas de point de montage pour la partition racine"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ne contient pas de clé \"rootMountPoint\", ne fait rien"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Mauvais point de montage pour la partition racine"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint est \"{}\", ce qui n'existe pas, ne fait rien"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Mauvaise configuration unsquash"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installation du bootloader."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Le système de fichiers pour \"{}\" ({}) n'est pas pris en charge par votre "
-"noyau actuel"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Le système de fichiers source \"{}\" n'existe pas"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Échec de la recherche de unsquashfs, assurez-vous que le paquetage squashfs-"
-"tools est installé."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Impossible d'écrire le fichier de configuration KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Le fichier de configuration KDM n'existe pas"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Impossible d'écrire le fichier de configuration LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Le fichier de configuration LXDM n'existe pas"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Impossible d'écrire le fichier de configuration LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Le fichier de configuration LightDM {!S} n'existe pas"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Impossible de configurer LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Aucun hôte LightDM est installé"
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Impossible d'écrire le fichier de configuration SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Le fichier de configuration SLIM {!S} n'existe pas"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 "Aucun gestionnaire d'affichage n'a été sélectionné pour le module de "
 "gestionnaire d'affichage"
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -220,28 +98,162 @@ msgstr ""
 "La liste des gestionnaires d'affichage est vide ou indéfinie à la fois dans "
 "globalstorage et displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "La configuration du gestionnaire d'affichage était incomplète"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configuration de mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Configuration du initramfs avec dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Erreur d'exécution de dracut sur la cible."
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Le code de sortie était {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tâche factice de python"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Étape factice de python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Écriture du fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Erreur de configuration"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+"Aucune partition n'est définie pour être utilisée par 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Aucun point de montage racine n'a été donné pour être utilisé par "
 "
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configuration du GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuration de l'horloge matériel."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configuration de mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configuration du initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuration des locales."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configuration du swap chiffrée."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Création d'initramfs avec mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Échec de l'exécution de mkinitfs sur la cible"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montage des partitions."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Sauvegarde de la configuration du réseau en cours."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuration du service OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installer les paquets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Traitement des paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installation d'un paquet."
+msgstr[1] "Installation de %(num)d paquets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Suppression d'un paquet."
+msgstr[1] "Suppression de %(num)d paquets."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurer le thème Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installation de données."
@@ -266,6 +278,11 @@ msgstr ""
 "Service-action {arg!s} inconnue pour le service {name!s} dans "
 "le run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Impossible de modifier le service"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -297,87 +314,105 @@ msgstr ""
 "Le chemin pour le service {name!s} est {path!s}, qui n'existe "
 "pas."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurer le thème Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurer les services systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installer les paquets."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
+"{num!s}"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Traitement des paquets (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossible d'activer le service systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installation d'un paquet."
-msgstr[1] "Installation de %(num)d paquets."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossible d'activer la cible systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Suppression d'un paquet."
-msgstr[1] "Suppression de %(num)d paquets."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Impossible de désactiver la cible systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installation du bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossible de masquer l'unit systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuration de l'horloge matériel."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Commandes systemd {command!s} et {suffix!s} "
+"inconnues pour l'unit {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Création d'initramfs avec mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Démonter les systèmes de fichiers"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Échec de l'exécution de mkinitfs sur la cible"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Remplir les systèmes de fichiers."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Le code de sortie était {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync a échoué avec le code d'erreur {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Configuration du initramfs avec dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Décompression de l'image {}/{}, fichier {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Erreur d'exécution de dracut sur la cible."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Commencer à décompresser {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuration du initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Impossible de décompresser l'image \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuration du service OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Pas de point de montage pour la partition racine"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Écriture du fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ne contient pas de clé \"rootMountPoint\", ne fait rien"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tâche factice de python"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Mauvais point de montage pour la partition racine"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Étape factice de python {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint est \"{}\", ce qui n'existe pas, ne fait rien"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuration des locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mauvaise configuration unsquash"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Sauvegarde de la configuration du réseau en cours."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Le système de fichiers pour \"{}\" ({}) n'est pas pris en charge par votre "
+"noyau actuel"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Le système de fichiers source \"{}\" n'existe pas"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Échec de la recherche de unsquashfs, assurez-vous que le paquetage squashfs-"
+"tools est installé."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po
index 219e71fd06..57ada0388c 100644
--- a/lang/python/fr_CH/LC_MESSAGES/python.po
+++ b/lang/python/fr_CH/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: fr_CH\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po
index 44eb8b50ed..d22dfa2a09 100644
--- a/lang/python/fur/LC_MESSAGES/python.po
+++ b/lang/python/fur/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Fabio Tomat , 2020\n"
 "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n"
@@ -21,186 +21,65 @@ msgstr ""
 "Language: fur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montaç des partizions."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Erôr di configurazion"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No je stade definide nissune partizion di doprâ par 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure i servizis di systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impussibil modificâ il servizi"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
-"erôr {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-"Impussibil disabilitâ la destinazion di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comants di systemd {command!s} e {suffix!s} no "
-"cognossûts pe unitât {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dismonte i file-systems."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Daûr a jemplâ i filesystems."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Sincronizazion cun rsync falide cun codiç di erôr {}. "
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Estrazion imagjin {}/{}, file {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Daûr a scomençâ la estrazion {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No si è rivâts a estrai la imagjin \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nissun pont di montaç pe partizion lidrîs"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instale il bootloader."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"globalstorage nol conten une clâf \"rootMountPoint\", duncje no si fâs nuie"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Pont di montaç sbaliât pe partizion lidrîs"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint al è \"{}\", che nol esist, duncje no si fâs nuie"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configurazion di \"unsquash\" sbaliade"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Il filesystem par \"{}\" ({}) nol è supuartât dal to kernel atuâl"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Il filesystem sorzint \"{}\" nol esist"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"No si è rivâts a cjatâ unsquashfs, controle di vê instalât il pachet "
-"squashfs-tools"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Impussibil scrivi il file di configurazion di KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Il file di configurazion di KDM {!s} nol esist"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Impussibil scrivi il file di configurazion di LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Il file di configurazion di LXDM {!s} nol esist"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Impussibil scrivi il file di configurazion di LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Il file di configurazion di LightDM {!s} nol esist"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Impussibil configurâ LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Nissun menù di benvignût par LightDM instalât."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Impussibil scrivi il file di configurazion SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Il file di configurazion di SLIM {!s} nol esist"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Nissun gjestôr di visôrs selezionât pal modul displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -208,27 +87,160 @@ msgstr ""
 "La liste dai gjestôrs di visôrs e je vueide o no je definide sedi in "
 "globalstorage che in displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazion dal gjestôr dai visôrs no jere complete"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Daûr a configurâ di mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Daûr a creâ initramfs cun dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "No si è rivâts a eseguî dracut su la destinazion"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codiç di jessude al jere {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Lavôr di python pustiç."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passaç di python pustiç {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Daûr a scrivi fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Erôr di configurazion"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No je stade definide nissune partizion di doprâ par 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nol è stât indicât nissun pont di montaç di doprâ par 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Daûr a configurâ l'orloi hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Daûr a configurâ di mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Daûr a configurâ initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Daûr a configurâ la localizazion."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Daûr a configurâ la memorie di scambi (swap) cifrade."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Daûr a creâ il initramfs cun mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaç des partizions."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Salvament de configurazion di rêt."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instale pachets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Daûr a instalâ un pachet."
+msgstr[1] "Daûr a instalâ %(num)d pachets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Daûr a gjavâ un pachet."
+msgstr[1] "Daûr a gjavâ %(num)d pachets."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure il teme di Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Daûr a instalâ i dâts."
@@ -253,6 +265,11 @@ msgstr ""
 "Azion dal servizi {arg!s} no cognossude pal servizi {name!s} "
 "tal run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Impussibil modificâ il servizi"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -282,87 +299,105 @@ msgid ""
 msgstr ""
 "Il percors pal servizi {name!s} al è {path!s}, che nol esist."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure il teme di Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure i servizis di systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instale pachets."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
+"erôr {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Daûr a instalâ un pachet."
-msgstr[1] "Daûr a instalâ %(num)d pachets."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Daûr a gjavâ un pachet."
-msgstr[1] "Daûr a gjavâ %(num)d pachets."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impussibil disabilitâ la destinazion di systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instale il bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Daûr a configurâ l'orloi hardware."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comants di systemd {command!s} e {suffix!s} no "
+"cognossûts pe unitât {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Daûr a creâ il initramfs cun mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dismonte i file-systems."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Daûr a jemplâ i filesystems."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codiç di jessude al jere {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Sincronizazion cun rsync falide cun codiç di erôr {}. "
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Daûr a creâ initramfs cun dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazion imagjin {}/{}, file {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "No si è rivâts a eseguî dracut su la destinazion"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Daûr a scomençâ la estrazion {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Daûr a configurâ initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No si è rivâts a estrai la imagjin \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nissun pont di montaç pe partizion lidrîs"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Daûr a scrivi fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nol conten une clâf \"rootMountPoint\", duncje no si fâs nuie"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Lavôr di python pustiç."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Pont di montaç sbaliât pe partizion lidrîs"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passaç di python pustiç {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint al è \"{}\", che nol esist, duncje no si fâs nuie"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Daûr a configurâ la localizazion."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazion di \"unsquash\" sbaliade"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Salvament de configurazion di rêt."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Il filesystem par \"{}\" ({}) nol è supuartât dal to kernel atuâl"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorzint \"{}\" nol esist"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"No si è rivâts a cjatâ unsquashfs, controle di vê instalât il pachet "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po
index dd1abe7a53..2646ae5988 100644
--- a/lang/python/gl/LC_MESSAGES/python.po
+++ b/lang/python/gl/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Xosé, 2018\n"
 "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n"
@@ -21,202 +21,222 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de KDM"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de KDM {!s} non existe"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de LXDM"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de LXDM {!s} non existe"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de LightDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de LightDM {!s} non existe"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr "Non é posíbel configurar LightDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr "Non se instalou o saudador de LightDM."
+
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr "Non é posíbel escribir o ficheiro de configuración de SLIM"
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr "O ficheiro de configuración de SLIM {!s} non existe"
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
+"Non hai xestores de pantalla seleccionados para o módulo displaymanager."
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de ficheiros."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr "A configuración do xestor de pantalla foi incompleta"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa parva de python."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso parvo de python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de KDM"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de KDM {!s} non existe"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de LXDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de LXDM {!s} non existe"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de LightDM"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de LightDM {!s} non existe"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
-msgstr "Non é posíbel configurar LightDM"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar paquetes."
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
-msgstr "Non se instalou o saudador de LightDM."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "A procesar paquetes  (%(count)d/%(total)d)"
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
-msgstr "Non é posíbel escribir o ficheiro de configuración de SLIM"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "A instalar un paquete."
+msgstr[1] "A instalar %(num)d paquetes."
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
-msgstr "O ficheiro de configuración de SLIM {!s} non existe"
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "A retirar un paquete."
+msgstr[1] "A retirar %(num)d paquetes."
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
-"Non hai xestores de pantalla seleccionados para o módulo displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/packages/main.py:589
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
-msgstr "A configuración do xestor de pantalla foi incompleta"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -241,6 +261,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -266,87 +291,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar paquetes."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "A procesar paquetes  (%(count)d/%(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "A instalar un paquete."
-msgstr[1] "A instalar %(num)d paquetes."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "A retirar un paquete."
-msgstr[1] "A retirar %(num)d paquetes."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa parva de python."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso parvo de python {}"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po
index 588606614f..0bbae30e3e 100644
--- a/lang/python/gu/LC_MESSAGES/python.po
+++ b/lang/python/gu/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po
index 21cdc6a561..28e0acf8eb 100644
--- a/lang/python/he/LC_MESSAGES/python.po
+++ b/lang/python/he/LC_MESSAGES/python.po
@@ -6,16 +6,16 @@
 # Translators:
 # Eli Shleifer , 2017
 # Omer I.S. , 2020
-# Yaron Shahrabani , 2020
+# Yaron Shahrabani , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Yaron Shahrabani , 2020\n"
+"Last-Translator: Yaron Shahrabani , 2021\n"
 "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,181 +23,67 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "הגדרת GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "מחיצות מעוגנות."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "שגיאת הגדרות"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "לא הוגדרו מחיצות לשימוש של 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "הגדרת שירותי systemd"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "התקנת מנהל אתחול."
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "לא ניתן לשנות את השירות"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "שגיאת התקנת מנהל אתחול"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:503
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
+"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
    {!s}
     החזירה את קוד "
+"השגיאה {!s}."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"פקודות לא ידועות של systemd‏ {command!s} "
-"ו־{suffix!s} עבור היחידה {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ניתוק עיגון מערכות קבצים."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "מערכות הקבצים מתמלאות."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync נכשל עם קוד השגיאה {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "קובץ הדמות נפרס {}/{}, קובץ {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "הפריסה של {} מתחילה"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "פריסת קובץ הדמות \"{}\" נכשלה"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "אין נקודת עגינה למחיצת העל"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "נקודת העגינה של מחיצת השורה שגויה"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "תצורת unsquash שגויה"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "מערכת הקבצים עבור „{}” ‏({}) אינה נתמכת על ידי הליבה הנוכחית שלך."
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "מערכת הקבצים במקור „{}” אינה קיימת"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "איתור unsquashfs לא צלח, נא לוודא שהחבילה squashfs-tools מותקנת"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "לא ניתן לכתוב את קובץ התצורה של KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "קובץ התצורה של KDM ‏{!s} אינו קיים"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "לא ניתן לכתוב את קובץ התצורה של LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "קובץ התצורה של LXDM ‏{!s} אינו קיים"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "לא ניתן לכתוב את קובץ התצורה של LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "קובץ התצורה של LightDM ‏{!s} אינו קיים"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "לא ניתן להגדיר את LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "לא מותקן מקבל פנים מסוג LightDM."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "לא ניתן לכתוב קובץ תצורה של SLIM."
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "קובץ התצורה {!s} של SLIM אינו קיים"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "לא נבחרו מנהלי תצוגה למודול displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -205,26 +91,169 @@ msgstr ""
 "רשימת מנהלי התצוגה ריקה או שאינה מוגדרת גם באחסון הכללי (globalstorage) וגם "
 "ב־displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "תצורת מנהל התצוגה אינה שלמה"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio מותקן."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "נוצר initramfs עם dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "הרצת dracut על היעד נכשלה"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "קוד היציאה היה {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "משימת דמה של Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "צעד דמה של Python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab נכתב."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "שגיאת הגדרות"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "לא הוגדרו מחיצות לשימוש של 
    {!s}
    ."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "לא סופקה תצורת 
    {!s}
     לשימוש 
    {!s}
    ."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "הגדרת GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "שעון החומרה מוגדר."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio מותקן."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs מוגדר."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "השפות מוגדרות."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "מוגדר שטח החלפה מוצפן."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "initramfs נוצר בעזרת mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "הרצת mkinitfs על היעד נכשלה"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "מחיצות מעוגנות."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "הגדרות הרשת נשמרות."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "שירות dmcrypt ל־OpenRC מוגדר."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "התקנת חבילות."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "החבילות מעובדות (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "מותקנת חבילה אחת."
+msgstr[1] "מותקנות %(num)d חבילות."
+msgstr[2] "מותקנות %(num)d חבילות."
+msgstr[3] "מותקנות %(num)d חבילות."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "מתבצעת הסרה של חבילה אחת."
+msgstr[1] "מתבצעת הסרה של %(num)d חבילות."
+msgstr[2] "מתבצעת הסרה של %(num)d חבילות."
+msgstr[3] "מתבצעת הסרה של %(num)d חבילות."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "שגיאת מנהל חבילות"
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח להכין את העדכונים. הפקודה 
    {!s}
     החזירה את "
+"קוד השגיאה {!s}."
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח לעדכן את המערכת. הפקודה 
    {!s}
     החזירה את קוד "
+"השגיאה {!s}."
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה 
    {!s}
     "
+"החזירה את קוד השגיאה {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "הגדרת ערכת עיצוב של Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "הנתונים מותקנים."
@@ -249,6 +278,11 @@ msgstr ""
 "service-action‏ (פעולת שירות) {arg!s} בלתי ידועה עבור השירות "
 "{name!s} בשכבת ההפעלה {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "לא ניתן לשנות את השירות"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -277,91 +311,100 @@ msgid ""
 "exist."
 msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "הגדרת ערכת עיצוב של Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "הגדרת שירותי systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "התקנת חבילות."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "החבילות מעובדות (%(count)d/%(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "מותקנת חבילה אחת."
-msgstr[1] "מותקנות %(num)d חבילות."
-msgstr[2] "מותקנות %(num)d חבילות."
-msgstr[3] "מותקנות %(num)d חבילות."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "מתבצעת הסרה של חבילה אחת."
-msgstr[1] "מתבצעת הסרה של %(num)d חבילות."
-msgstr[2] "מתבצעת הסרה של %(num)d חבילות."
-msgstr[3] "מתבצעת הסרה של %(num)d חבילות."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "התקנת מנהל אתחול."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "שעון החומרה מוגדר."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"פקודות לא ידועות של systemd‏ {command!s} "
+"ו־{suffix!s} עבור היחידה {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "initramfs נוצר בעזרת mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ניתוק עיגון מערכות קבצים."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "הרצת mkinitfs על היעד נכשלה"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "מערכות הקבצים מתמלאות."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "קוד היציאה היה {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync נכשל עם קוד השגיאה {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "נוצר initramfs עם dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "קובץ הדמות נפרס {}/{}, קובץ {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "הרצת dracut על היעד נכשלה"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "הפריסה של {} מתחילה"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs מוגדר."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "פריסת קובץ הדמות \"{}\" נכשלה"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "שירות dmcrypt ל־OpenRC מוגדר."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "אין נקודת עגינה למחיצת העל"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab נכתב."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "משימת דמה של Python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "נקודת העגינה של מחיצת השורה שגויה"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "צעד דמה של Python {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "השפות מוגדרות."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "תצורת unsquash שגויה"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "הגדרות הרשת נשמרות."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "מערכת הקבצים עבור „{}” ‏({}) אינה נתמכת על ידי הליבה הנוכחית שלך."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "מערכת הקבצים במקור „{}” אינה קיימת"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "איתור unsquashfs לא צלח, נא לוודא שהחבילה squashfs-tools מותקנת"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index 719a123432..470500c5f2 100644
--- a/lang/python/hi/LC_MESSAGES/python.po
+++ b/lang/python/hi/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Panwar108 , 2020\n"
 "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
@@ -21,181 +21,65 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB विन्यस्त करना।"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "विभाजन माउंट करना।"
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "विन्यास त्रुटि"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd सेवाएँ विन्यस्त करना"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "सेवा को संशोधित नहीं किया जा सकता"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "बूट लोडर इंस्टॉल करना।"
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
-"{suffix!s}।"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "फ़ाइल सिस्टम माउंट से हटाना।"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "फाइल सिस्टम भरना।"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync त्रुटि कोड {} के साथ विफल।"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "इमेज फ़ाइल {}/{}, फ़ाइल {}/{} सम्पीड़ित की जा रही है"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} हेतु संपीड़न प्रक्रिया आरंभ हो रही है "
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "इमेज फ़ाइल \"{}\" को खोलने में विफल"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "रुट विभाजन हेतु कोई माउंट पॉइंट नहीं है"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage में \"rootMountPoint\" कुंजी नहीं है, कुछ नहीं किया जाएगा"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "रुट विभाजन हेतु ख़राब माउंट पॉइंट"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "रुट माउंट पॉइंट \"{}\" है, जो कि मौजूद नहीं है, कुछ नहीं किया जाएगा"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "ख़राब unsquash विन्यास सेटिंग्स"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) हेतु फ़ाइल सिस्टम आपके वर्तमान कर्नेल द्वारा समर्थित नहीं है"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" स्रोत फ़ाइल सिस्टम मौजूद नहीं है"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल है"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "KDM विन्यास फ़ाइल राइट नहीं की जा सकती"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "LXDM विन्यास फ़ाइल राइट नहीं की जा सकती"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "LightDM विन्यास फ़ाइल राइट नहीं की जा सकती"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM विन्यास फ़ाइल {!s} मौजूद नहीं है"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "LightDM को विन्यस्त नहीं किया जा सकता"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "कोई LightDM लॉगिन स्क्रीन इंस्टॉल नहीं है।"
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "SLIM विन्यास फ़ाइल राइट नहीं की जा सकती"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM विन्यास फ़ाइल {!s} मौजूद नहीं है"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "चयनित डिस्प्ले प्रबंधक मॉड्यूल हेतु कोई डिस्प्ले प्रबंधक नहीं मिला।"
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -203,27 +87,160 @@ msgstr ""
 "globalstorage व displaymanager.conf में डिस्प्ले प्रबंधक सूची रिक्त या "
 "अपरिभाषित है।"
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio को विन्यस्त करना।"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracut के साथ initramfs बनाना।"
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "लक्ष्य पर dracut निष्पादन विफल"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "त्रुटि कोड  {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "डमी पाइथन प्रक्रिया ।"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab पर राइट करना।"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "विन्यास त्रुटि"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB विन्यस्त करना।"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "हार्डवेयर घड़ी सेट करना।"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio को विन्यस्त करना।"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs को विन्यस्त करना। "
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "स्थानिकी को विन्यस्त करना।"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "एन्क्रिप्टेड स्वैप को विन्यस्त करना।"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs के साथ initramfs बनाना।"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "विभाजन माउंट करना।"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "पैकेज इंस्टॉल करना।"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "पैकेज (%(count)d / %(total)d) संसाधित किए जा रहे हैं"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "एक पैकेज इंस्टॉल किया जा रहा है।"
+msgstr[1] "%(num)d पैकेज इंस्टॉल किए जा रहे हैं।"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "एक पैकेज हटाया जा रहा है।"
+msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।"
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth थीम विन्यस्त करना "
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "डाटा इंस्टॉल करना।"
@@ -248,6 +265,11 @@ msgstr ""
 "रन-लेवल {level!s} में सेवा {name!s} हेतु अज्ञात सेवा-कार्य "
 "{arg!s}।"
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "सेवा को संशोधित नहीं किया जा सकता"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -274,87 +296,100 @@ msgid ""
 "exist."
 msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth थीम विन्यस्त करना "
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd सेवाएँ विन्यस्त करना"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "पैकेज इंस्टॉल करना।"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "पैकेज (%(count)d / %(total)d) संसाधित किए जा रहे हैं"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "एक पैकेज इंस्टॉल किया जा रहा है।"
-msgstr[1] "%(num)d पैकेज इंस्टॉल किए जा रहे हैं।"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "एक पैकेज हटाया जा रहा है।"
-msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "बूट लोडर इंस्टॉल करना।"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "हार्डवेयर घड़ी सेट करना।"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
+"{suffix!s}।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs के साथ initramfs बनाना।"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "फ़ाइल सिस्टम माउंट से हटाना।"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "फाइल सिस्टम भरना।"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "त्रुटि कोड  {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync त्रुटि कोड {} के साथ विफल।"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracut के साथ initramfs बनाना।"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "इमेज फ़ाइल {}/{}, फ़ाइल {}/{} सम्पीड़ित की जा रही है"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "लक्ष्य पर dracut निष्पादन विफल"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} हेतु संपीड़न प्रक्रिया आरंभ हो रही है "
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs को विन्यस्त करना। "
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "इमेज फ़ाइल \"{}\" को खोलने में विफल"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "रुट विभाजन हेतु कोई माउंट पॉइंट नहीं है"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab पर राइट करना।"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage में \"rootMountPoint\" कुंजी नहीं है, कुछ नहीं किया जाएगा"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "डमी पाइथन प्रक्रिया ।"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "रुट विभाजन हेतु ख़राब माउंट पॉइंट"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "रुट माउंट पॉइंट \"{}\" है, जो कि मौजूद नहीं है, कुछ नहीं किया जाएगा"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "स्थानिकी को विन्यस्त करना।"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "ख़राब unsquash विन्यास सेटिंग्स"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) हेतु फ़ाइल सिस्टम आपके वर्तमान कर्नेल द्वारा समर्थित नहीं है"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" स्रोत फ़ाइल सिस्टम मौजूद नहीं है"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल है"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po
index 0ccbd948c3..70fe6b047c 100644
--- a/lang/python/hr/LC_MESSAGES/python.po
+++ b/lang/python/hr/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lovro Kudelić , 2020\n"
 "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
@@ -21,184 +21,65 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurirajte GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montiranje particija."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Greška konfiguracije"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nema definiranih particija za 
    {!s}
     korištenje."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriraj systemd servise"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Ne mogu modificirati servis"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne mogu omogućiti systemd servis {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Ne mogu omogućiti systemd cilj {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instaliram bootloader."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Nepoznata systemd naredba {command!s} i {suffix!s}"
-" za jedinicu {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odmontiraj datotečne sustave."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Popunjavanje datotečnih sustava."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync nije uspio s kodom pogreške {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Otpakiravanje slike {}/{}, datoteka {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Početak raspakiravanja {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Otpakiravnje slike nije uspjelo \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nema točke montiranja za root particiju"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ne sadrži ključ \"rootMountPoint\", ne radi ništa"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Neispravna točka montiranja za root particiju"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Neispravna unsquash konfiguracija"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Datotečni sustav za \"{}\" ({}) nije podržan na vašem trenutnom kernelu"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Izvorni datotečni sustav \"{}\" ne postoji"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Neuspješno pronalaženje unsquashfs, provjerite imate li instaliran paket "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Ne mogu zapisati KDM konfiguracijsku datoteku"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM konfiguracijska datoteka {!s} ne postoji"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Ne mogu zapisati LXDM konfiguracijsku datoteku"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM konfiguracijska datoteka {!s} ne postoji"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Ne moku zapisati LightDM konfiguracijsku datoteku"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM konfiguracijska datoteka {!s} ne postoji"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Ne mogu konfigurirati LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Nije instaliran LightDM pozdravnik."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Ne mogu zapisati SLIM konfiguracijsku datoteku"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM konfiguracijska datoteka {!s} ne postoji"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Nisu odabrani upravitelji zaslona za modul displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -206,27 +87,162 @@ msgstr ""
 "Popis upravitelja zaslona je prazan ili nedefiniran u oba globalstorage i "
 "displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriranje mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Stvaranje initramfs s dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Izlazni kod bio je {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testni python posao."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testni python korak {}"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisujem fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Greška konfiguracije"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nema definiranih particija za 
    {!s}
     korištenje."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nijedna root točka montiranja nije definirana za 
    {!s}
     korištenje."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurirajte GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Postavljanje hardverskog sata."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriranje mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriranje initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriranje lokalizacije."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfiguriranje šifriranog swapa."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Stvaranje initramfs s mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montiranje particija."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Spremanje mrežne konfiguracije."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriranje servisa OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instaliraj pakete."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Obrađujem pakete (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instaliram paket."
+msgstr[1] "Instaliram %(num)d pakete."
+msgstr[2] "Instaliram %(num)d pakete."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Uklanjam paket."
+msgstr[1] "Uklanjam %(num)d pakete."
+msgstr[2] "Uklanjam %(num)d pakete."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurirajte Plymouth temu"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instaliranje podataka."
@@ -251,6 +267,11 @@ msgstr ""
 "Nepoznat service-action {arg!s} za servis {name!s} u run-level "
 "{level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Ne mogu modificirati servis"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -281,89 +302,103 @@ msgid ""
 msgstr ""
 "Putanja servisa  {name!s} je {path!s}, međutim ona ne postoji."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurirajte Plymouth temu"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriraj systemd servise"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instaliraj pakete."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
+"{num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Obrađujem pakete (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne mogu omogućiti systemd servis {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instaliram paket."
-msgstr[1] "Instaliram %(num)d pakete."
-msgstr[2] "Instaliram %(num)d pakete."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Ne mogu omogućiti systemd cilj {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Uklanjam paket."
-msgstr[1] "Uklanjam %(num)d pakete."
-msgstr[2] "Uklanjam %(num)d pakete."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instaliram bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Postavljanje hardverskog sata."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Nepoznata systemd naredba {command!s} i {suffix!s}"
+" za jedinicu {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Stvaranje initramfs s mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontiraj datotečne sustave."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Popunjavanje datotečnih sustava."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Izlazni kod bio je {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync nije uspio s kodom pogreške {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Stvaranje initramfs s dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Otpakiravanje slike {}/{}, datoteka {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Početak raspakiravanja {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriranje initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Otpakiravnje slike nije uspjelo \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriranje servisa OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nema točke montiranja za root particiju"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisujem fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ne sadrži ključ \"rootMountPoint\", ne radi ništa"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testni python posao."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Neispravna točka montiranja za root particiju"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testni python korak {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriranje lokalizacije."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Neispravna unsquash konfiguracija"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Spremanje mrežne konfiguracije."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Datotečni sustav za \"{}\" ({}) nije podržan na vašem trenutnom kernelu"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Izvorni datotečni sustav \"{}\" ne postoji"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Neuspješno pronalaženje unsquashfs, provjerite imate li instaliran paket "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po
index 1a4034f14b..d6d519bb5c 100644
--- a/lang/python/hu/LC_MESSAGES/python.po
+++ b/lang/python/hu/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lajos Pasztor , 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
@@ -24,210 +24,223 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurálása."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Partíciók csatolása."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Konfigurációs hiba"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nincsenek partíciók meghatározva a 
    {!s}
     használatához."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd szolgáltatások beállítása"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "a szolgáltatást nem lehet módosítani"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nem sikerült a systemd cél {name!s} letiltása."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nem maszkolható systemd egység: {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Ismeretlen systemd parancsok {command!s} és "
-"{suffix!s} a {name!s} egységhez. "
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fájlrendszerek leválasztása."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fájlrendszerek betöltése."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "az rsync elhalt a(z) {} hibakóddal"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" kép kicsomagolása nem sikerült"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nincs betöltési pont a root partíciónál"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nem tartalmaz \"rootMountPoint\" kulcsot, semmi nem történik"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Rossz betöltési pont a root partíciónál"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", ami nem létezik, semmi nem történik"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Rossz unsquash konfiguráció"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Rendszerbetöltő telepítése."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "A forrás fájlrendszer \"{}\" nem létezik"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs nem található, győződj meg róla a squashfs-tools csomag telepítve"
-" van."
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "A KDM konfigurációs fájl nem írható"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "A(z) {!s} KDM konfigurációs fájl nem létezik"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Az LXDM konfigurációs fájl nem írható"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "A(z) {!s} LXDM konfigurációs fájl nem létezik"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "A LightDM konfigurációs fájl nem írható"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "A(z) {!s} LightDM konfigurációs fájl nem létezik"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "A LightDM nem állítható be"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Nincs LightDM üdvözlő telepítve."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "A SLIM konfigurációs fájl nem írható"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "A(z) {!s} SLIM konfigurációs fájl nem létezik"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Nincs kijelzőkezelő kiválasztva a kijelzőkezelő modulhoz."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "A kijelzőkezelő konfigurációja hiányos volt"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio konfigurálása."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "initramfs létrehozása ezzel: dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "dracut futtatása nem sikerült a célon."
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "A kilépési kód {} volt."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Hamis Python feladat."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hamis {}. Python lépés"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab írása."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Konfigurációs hiba"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nincsenek partíciók meghatározva a 
    {!s}
     használatához."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nincs root csatolási pont megadva a 
    {!s}
     használatához."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurálása."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Rendszeridő beállítása."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio konfigurálása."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs konfigurálása."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "nyelvi értékek konfigurálása."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Titkosított swap konfigurálása."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partíciók csatolása."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Hálózati konfiguráció mentése."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Csomagok telepítése."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Egy csomag telepítése."
+msgstr[1] "%(num)d csomag telepítése."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Egy csomag eltávolítása."
+msgstr[1] "%(num)d csomag eltávolítása."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth téma beállítása"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Adatok telepítése."
@@ -252,6 +265,11 @@ msgstr ""
 "Ismeretlen service-action {arg!s} a szolgáltatáshoz {name!s} in"
 " run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "a szolgáltatást nem lehet módosítani"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -281,87 +299,104 @@ msgid ""
 msgstr ""
 "A szolgáltatás {name!s} elérési útja {path!s}, nem létezik."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth téma beállítása"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd szolgáltatások beállítása"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Csomagok telepítése."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Egy csomag telepítése."
-msgstr[1] "%(num)d csomag telepítése."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Egy csomag eltávolítása."
-msgstr[1] "%(num)d csomag eltávolítása."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nem sikerült a systemd cél {name!s} letiltása."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Rendszerbetöltő telepítése."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nem maszkolható systemd egység: {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Rendszeridő beállítása."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ismeretlen systemd parancsok {command!s} és "
+"{suffix!s} a {name!s} egységhez. "
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fájlrendszerek leválasztása."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fájlrendszerek betöltése."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "az rsync elhalt a(z) {} hibakóddal"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "A kilépési kód {} volt."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kép kicsomagolása nem sikerült"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "initramfs létrehozása ezzel: dracut."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nincs betöltési pont a root partíciónál"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "dracut futtatása nem sikerült a célon."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nem tartalmaz \"rootMountPoint\" kulcsot, semmi nem történik"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs konfigurálása."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Rossz betöltési pont a root partíciónál"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint is \"{}\", ami nem létezik, semmi nem történik"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab írása."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Rossz unsquash konfiguráció"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Hamis Python feladat."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hamis {}. Python lépés"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "A forrás fájlrendszer \"{}\" nem létezik"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "nyelvi értékek konfigurálása."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs nem található, győződj meg róla a squashfs-tools csomag telepítve"
+" van."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Hálózati konfiguráció mentése."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po
index 5ba45ae051..2501a445a0 100644
--- a/lang/python/id/LC_MESSAGES/python.po
+++ b/lang/python/id/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Drajat Hasan , 2021\n"
 "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
@@ -24,201 +24,219 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Kesalahan Konfigurasi"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr "Gak bisa menulis file konfigurasi KDM"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr "File {!s} config KDM belum ada"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr "Gak bisa menulis file konfigurasi LXDM"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr "File {!s} config LXDM enggak ada"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr "Gak bisa menulis file konfigurasi LightDM"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr "File {!s} config LightDM belum ada"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr "Gak bisa mengkonfigurasi LightDM"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr "Tiada LightDM greeter yang terinstal."
+
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr "Gak bisa menulis file konfigurasi SLIM"
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr "File {!s} config SLIM belum ada"
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
+msgstr "Tiada display manager yang dipilih untuk modul displaymanager."
+
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Lepaskan sistem berkas."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr "Konfigurasi display manager belum rampung"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tugas dumi python."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Langkah {} dumi python"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Kesalahan Konfigurasi"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
-msgstr "Gak bisa menulis file konfigurasi KDM"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
-msgstr "File {!s} config KDM belum ada"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
-msgstr "Gak bisa menulis file konfigurasi LXDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
-msgstr "File {!s} config LXDM enggak ada"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
-msgstr "Gak bisa menulis file konfigurasi LightDM"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
-msgstr "File {!s} config LightDM belum ada"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
-msgstr "Gak bisa mengkonfigurasi LightDM"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instal paket-paket."
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
-msgstr "Tiada LightDM greeter yang terinstal."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paket pemrosesan (%(count)d/%(total)d)"
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
-msgstr "Gak bisa menulis file konfigurasi SLIM"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Menginstal paket %(num)d"
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
-msgstr "File {!s} config SLIM belum ada"
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "mencopot %(num)d paket"
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
-msgstr "Tiada display manager yang dipilih untuk modul displaymanager."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/packages/main.py:589
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
-msgstr "Konfigurasi display manager belum rampung"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -243,6 +261,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -268,85 +291,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instal paket-paket."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paket pemrosesan (%(count)d/%(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Menginstal paket %(num)d"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "mencopot %(num)d paket"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Lepaskan sistem berkas."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tugas dumi python."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Langkah {} dumi python"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/id_ID/LC_MESSAGES/python.po b/lang/python/id_ID/LC_MESSAGES/python.po
index 1cbcd75199..4c78ec0424 100644
--- a/lang/python/id_ID/LC_MESSAGES/python.po
+++ b/lang/python/id_ID/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/calamares/teams/20061/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,85 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po
index eb96deb152..ee8ba7f276 100644
--- a/lang/python/ie/LC_MESSAGES/python.po
+++ b/lang/python/ie/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Caarmi, 2020\n"
 "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n"
@@ -21,204 +21,222 @@ msgstr ""
 "Language: ie\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurante GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installante li bootloader."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montente partitiones."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Errore de configuration"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Null partition es definit por usa de 
    {!s}
    ."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr "Ne successat scrir li file de configuration de KDM"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurante servicios de systemd"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr "File del configuration de KDM {!s} ne existe"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr "Ne successat scrir li file de configuration de LXDM"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Invocation de systemctl {arg!s} in chroot retrodat li code "
-"{num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr "File del configuration de LXDM {!s} ne existe"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne successat activar li servicio de systemd {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr "Ne successat scrir li file de configuration de LightDM"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr "File del configuration de LightDM {!s} ne existe"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr "File del configuration de SLIM {!s} ne existe"
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ne successat depaccar li image \"{}\""
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Li code de termination esset {}"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrition de fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Errore de configuration"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Ínvalid configuration de unsquash"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Null partition es definit por usa de 
    {!s}
    ."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurante GRUB."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
-msgstr "Ne successat scrir li file de configuration de KDM"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurante mkinitcpio."
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
-msgstr "File del configuration de KDM {!s} ne existe"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurante initramfs."
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
-msgstr "Ne successat scrir li file de configuration de LXDM"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurante locales."
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
-msgstr "File del configuration de LXDM {!s} ne existe"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
-msgstr "Ne successat scrir li file de configuration de LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
-msgstr "File del configuration de LightDM {!s} ne existe"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montente partitiones."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installante paccages."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
-msgstr "File del configuration de SLIM {!s} ne existe"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/packages/main.py:589
 msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurante mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr ""
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurante li tema de Plymouth"
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
@@ -242,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -269,87 +292,99 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurante li tema de Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurante servicios de systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installante paccages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Invocation de systemctl {arg!s} in chroot retrodat li code "
+"{num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne successat activar li servicio de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installante li bootloader."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Li code de termination esset {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ne successat depaccar li image \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurante initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrition de fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ínvalid configuration de unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurante locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po
index 8a57cabf5f..3b6bdcec7e 100644
--- a/lang/python/is/LC_MESSAGES/python.po
+++ b/lang/python/is/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kristján Magnússon, 2018\n"
 "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Aftengja skráarkerfi."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Setja upp pakka."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Vinnslupakkar (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Setja upp einn pakka."
+msgstr[1] "Setur upp %(num)d pakka."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjarlægi einn pakka."
+msgstr[1] "Fjarlægi %(num)d pakka."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,87 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Setja upp pakka."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Vinnslupakkar (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Setja upp einn pakka."
-msgstr[1] "Setur upp %(num)d pakka."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjarlægi einn pakka."
-msgstr[1] "Fjarlægi %(num)d pakka."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Aftengja skráarkerfi."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po
index 5f516a9495..b947aae012 100644
--- a/lang/python/it_IT/LC_MESSAGES/python.po
+++ b/lang/python/it_IT/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Giuseppe Pignataro , 2021\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
@@ -24,188 +24,66 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montaggio partizioni."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Errore di Configurazione"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nessuna partizione definita per l'uso con 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura servizi  systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impossibile modificare il servizio"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
-" di errore {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossibile abilitare il servizio systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossibile abilitare la destinazione systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installa il bootloader."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Impossibile disabilitare la destinazione systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossibile mascherare l'unità systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Comandi systemd sconosciuti {command!s} "
-"e{suffix!s} per l'unità {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Smonta i file system."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Copia dei file system."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync fallita con codice d'errore {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Estrazione immagine {}/{}, file {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Avvio dell'estrazione {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Estrazione dell'immagine \"{}\" fallita"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nessun punto di montaggio per la partizione di root"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage non contiene una chiave \"rootMountPoint\", nessuna azione "
-"prevista"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punto di montaggio per la partizione di root errato"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint è \"{}\" ma non esiste, nessuna azione prevista"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configurazione unsquash errata"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Il filesystem per \"{}\" ({}) non è supportato dal kernel corrente"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Il filesystem sorgente \"{}\" non esiste"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Impossibile trovare unsquashfs, assicurarsi di aver installato il pacchetto "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinazione del sistema \"{}\" non è una directory"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Impossibile scrivere il file di configurazione di KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Il file di configurazione di KDM {!s} non esiste"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Impossibile scrivere il file di configurazione di LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Il file di configurazione di LXDM {!s} non esiste"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Impossibile scrivere il file di configurazione di LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Il file di configurazione di LightDM {!s} non esiste"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Impossibile configurare LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Nessun LightDM greeter installato."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Impossibile scrivere il file di configurazione di SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Il file di configurazione di SLIM {!s} non esiste"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 "Non è stato selezionato alcun display manager per il modulo displaymanager"
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -213,26 +91,159 @@ msgstr ""
 "L'elenco dei display manager è vuota o non definita sia in globalstorage che"
 " in displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazione del display manager è incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurazione di mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creazione di initramfs con dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Impossibile eseguire dracut sulla destinazione"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codice di uscita era {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fittizio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Python step {} fittizio"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrittura di fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Errore di Configurazione"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nessuna partizione definita per l'uso con 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nessun punto di mount root è dato in l'uso per 
    {!s}
    "
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Impostazione del clock hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurazione di mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurazione di initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurazione della localizzazione."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurazione per lo swap cifrato."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Sto creando initramfs con mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Impossibile eseguire mkinitfs sulla destinazione"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaggio partizioni."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Salvataggio della configurazione di rete."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurazione del servizio OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installa pacchetti."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installando un pacchetto."
+msgstr[1] "Installazione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Rimuovendo un pacchetto."
+msgstr[1] "Rimozione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura il tema Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installazione dei dati."
@@ -257,6 +268,11 @@ msgstr ""
 "Service-action sconosciuta {arg!s} per il servizio {name!s} nel"
 " run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Impossibile modificare il servizio"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,87 +302,106 @@ msgid ""
 msgstr ""
 "Il percorso del servizio {name!s} è {path!s}, ma non esiste."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura il tema Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura servizi  systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installa pacchetti."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
+" di errore {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossibile abilitare il servizio systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installando un pacchetto."
-msgstr[1] "Installazione di %(num)d pacchetti."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossibile abilitare la destinazione systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Rimuovendo un pacchetto."
-msgstr[1] "Rimozione di %(num)d pacchetti."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impossibile disabilitare la destinazione systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installa il bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossibile mascherare l'unità systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Impostazione del clock hardware."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandi systemd sconosciuti {command!s} "
+"e{suffix!s} per l'unità {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Sto creando initramfs con mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Smonta i file system."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Impossibile eseguire mkinitfs sulla destinazione"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Copia dei file system."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codice di uscita era {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync fallita con codice d'errore {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creazione di initramfs con dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazione immagine {}/{}, file {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Impossibile eseguire dracut sulla destinazione"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Avvio dell'estrazione {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurazione di initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Estrazione dell'immagine \"{}\" fallita"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurazione del servizio OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nessun punto di montaggio per la partizione di root"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrittura di fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage non contiene una chiave \"rootMountPoint\", nessuna azione "
+"prevista"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fittizio."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punto di montaggio per la partizione di root errato"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Python step {} fittizio"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint è \"{}\" ma non esiste, nessuna azione prevista"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurazione della localizzazione."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazione unsquash errata"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Salvataggio della configurazione di rete."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Il filesystem per \"{}\" ({}) non è supportato dal kernel corrente"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorgente \"{}\" non esiste"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Impossibile trovare unsquashfs, assicurarsi di aver installato il pacchetto "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinazione del sistema \"{}\" non è una directory"
diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po
index fb22addaf9..a57e4d132c 100644
--- a/lang/python/ja/LC_MESSAGES/python.po
+++ b/lang/python/ja/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: UTUMI Hirosi , 2020\n"
 "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
@@ -23,206 +23,221 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUBを設定にします。"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "パーティションのマウント。"
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "コンフィグレーションエラー"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     に使用するパーティションが定義されていません。"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemdサービスを設定"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "サービスが変更できません"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ブートローダーをインストール"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s}というsystemdサービスが可能にすることができません"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が開始できません。"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が停止できません。"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd ユニット {name!s} をマスクできません。"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
-"{suffix!s}。"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ファイルシステムをアンマウント。"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ファイルシステムに書き込んでいます。"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "エラーコード {} によりrsyncを失敗。"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "イメージ {}/{}, ファイル {}/{} を解凍しています"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} の解凍を開始しています"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "イメージ  \"{}\" の展開に失敗"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "ルートパーティションのためのマウントポイントがありません"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "ルートパーティションのためのマウントポイントが不正です"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "unsquash の設定が不正です"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) のファイルシステムは、現在のカーネルではサポートされていません"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "ソースファイルシステム  \"{}\" は存在しません"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "unsquashfs が見つかりませんでした。 squashfs-toolsがインストールされているか、確認してください。"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "KDMの設定ファイルに書き込みができません"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM 設定ファイル {!s} が存在しません"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "LXDMの設定ファイルに書き込みができません"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM 設定ファイル {!s} が存在しません"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "LightDMの設定ファイルに書き込みができません"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM 設定ファイル {!s} が存在しません"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "LightDMの設定ができません"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "LightDM greeter がインストールされていません。"
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "SLIMの設定ファイルに書き込みができません"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM 設定ファイル {!s} が存在しません"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "ディスプレイマネージャが選択されていません。"
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リストが空か未定義です。"
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "ディスプレイマネージャの設定が不完全です"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpioを設定しています。"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracutとinitramfsを作成しています。"
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "ターゲット上で dracut の実行に失敗"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "停止コードは {} でした"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstabを書き込んでいます。"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "コンフィグレーションエラー"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     に使用するパーティションが定義されていません。"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr " 
    {!s}
     を使用するのにルートマウントポイントが与えられていません。"
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUBを設定にします。"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "ハードウェアクロックの設定"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpioを設定しています。"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfsを設定しています。"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "ロケールを設定しています。"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "暗号化したswapを設定しています。"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfsを使用してinitramfsを作成します。"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "ターゲットでmkinitfsを実行できませんでした"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "パーティションのマウント。"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "ネットワーク設定を保存しています。"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcryptサービスを設定しています。"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "パッケージのインストール"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "パッケージを処理しています (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] " %(num)d パッケージをインストールしています。"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] " %(num)d パッケージを削除しています。"
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouthテーマを設定"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "データのインストール。"
@@ -246,6 +261,11 @@ msgid ""
 msgstr ""
 "ランレベル {level!s} 内のサービス {name!s} に対する未知のサービスアクション {arg!s}。"
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "サービスが変更できません"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -271,85 +291,100 @@ msgid ""
 "exist."
 msgstr "サービス {name!s} のパスが {path!s} です。これは存在しません。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouthテーマを設定"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemdサービスを設定"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "パッケージのインストール"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "パッケージを処理しています (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s}というsystemdサービスが可能にすることができません"
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] " %(num)d パッケージをインストールしています。"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が開始できません。"
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] " %(num)d パッケージを削除しています。"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が停止できません。"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ブートローダーをインストール"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd ユニット {name!s} をマスクできません。"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "ハードウェアクロックの設定"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
+"{suffix!s}。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfsを使用してinitramfsを作成します。"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ファイルシステムをアンマウント。"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "ターゲットでmkinitfsを実行できませんでした"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ファイルシステムに書き込んでいます。"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "停止コードは {} でした"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "エラーコード {} によりrsyncを失敗。"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutとinitramfsを作成しています。"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "イメージ {}/{}, ファイル {}/{} を解凍しています"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "ターゲット上で dracut の実行に失敗"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} の解凍を開始しています"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfsを設定しています。"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "イメージ  \"{}\" の展開に失敗"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcryptサービスを設定しています。"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントがありません"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstabを書き込んでいます。"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントが不正です"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "ロケールを設定しています。"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "unsquash の設定が不正です"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "ネットワーク設定を保存しています。"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) のファイルシステムは、現在のカーネルではサポートされていません"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "ソースファイルシステム  \"{}\" は存在しません"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "unsquashfs が見つかりませんでした。 squashfs-toolsがインストールされているか、確認してください。"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po
index 64d0eae02f..d4981db3c7 100644
--- a/lang/python/kk/LC_MESSAGES/python.po
+++ b/lang/python/kk/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: kk\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po
index 86580ad77b..593f86ec1f 100644
--- a/lang/python/kn/LC_MESSAGES/python.po
+++ b/lang/python/kn/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index ed244e03d9..d29cefce71 100644
--- a/lang/python/ko/LC_MESSAGES/python.po
+++ b/lang/python/ko/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: JungHee Lee , 2020\n"
 "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
@@ -22,180 +22,65 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB 구성"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "파티션 마운트 중."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "구성 오류"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "사용할 
    {!s}
    에 대해 정의된 파티션이 없음."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd 서비스 구성"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "서비스를 수정할 수 없음"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "부트로더 설치."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
-"s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "파일 시스템 마운트를 해제합니다."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "파일 시스템을 채우는 중."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync가 {} 오류 코드로 실패했습니다."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "이미지 {}/{}, 파일 {}/{} 압축푸는 중"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} 압축 풀기 시작 중"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다."
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "루트 파티션에 대한 마운트 위치 없음"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "루트 파티션에 대한 잘못된 마운트 위치"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "잘못된 unsquash 구성"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({})에 대한 파일 시스템은 현재 커널에서 지원되지 않습니다."
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다."
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치되어 있는지 확인하십시오."
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "KDM 구성 파일을 쓸 수 없습니다."
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM 구성 파일 {! s}가 없습니다"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "LMLDM 구성 파일을 쓸 수 없습니다."
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM 구성 파일 {!s}이 없습니다."
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "LightDM 구성 파일을 쓸 수 없습니다."
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM 구성 파일 {!s}가 없습니다."
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "LightDM을 구성할 수 없습니다."
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "LightDM greeter가 설치되지 않았습니다."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "SLIM 구성 파일을 쓸 수 없음"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM 구성 파일 {!s}가 없음"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "displaymanager 모듈에 대해 선택된 디스플레이 관리자가 없습니다."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -203,26 +88,157 @@ msgstr ""
 "displaymanagers 목록이 비어 있거나 globalstorage 및 displaymanager.conf 모두에서 정의되지 "
 "않았습니다."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio 구성 중."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracut을 사용하여 initramfs 만들기."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "대상에서 dracut을 실행하지 못함"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "종료 코드 {}"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "더미 파이썬 작업."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "더미 파이썬 단계 {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab 쓰기."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "구성 오류"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "사용할 
    {!s}
    에 대해 정의된 파티션이 없음."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "
    {!s}
    에서 사용할 루트 마운트 지점이 제공되지 않음."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB 구성"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "하드웨어 클럭 설정 중."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio 구성 중."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs 구성 중."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "로컬 구성 중."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "암호화된 스왑 구성 중."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs로 initramfs 생성 중."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "파티션 마운트 중."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "네트워크 구성 저장 중."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt 서비스 구성 중."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "패키지를 설치합니다."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "패키지 처리중 (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "플리머스 테마 구성"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "데이터 설치중."
@@ -247,6 +263,11 @@ msgstr ""
 "run-level {level!s}의 service {name!s}에 대해 알 수 없는 service-action "
 "{arg!s}입니다."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "서비스를 수정할 수 없음"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -272,85 +293,99 @@ msgid ""
 "exist."
 msgstr "{name!s} 서비스에 대한 경로는 {path!s}이고, 존재하지 않습니다."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "플리머스 테마 구성"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd 서비스 구성"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "패키지를 설치합니다."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "패키지 처리중 (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "부트로더 설치."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "하드웨어 클럭 설정 중."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
+"s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs로 initramfs 생성 중."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "파일 시스템 마운트를 해제합니다."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "파일 시스템을 채우는 중."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "종료 코드 {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync가 {} 오류 코드로 실패했습니다."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracut을 사용하여 initramfs 만들기."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "이미지 {}/{}, 파일 {}/{} 압축푸는 중"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "대상에서 dracut을 실행하지 못함"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} 압축 풀기 시작 중"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs 구성 중."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt 서비스 구성 중."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "루트 파티션에 대한 마운트 위치 없음"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab 쓰기."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "더미 파이썬 작업."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "루트 파티션에 대한 잘못된 마운트 위치"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "더미 파이썬 단계 {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "로컬 구성 중."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "잘못된 unsquash 구성"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "네트워크 구성 저장 중."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({})에 대한 파일 시스템은 현재 커널에서 지원되지 않습니다."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다."
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치되어 있는지 확인하십시오."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po
index fdbc1b6ba8..eff5c79ddd 100644
--- a/lang/python/lo/LC_MESSAGES/python.po
+++ b/lang/python/lo/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,85 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po
index 69e5ad171f..abed5af2ec 100644
--- a/lang/python/lt/LC_MESSAGES/python.po
+++ b/lang/python/lt/LC_MESSAGES/python.po
@@ -5,16 +5,16 @@
 # 
 # Translators:
 # Mindaugas , 2019
-# Moo, 2020
+# Moo, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Moo, 2020\n"
+"Last-Translator: Moo, 2021\n"
 "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,184 +22,67 @@ msgstr ""
 "Language: lt\n"
 "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigūruoti GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Prijungiami skaidiniai."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Konfigūracijos klaida"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
    {!s}
     naudojimui."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigūruoti systemd tarnybas"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nepavyksta modifikuoti tarnybos"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Nežinomos systemd komandos {command!s} ir "
-"{suffix!s} įtaisui {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Atjungti failų sistemas."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Užpildomos failų sistemos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync patyrė nesėkmę su klaidos kodu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Išpakuojamas atvaizdis {}/{}, failas {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Pradedama išpakuoti {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Nepavyko išpakuoti atvaizdį „{}“"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nėra prijungimo taško šaknies skaidiniui"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage viduje nėra „rootMountPoint“ rakto, nieko nedaroma"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Blogas šaknies skaidinio prijungimo taškas"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint yra „{}“, kurio nėra, nieko nedaroma"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Bloga unsquash konfigūracija"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta \"{}\" ({})"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Įdiegti operacinės sistemos paleidyklę."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Šaltinio failų sistemos „{}“ nėra"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Operacinės sistemos paleidyklės diegimo klaida"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nepavyko rasti unsquashfs, įsitikinkite, kad esate įdiegę squashfs-tools "
-"paketą"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
+"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
+"
    {!s}
     grąžino klaidos kodą {!s}."
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Nepavyksta įrašyti KDM konfigūracijos failą"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM konfigūracijos failo {!s} nėra"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Nepavyksta įrašyti LXDM konfigūracijos failą"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM konfigūracijos failo {!s} nėra"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Nepavyksta įrašyti LightDM konfigūracijos failą"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM konfigūracijos failo {!s} nėra"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Nepavyksta konfigūruoti LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Neįdiegtas joks LightDM pasisveikinimas."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Nepavyksta įrašyti SLIM konfigūracijos failą"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM konfigūracijos failo {!s} nėra"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Displaymanagers moduliui nėra pasirinkta jokių ekranų tvarkytuvių."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -207,28 +90,171 @@ msgstr ""
 "Displaymanagers sąrašas yra tuščias arba neapibrėžtas tiek globalstorage, "
 "tiek ir displaymanager.conf faile."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigūruojama mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Sukuriama initramfs naudojant dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nepavyko paskirties vietoje paleisti dracut"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Išėjimo kodas buvo {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktyvi python užduotis."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktyvus python žingsnis {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Rašoma fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Konfigūracijos klaida"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
    {!s}
     naudojimui."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nėra nurodyta jokių šaknies prijungimo taškų, skirtų 
    {!s}
     "
 "naudojimui."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Nenurodyta jokia 
    {!s}
     konfigūracija, kurią 
    {!s}
     galėtų"
+" naudoti."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigūruoti GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nustatomas aparatinės įrangos laikrodis."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigūruojama mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigūruojama initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigūruojamos lokalės."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigūruojamas šifruotas sukeitimų skaidinys."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Kuriama initramfs naudojant mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Prijungiami skaidiniai."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Įrašoma tinklo konfigūracija."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Įdiegti paketus."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Apdorojami paketai (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Įdiegiamas %(num)d paketas."
+msgstr[1] "Įdiegiami %(num)d paketai."
+msgstr[2] "Įdiegiama %(num)d paketų."
+msgstr[3] "Įdiegiama %(num)d paketų."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Šalinamas %(num)d paketas."
+msgstr[1] "Šalinami %(num)d paketai."
+msgstr[2] "Šalinama %(num)d paketų."
+msgstr[3] "Šalinama %(num)d paketų."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Paketų tvarkytuvės klaida"
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko paruošti atnaujinimų. Komanda 
    {!s}
     "
+"grąžino klaidos kodą {!s}."
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Paketų tvarkytuvei nepavyko atnaujinti sistemos. Komanda 
    {!s}
     "
+"grąžino klaidos kodą {!s}."
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigūruoti Plymouth temą"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Įdiegiami duomenys."
@@ -253,6 +279,11 @@ msgstr ""
 "Nežinomas tarnybos veiksmas {arg!s}, skirtas tarnybai {name!s} "
 "vykdymo lygmenyje {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Nepavyksta modifikuoti tarnybos"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -283,91 +314,103 @@ msgid ""
 msgstr ""
 "Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigūruoti Plymouth temą"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigūruoti systemd tarnybas"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Įdiegti paketus."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Apdorojami paketai (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Įdiegiamas %(num)d paketas."
-msgstr[1] "Įdiegiami %(num)d paketai."
-msgstr[2] "Įdiegiama %(num)d paketų."
-msgstr[3] "Įdiegiama %(num)d paketų."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Šalinamas %(num)d paketas."
-msgstr[1] "Šalinami %(num)d paketai."
-msgstr[2] "Šalinama %(num)d paketų."
-msgstr[3] "Šalinama %(num)d paketų."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Įdiegti paleidyklę."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nustatomas aparatinės įrangos laikrodis."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Nežinomos systemd komandos {command!s} ir "
+"{suffix!s} įtaisui {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Kuriama initramfs naudojant mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Atjungti failų sistemas."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Užpildomos failų sistemos."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Išėjimo kodas buvo {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync patyrė nesėkmę su klaidos kodu {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Sukuriama initramfs naudojant dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Išpakuojamas atvaizdis {}/{}, failas {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nepavyko paskirties vietoje paleisti dracut"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Pradedama išpakuoti {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigūruojama initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepavyko išpakuoti atvaizdį „{}“"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nėra prijungimo taško šaknies skaidiniui"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Rašoma fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage viduje nėra „rootMountPoint“ rakto, nieko nedaroma"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktyvi python užduotis."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Blogas šaknies skaidinio prijungimo taškas"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktyvus python žingsnis {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint yra „{}“, kurio nėra, nieko nedaroma"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigūruojamos lokalės."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Bloga unsquash konfigūracija"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Įrašoma tinklo konfigūracija."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta \"{}\" ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Šaltinio failų sistemos „{}“ nėra"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nepavyko rasti unsquashfs, įsitikinkite, kad esate įdiegę squashfs-tools "
+"paketą"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po
index 0c28a383c4..f08ec43a40 100644
--- a/lang/python/lv/LC_MESSAGES/python.po
+++ b/lang/python/lv/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,223 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +258,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,89 +288,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po
index 44307a32b5..d05e86b805 100644
--- a/lang/python/mk/LC_MESSAGES/python.po
+++ b/lang/python/mk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Martin Ristovski , 2018\n"
 "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr "KDM конфигурациониот фајл не може да се создаде"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr "KDM конфигурациониот фајл {!s} не постои"
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr "LXDM конфигурациониот фајл не може да се создаде"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr "LXDM конфигурациониот фајл {!s} не постои"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr "LightDM конфигурациониот фајл не може да се создаде"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr "LightDM конфигурациониот фајл {!s} не постои"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr "Не може да се подеси LightDM"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr "Нема инсталирано LightDM поздравувач"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr "SLIM конфигурациониот фајл не може да се создаде"
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr "SLIM конфигурациониот фајл {!s} не постои"
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
+msgstr "Немате избрано дисплеј менаџер за displaymanager модулот."
+
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
-msgstr "KDM конфигурациониот фајл не може да се создаде"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
-msgstr "KDM конфигурациониот фајл {!s} не постои"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
-msgstr "LXDM конфигурациониот фајл не може да се создаде"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM конфигурациониот фајл {!s} не постои"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
-msgstr "LightDM конфигурациониот фајл не може да се создаде"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM конфигурациониот фајл {!s} не постои"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
-msgstr "Не може да се подеси LightDM"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
-msgstr "Нема инсталирано LightDM поздравувач"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
-msgstr "SLIM конфигурациониот фајл не може да се создаде"
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM конфигурациониот фајл {!s} не постои"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
-msgstr "Немате избрано дисплеј менаџер за displaymanager модулот."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,87 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po
index 546d72695e..2473ecc7cc 100644
--- a/lang/python/ml/LC_MESSAGES/python.po
+++ b/lang/python/ml/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Balasankar C , 2019\n"
 "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n"
@@ -22,201 +22,221 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -241,6 +261,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -266,87 +291,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po
index 21677bf5c6..b5f28db3fd 100644
--- a/lang/python/mr/LC_MESSAGES/python.po
+++ b/lang/python/mr/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po
index 153a01d9a4..3844542189 100644
--- a/lang/python/nb/LC_MESSAGES/python.po
+++ b/lang/python/nb/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 865ac004d9acf2568b2e4b389e0007c7_fba755c <3516cc82d94f87187da1e036e5f09e42_616112>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installer pakker."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,87 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installer pakker."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ne/LC_MESSAGES/python.po b/lang/python/ne/LC_MESSAGES/python.po
index ef9c472e96..285a1a9964 100644
--- a/lang/python/ne/LC_MESSAGES/python.po
+++ b/lang/python/ne/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Nepali (https://www.transifex.com/calamares/teams/20061/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po
index 7a80aa9b9d..b92fd7db16 100644
--- a/lang/python/ne_NP/LC_MESSAGES/python.po
+++ b/lang/python/ne_NP/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: ne_NP\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po
index 69cd3c7dd3..a69e2e0598 100644
--- a/lang/python/nl/LC_MESSAGES/python.po
+++ b/lang/python/nl/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Adriaan de Groot , 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
@@ -22,189 +22,65 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB instellen."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Partities mounten."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Configuratiefout"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Geen partities gedefinieerd voor 
    {!s}
     om te gebruiken."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configureer systemd services "
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "De service kan niet worden gewijzigd"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-"De systemd service {name!s} kon niet worden ingeschakeld."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Onbekende systemd opdrachten {command!s} en "
-"{suffix!s} voor unit {name!s}. "
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount bestandssystemen."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Bestandssystemen opvullen."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync mislukte met foutcode {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Bestandssysteem uitpakken {}/{}, bestand {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Beginnen met uitpakken van {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Uitpakken van bestandssysteem \"{}\" mislukt"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Geen mount-punt voor de root-partitie"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage bevat geen sleutel \"rootMountPoint\", er wordt niks gedaan"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Onjuist mount-punt voor de root-partitie"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-"rootMountPoint is ingesteld op \"{}\", welke niet bestaat, er wordt niks "
-"gedaan"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Foutieve unsquash configuratie"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installeer bootloader"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Het bestandssysteem voor \"{}\" ({}) wordt niet ondersteund door je huidige "
-"kernel"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Het bronbestandssysteem \"{}\" bestaat niet"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs niet gevonden, verifieer dat je het squashfs-tools pakket heb "
-"geïnstalleerd"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Schrijven naar het KDM-configuratiebestand is mislukt "
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM-configuratiebestand {!s} bestaat niet."
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Schrijven naar het LXDM-configuratiebestand is mislukt"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Het KDM-configuratiebestand {!s} bestaat niet"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Schrijven naar het LightDM-configuratiebestand is mislukt"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Het LightDM-configuratiebestand {!s} bestaat niet"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Kon LightDM niet configureren"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Geen LightDM begroeter geïnstalleerd"
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Schrijven naar het SLIM-configuratiebestand is mislukt"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Het SLIM-configuratiebestand {!s} bestaat niet"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Geen display managers geselecteerd voor de displaymanager module."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -212,27 +88,160 @@ msgstr ""
 "De lijst van display-managers is leeg, zowel in de configuratie "
 "displaymanager.conf als de globale opslag."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Display manager configuratie was incompleet"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Instellen van mkinitcpio"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "initramfs aanmaken met dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Uitvoeren van dracut op het doel is mislukt"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "De afsluitcode was {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Voorbeeld Python-taak"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Voorbeeld Python-stap {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab schrijven."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Configuratiefout"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Geen partities gedefinieerd voor 
    {!s}
     om te gebruiken."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Geen hoofd mount punt is gegeven voor 
    {!s}
     om te gebruiken. "
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB instellen."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Instellen van hardwareklok"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Instellen van mkinitcpio"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Instellen van initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Taal en locatie instellen."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Instellen van versleutelde swap."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Een initramfs wordt aangemaakt met mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partities mounten."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Netwerk-configuratie opslaan."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configureren van OpenRC dmcrypt service."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Pakketten installeren."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Pakket installeren."
+msgstr[1] "%(num)d pakketten installeren."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Pakket verwijderen."
+msgstr[1] "%(num)d pakketten verwijderen."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth thema instellen"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Data aan het installeren."
@@ -257,6 +266,11 @@ msgstr ""
 "Onbekende serviceactie {arg!s} voor service {name!s} in "
 "runlevel {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "De service kan niet worden gewijzigd"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,87 +300,108 @@ msgid ""
 msgstr ""
 "Het pad voor service {level!s} is {path!s}, welke niet bestaat"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth thema instellen"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configureer systemd services "
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Pakketten installeren."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
+"{num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+"De systemd service {name!s} kon niet worden ingeschakeld."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Pakket installeren."
-msgstr[1] "%(num)d pakketten installeren."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Pakket verwijderen."
-msgstr[1] "%(num)d pakketten verwijderen."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installeer bootloader"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Instellen van hardwareklok"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Onbekende systemd opdrachten {command!s} en "
+"{suffix!s} voor unit {name!s}. "
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Een initramfs wordt aangemaakt met mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount bestandssystemen."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Bestandssystemen opvullen."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "De afsluitcode was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync mislukte met foutcode {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "initramfs aanmaken met dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Bestandssysteem uitpakken {}/{}, bestand {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Uitvoeren van dracut op het doel is mislukt"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Beginnen met uitpakken van {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Instellen van initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Uitpakken van bestandssysteem \"{}\" mislukt"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configureren van OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Geen mount-punt voor de root-partitie"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab schrijven."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage bevat geen sleutel \"rootMountPoint\", er wordt niks gedaan"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Voorbeeld Python-taak"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Onjuist mount-punt voor de root-partitie"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Voorbeeld Python-stap {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"rootMountPoint is ingesteld op \"{}\", welke niet bestaat, er wordt niks "
+"gedaan"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Taal en locatie instellen."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Foutieve unsquash configuratie"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Netwerk-configuratie opslaan."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Het bestandssysteem voor \"{}\" ({}) wordt niet ondersteund door je huidige "
+"kernel"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Het bronbestandssysteem \"{}\" bestaat niet"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs niet gevonden, verifieer dat je het squashfs-tools pakket heb "
+"geïnstalleerd"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po
index fac070882e..20e0ff1514 100644
--- a/lang/python/pl/LC_MESSAGES/python.po
+++ b/lang/python/pl/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jacob B. , 2021\n"
 "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
@@ -24,189 +24,65 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfiguracja GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montowanie partycji."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Błąd konfiguracji"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nie ma zdefiniowanych partycji dla 
    {!s}
     do użytku."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguracja usług systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nie można zmodyfikować usług"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nie można włączyć usługi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nie można włączyć celu w systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nie można wyłączyć celu w systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nie można zamaskować jednostki systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Nieznana komenda systemd {command!s} oraz "
-"{suffix!s} dla jednostki {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odmontuj systemy plików."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Zapełnianie systemu plików."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync zakończyło działanie kodem błędu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Rozpoczynanie odpakowywania {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Błąd rozpakowywania obrazu \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Brak punktu montowania partycji root"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nie zawiera klucza \"rootMountPoint\", nic nie zostanie "
-"zrobione"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Błędny punkt montowania partycji root"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-"Punkt montowania partycji root (rootMountPoint) jest \"{}\", które nie "
-"istnieje; nic nie zostanie zrobione"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Błędna konfiguracja unsquash"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalacja programu rozruchowego."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego "
-"systemu"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Źródłowy system plików \"{}\" nie istnieje"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nie można odnaleźć unsquashfs, upewnij się, że masz zainstalowany pakiet "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Nie można zapisać pliku konfiguracji KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Plik konfiguracyjny KDM {!s} nie istnieje"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Nie można zapisać pliku konfiguracji LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Plik konfiguracji LXDM {!s} nie istnieje"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Nie można zapisać pliku konfiguracji LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Plik konfiguracji LightDM {!s} nie istnieje"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Nie można skonfigurować LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Nie zainstalowano ekranu powitalnego LightDM."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Nie można zapisać pliku konfiguracji SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Plik konfiguracji SLIM {!s} nie istnieje"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Brak wybranych menedżerów wyświetlania dla modułu displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -214,27 +90,164 @@ msgstr ""
 "Lista displaymanagers jest pusta lub niezdefiniowana w globalstorage oraz "
 "displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracja menedżera wyświetlania była niekompletna"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurowanie mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Tworzenie initramfs z dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nie udało się włączyć dracut."
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Kod wyjściowy to {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Zadanie fikcyjne Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Krok fikcyjny Python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisywanie fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Błąd konfiguracji"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nie ma zdefiniowanych partycji dla 
    {!s}
     do użytku."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nie znaleziono głównego punktu montowania dla 
    {!s}
     do użycia."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfiguracja GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ustawianie zegara systemowego."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurowanie mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurowanie initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurowanie ustawień lokalnych."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurowanie zaszyfrowanej przestrzeni wymiany."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Tworzenie initramfs z mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nie udało się włączyć mkinitfs."
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montowanie partycji."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Zapisywanie konfiguracji sieci."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurowanie usługi OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Zainstaluj pakiety."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalowanie jednego pakietu."
+msgstr[1] "Instalowanie %(num)d pakietów."
+msgstr[2] "Instalowanie %(num)d pakietów."
+msgstr[3] "Instalowanie%(num)d pakietów."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Usuwanie jednego pakietu."
+msgstr[1] "Usuwanie %(num)d pakietów."
+msgstr[2] "Usuwanie %(num)d pakietów."
+msgstr[3] "Usuwanie %(num)d pakietów."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguracja motywu Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalowanie danych."
@@ -261,6 +274,11 @@ msgstr ""
 "Nieznana akcja-usługi {arg!s} dla usługi {name!s} w poziomie-"
 "uruchamiania {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Nie można zmodyfikować usług"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -289,91 +307,108 @@ msgid ""
 "exist."
 msgstr "Ścieżka do usługi {name!s} to {path!s},  nie istnieje."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguracja motywu Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguracja usług systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Zainstaluj pakiety."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nie można włączyć usługi systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalowanie jednego pakietu."
-msgstr[1] "Instalowanie %(num)d pakietów."
-msgstr[2] "Instalowanie %(num)d pakietów."
-msgstr[3] "Instalowanie%(num)d pakietów."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nie można włączyć celu w systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Usuwanie jednego pakietu."
-msgstr[1] "Usuwanie %(num)d pakietów."
-msgstr[2] "Usuwanie %(num)d pakietów."
-msgstr[3] "Usuwanie %(num)d pakietów."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nie można wyłączyć celu w systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalacja programu rozruchowego."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nie można zamaskować jednostki systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ustawianie zegara systemowego."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Nieznana komenda systemd {command!s} oraz "
+"{suffix!s} dla jednostki {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Tworzenie initramfs z mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontuj systemy plików."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nie udało się włączyć mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Zapełnianie systemu plików."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kod wyjściowy to {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync zakończyło działanie kodem błędu {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Tworzenie initramfs z dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nie udało się włączyć dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Rozpoczynanie odpakowywania {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurowanie initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Błąd rozpakowywania obrazu \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurowanie usługi OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Brak punktu montowania partycji root"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisywanie fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nie zawiera klucza \"rootMountPoint\", nic nie zostanie "
+"zrobione"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Zadanie fikcyjne Python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Błędny punkt montowania partycji root"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Krok fikcyjny Python {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"Punkt montowania partycji root (rootMountPoint) jest \"{}\", które nie "
+"istnieje; nic nie zostanie zrobione"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurowanie ustawień lokalnych."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Błędna konfiguracja unsquash"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Zapisywanie konfiguracji sieci."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego "
+"systemu"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Źródłowy system plików \"{}\" nie istnieje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nie można odnaleźć unsquashfs, upewnij się, że masz zainstalowany pakiet "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index dab21b4fa7..5ae907dafd 100644
--- a/lang/python/pt_BR/LC_MESSAGES/python.po
+++ b/lang/python/pt_BR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Guilherme Marçal Silva, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
@@ -22,185 +22,66 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando partições."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Erro de Configuração."
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Sem partições definidas para uso por 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços do systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Não é possível modificar o serviço"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"A chamada systemctl {arg!s} no chroot retornou o código de erro"
-" {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível habilitar o serviço {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível habilitar o alvo {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade {name!s} do systemd."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar bootloader."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Comandos desconhecidos do systemd {command!s} e "
-"{suffix!s} para a unidade {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar os sistemas de arquivos."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Preenchendo sistemas de arquivos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "O rsync falhou com o código de erro {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Descompactando imagem {}/{}, arquivo {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Começando a descompactar {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nenhum ponto de montagem para a partição root"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "O globalstorage não contém uma chave \"rootMountPoint\". Nada foi feito."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ponto de montagem incorreto para a partição root"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "O rootMountPoint é \"{}\", mas ele não existe. Nada foi feito."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuração incorreta do unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Não há suporte para o sistema de arquivos \"{}\" ({}) no seu kernel atual"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "O sistema de arquivos de origem \"{}\" não existe"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Ocorreu uma falha ao localizar o unsquashfs, certifique-se de que o pacote "
-"squashfs-tools esteja instalado"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "A destinação \"{}\" no sistema de destino não é um diretório"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Não foi possível gravar o arquivo de configuração do KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "O arquivo de configuração {!s} do KDM não existe"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Não foi possível gravar o arquivo de configuração do LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "O arquivo de configuração {!s} do LXDM não existe"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Não foi possível gravar o arquivo de configuração do LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "O arquivo de configuração {!s} do LightDM não existe"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Não é possível configurar o LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Não há nenhuma tela de login do LightDM instalada."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Não foi possível gravar o arquivo de configuração do SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "O arquivo de configuração {!s} do SLIM não existe"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 "Nenhum gerenciador de exibição selecionado para o módulo do displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -208,27 +89,160 @@ msgstr ""
 "A lista de displaymanagers está vazia ou indefinida em ambos globalstorage e"
 " displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gerenciador de exibição está incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando initramfs com dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Erro ao executar dracut no alvo"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa modelo python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Etapa modelo python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escrevendo fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Erro de Configuração."
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Sem partições definidas para uso por 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nenhum ponto de montagem para o root fornecido para uso por 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando relógio de hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locais."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando swap encriptada."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Criando initramfs com mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar mkinitfs no alvo"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando partições."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Salvando configuração de rede."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando serviço dmcrypt do OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar pacotes."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processando pacotes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando um pacote."
+msgstr[1] "Instalando %(num)d pacotes."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removendo um pacote."
+msgstr[1] "Removendo %(num)d pacotes."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando os dados."
@@ -255,6 +269,11 @@ msgstr ""
 "Serviço de ação {arg!s} desconhecido para o serviço {name!s} no"
 " nível de execução {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Não é possível modificar o serviço"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,87 +305,103 @@ msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, o qual não "
 "existe."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços do systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar pacotes."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"A chamada systemctl {arg!s} no chroot retornou o código de erro"
+" {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processando pacotes (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível habilitar o serviço {name!s} do systemd."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando um pacote."
-msgstr[1] "Instalando %(num)d pacotes."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível habilitar o alvo {name!s} do systemd."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removendo um pacote."
-msgstr[1] "Removendo %(num)d pacotes."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade {name!s} do systemd."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando relógio de hardware."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandos desconhecidos do systemd {command!s} e "
+"{suffix!s} para a unidade {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Criando initramfs com mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar os sistemas de arquivos."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar mkinitfs no alvo"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Preenchendo sistemas de arquivos."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "O rsync falhou com o código de erro {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Criando initramfs com dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Descompactando imagem {}/{}, arquivo {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Erro ao executar dracut no alvo"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Começando a descompactar {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando serviço dmcrypt do OpenRC."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escrevendo fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "O globalstorage não contém uma chave \"rootMountPoint\". Nada foi feito."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa modelo python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem incorreto para a partição root"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Etapa modelo python {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "O rootMountPoint é \"{}\", mas ele não existe. Nada foi feito."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locais."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuração incorreta do unsquash"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Salvando configuração de rede."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Não há suporte para o sistema de arquivos \"{}\" ({}) no seu kernel atual"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de arquivos de origem \"{}\" não existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ocorreu uma falha ao localizar o unsquashfs, certifique-se de que o pacote "
+"squashfs-tools esteja instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "A destinação \"{}\" no sistema de destino não é um diretório"
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index e3298f22cc..7f48c9a2e1 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -6,16 +6,16 @@
 # Translators:
 # Nuno Amorim , 2018
 # Ricardo Simões , 2020
-# Hugo Carvalho , 2020
+# Hugo Carvalho , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Hugo Carvalho , 2020\n"
+"Last-Translator: Hugo Carvalho , 2021\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,187 +23,68 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar o GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "A montar partições."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Erro de configuração"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nenhuma partição está definida para 
    {!s}
     usar."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Não é possível modificar serviço"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chamar pelo chroot retornou com código de "
-"erro {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível ativar o serviço systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível ativar o destino do systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desativar o destino do systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade do systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comandos do systemd desconhecidos {command!s} e "
-"{suffix!s} por unidade {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de ficheiros."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "A preencher os sistemas de ficheiros."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falhou com código de erro {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "A descompactar imagem {}/{}, ficheiro {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "A começar a descompactação {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Falha ao descompactar imagem \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nenhum ponto de montagem para a partição root"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage não contém um \"rootMountPoint\" chave, nada a fazer"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ponto de montagem mau para partição root"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Má configuração unsquash"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar o carregador de arranque."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"O sistema de ficheiros para \"{}\" ({}) não é suportado pelo seu kernel "
-"atual"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de arranque"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "O sistema de ficheiros fonte \"{}\" não existe"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Falha ao procurar unsquashfs, certifique-se que tem o pacote squashfs-tools "
-"instalado"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "O destino \"{}\" no sistema de destino não é um diretório"
+"Não foi possível instalar o carregador de arranque. O comando de instalação "
+"
    {!s}
     apresentou o código de erro {!s}."
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Não é possível gravar o ficheiro de configuração KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "O ficheiro de configuração do KDM {!s} não existe"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Não é possível gravar o ficheiro de configuração LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "O ficheiro de configuração do LXDM {!s} não existe"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Não é possível gravar o ficheiro de configuração LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "O ficheiro de configuração do LightDM {!s} não existe"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Não é possível configurar o LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Nenhum ecrã de boas-vindas LightDM instalado."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Não é possível gravar o ficheiro de configuração SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "O ficheiro de configuração do SLIM {!s} não existe"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 "Nenhum gestor de exibição selecionado para o módulo de gestor de exibição."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -211,26 +92,167 @@ msgstr ""
 "A lista de gestores de visualização está vazia ou indefinida tanto no "
 "globalstorage como no displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gestor de exibição estava incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "A configurar o mkintcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando o initramfs com o dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Falha ao executar o dracut no destino"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa Dummy python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passo Dummy python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "A escrever o fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Erro de configuração"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nenhuma partição está definida para 
    {!s}
     usar."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nenhum ponto de montagem root é fornecido para 
    {!s}
     usar."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Não é dada nenhuma configuração 
    {!s}
     para 
    {!s}
     "
+"utilizar."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar o GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "A definir o relógio do hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "A configurar o mkintcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "A configurar o initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "A configurar a localização."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando a swap criptografada."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "A criar o initramfs com o mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar o mkintfs no destino"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "A montar partições."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "A guardar a configuração de rede."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "A configurar o serviço OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar pacotes."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "A processar pacotes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "A instalar um pacote."
+msgstr[1] "A instalar %(num)d pacotes."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "A remover um pacote."
+msgstr[1] "A remover %(num)d pacotes."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Erro do gestor de pacotes"
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu preparar atualizações. O comando "
+"
    {!s}
     apresentou o código de erro {!s}."
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
+"
    {!s}
     apresentou o código de erro {!s}."
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"O gestor de pacotes poderia fazer alterações ao sistema instalado. O comando"
+" 
    {!s}
     apresentou o código de erro {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "A instalar dados."
@@ -257,6 +279,11 @@ msgstr ""
 "Serviço de ação desconhecido {arg!s} para serviço {name!s} em "
 "nível de execução {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Não é possível modificar serviço"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -287,87 +314,105 @@ msgid ""
 msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, que não existe."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar pacotes."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} chamar pelo chroot retornou com código de "
+"erro {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "A processar pacotes (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível ativar o serviço systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "A instalar um pacote."
-msgstr[1] "A instalar %(num)d pacotes."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível ativar o destino do systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "A remover um pacote."
-msgstr[1] "A remover %(num)d pacotes."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desativar o destino do systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar o carregador de arranque."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade do systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "A definir o relógio do hardware."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandos do systemd desconhecidos {command!s} e "
+"{suffix!s} por unidade {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "A criar o initramfs com o mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar o mkintfs no destino"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "A preencher os sistemas de ficheiros."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falhou com código de erro {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Criando o initramfs com o dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "A descompactar imagem {}/{}, ficheiro {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Falha ao executar o dracut no destino"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "A começar a descompactação {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "A configurar o initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Falha ao descompactar imagem \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "A configurar o serviço OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "A escrever o fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage não contém um \"rootMountPoint\" chave, nada a fazer"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa Dummy python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem mau para partição root"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passo Dummy python {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "A configurar a localização."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Má configuração unsquash"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "A guardar a configuração de rede."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"O sistema de ficheiros para \"{}\" ({}) não é suportado pelo seu kernel "
+"atual"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de ficheiros fonte \"{}\" não existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Falha ao procurar unsquashfs, certifique-se que tem o pacote squashfs-tools "
+"instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "O destino \"{}\" no sistema de destino não é um diretório"
diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po
index efafa2872b..0cddb0e9c8 100644
--- a/lang/python/ro/LC_MESSAGES/python.po
+++ b/lang/python/ro/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Sebastian Brici , 2018\n"
 "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
@@ -22,201 +22,223 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Demonteaza sistemul de fisiere"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fictiv."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalează pachetele."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Se procesează pachetele (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalează un pachet."
+msgstr[1] "Se instalează %(num)d pachete."
+msgstr[2] "Se instalează %(num)d din pachete."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se elimină un pachet."
+msgstr[1] "Se elimină %(num)d pachet."
+msgstr[2] "Se elimină %(num)d de pachete."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -241,6 +263,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -266,89 +293,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalează pachetele."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Se procesează pachetele (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalează un pachet."
-msgstr[1] "Se instalează %(num)d pachete."
-msgstr[2] "Se instalează %(num)d din pachete."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se elimină un pachet."
-msgstr[1] "Se elimină %(num)d pachet."
-msgstr[2] "Se elimină %(num)d de pachete."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demonteaza sistemul de fisiere"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fictiv."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po
index e6ce31f074..56f641f1a9 100644
--- a/lang/python/ru/LC_MESSAGES/python.po
+++ b/lang/python/ru/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: ZIzA, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
@@ -22,203 +22,226 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Настройте GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтирование разделов."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Ошибка конфигурации"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Не определены разделы для использования 
    {!S}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Настройка systemd сервисов"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Установить загрузчик."
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не могу изменить сервис"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:503
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Размонтирование файловой системы."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Наполнение файловой системы."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Создание initramfs с помощью dracut."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не удалось запустить dracut на цели"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхода {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
-msgstr ""
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Запись fstab."
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
-msgstr ""
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Ошибка конфигурации"
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
-msgstr ""
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Не определены разделы для использования 
    {!S}
    ."
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
-msgstr ""
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Настройте GRUB."
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
-msgstr ""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Установка аппаратных часов."
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
-msgstr ""
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Настройка initramfs."
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Настройка языка."
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Настройка зашифрованного swap."
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтирование разделов."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Сохранение настроек сети."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Настройка службы OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Установить пакеты."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработка пакетов (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Установка одного пакета."
+msgstr[1] "Установка %(num)d пакетов."
+msgstr[2] "Установка %(num)d пакетов."
+msgstr[3] "Установка %(num)d пакетов."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Удаление одного пакета."
+msgstr[1] "Удаление %(num)d пакетов."
+msgstr[2] "Удаление %(num)d пакетов."
+msgstr[3] "Удаление %(num)d пакетов."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Настройка зашифрованного swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Настроить тему Plymouth"
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
@@ -242,6 +265,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Не могу изменить сервис"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -267,91 +295,98 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Настроить тему Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Настройка systemd сервисов"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Установить пакеты."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обработка пакетов (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Установка одного пакета."
-msgstr[1] "Установка %(num)d пакетов."
-msgstr[2] "Установка %(num)d пакетов."
-msgstr[3] "Установка %(num)d пакетов."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Удаление одного пакета."
-msgstr[1] "Удаление %(num)d пакетов."
-msgstr[2] "Удаление %(num)d пакетов."
-msgstr[3] "Удаление %(num)d пакетов."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Установить загрузчик."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Установка аппаратных часов."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Размонтирование файловой системы."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Наполнение файловой системы."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхода {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Создание initramfs с помощью dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не удалось запустить dracut на цели"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Настройка initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Настройка службы OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запись fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Настройка языка."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Сохранение настроек сети."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
diff --git a/lang/python/ru_RU/LC_MESSAGES/python.po b/lang/python/ru_RU/LC_MESSAGES/python.po
index 814b007b27..85ccaac501 100644
--- a/lang/python/ru_RU/LC_MESSAGES/python.po
+++ b/lang/python/ru_RU/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Russian (Russia) (https://www.transifex.com/calamares/teams/20061/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,225 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,91 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po
index a92013b920..14373e73da 100644
--- a/lang/python/si/LC_MESSAGES/python.po
+++ b/lang/python/si/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po
index a9f0e12e14..466293383d 100644
--- a/lang/python/sk/LC_MESSAGES/python.po
+++ b/lang/python/sk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Dušan Kazik , 2020\n"
 "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
@@ -21,207 +21,227 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurácia zavádzača GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Pripájanie oddielov."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Chyba konfigurácie"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nie sú určené žiadne oddiely na použitie pre 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurácia služieb systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nedá sa upraviť služba"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Inštalácia zavádzača."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
-"kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedá sa povoliť služba systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Neznáme príkazy systému systemd {command!s} a "
-"{suffix!s} pre jednotku {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odpojenie súborových systémov."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Napĺňanie súborových systémov."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Príkaz rsync zlyhal s chybovým kódom {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Rozbaľuje sa obraz {}/{}, súbor {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Spúšťa sa rozbaľovanie {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Zlyhalo rozbalenie obrazu „{}“"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Žiadny bod pripojenia pre koreňový oddiel"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Zlý bod pripojenia pre koreňový oddiel"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Nesprávna konfigurácia nástroja unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Súborový systém pre \"{}\" ({}) nie je podporovaný vaším aktuálnym jadrom"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Zdrojový súborový systém \"{}\" neexistuje"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Nedá sa zapísať konfiguračný súbor správcu KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Konfiguračný súbor správcu KDM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Nedá sa zapísať konfiguračný súbor správcu LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Konfiguračný súbor správcu LXDM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Nedá sa zapísať konfiguračný súbor správcu LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Konfiguračný súbor správcu LightDM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Nedá s nakonfigurovať správca LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Nie je nainštalovaný žiadny vítací nástroj LightDM."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Nedá sa zapísať konfiguračný súbor správcu SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Konfiguračný súbor správcu SLIM {!s} neexistuje"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Neboli vybraní žiadni správcovia zobrazenia pre modul displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurácia správcu zobrazenia nebola úplná"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurácia mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváranie initramfs pomocou nástroja dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Zlyhalo spustenie nástroja dracut v cieli"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Kód skončenia bol {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktívna úloha jazyka python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktívny krok {} jazyka python"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisovanie fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Chyba konfigurácie"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nie sú určené žiadne oddiely na použitie pre 
    {!s}
    ."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurácia zavádzača GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavovanie hardvérových hodín."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurácia mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurácia initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurácia miestnych nastavení."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurácia zašifrovaného odkladacieho priestoru."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Pripájanie oddielov."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Ukladanie sieťovej konfigurácie."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Inštalácia balíkov."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Spracovávajú sa balíky (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Inštaluje sa jeden balík."
+msgstr[1] "Inštalujú sa %(num)d balíky."
+msgstr[2] "Inštaluje sa %(num)d balíkov."
+msgstr[3] "Inštaluje sa %(num)d balíkov."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Odstraňuje sa jeden balík."
+msgstr[1] "Odstraňujú sa %(num)d balíky."
+msgstr[2] "Odstraňuje sa %(num)d balíkov."
+msgstr[3] "Odstraňuje sa %(num)d balíkov."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurácia motívu služby Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Inštalácia údajov."
@@ -244,6 +264,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Nedá sa upraviť služba"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -269,91 +294,101 @@ msgid ""
 "exist."
 msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurácia motívu služby Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Inštalácia balíkov."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurácia služieb systemd"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Spracovávajú sa balíky (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
+"kód {num!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Inštaluje sa jeden balík."
-msgstr[1] "Inštalujú sa %(num)d balíky."
-msgstr[2] "Inštaluje sa %(num)d balíkov."
-msgstr[3] "Inštaluje sa %(num)d balíkov."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedá sa povoliť služba systému systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Odstraňuje sa jeden balík."
-msgstr[1] "Odstraňujú sa %(num)d balíky."
-msgstr[2] "Odstraňuje sa %(num)d balíkov."
-msgstr[3] "Odstraňuje sa %(num)d balíkov."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Inštalácia zavádzača."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavovanie hardvérových hodín."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Neznáme príkazy systému systemd {command!s} a "
+"{suffix!s} pre jednotku {name!s}."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojenie súborových systémov."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kód skončenia bol {}"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Napĺňanie súborových systémov."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Vytváranie initramfs pomocou nástroja dracut."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Príkaz rsync zlyhal s chybovým kódom {}."
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Zlyhalo spustenie nástroja dracut v cieli"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbaľuje sa obraz {}/{}, súbor {}/{}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurácia initramfs."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Spúšťa sa rozbaľovanie {}"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Zlyhalo rozbalenie obrazu „{}“"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Žiadny bod pripojenia pre koreňový oddiel"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisovanie fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Zlý bod pripojenia pre koreňový oddiel"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktívna úloha jazyka python."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktívny krok {} jazyka python"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Nesprávna konfigurácia nástroja unsquash"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurácia miestnych nastavení."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Súborový systém pre \"{}\" ({}) nie je podporovaný vaším aktuálnym jadrom"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Ukladanie sieťovej konfigurácie."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový súborový systém \"{}\" neexistuje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po
index e58838407d..cc41347c9b 100644
--- a/lang/python/sl/LC_MESSAGES/python.po
+++ b/lang/python/sl/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,225 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,91 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po
index a0303533e3..032742c210 100644
--- a/lang/python/sq/LC_MESSAGES/python.po
+++ b/lang/python/sq/LC_MESSAGES/python.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Besnik Bleta , 2020
+# Besnik Bleta , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Besnik Bleta , 2020\n"
+"Last-Translator: Besnik Bleta , 2021\n"
 "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,185 +21,67 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Formësoni GRUB-in."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Po montohen pjesë."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Gabim Formësimi"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "S’ka pjesë të përkufizuara për 
    {!s}
     për t’u përdorur."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Formësoni shërbime systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "S’modifikohet dot shërbimi"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "S’aktivizohet dot objektivi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "S’maskohet dot njësia systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Urdhra të panjohur systemd {command!s} dhe "
-"{suffix!s} për njësi {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Çmontoni sisteme kartelash."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Po mbushen sisteme kartelash."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync dështoi me kod gabimi {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Po shpaketohet paketa {}/{}, kartela {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Po fillohet të shpaketohet {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Dështoi shpaketimi i figurës \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "S’ka pikë montimi për ndarjen rrënjë"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage nuk përmban një vlerë \"rootMountPoint\", s’po bëhet gjë"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Pikë e gabuar montimi për ndarjen rrënjë"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint është \"{}\", që s’ekziston, s’po bëhet gjë"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Formësim i keq i unsquash-it"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Sistemi i kartelave për \"{}\" ({}) nuk mbulohet nga kerneli juaj i tanishëm"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalo ngarkues nisjesh."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Gabim instalimi Ngarkuesi Nisësi"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"S’u arrit të gjendej unsquashfs, sigurohuni se e keni të instaluar paketën "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
+"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
    {!s}
     u "
+"përgjigj me kod gabimi {!s}."
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "S’shkruhet dot kartelë formësimi KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "S’ekziston kartelë formësimi KDM {!s}"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "S’shkruhet dot kartelë formësimi LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "S’ekziston kartelë formësimi LXDM {!s}"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "S’shkruhet dot kartelë formësimi LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "S’ekziston kartelë formësimi LightDM {!s}"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "S’formësohet dot LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "S’ka të instaluar përshëndetës LightDM."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "S’shkruhet dot kartelë formësimi SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "S’ekziston kartelë formësimi SLIM {!s}"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "S’janë përzgjedhur përgjegjës ekrani për modulin displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -207,27 +89,167 @@ msgstr ""
 "Lista “displaymanagers” është e zbrazët ose e papërkufizuar për të dy "
 "rastet, për “globalstorage” dhe për “displaymanager.conf”."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Po formësohet mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Po krijohet initramfs me dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "S’u arrit të xhirohej dracut mbi objektivin"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Kodi i daljes qe {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Akt python dummy."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hap python {} dummy"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Po shkruhet fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Gabim Formësimi"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "S’ka pjesë të përkufizuara për 
    {!s}
     për t’u përdorur."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "S’është dhënë pikë montimi rrënjë për 
    {!s}
     për t’u përdorur."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"S’është dhënë formësim 
    {!s}
     për t’u përdorur nga 
    {!s}
    ."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Formësoni GRUB-in."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Po caktohet ora hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Po formësohet mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Po formësohet initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Po formësohen vendoret."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Po formësohet pjesë swap e fshehtëzuar."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Po krijohet initramfs me mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Po montohen pjesë."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Po ruhet formësimi i rrjetit."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Po formësohet shërbim OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalo paketa."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Po instalohet një paketë."
+msgstr[1] "Po instalohen %(num)d paketa."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Po hiqet një paketë."
+msgstr[1] "Po hiqen %(num)d paketa."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Gabim Përgjegjësi Paketash"
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri 
    {!s}
     u"
+" përgjigj me kod gabimi {!s}."
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri 
    {!s}
     u "
+"përgjigj me kod gabimi {!s}."
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
+"
    {!s}
     u përgjigj me kod gabimi {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Formësoni temën Plimuth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Po instalohen të dhëna."
@@ -252,6 +274,11 @@ msgstr ""
 "Service-action {arg!s} i panjohur për shërbimin {name!s} te "
 "run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "S’modifikohet dot shërbimi"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -283,87 +310,104 @@ msgstr ""
 "Shtegu për shërbimin {name!s} është {path!s}, i cili nuk "
 "ekziston."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Formësoni temën Plimuth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Formësoni shërbime systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalo paketa."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
+"{num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Po instalohet një paketë."
-msgstr[1] "Po instalohen %(num)d paketa."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "S’aktivizohet dot objektivi systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Po hiqet një paketë."
-msgstr[1] "Po hiqen %(num)d paketa."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalo ngarkues nisjesh."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "S’maskohet dot njësia systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Po caktohet ora hardware."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Urdhra të panjohur systemd {command!s} dhe "
+"{suffix!s} për njësi {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Po krijohet initramfs me mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Çmontoni sisteme kartelash."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Po mbushen sisteme kartelash."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kodi i daljes qe {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync dështoi me kod gabimi {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Po krijohet initramfs me dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Po shpaketohet paketa {}/{}, kartela {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "S’u arrit të xhirohej dracut mbi objektivin"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Po fillohet të shpaketohet {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Po formësohet initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Dështoi shpaketimi i figurës \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Po formësohet shërbim OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "S’ka pikë montimi për ndarjen rrënjë"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Po shkruhet fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage nuk përmban një vlerë \"rootMountPoint\", s’po bëhet gjë"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Akt python dummy."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Pikë e gabuar montimi për ndarjen rrënjë"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hap python {} dummy"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint është \"{}\", që s’ekziston, s’po bëhet gjë"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Po formësohen vendoret."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Formësim i keq i unsquash-it"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Po ruhet formësimi i rrjetit."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Sistemi i kartelave për \"{}\" ({}) nuk mbulohet nga kerneli juaj i tanishëm"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"S’u arrit të gjendej unsquashfs, sigurohuni se e keni të instaluar paketën "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po
index f4b5652bff..ce1a2ac0b8 100644
--- a/lang/python/sr/LC_MESSAGES/python.po
+++ b/lang/python/sr/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Slobodan Simić , 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
@@ -21,201 +21,223 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Подеси ГРУБ"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтирање партиција."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Грешка поставе"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Подеси „systemd“ сервисе"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не могу да мењам сервис"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:503
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтирање фајл-система."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Попуњавање фајл-система."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync неуспешан са кодом грешке {}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Неуспело распакивање одраза \"{}\""
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Нема тачке мотирања за root партицију"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Лоша тачка монтирања за корену партицију"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Уписивање fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Грешка поставе"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Подеси ГРУБ"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Подешавање локалитета."
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтирање партиција."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Упис поставе мреже."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +262,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Не могу да мењам сервис"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,89 +292,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Подеси „systemd“ сервисе"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтирање фајл-система."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Попуњавање фајл-система."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync неуспешан са кодом грешке {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Неуспело распакивање одраза \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Нема тачке мотирања за root партицију"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Лоша тачка монтирања за корену партицију"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Уписивање fstab."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Подешавање локалитета."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Упис поставе мреже."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po
index 5daee27b29..805e0a31ea 100644
--- a/lang/python/sr@latin/LC_MESSAGES/python.po
+++ b/lang/python/sr@latin/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,223 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +258,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,89 +288,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po
index 83330e1bfa..79b08ab0ea 100644
--- a/lang/python/sv/LC_MESSAGES/python.po
+++ b/lang/python/sv/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Luna Jernberg , 2020\n"
 "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
@@ -23,184 +23,65 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurera GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Monterar partitioner."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Konfigurationsfel"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Inga partitioner är definerade för 
    {!s}
     att använda."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurera systemd tjänster"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Kunde inte modifiera tjänst"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Anrop till systemctl {arg!s}i chroot returnerade felkod "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kunde inte aktivera systemd tjänst {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kunde inte aktivera systemd målsystem {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan inte maskera systemd unit {name!s}"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installera starthanterare."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Okända systemd kommandon {command!s} och {suffix!s} för "
-"enhet {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Avmontera filsystem."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Packar upp filsystem."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync misslyckades med felkod {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Packar upp avbild {}/{}, fil {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Börjar att packa upp {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Misslyckades att packa upp avbild \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ingen monteringspunkt för root partition"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage innehåller ingen \"rootMountPoint\"-nyckel, så gör inget"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Dålig monteringspunkt för root partition"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint är \"{}\", vilket inte finns, så gör inget"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Dålig unsquash konfiguration"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Filsystemet för \"{}\" ({}) stöds inte av din nuvarande kärna"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Källfilsystemet \"{}\" existerar inte"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Kunde inte hitta unsquashfs, se till att du har paketet squashfs-tools "
-"installerat"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Misslyckades med att skriva KDM konfigurationsfil"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM konfigurationsfil {!s} existerar inte"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Misslyckades med att skriva LXDM konfigurationsfil"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM konfigurationsfil {!s} existerar inte"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Misslyckades med att skriva LightDM konfigurationsfil"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM konfigurationsfil {!s} existerar inte"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Kunde inte konfigurera LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Ingen LightDM greeter installerad."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Misslyckades med att SLIM konfigurationsfil"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM konfigurationsfil {!s} existerar inte"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Ingen skärmhanterare vald för displaymanager modulen."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -208,27 +89,160 @@ msgstr ""
 "Skärmhanterar listan är tom eller odefinierad i både globalstorage och "
 "displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguration för displayhanteraren var inkomplett"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerar mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Skapar initramfs med dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Misslyckades att köra dracut på målet "
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Felkoden var {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Exempel python jobb"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Exempel python steg {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Konfigurationsfel"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Inga partitioner är definerade för 
    {!s}
     att använda."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Ingen root monteringspunkt är angiven för 
    {!s}
     att använda."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurera GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ställer hårdvaruklockan."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerar mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerar initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerar språkinställningar"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurerar krypterad swap."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Skapar initramfs med mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Misslyckades att köra mkinitfs på målet "
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterar partitioner."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Sparar nätverkskonfiguration."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerar OpenRC dmcrypt tjänst."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installera paket."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Bearbetar paket (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerar ett paket."
+msgstr[1] "Installerar %(num)d paket."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Tar bort ett paket."
+msgstr[1] "Tar bort %(num)d paket."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurera Plymouth tema"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installerar data."
@@ -253,6 +267,11 @@ msgstr ""
 "Okänt tjänst-anrop {arg!s}för tjänsten {name!s} i körnivå "
 "{level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Kunde inte modifiera tjänst"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -283,87 +302,103 @@ msgid ""
 msgstr ""
 "Sökvägen för tjänst {name!s} är {path!s}, som inte existerar."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurera Plymouth tema"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurera systemd tjänster"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installera paket."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Anrop till systemctl {arg!s}i chroot returnerade felkod "
+"{num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Bearbetar paket (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kunde inte aktivera systemd tjänst {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerar ett paket."
-msgstr[1] "Installerar %(num)d paket."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kunde inte aktivera systemd målsystem {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Tar bort ett paket."
-msgstr[1] "Tar bort %(num)d paket."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installera starthanterare."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan inte maskera systemd unit {name!s}"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ställer hårdvaruklockan."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Okända systemd kommandon {command!s} och {suffix!s} för "
+"enhet {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Skapar initramfs med mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Avmontera filsystem."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Misslyckades att köra mkinitfs på målet "
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Packar upp filsystem."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Felkoden var {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync misslyckades med felkod {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Skapar initramfs med dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Packar upp avbild {}/{}, fil {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Misslyckades att köra dracut på målet "
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Börjar att packa upp {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerar initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Misslyckades att packa upp avbild \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerar OpenRC dmcrypt tjänst."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ingen monteringspunkt för root partition"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage innehåller ingen \"rootMountPoint\"-nyckel, så gör inget"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Exempel python jobb"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Dålig monteringspunkt för root partition"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Exempel python steg {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint är \"{}\", vilket inte finns, så gör inget"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerar språkinställningar"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dålig unsquash konfiguration"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Sparar nätverkskonfiguration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Filsystemet för \"{}\" ({}) stöds inte av din nuvarande kärna"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Källfilsystemet \"{}\" existerar inte"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Kunde inte hitta unsquashfs, se till att du har paketet squashfs-tools "
+"installerat"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po
index 3f334d59dd..ec04917b85 100644
--- a/lang/python/te/LC_MESSAGES/python.po
+++ b/lang/python/te/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po
index 0cf6d80f78..8227f42645 100644
--- a/lang/python/tg/LC_MESSAGES/python.po
+++ b/lang/python/tg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Victor Ibragimov , 2020\n"
 "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n"
@@ -21,186 +21,65 @@ msgstr ""
 "Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Танзимоти GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Васлкунии қисмҳои диск."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Хатои танзимкунӣ"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Ягон қисми диск барои истифодаи 
    {!s}
     муайян карда нашуд."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Танзимоти хидматҳои systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Хидмат тағйир дода намешавад"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
-" вуҷуд овард."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Фармонҳои systemd-и номаълум {command!s} ва "
-"{suffix!s} барои воҳиди {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Ҷудо кардани низомҳои файлӣ."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Пурборкунӣ бо низомҳои файлӣ."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync бо рамзи хатои {} қатъ шуд."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Баровардани тимсол: {}/{}, файл: {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Оғози барориши {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Тимсоли \"{}\" бароварда нашуд"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ягон нуқтаи васл барои қисми диски реша (root) нест"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Насбкунии боркунандаи роҳандозӣ."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"globalstorage калиди \"rootMountPoint\"-ро дар бар намегирад, ҳeҷ кop "
-"намeкyнад"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Нуқтаи васли нодуруст барои қисми диски реша (root)"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint аз \"{}\" иборат аст, ки вуҷуд надорад, ҳeҷ кop намeкyнад"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Танзимоти unsquash нодуруст аст"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Низоми файлӣ барои \"{}\" ({}) бо ҳастаи ҷории шумо дастгирӣ намешавад"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Низоми файлии манбаи \"{}\" вуҷуд надорад"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs ёфт нашуд, мутмаин шавед, ки бастаи squashfs-tools насб карда "
-"шудааст"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Файли танзимии KDM сабт карда намешавад"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Файли танзимии KDM {!s} вуҷуд надорад"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Файли танзимии LXDM сабт карда намешавад"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Файли танзимии LXDM {!s} вуҷуд надорад"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Файли танзимии LightDM сабт карда намешавад"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Файли танзимии LightDM {!s} вуҷуд надорад"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "LightDM танзим карда намешавад"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Хушомади LightDM насб нашудааст."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Файли танзимии SLIM сабт карда намешавад"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Файли танзимии SLIM {!s} вуҷуд надорад"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Ягон мудири намоиш барои модули displaymanager интихоб нашудааст."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -208,26 +87,159 @@ msgstr ""
 "Рӯйхати displaymanagers ҳам дар globalstorage ва ҳам дар displaymanager.conf"
 " холӣ ё номаълум аст."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Танзимкунии mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Эҷодкунии initramfs бо dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "dracut дар низоми интихобшуда иҷро нашуд"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Рамзи барориш: {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Вазифаи амсилаи python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Қадами амсилаи python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Сабткунии fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Хатои танзимкунӣ"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Ягон қисми диск барои истифодаи 
    {!s}
     муайян карда нашуд."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Нуқтаи васли реша (root) барои истифодаи 
    {!s}
     дода нашуд."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Танзимоти GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Танзимкунии соати сахтафзор."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Танзимкунии mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Танзимкунии initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Танзимкунии маҳаллигардониҳо."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Танзимкунии мубодилаи рамзгузоришуда."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Эҷодкунии initramfs бо mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Васлкунии қисмҳои диск."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Нигоҳдории танзимоти шабака."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Танзимкунии хидмати OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Насбкунии қуттиҳо."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Насбкунии як баста."
+msgstr[1] "Насбкунии %(num)d баста."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Тозакунии як баста"
+msgstr[1] "Тозакунии %(num)d баста."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Танзимоти мавзӯи Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Насбкунии иттилоот."
@@ -252,6 +264,11 @@ msgstr ""
 "Хидмати амалии {arg!s} барои хидмати {name!s} дар run-level "
 "{level!s} номаълум аст."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Хидмат тағйир дода намешавад"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -283,87 +300,105 @@ msgstr ""
 "Масир барои хидмати {name!s} аз {path!s} иборат аст, аммо он "
 "вуҷуд надорад."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Танзимоти мавзӯи Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Танзимоти хидматҳои systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Насбкунии қуттиҳо."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
+" вуҷуд овард."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Насбкунии як баста."
-msgstr[1] "Насбкунии %(num)d баста."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Тозакунии як баста"
-msgstr[1] "Тозакунии %(num)d баста."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Насбкунии боркунандаи роҳандозӣ."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Танзимкунии соати сахтафзор."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Фармонҳои systemd-и номаълум {command!s} ва "
+"{suffix!s} барои воҳиди {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Эҷодкунии initramfs бо mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Ҷудо кардани низомҳои файлӣ."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Пурборкунӣ бо низомҳои файлӣ."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Рамзи барориш: {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync бо рамзи хатои {} қатъ шуд."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Эҷодкунии initramfs бо dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Баровардани тимсол: {}/{}, файл: {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "dracut дар низоми интихобшуда иҷро нашуд"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Оғози барориши {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Танзимкунии initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Тимсоли \"{}\" бароварда нашуд"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Танзимкунии хидмати OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ягон нуқтаи васл барои қисми диски реша (root) нест"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Сабткунии fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage калиди \"rootMountPoint\"-ро дар бар намегирад, ҳeҷ кop "
+"намeкyнад"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Вазифаи амсилаи python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Нуқтаи васли нодуруст барои қисми диски реша (root)"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Қадами амсилаи python {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint аз \"{}\" иборат аст, ки вуҷуд надорад, ҳeҷ кop намeкyнад"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Танзимкунии маҳаллигардониҳо."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Танзимоти unsquash нодуруст аст"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Нигоҳдории танзимоти шабака."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Низоми файлӣ барои \"{}\" ({}) бо ҳастаи ҷории шумо дастгирӣ намешавад"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Низоми файлии манбаи \"{}\" вуҷуд надорад"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs ёфт нашуд, мутмаин шавед, ки бастаи squashfs-tools насб карда "
+"шудааст"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po
index 876a1f1a5f..5a9d718cc1 100644
--- a/lang/python/th/LC_MESSAGES/python.po
+++ b/lang/python/th/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,85 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po
index a576509654..745fe2ea50 100644
--- a/lang/python/tr_TR/LC_MESSAGES/python.po
+++ b/lang/python/tr_TR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Demiray Muhterem , 2020\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@@ -22,184 +22,65 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB'u yapılandır."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölümlemeleri bağlanıyor."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Yapılandırma Hatası"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     kullanması için hiçbir bölüm tanımlanmadı."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd hizmetlerini yapılandır"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Hizmet değiştirilemiyor"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Systemd birimi maskeleyemiyor {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Bilinmeyen sistem komutları {command!s} ve "
-"{suffix!s}  {name!s} birimi için."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dosya sistemlerini ayırın."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Dosya sistemlerini dolduruyorum."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync {} hata koduyla başarısız oldu."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Açılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Dışa aktarım başlatılıyor {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" kurulum medyası aktarılamadı"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "kök disk bölümü için bağlama noktası yok"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükleyici kuruluyor"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"globalstorage bir \"rootMountPoint\" anahtarı içermiyor, hiçbirşey yapılmadı"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök disk bölümü için hatalı bağlama noktası"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash yapılandırma sorunlu"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) Dosya sistemi mevcut çekirdeğiniz tarafından desteklenmiyor"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" Kaynak dosya sistemi mevcut değil"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Unsquashfs bulunamadı, squashfs-tools paketinin kurulu olduğundan emin olun."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "KDM yapılandırma dosyası yazılamıyor"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM yapılandırma dosyası {!s} mevcut değil"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "LXDM yapılandırma dosyası yazılamıyor"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM yapılandırma dosyası {!s} mevcut değil"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "LightDM yapılandırma dosyası yazılamıyor"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM yapılandırma dosyası {!s} mevcut değil"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "LightDM yapılandırılamıyor"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "LightDM karşılama yüklü değil."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "SLIM yapılandırma dosyası yazılamıyor"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM yapılandırma dosyası {!s} mevcut değil"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Ekran yöneticisi modülü için ekran yöneticisi seçilmedi."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -207,26 +88,159 @@ msgstr ""
 "Displaymanagers listesi hem globalstorage hem de displaymanager.conf'ta boş "
 "veya tanımsız."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Mkinitcpio yapılandırılıyor."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ile initramfs oluşturuluyor."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hedef üzerinde dracut çalıştırılamadı"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıkış kodu {} idi"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab dosyasına yazılıyor."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Yapılandırma Hatası"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     kullanması için hiçbir bölüm tanımlanmadı."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "
    {!s}
     kullanması için kök bağlama noktası verilmedi."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB'u yapılandır."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Donanım saati ayarlanıyor."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Mkinitcpio yapılandırılıyor."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Initramfs yapılandırılıyor."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Sistem yerelleri yapılandırılıyor."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Şifreli takas alanı yapılandırılıyor."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Mkinitfs ile initramfs oluşturuluyor."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hedefte mkinitfs çalıştırılamadı"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölümlemeleri bağlanıyor."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Ağ yapılandırması kaydediliyor."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketleri yükle"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paketler işleniyor (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d paket yükleniyor"
+msgstr[1] "%(num)d paket yükleniyor"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d paket kaldırılıyor."
+msgstr[1] "%(num)d paket kaldırılıyor."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth temasını yapılandır"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Veri yükleniyor."
@@ -251,6 +265,11 @@ msgstr ""
 "Çalışma düzeyinde {level!s} hizmetinde {name!s} servisi için bilinmeyen "
 "hizmet eylemi {arg!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Hizmet değiştirilemiyor"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -278,87 +297,103 @@ msgid ""
 "exist."
 msgstr "{name!s} hizmetinin yolu {path!s}, ki mevcut değil."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth temasını yapılandır"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd hizmetlerini yapılandır"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketleri yükle"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
+"{num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketler işleniyor (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d paket yükleniyor"
-msgstr[1] "%(num)d paket yükleniyor"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d paket kaldırılıyor."
-msgstr[1] "%(num)d paket kaldırılıyor."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükleyici kuruluyor"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Systemd birimi maskeleyemiyor {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Donanım saati ayarlanıyor."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Bilinmeyen sistem komutları {command!s} ve "
+"{suffix!s}  {name!s} birimi için."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Mkinitfs ile initramfs oluşturuluyor."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dosya sistemlerini ayırın."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hedefte mkinitfs çalıştırılamadı"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Dosya sistemlerini dolduruyorum."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıkış kodu {} idi"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync {} hata koduyla başarısız oldu."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ile initramfs oluşturuluyor."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Açılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hedef üzerinde dracut çalıştırılamadı"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Dışa aktarım başlatılıyor {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Initramfs yapılandırılıyor."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kurulum medyası aktarılamadı"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "kök disk bölümü için bağlama noktası yok"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab dosyasına yazılıyor."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage bir \"rootMountPoint\" anahtarı içermiyor, hiçbirşey yapılmadı"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök disk bölümü için hatalı bağlama noktası"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Sistem yerelleri yapılandırılıyor."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash yapılandırma sorunlu"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Ağ yapılandırması kaydediliyor."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) Dosya sistemi mevcut çekirdeğiniz tarafından desteklenmiyor"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" Kaynak dosya sistemi mevcut değil"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Unsquashfs bulunamadı, squashfs-tools paketinin kurulu olduğundan emin olun."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po
index d4cf0b6f84..1cbc379aaa 100644
--- a/lang/python/uk/LC_MESSAGES/python.po
+++ b/lang/python/uk/LC_MESSAGES/python.po
@@ -6,16 +6,16 @@
 # Translators:
 # Володимир Братко , 2018
 # Paul S <204@tuta.io>, 2019
-# Yuri Chornoivan , 2020
+# Yuri Chornoivan , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Yuri Chornoivan , 2020\n"
+"Last-Translator: Yuri Chornoivan , 2021\n"
 "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,189 +23,67 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Налаштовування GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтування розділів."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Помилка налаштовування"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Не визначено розділів для використання 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Налаштуйте служби systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не вдалося змінити службу"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
-"повідомлення з кодом помилки {num! s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Не вдалося ввімкнути службу systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Не вдалося вимкнути завдання systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Не вдалося замаскувати вузол systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Невідомі команди systemd {command!s} та {suffix!s}"
-" для пристрою {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтувати файлові системи."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Заповнення файлових систем."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Розпаковуємо образ {} з {}, файл {} з {}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Починаємо розпаковувати {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Не вдалося розпакувати образ «{}»"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Немає точки монтування для кореневого розділу"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо "
-"ніяких дій."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Помилкова точна монтування для кореневого розділу"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не "
-"виконуватимемо ніяких дій."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Помилкові налаштування unsquash"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Встановити завантажувач."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"У поточному ядрі системи не передбачено підтримки файлової системи «{}» ({})"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Помилка встановлення завантажувача"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Вихідної файлової системи «{}» не існує"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Не вдалося знайти unsquashfs; переконайтеся, що встановлено пакет squashfs-"
-"tools"
+"Не вдалося встановити завантажувач. Програмою для встановлення "
+"
    {!s}
     повернуто код помилки {!s}."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Призначення «{}» у цільовій системі не є каталогом"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Не вдалося записати файл налаштувань KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Файла налаштувань KDM {!s} не існує"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Не вдалося виконати запис до файла налаштувань LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Файла налаштувань LXDM {!s} не існує"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Не вдалося виконати запис до файла налаштувань LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Файла налаштувань LightDM {!s} не існує"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Не вдалося налаштувати LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Засіб входу до системи LightDM не встановлено."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Не вдалося виконати запис до файла налаштувань SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Файла налаштувань SLIM {!s} не існує"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "Не вибрано засобу керування дисплеєм для модуля displaymanager."
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -213,27 +91,171 @@ msgstr ""
 "Список засобів керування дисплеєм є порожнім або невизначеним у "
 "bothglobalstorage та displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Налаштування засобу керування дисплеєм є неповними"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Налаштовуємо mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Створюємо initramfs за допомогою dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не вдалося виконати dracut над призначенням"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Код виходу — {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фіктивне завдання python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фіктивний крок python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Записуємо fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Помилка налаштовування"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Не визначено розділів для використання 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Не вказано кореневої точки монтування для використання у 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Не надано налаштувань 
    {!s}
     для використання у 
    {!s}
    ."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Налаштовування GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Встановлюємо значення для апаратного годинника."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Налаштовуємо mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Налаштовуємо initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Налаштовуємо локалі."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Налаштовуємо зашифрований розділ резервної пам'яті."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Створення initramfs за допомогою mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не вдалося виконати mkinitfs над призначенням"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтування розділів."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Зберігаємо налаштування мережі."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Налаштовуємо службу dmcrypt OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Встановити пакети."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обробляємо пакунки (%(count)d з %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Встановлюємо %(num)d пакунок."
+msgstr[1] "Встановлюємо %(num)d пакунки."
+msgstr[2] "Встановлюємо %(num)d пакунків."
+msgstr[3] "Встановлюємо один пакунок."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Вилучаємо %(num)d пакунок."
+msgstr[1] "Вилучаємо %(num)d пакунки."
+msgstr[2] "Вилучаємо %(num)d пакунків."
+msgstr[3] "Вилучаємо один пакунок."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Помилка засобу керування пакунками"
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося приготувати оновлення. Програмою "
+"
    {!s}
     повернуто код помилки {!s}."
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося оновити систему. Програмою "
+"
    {!s}
     повернуто код помилки {!s}."
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
+"Програмою 
    {!s}
     повернуто код помилки {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Налаштувати тему Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Встановлюємо дані."
@@ -258,6 +280,11 @@ msgstr ""
 "Невідома дія зі службою {arg!s} для служби {name!s} на рівні "
 "запуску {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Не вдалося змінити службу"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -289,91 +316,108 @@ msgstr ""
 "Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
 "існує."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Налаштувати тему Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Налаштуйте служби systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Встановити пакети."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
+"повідомлення з кодом помилки {num! s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обробляємо пакунки (%(count)d з %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Не вдалося ввімкнути службу systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Встановлюємо %(num)d пакунок."
-msgstr[1] "Встановлюємо %(num)d пакунки."
-msgstr[2] "Встановлюємо %(num)d пакунків."
-msgstr[3] "Встановлюємо один пакунок."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Вилучаємо %(num)d пакунок."
-msgstr[1] "Вилучаємо %(num)d пакунки."
-msgstr[2] "Вилучаємо %(num)d пакунків."
-msgstr[3] "Вилучаємо один пакунок."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Не вдалося вимкнути завдання systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Встановити завантажувач."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Не вдалося замаскувати вузол systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Встановлюємо значення для апаратного годинника."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Невідомі команди systemd {command!s} та {suffix!s}"
+" для пристрою {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Створення initramfs за допомогою mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтувати файлові системи."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не вдалося виконати mkinitfs над призначенням"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Заповнення файлових систем."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код виходу — {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Створюємо initramfs за допомогою dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Розпаковуємо образ {} з {}, файл {} з {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не вдалося виконати dracut над призначенням"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Починаємо розпаковувати {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Налаштовуємо initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Не вдалося розпакувати образ «{}»"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Налаштовуємо службу dmcrypt OpenRC."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Немає точки монтування для кореневого розділу"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Записуємо fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо "
+"ніяких дій."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фіктивне завдання python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Помилкова точна монтування для кореневого розділу"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фіктивний крок python {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не "
+"виконуватимемо ніяких дій."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Налаштовуємо локалі."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Помилкові налаштування unsquash"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Зберігаємо налаштування мережі."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"У поточному ядрі системи не передбачено підтримки файлової системи «{}» ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Вихідної файлової системи «{}» не існує"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Не вдалося знайти unsquashfs; переконайтеся, що встановлено пакет squashfs-"
+"tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Призначення «{}» у цільовій системі не є каталогом"
diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po
index fa1c761785..c8944a7407 100644
--- a/lang/python/ur/LC_MESSAGES/python.po
+++ b/lang/python/ur/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,87 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po
index a1a9fe88dc..db5831cebc 100644
--- a/lang/python/uz/LC_MESSAGES/python.po
+++ b/lang/python/uz/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,85 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po
index 7f4fd3b67b..cedba816e2 100644
--- a/lang/python/vi/LC_MESSAGES/python.po
+++ b/lang/python/vi/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: T. Tran , 2020\n"
 "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n"
@@ -21,182 +21,66 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Cấu hình GRUB"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Đang gắn kết các phân vùng."
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Lỗi cấu hình"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Không có phân vùng nào được định nghĩa cho 
    {!s}
     để dùng."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Cấu hình các dịch vụ systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Không thể sửa đổi dịch vụ"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Đang cài đặt bộ khởi động."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Không thể bật dịch vụ systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Không nhận ra lệnh systemd {command!s} và "
-"{suffix!s} cho đơn vị {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Gỡ kết nối các hệ thống tập tin."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Đang làm đầy các hệ thống tập tin."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync thất bại với lỗi {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Bắt đầu bung nội dung {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Bung hình ảnh thất bại \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Không có điểm kết nối cho phân vùng gốc"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage không có khoá \"rootMountPoint\", sẽ không làm gì cả"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Sai điểm kết nối cho phân vùng gốc"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint không tồn tại, có giá trị là \"{}\", sẽ không làm gì cả"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Sai cấu hình bung nén"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Hệ thống tập tin cho \"{}\" ({}) không được hỗ trợ bởi nhân hiện tại"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Hệ thống tập tin nguồn \"{}\" không tồn tại"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "Không tìm thấy lệnh unsquashfs, vui lòng cài đặt gói squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
-
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Không thể ghi vào tập tin cấu hình KDM"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "Tập tin cấu hình KDM {!s} không tồn tại"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "Không thể ghi vào tập tin cấu hình LXDM"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "Tập tin cấu hình LXDM {!s} không tồn tại"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "Không thể ghi vào tập tin cấu hình LightDM"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "Tập tin cấu hình LightDM {!s} không tồn tại"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "Không thể cấu hình LXDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "Màn hình chào mừng LightDM không được cài đặt."
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "Không thể ghi vào tập tin cấu hình SLIM"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "Tập tin cấu hình SLIM {!s} không tồn tại"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr ""
 "Không có trình quản lý hiển thị nào được chọn cho mô-đun quản lý hiển thị"
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
@@ -204,26 +88,157 @@ msgstr ""
 "Danh sách quản lý hiện thị trống hoặc không được định nghĩa cả trong "
 "globalstorage và displaymanager.conf."
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "Cầu hình quản lý hiện thị không hoàn tất"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Đang cấu hình mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Đang tạo initramfs bằng dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Chạy dracut thất bại ở hệ thống đích"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Mã lỗi trả về là {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Ví dụ công việc python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Ví dụ python bước {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Đang viết vào fstab."
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Lỗi cấu hình"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Không có phân vùng nào được định nghĩa cho 
    {!s}
     để dùng."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Không có điểm kết nối gốc cho 
    {!s}
     để dùng."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Cấu hình GRUB"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Đang thiết lập đồng hồ máy tính."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Đang cấu hình mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Đang cấu hình initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Đang cấu hình ngôn ngữ."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Đang cấu hình hoán đổi mã hoá"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Đang tạo initramfs bằng mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Đang gắn kết các phân vùng."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Đang lưu cấu hình mạng."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Đang cài đặt các gói ứng dụng."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Đang xử lý gói (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Cấu hình giao diện Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Đang cài đặt dữ liệu."
@@ -248,6 +263,11 @@ msgstr ""
 "Không nhận ra thao tác {arg!s} cho dịch vụ {name!s} ở run-level"
 " {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Không thể sửa đổi dịch vụ"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -279,85 +299,100 @@ msgstr ""
 "Đường dẫn cho dịch vụ {name!s} là {path!s}, nhưng không tồn "
 "tại."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Cấu hình giao diện Plymouth"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Cấu hình các dịch vụ systemd"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Đang cài đặt các gói ứng dụng."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Đang xử lý gói (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Không thể bật dịch vụ systemd {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Đang cài đặt bộ khởi động."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Đang thiết lập đồng hồ máy tính."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Không nhận ra lệnh systemd {command!s} và "
+"{suffix!s} cho đơn vị {name!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Đang tạo initramfs bằng mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Gỡ kết nối các hệ thống tập tin."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Đang làm đầy các hệ thống tập tin."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Mã lỗi trả về là {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync thất bại với lỗi {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Đang tạo initramfs bằng dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Chạy dracut thất bại ở hệ thống đích"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Bắt đầu bung nội dung {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Đang cấu hình initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Bung hình ảnh thất bại \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Không có điểm kết nối cho phân vùng gốc"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Đang viết vào fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage không có khoá \"rootMountPoint\", sẽ không làm gì cả"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Ví dụ công việc python."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Sai điểm kết nối cho phân vùng gốc"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Ví dụ python bước {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint không tồn tại, có giá trị là \"{}\", sẽ không làm gì cả"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Đang cấu hình ngôn ngữ."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Sai cấu hình bung nén"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Đang lưu cấu hình mạng."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Hệ thống tập tin cho \"{}\" ({}) không được hỗ trợ bởi nhân hiện tại"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Hệ thống tập tin nguồn \"{}\" không tồn tại"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "Không tìm thấy lệnh unsquashfs, vui lòng cài đặt gói squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po
index 0ff1233a20..ed87981046 100644
--- a/lang/python/zh/LC_MESSAGES/python.po
+++ b/lang/python/zh/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (https://www.transifex.com/calamares/teams/20061/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:514
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:515
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:576
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:577
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:660
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:661
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:735
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:736
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:767
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:768
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:894
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:895
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:977
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:203
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,85 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index ac6d2d50c6..785fb9e2d6 100644
--- a/lang/python/zh_CN/LC_MESSAGES/python.po
+++ b/lang/python/zh_CN/LC_MESSAGES/python.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 玉堂白鹤 , 2020\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
@@ -25,205 +25,221 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "配置 GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "挂载分区。"
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "配置错误"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "没有分配分区给 
    {!s}
    。"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "配置 systemd 服务"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "无法修改服务"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "无法启用 systemd 服务 {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "无法启用 systemd 目标 {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "无法禁用 systemd 目标 {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "无法屏蔽 systemd 单元 {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安装启动加载器。"
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
-"{suffix!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "卸载文件系统。"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "写入文件系统。"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync 报错，错误码 {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "解压镜像 {}/{}，文件{}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "开始解压 {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "解压镜像失败 \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "无 root 分区挂载点"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "错误的 root 分区挂载点"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "错误的 unsquash 配置"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "你当前的内核不支持文件系统 \"{}\" ({})"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "源文件系统 \"{}\" 不存在"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "未找到 unsquashfs，请确保安装了 squashfs-tools 软件包"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "目标系统中的 \"{}\" 不是一个目录"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "无法写入 KDM 配置文件"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM 配置文件 {!s} 不存在"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "无法写入 LXDM 配置文件"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM 配置文件 {!s} 不存在"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "无法写入 LightDM 配置文件"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM 配置文件 {!s} 不存在"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "无法配置 LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "未安装 LightDM 欢迎程序。"
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "无法写入 SLIM 配置文件"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM 配置文件 {!s} 不存在"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "显示管理器模块中未选择显示管理器。"
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显示管理器。"
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "显示管理器配置不完全"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "配置 mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "用 dracut 创建 initramfs."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "无法在目标中运行 dracut "
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "退出码是 {}"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "占位 Python 任务。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "占位 Python 步骤 {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在写入 fstab。"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "配置错误"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "没有分配分区给 
    {!s}
    。"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr " 未设置 
    {!s}
     要使用的根挂载点。"
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "配置 GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "设置硬件时钟。"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "配置 mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在配置初始内存文件系统。"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在进行本地化配置。"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "配置加密交换分区。"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在用 mkinitfs 创建initramfs。"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "无法在目标中运行 mkinitfs"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "挂载分区。"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "正在保存网络配置。"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "配置 OpenRC dmcrypt 服务。"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "安装软件包。"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "软件包处理中（%(count)d/%(total)d）"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "安装%(num)d软件包。"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "移除%(num)d软件包。"
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "配置 Plymouth 主题"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "安装数据."
@@ -246,6 +262,11 @@ msgid ""
 "level {level!s}."
 msgstr "未知的服务动作 {arg!s}，服务名: {name!s}，运行级别: {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "无法修改服务"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -271,85 +292,99 @@ msgid ""
 "exist."
 msgstr "服务 {name!s} 的路径 {path!s} 不存在。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "配置 Plymouth 主题"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "配置 systemd 服务"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "安装软件包。"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "软件包处理中（%(count)d/%(total)d）"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "无法启用 systemd 服务 {name!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "安装%(num)d软件包。"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "无法启用 systemd 目标 {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "移除%(num)d软件包。"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "无法禁用 systemd 目标 {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安装启动加载器。"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "无法屏蔽 systemd 单元 {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "设置硬件时钟。"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
+"{suffix!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在用 mkinitfs 创建initramfs。"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "卸载文件系统。"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "无法在目标中运行 mkinitfs"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "写入文件系统。"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "退出码是 {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync 报错，错误码 {}."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "用 dracut 创建 initramfs."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "解压镜像 {}/{}，文件{}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "无法在目标中运行 dracut "
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "开始解压 {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在配置初始内存文件系统。"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "解压镜像失败 \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "配置 OpenRC dmcrypt 服务。"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "无 root 分区挂载点"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在写入 fstab。"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "占位 Python 任务。"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "错误的 root 分区挂载点"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "占位 Python 步骤 {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在进行本地化配置。"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "错误的 unsquash 配置"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "正在保存网络配置。"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "你当前的内核不支持文件系统 \"{}\" ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "源文件系统 \"{}\" 不存在"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "未找到 unsquashfs，请确保安装了 squashfs-tools 软件包"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "目标系统中的 \"{}\" 不是一个目录"
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po
index 254d0e1ec8..a81d8e5b73 100644
--- a/lang/python/zh_TW/LC_MESSAGES/python.po
+++ b/lang/python/zh_TW/LC_MESSAGES/python.po
@@ -5,16 +5,16 @@
 # 
 # Translators:
 # Walter Cheuk , 2020
-# 黃柏諺 , 2020
+# 黃柏諺 , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 14:27+0100\n"
+"POT-Creation-Date: 2021-07-12 14:14+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: 黃柏諺 , 2020\n"
+"Last-Translator: 黃柏諺 , 2021\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,205 +22,221 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "設定 GRUB。"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "正在掛載分割區。"
-
-#: src/modules/mount/main.py:125 src/modules/initcpiocfg/main.py:198
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/localecfg/main.py:135
-#: src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "設定錯誤"
-
-#: src/modules/mount/main.py:126 src/modules/initcpiocfg/main.py:199
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "沒有分割區被定義為 
    {!s}
     以供使用。"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "設定 systemd 服務"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "無法修改服務"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "無法啟用 systemd 服務 {name!s}。"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "無法啟用 systemd 目標 {name!s}。"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "無法停用 systemd 目標 {name!s}。"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "無法 mask systemd 單位 {name!s}。"
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
-"{name!s}。"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "解除掛載檔案系統。"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "填滿檔案系統。"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync 失敗，錯誤碼 {} 。"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "正在解壓縮 {}/{}，檔案 {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "開始解壓縮 {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "無法解開映像檔 \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "沒有 root 分割區的掛載點"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "root 分割區掛載點錯誤"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "錯誤的 unsquash 設定"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安裝開機載入程式。"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "開機載入程式安裝錯誤"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "來源檔案系統 \"{}\" 不存在"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "找不到 unsquashfs，請確定已安裝 squashfs-tools 軟體包"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "目標系統中的目的地 \"{}\" 不是目錄"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr "無法安裝開機載入程式。安裝指令 
    {!s}
     回傳了錯誤碼 {!s}。"
 
-#: src/modules/displaymanager/main.py:514
+#: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "無法寫入 KDM 設定檔"
 
-#: src/modules/displaymanager/main.py:515
+#: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
 msgstr "KDM 設定檔 {!s} 不存在"
 
-#: src/modules/displaymanager/main.py:576
+#: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
 msgstr "無法寫入 LXDM 設定檔"
 
-#: src/modules/displaymanager/main.py:577
+#: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
 msgstr "LXDM 設定檔 {!s} 不存在"
 
-#: src/modules/displaymanager/main.py:660
+#: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
 msgstr "無法寫入 LightDM 設定檔"
 
-#: src/modules/displaymanager/main.py:661
+#: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
 msgstr "LightDM 設定檔 {!s} 不存在"
 
-#: src/modules/displaymanager/main.py:735
+#: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
 msgstr "無法設定 LightDM"
 
-#: src/modules/displaymanager/main.py:736
+#: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
 msgstr "未安裝 LightDM greeter。"
 
-#: src/modules/displaymanager/main.py:767
+#: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
 msgstr "無法寫入 SLIM 設定檔"
 
-#: src/modules/displaymanager/main.py:768
+#: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
 msgstr "SLIM 設定檔 {!s} 不存在"
 
-#: src/modules/displaymanager/main.py:894
+#: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
 msgstr "未在顯示管理器模組中選取顯示管理器。"
 
-#: src/modules/displaymanager/main.py:895
+#: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf 中皆未定義。"
 
-#: src/modules/displaymanager/main.py:977
+#: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
 msgstr "顯示管理器設定不完整"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "正在設定 mkinitcpio。"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "正在使用 dracut 建立 initramfs。"
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "在目標上執行 dracut 失敗"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "結束碼為 {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "假的 python 工作。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "假的 python step {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在寫入 fstab。"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "設定錯誤"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "沒有分割區被定義為 
    {!s}
     以供使用。"
 
-#: src/modules/initcpiocfg/main.py:203
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "沒有給定的根掛載點 
    {!s}
     以供使用。"
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "無 
    {!s}
     設定可供 
    {!s}
     使用。"
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "設定 GRUB。"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "正在設定硬體時鐘。"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "正在設定 mkinitcpio。"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在設定 initramfs。"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在設定語系。"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "正在設定已加密的 swap。"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在使用 mkinitfs 建立 initramfs。"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "在目標上執行 mkinitfs 失敗"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "正在掛載分割區。"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "正在儲存網路設定。"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "正在設定 OpenRC dmcrypt 服務。"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "安裝軟體包。"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "正在處理軟體包 (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "正在安裝 %(num)d 軟體包。"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "正在移除 %(num)d 軟體包。"
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "軟體包管理程式錯誤"
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr "軟體包管理程式無法準備更新。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr "軟體包管理程式無法更新系統。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could make changes to the installed system. The command "
+"
    {!s}
     returned error code {!s}."
+msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "設定 Plymouth 主題"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "正在安裝資料。"
@@ -243,6 +259,11 @@ msgid ""
 "level {level!s}."
 msgstr "未知的服務動作 {arg!s} 給服務 {name!s} 在執行層級 {level!s}。"
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "無法修改服務"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -268,85 +289,99 @@ msgid ""
 "exist."
 msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "設定 Plymouth 主題"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "設定 systemd 服務"
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "安裝軟體包。"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "正在處理軟體包 (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "無法啟用 systemd 服務 {name!s}。"
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "正在安裝 %(num)d 軟體包。"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "無法啟用 systemd 目標 {name!s}。"
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "正在移除 %(num)d 軟體包。"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "無法停用 systemd 目標 {name!s}。"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安裝開機載入程式。"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "無法 mask systemd 單位 {name!s}。"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "正在設定硬體時鐘。"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
+"{name!s}。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在使用 mkinitfs 建立 initramfs。"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "解除掛載檔案系統。"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "在目標上執行 mkinitfs 失敗"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "填滿檔案系統。"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "結束碼為 {}"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync 失敗，錯誤碼 {} 。"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "正在使用 dracut 建立 initramfs。"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "正在解壓縮 {}/{}，檔案 {}/{}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "在目標上執行 dracut 失敗"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "開始解壓縮 {}"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在設定 initramfs。"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "無法解開映像檔 \"{}\""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "正在設定 OpenRC dmcrypt 服務。"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "沒有 root 分割區的掛載點"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在寫入 fstab。"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "假的 python 工作。"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "root 分割區掛載點錯誤"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "假的 python step {}"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在設定語系。"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "錯誤的 unsquash 設定"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "正在儲存網路設定。"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "來源檔案系統 \"{}\" 不存在"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "找不到 unsquashfs，請確定已安裝 squashfs-tools 軟體包"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "目標系統中的目的地 \"{}\" 不是目錄"

From 9051faf062631f8199fc1faac49bc707d329e3d9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 14 Jul 2021 00:08:37 +0200
Subject: [PATCH 281/492] CMake: update language list

The list suggests things are not-so-good because of recently-pushed
changes to the translations and teams haven't had time to react.
There are also some new duplicate languages.
---
 CMakeLists.txt | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 246c828cca..c6108223f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,15 +132,14 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 # NOTE: update these lines by running `txstats.py`, or for full automation
 #       `txstats.py -e`. See also
 #
-# Total 75 languages
-set( _tx_complete az az_AZ be ca de fi_FI he hi hr ja ko lt pt_BR
-    pt_PT sq sv tr_TR uk vi zh_CN zh_TW )
-set( _tx_good as ast ca@valencia cs_CZ da es fa fr fur hu it_IT ml
-    nl ru sk tg )
-set( _tx_ok ar bg bn el en_GB es_MX es_PR et eu gl id is mr nb pl
-    ro sl sr sr@latin th )
-set( _tx_incomplete eo fr_CH gu id_ID ie kk kn lo lv mk ne ne_NP si
-    te ur uz zh )
+# Total 77 languages
+set( _tx_complete ca lt pt_PT sq uk zh_TW )
+set( _tx_good as az az_AZ be ca@valencia cs_CZ da de fi_FI fr fur
+    he hi hr it_IT ja ko ml nl pt_BR ru sk sv tg tr_TR vi zh_CN )
+set( _tx_ok ar ast bg bn el en_GB es es_MX es_PR et eu fa gl hu id
+    is mr nb pl ro sl sr sr@latin th )
+set( _tx_incomplete eo es_PE fr_CH gu id_ID ie kk kn lo lv mk ne
+    ne_NP ru_RU si te ur uz zh )
 
 ### Required versions
 #

From 0d2763f68a76b929f447fa5f9e5d47992e92e7e7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 14 Jul 2021 09:02:16 +0200
Subject: [PATCH 282/492] Changes: pre-release housekeeping

---
 CHANGES        | 2 +-
 CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 829be924f6..ae86c42f9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.40 (unreleased) #
+# 3.2.40 (2021-07-14) #
 
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6108223f7..e3db9050d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ project( CALAMARES
     LANGUAGES C CXX
 )
 
-set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From bc77478b2a0a35715cfaa8328d42fd608a4efcc9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 14 Jul 2021 09:29:20 +0200
Subject: [PATCH 283/492] [calamares] Expand test-mocks for Python

- the rawfs module uses more parts of the subprocess Python module
  and so needs more things mocked for testing.
---
 src/calamares/testmain.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index aa74922367..0e7f4ab42c 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -389,10 +389,9 @@ createApplication( int& argc, char* argv[] )
 }
 
 #ifdef WITH_PYTHON
-static const char pythonPreScript[] = R"(
+static const char pythonPreScript[] = R"%(
 # This is Python code executed by Python modules *before* the
-# script file (e.g. main.py) is executed. Beware " before )
-# because it's a C++ raw-string.
+# script file (e.g. main.py) is executed.
 #
 # Calls to suprocess methods that execute something are
 # suppressed and logged -- scripts should really be using libcalamares
@@ -401,20 +400,32 @@ _calamares_subprocess = __import__("subprocess", globals(), locals(), [], 0)
 import sys
 import libcalamares
 class fake_subprocess(object):
+    PIPE = object()
+    STDOUT = object()
+    STDERR = object()
+    class CompletedProcess(object):
+        returncode = 0
+        stdout = ""
+        stderr = ""
     @staticmethod
     def call(*args, **kwargs):
-        libcalamares.utils.debug("subprocess.call(%r,%r) X run normally" % (args, kwargs))
+        libcalamares.utils.debug("subprocess.call(%r,%r) X ignored" % (args, kwargs))
         return 0
     @staticmethod
     def check_call(*args, **kwargs):
-        libcalamares.utils.debug("subprocess.check_call(%r,%r) X subverted to call" % (args, kwargs))
+        libcalamares.utils.debug("subprocess.check_call(%r,%r) X ignored" % (args, kwargs))
         return 0
+    # This is a 3.5-and-later method, is supposed to return a CompletedProcess
+    @staticmethod
+    def run(*args, **kwargs):
+        libcalamares.utils.debug("subprocess.run(%r,%r) X ignored" % (args, kwargs))
+        return fake_subprocess.CompletedProcess()
 for attr in ("CalledProcessError",):
     setattr(fake_subprocess,attr,getattr(_calamares_subprocess,attr))
 sys.modules["subprocess"] = fake_subprocess
 libcalamares.utils.debug('pre-script for testing purposes injected')
 
-)";
+)%";
 #endif
 
 int

From 3a5334071ddce618350dbab2e7f0ca15bd07f1b1 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 14 Jul 2021 12:54:07 +0200
Subject: [PATCH 284/492] [packages] Fix wording problem

---
 src/modules/packages/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py
index 9be079dace..6982468df9 100644
--- a/src/modules/packages/main.py
+++ b/src/modules/packages/main.py
@@ -626,7 +626,7 @@ def run():
             libcalamares.utils.debug("stdout:" + str(e.stdout))
             libcalamares.utils.debug("stderr:" + str(e.stderr))
             return (_("Package Manager error"),
-                    _("The package manager could make changes to the installed system. The command 
    {!s}
     returned error code {!s}.")
+                    _("The package manager could not make changes to the installed system. The command 
    {!s}
     returned error code {!s}.")
                     .format(e.cmd, e.returncode))
 
     mode_packages = None

From 8f13e7abb49548962bc038cfe28bfb82093db619 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Wed, 14 Jul 2021 13:03:42 +0200
Subject: [PATCH 285/492] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_ar.ts          | 10 +++----
 lang/calamares_as.ts          | 10 +++----
 lang/calamares_ast.ts         | 10 +++----
 lang/calamares_az.ts          | 10 +++----
 lang/calamares_az_AZ.ts       | 10 +++----
 lang/calamares_be.ts          | 10 +++----
 lang/calamares_bg.ts          | 10 +++----
 lang/calamares_bn.ts          | 10 +++----
 lang/calamares_ca.ts          | 10 +++----
 lang/calamares_ca@valencia.ts | 10 +++----
 lang/calamares_cs_CZ.ts       | 10 +++----
 lang/calamares_da.ts          | 10 +++----
 lang/calamares_de.ts          | 10 +++----
 lang/calamares_el.ts          | 10 +++----
 lang/calamares_en.ts          | 10 +++----
 lang/calamares_en_GB.ts       | 10 +++----
 lang/calamares_eo.ts          | 10 +++----
 lang/calamares_es.ts          | 10 +++----
 lang/calamares_es_MX.ts       | 10 +++----
 lang/calamares_es_PE.ts       | 10 +++----
 lang/calamares_es_PR.ts       | 10 +++----
 lang/calamares_et.ts          | 10 +++----
 lang/calamares_eu.ts          | 10 +++----
 lang/calamares_fa.ts          | 10 +++----
 lang/calamares_fi_FI.ts       | 34 +++++++++++------------
 lang/calamares_fr.ts          | 10 +++----
 lang/calamares_fr_CH.ts       | 10 +++----
 lang/calamares_fur.ts         | 10 +++----
 lang/calamares_gl.ts          | 10 +++----
 lang/calamares_gu.ts          | 10 +++----
 lang/calamares_he.ts          | 21 +++++++-------
 lang/calamares_hi.ts          | 36 ++++++++++++------------
 lang/calamares_hr.ts          | 48 ++++++++++++++++----------------
 lang/calamares_hu.ts          | 10 +++----
 lang/calamares_id.ts          | 10 +++----
 lang/calamares_id_ID.ts       | 10 +++----
 lang/calamares_ie.ts          | 10 +++----
 lang/calamares_is.ts          | 10 +++----
 lang/calamares_it_IT.ts       | 10 +++----
 lang/calamares_ja.ts          | 52 +++++++++++++++++------------------
 lang/calamares_kk.ts          | 10 +++----
 lang/calamares_kn.ts          | 10 +++----
 lang/calamares_ko.ts          | 36 ++++++++++++------------
 lang/calamares_lo.ts          | 10 +++----
 lang/calamares_lt.ts          | 10 +++----
 lang/calamares_lv.ts          | 10 +++----
 lang/calamares_mk.ts          | 10 +++----
 lang/calamares_ml.ts          | 10 +++----
 lang/calamares_mr.ts          | 10 +++----
 lang/calamares_nb.ts          | 10 +++----
 lang/calamares_ne.ts          | 10 +++----
 lang/calamares_ne_NP.ts       | 10 +++----
 lang/calamares_nl.ts          | 10 +++----
 lang/calamares_pl.ts          | 10 +++----
 lang/calamares_pt_BR.ts       | 10 +++----
 lang/calamares_pt_PT.ts       | 10 +++----
 lang/calamares_ro.ts          | 10 +++----
 lang/calamares_ru.ts          | 10 +++----
 lang/calamares_ru_RU.ts       | 10 +++----
 lang/calamares_si.ts          | 10 +++----
 lang/calamares_sk.ts          | 10 +++----
 lang/calamares_sl.ts          | 10 +++----
 lang/calamares_sq.ts          | 10 +++----
 lang/calamares_sr.ts          | 10 +++----
 lang/calamares_sr@latin.ts    | 10 +++----
 lang/calamares_sv.ts          | 20 +++++++-------
 lang/calamares_te.ts          | 10 +++----
 lang/calamares_tg.ts          | 10 +++----
 lang/calamares_th.ts          | 10 +++----
 lang/calamares_tr_TR.ts       | 10 +++----
 lang/calamares_uk.ts          | 10 +++----
 lang/calamares_ur.ts          | 10 +++----
 lang/calamares_uz.ts          | 10 +++----
 lang/calamares_vi.ts          | 10 +++----
 lang/calamares_zh.ts          | 10 +++----
 lang/calamares_zh_CN.ts       | 10 +++----
 lang/calamares_zh_TW.ts       | 10 +++----
 77 files changed, 474 insertions(+), 473 deletions(-)

diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts
index 07d107472b..e877be05ea 100644
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
@@ -4276,11 +4276,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4321,6 +4316,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts
index 9b2e7f70d6..fea72b6a77 100644
--- a/lang/calamares_as.ts
+++ b/lang/calamares_as.ts
@@ -4241,11 +4241,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4286,6 +4281,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts
index af0b90cbc3..e6fa0bc715 100644
--- a/lang/calamares_ast.ts
+++ b/lang/calamares_ast.ts
@@ -4238,11 +4238,6 @@ Salida:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4283,6 +4278,11 @@ Salida:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts
index 691bf9a9e8..277a0413bc 100644
--- a/lang/calamares_az.ts
+++ b/lang/calamares_az.ts
@@ -4279,11 +4279,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4324,6 +4319,11 @@ Output:
       Log in automatically without asking for the password
       Şifrə soruşmadan sistemə daxil olmaq
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts
index ff3894b6d1..08aa89be9a 100644
--- a/lang/calamares_az_AZ.ts
+++ b/lang/calamares_az_AZ.ts
@@ -4279,11 +4279,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4324,6 +4319,11 @@ Output:
       Log in automatically without asking for the password
       Şifrə soruşmadan sistemə daxil olmaq
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts
index cb1a7f0776..27ab2e0764 100644
--- a/lang/calamares_be.ts
+++ b/lang/calamares_be.ts
@@ -4294,11 +4294,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       Назва будзе выкарыстоўвацца для пазначэння камп’ютара ў сетцы.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4339,6 +4334,11 @@ Output:
       Log in automatically without asking for the password
       Аўтаматычна ўваходзіць без уводу пароля
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index 440d8e5dae..8926c2850c 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -4235,11 +4235,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4280,6 +4275,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts
index 271c660c6b..231aa11766 100644
--- a/lang/calamares_bn.ts
+++ b/lang/calamares_bn.ts
@@ -4231,11 +4231,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4276,6 +4271,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index a2dcc12c8f..33c9ad2639 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -4280,11 +4280,6 @@ La configuració pot continuar, però algunes característiques podrien estar in
       This name will be used if you make the computer visible to others on a network.
       Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      Només es permeten lletres, números, guionets, guionets baixos i un mínim de dos caràcters.
-    
     
       
       localhost is not allowed as hostname.
@@ -4325,6 +4320,11 @@ La configuració pot continuar, però algunes característiques podrien estar in
       Log in automatically without asking for the password
       Entra automàticament sense demanar la contrasenya.
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Només es permeten lletres, números, guionets, guionets baixos i un mínim de dos caràcters.
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts
index 0777777765..dbe801dddc 100644
--- a/lang/calamares_ca@valencia.ts
+++ b/lang/calamares_ca@valencia.ts
@@ -4274,11 +4274,6 @@ La configuració pot continuar, però és possible que algunes característiques
       This name will be used if you make the computer visible to others on a network.
       Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4319,6 +4314,11 @@ La configuració pot continuar, però és possible que algunes característiques
       Log in automatically without asking for the password
       Entra automàticament sense demanar la contrasenya.
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index 0f69f762f9..3fc4012745 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -4296,11 +4296,6 @@ Výstup:
       This name will be used if you make the computer visible to others on a network.
       Tento název se použije, pokud počítač zviditelníte ostatním v síti.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4341,6 +4336,11 @@ Výstup:
       Log in automatically without asking for the password
       Přihlaste se automaticky bez zadávání hesla
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts
index 60b6c5d000..f0ab19eae4 100644
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
@@ -4274,11 +4274,6 @@ setting
       This name will be used if you make the computer visible to others on a network.
       Navnet bruges, hvis du gør computeren synlig for andre på et netværk.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4319,6 +4314,11 @@ setting
       Log in automatically without asking for the password
       Log ind automatisk uden at spørge efter adgangskoden
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index 379a4a922a..cb48adb161 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -4280,11 +4280,6 @@ Ausgabe:
       This name will be used if you make the computer visible to others on a network.
       Dieser Name wird benutzt, wenn Sie den Computer im Netzwerk für andere sichtbar machen.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4325,6 +4320,11 @@ Ausgabe:
       Log in automatically without asking for the password
       Automatisch anmelden ohne Passwortabfrage
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts
index 33688f9886..8cd2e4877a 100644
--- a/lang/calamares_el.ts
+++ b/lang/calamares_el.ts
@@ -4231,11 +4231,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4276,6 +4271,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index ad01224f99..5ff148eccd 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -4280,11 +4280,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       This name will be used if you make the computer visible to others on a network.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-    
     
       
       localhost is not allowed as hostname.
@@ -4325,6 +4320,11 @@ Output:
       Log in automatically without asking for the password
       Log in automatically without asking for the password
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts
index 78eed7524b..bd720af70a 100644
--- a/lang/calamares_en_GB.ts
+++ b/lang/calamares_en_GB.ts
@@ -4234,11 +4234,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4279,6 +4274,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts
index f220c318f9..70bf7c1b86 100644
--- a/lang/calamares_eo.ts
+++ b/lang/calamares_eo.ts
@@ -4235,11 +4235,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4280,6 +4275,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index 2844fe699a..5e3c751d86 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -4235,11 +4235,6 @@ Salida:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4280,6 +4275,11 @@ Salida:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts
index 356da18df7..50402d9d83 100644
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
@@ -4237,11 +4237,6 @@ Salida
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4282,6 +4277,11 @@ Salida
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_es_PE.ts b/lang/calamares_es_PE.ts
index ff84d0f62a..a91085c84c 100644
--- a/lang/calamares_es_PE.ts
+++ b/lang/calamares_es_PE.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts
index f0fbdf6f8b..ba98c1476d 100644
--- a/lang/calamares_es_PR.ts
+++ b/lang/calamares_es_PR.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts
index f28d7d8c36..f2e99148a4 100644
--- a/lang/calamares_et.ts
+++ b/lang/calamares_et.ts
@@ -4234,11 +4234,6 @@ Väljund:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4279,6 +4274,11 @@ Väljund:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts
index 515734b016..e2db24dc6e 100644
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
@@ -4233,11 +4233,6 @@ Irteera:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4278,6 +4273,11 @@ Irteera:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts
index af3116735b..f98c92fb32 100644
--- a/lang/calamares_fa.ts
+++ b/lang/calamares_fa.ts
@@ -4233,11 +4233,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4278,6 +4273,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts
index ef626b2bce..c84a0cea21 100644
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
@@ -510,12 +510,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
     
       
       Set filesystem label on %1.
-      
+      Valitse tiedostojärjestelmän nimi %1.
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      Valitse tiedostojärjestelmän nimi  <strong>%1</strong> osioon <strong>%2</strong>.
     
     
       
@@ -897,7 +897,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
       
       OK!
-      
+      OK!
     
     
       
@@ -1013,12 +1013,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
       
       Label for the filesystem
-      
+      Tiedostojärjestelmän nimi
     
     
       
       FS Label:
-      
+      FS-nimi:
     
     
       
@@ -1377,12 +1377,12 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
       
       Label for the filesystem
-      
+      Tiedostojärjestelmän nimi
     
     
       
       FS Label:
-      
+      FS-nimi:
     
     
       
@@ -1890,7 +1890,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
       
       Quit
-      
+      Sulje
     
   
   
@@ -2114,7 +2114,7 @@ hiiren vieritystä skaalaamiseen.
     
       
       Select your preferred Region, or use the default settings.
-      
+      Valitse sinun asuinalue tai käytä oletusta.
     
     
       
@@ -2654,7 +2654,7 @@ hiiren vieritystä skaalaamiseen.
     
       
       File System Label
-      
+      Tiedostojärjestelmän nimi
     
     
       
@@ -4265,7 +4265,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
       
       root is not allowed as username.
-      
+      root ei ole sallittu käyttäjän nimeksi.
     
     
       
@@ -4282,15 +4282,10 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.This name will be used if you make the computer visible to others on a network.
       Tätä nimeä käytetään, jos teet tietokoneen näkyväksi verkon muille käyttäjille.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
-      
+      localhost ei ole sallittu koneen nimeksi.
     
     
       
@@ -4327,6 +4322,11 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Log in automatically without asking for the password
       Kirjaudu automaattisesti ilman salasanaa
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Vain kirjaimet, numerot, alaviiva ja väliviiva ovat sallittuja, vähintään kaksi merkkiä.
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts
index 0be61451d5..6161ecde40 100644
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -4279,11 +4279,6 @@ Sortie
       This name will be used if you make the computer visible to others on a network.
       Ce nom sera utilisé si vous rendez l'ordinateur visible aux autres sur un réseau.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4324,6 +4319,11 @@ Sortie
       Log in automatically without asking for the password
       Connectez-vous automatiquement sans demander le mot de passe
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts
index 7c6b445a10..248ed0fd18 100644
--- a/lang/calamares_fr_CH.ts
+++ b/lang/calamares_fr_CH.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts
index 9d66e189a2..c203599fe8 100644
--- a/lang/calamares_fur.ts
+++ b/lang/calamares_fur.ts
@@ -4274,11 +4274,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       Si doprarà chest non se tu rindis visibil a altris chest computer suntune rêt.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4319,6 +4314,11 @@ Output:
       Log in automatically without asking for the password
       Jentre in automatic cence domandâ la password
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts
index 9a00dded55..ad0786b3cc 100644
--- a/lang/calamares_gl.ts
+++ b/lang/calamares_gl.ts
@@ -4235,11 +4235,6 @@ Saída:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4280,6 +4275,11 @@ Saída:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts
index da75b501de..16c0b61424 100644
--- a/lang/calamares_gu.ts
+++ b/lang/calamares_gu.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index 8ea3b98af7..875d188cb0 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -1432,7 +1432,7 @@ The installer will quit and all changes will be lost.
     
       
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
-      
+      התקנת %1 על מחיצת מערכת <strong>חדשה</strong> מסוג %2 עם היכולות <em>%3</em>
     
     
       
@@ -1442,12 +1442,12 @@ The installer will quit and all changes will be lost.
     
       
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
-      
+      הקמת מחיצת %2 <strong>חדשה</strong> עם נקודת העיגון <strong>%1</strong> והיכולות <em>%3</em>.
     
     
       
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
-      
+      הגדרת מחיצת מערכת <strong>חדשה</strong> מסוג %2 עם נקודת העיגון <strong>%1</strong> %3.
     
     
       
@@ -1457,7 +1457,7 @@ The installer will quit and all changes will be lost.
     
       
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
-      
+      הקמת מחיצת %3 בשם <strong>%1</strong> עם נקודת העגינה <strong>%2</strong> והיכולות <em>%4</em>.
     
     
       
@@ -4088,7 +4088,8 @@ Output:
       
       %1 has been installed on your computer.<br/>
             You may now restart into your new system, or continue using the Live environment.
-      
+      %1 הותקן על המחשב שלך.<br/>
+         כעת ניתן לאתחל את המחשב אל תוך המערכת החדשה שלך, או להמשיך להשתמש בסביבה הניסיונית.
     
     
       
@@ -4301,11 +4302,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       השם הזה יהיה בשימוש אם המחשב הזה יהיה גלוי לשאר הרשת.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      מותר להשתמש באותיות, ספרות, קווים תחתונים ומינוסים, שני תווים ומעלה.
-    
     
       
       localhost is not allowed as hostname.
@@ -4346,6 +4342,11 @@ Output:
       Log in automatically without asking for the password
       להיכנס אוטומטית מבלי לבקש סיסמה
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      מותר להשתמש באותיות, ספרות, קווים תחתונים ומינוסים, שני תווים ומעלה.
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index 88859e01aa..192fd8545a 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -510,17 +510,17 @@ The installer will quit and all changes will be lost.
     
       
       Set filesystem label on %1.
-      
+      %1 हेतु फाइल सिस्टम उपनाम सेट करें।
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      <strong>%2</strong> विभाजन हेतु फाइल सिस्टम उपनाम <strong>%1</strong> सेट करें।
     
     
       
       The installer failed to update partition table on disk '%1'.
-      
+      इंस्टॉलर द्वारा डिस्क '%1' पर विभाजन तालिका अपडेट करना विफल।
     
   
   
@@ -896,7 +896,7 @@ The installer will quit and all changes will be lost.
     
       
       OK!
-      
+      ठीक है!
     
     
       
@@ -1012,12 +1012,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      फाइल सिस्टम हेतु उपनाम
     
     
       
       FS Label:
-      
+      फाइल सिस्टम उपनाम :
     
     
       
@@ -1376,12 +1376,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      फाइल सिस्टम हेतु उपनाम
     
     
       
       FS Label:
-      
+      फाइल सिस्टम उपनाम :
     
     
       
@@ -1889,7 +1889,7 @@ The installer will quit and all changes will be lost.
     
       
       Quit
-      
+      बंद करें
     
   
   
@@ -2113,7 +2113,7 @@ The installer will quit and all changes will be lost.
     
       
       Select your preferred Region, or use the default settings.
-      
+      अपना इच्छित क्षेत्र चुनें या फिर डिफ़ॉल्ट सेटिंग्स उपयोग करें।
     
     
       
@@ -2653,7 +2653,7 @@ The installer will quit and all changes will be lost.
     
       
       File System Label
-      
+      फाइल सिस्टम उपनाम
     
     
       
@@ -4263,7 +4263,7 @@ Output:
     
       
       root is not allowed as username.
-      
+      उपयोक्ता नाम के रूप में root का उपयोग अस्वीकार्य है।
     
     
       
@@ -4280,15 +4280,10 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       यदि आपका कंप्यूटर किसी नेटवर्क पर दृश्यमान होता है, तो यह नाम उपयोग किया जाएगा।
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
-      
+      होस्ट नाम के रूप में localhost का उपयोग अस्वीकार्य है।
     
     
       
@@ -4325,6 +4320,11 @@ Output:
       Log in automatically without asking for the password
       कूटशब्द बिना पूछे ही स्वतः लॉग इन करें
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      केवल अक्षर, अंक, अंडरस्कोर व हाइफ़न ही स्वीकार्य हैं, परन्तु केवल दो अक्षर ही ऐसे हो सकते हैं।
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index 7aa9d9cffb..96f14fbc25 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -264,9 +264,9 @@
       
       Waiting for %n module(s).
       
-        Čekam %1 modul(a).
-        Čekam %1 modul(a).
-        Čekam %1 modul(a).
+        Čekam %n modul(a).
+        Čekam %n modul(a).
+        Čekam %n modul(a).
       
     
     
@@ -512,12 +512,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
       
       Set filesystem label on %1.
-      
+      Postavi oznaku datotečnog sustava na %1.
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      Postavi oznaku datotečnog sustava <strong>%1</strong> na particiju <strong>%2</strong>.
     
     
       
@@ -863,12 +863,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
       
       Your username must start with a lowercase letter or underscore.
-      Vaše korisničko ime mora započeti malim slovom ili podvlakom.
+      Vaše korisničko ime mora započeti malim slovom ili donjom crtom.
     
     
       
       Only lowercase letters, numbers, underscore and hyphen are allowed.
-      Dopuštena su samo mala slova, brojevi, podvlake i crtice.
+      Dopuštena su samo mala slova, brojevi, donja crta i crtica.
     
     
       
@@ -888,7 +888,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
       
       Only letters, numbers, underscore and hyphen are allowed.
-      Dopuštena su samo slova, brojevi, podvlake i crtice.
+      Dopuštena su samo slova, brojevi, donja crta i crtica.
     
     
       
@@ -898,7 +898,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
       
       OK!
-      
+      OK!
     
     
       
@@ -1014,12 +1014,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
       
       Label for the filesystem
-      
+      Oznaka za datotečni sustav
     
     
       
       FS Label:
-      
+      Oznaka datotečnog sustava:
     
     
       
@@ -1378,12 +1378,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
       
       Label for the filesystem
-      
+      Oznaka za datotečni sustav
     
     
       
       FS Label:
-      
+      Oznaka datotečnog sustava:
     
     
       
@@ -1891,7 +1891,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
       
       Quit
-      
+      izađi
     
   
   
@@ -2115,7 +2115,7 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
     
       
       Select your preferred Region, or use the default settings.
-      
+      Odaberite željenu regiju ili upotrijebite zadane postavke.
     
     
       
@@ -2664,7 +2664,7 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
     
       
       File System Label
-      
+      Oznaka datotečnog sustava
     
     
       
@@ -4268,12 +4268,12 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str
     
       
       Only lowercase letters, numbers, underscore and hyphen are allowed.
-      Dopuštena su samo mala slova, brojevi, podvlake i crtice.
+      Dopuštena su samo mala slova, brojevi, donja crta i crtica.
     
     
       
       root is not allowed as username.
-      
+      root nije dozvoljeno korisničko ime.
     
     
       
@@ -4290,15 +4290,10 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str
       This name will be used if you make the computer visible to others on a network.
       Ovo će se ime upotrebljavati ako računalo učinite vidljivim drugima na mreži.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
-      
+      localhost nije dozvoljeno ime računala.
     
     
       
@@ -4335,6 +4330,11 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str
       Log in automatically without asking for the password
       Automatska prijava bez traženja lozinke
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Dopuštena su samo slova, brojevi, donja crta i crtica i to kao najmanje dva znaka
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index 4a934ee39e..fb59f8d120 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -4238,11 +4238,6 @@ Calamares hiba %1.
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4283,6 +4278,11 @@ Calamares hiba %1.
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts
index c79cd1baac..4ed8df54f1 100644
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@@ -4237,11 +4237,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4282,6 +4277,11 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_id_ID.ts b/lang/calamares_id_ID.ts
index cdaea98abb..74887f1ff0 100644
--- a/lang/calamares_id_ID.ts
+++ b/lang/calamares_id_ID.ts
@@ -4219,11 +4219,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4264,6 +4259,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts
index 420fd1d13d..9685fcb6ee 100644
--- a/lang/calamares_ie.ts
+++ b/lang/calamares_ie.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts
index c67e49511c..fabd28221c 100644
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
@@ -4231,11 +4231,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4276,6 +4271,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts
index dc6a30466f..c0ec8a7dc1 100644
--- a/lang/calamares_it_IT.ts
+++ b/lang/calamares_it_IT.ts
@@ -4255,11 +4255,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4300,6 +4295,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index 7f8a0d884e..741d07e21d 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -508,12 +508,12 @@ The installer will quit and all changes will be lost.
     
       
       Set filesystem label on %1.
-      
+      ファイルシステムのラベルを %1 に設定する。
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      ファイルシステムのラベル <strong>%1</strong> をパーティション <strong>%2</strong> に設定する。 
     
     
       
@@ -894,7 +894,7 @@ The installer will quit and all changes will be lost.
     
       
       OK!
-      
+      OK!
     
     
       
@@ -1011,12 +1011,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      ファイルシステムのラベル
     
     
       
       FS Label:
-      
+      FSラベル:
     
     
       
@@ -1375,12 +1375,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      ファイルシステムのラベル
     
     
       
       FS Label:
-      
+      FSラベル:
     
     
       
@@ -1427,47 +1427,47 @@ The installer will quit and all changes will be lost.
     
       
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
-      <em>%3</em> 機能の<strong>新しい</strong> %2 システムパーティションに、%1 をインストールする
+      <strong>新規の</strong> %2 システムパーティション (機能 <em>%3</em>) に %1 をインストールする
     
     
       
       Install %1 on <strong>new</strong> %2 system partition.
-      <strong>新しい</strong> %2 システムパーティションに %1 をインストールする。
+      <strong>新規の</strong> %2 システムパーティションに %1 をインストールする。
     
     
       
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
-      マウントポイント <strong>%1</strong> に、<em>%3</em> 機能の<strong>新しい</strong> %2 パーティションをセットアップする。
+      <strong>新規の</strong> %2 パーティション (マウントポイント <strong>%1</strong>、機能 <em>%3</em>) をセットアップする。
     
     
       
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
-      マウントポイント <strong>%1</strong> %3 に<strong>新しい</strong> %2 パーティションをセットアップする。
+      <strong>新規の</strong> %2 パーティション (マウントポイント <strong>%1</strong> %3) をセットアップする。
     
     
       
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
-      <em>%4</em> 機能の %3 システムパーティション <strong>%1</strong> に %2 をインストールする。
+      %3 システムパーティション <strong>%1</strong> (機能 <em>%4</em>) に %2 をインストールする。
     
     
       
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
-      マウントポイント <strong>%2</strong> に、<em>%4</em> 機能の %3 パーティション <strong>%1</strong> をセットアップする。
+      パーティション %3 <strong>%1</strong> (マウントポイント <strong>%2</strong>、機能 <em>%4</em>) をセットアップする。
     
     
       
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
-      マウントポイント <strong>%2</strong> %4 に、%3 パーティション <strong>%1</strong> をセットアップする。
+      %3 パーティション <strong>%1</strong> (マウントポイント <strong>%2</strong> %4) をセットアップする。
     
     
       
       Install %2 on %3 system partition <strong>%1</strong>.
-      %3 システムパーティション <strong>%1</strong> に%2 をインストール。
+      %3 システムパーティション <strong>%1</strong> に%2 をインストールする。
     
     
       
       Install boot loader on <strong>%1</strong>.
-      <strong>%1</strong> にブートローダーをインストール
+      <strong>%1</strong> にブートローダーをインストールする。
     
     
       
@@ -1888,7 +1888,7 @@ The installer will quit and all changes will be lost.
     
       
       Quit
-      
+      終了
     
   
   
@@ -2113,7 +2113,7 @@ The installer will quit and all changes will be lost.
     
       
       Select your preferred Region, or use the default settings.
-      
+      希望する地域を選択するか、デフォルトの設定を使用してください。
     
     
       
@@ -2644,7 +2644,7 @@ The installer will quit and all changes will be lost.
     
       
       File System Label
-      
+      ファイルシステムのラベル
     
     
       
@@ -4254,7 +4254,7 @@ Output:
     
       
       root is not allowed as username.
-      
+      root はユーザー名として許可されていません。
     
     
       
@@ -4271,15 +4271,10 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       この名前は、コンピューターをネットワーク上の他のユーザーに表示する場合に使用されます。
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
-      
+      localhost はユーザー名として許可されていません。
     
     
       
@@ -4316,6 +4311,11 @@ Output:
       Log in automatically without asking for the password
       パスワードを要求せずに自動的にログインする
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      使用できるのはアルファベットと数字と _ と - で、2文字以上必要です。
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts
index 11f59e160e..957573b585 100644
--- a/lang/calamares_kk.ts
+++ b/lang/calamares_kk.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts
index a14c9faf1f..261b97b4e6 100644
--- a/lang/calamares_kn.ts
+++ b/lang/calamares_kn.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts
index 65a213adee..e8fa92dd60 100644
--- a/lang/calamares_ko.ts
+++ b/lang/calamares_ko.ts
@@ -508,17 +508,17 @@ The installer will quit and all changes will be lost.
     
       
       Set filesystem label on %1.
-      
+      파일시스템 레이블을 %1로 지정합니다.
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      <strong>%1</strong> 파일 시스템 레이블을 <strong>%2</strong> 파티션으로 설정하십시오.
     
     
       
       The installer failed to update partition table on disk '%1'.
-      
+      설치 프로그램은 디스크 '%1'에서 파티션 테이블을 업데이트하지 못했습니다.
     
   
   
@@ -894,7 +894,7 @@ The installer will quit and all changes will be lost.
     
       
       OK!
-      
+      확인!
     
     
       
@@ -1010,12 +1010,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      파일시스템에 대한 레이블
     
     
       
       FS Label:
-      
+      FS 레이블:
     
     
       
@@ -1374,12 +1374,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      파일시스템에 대한 레이블
     
     
       
       FS Label:
-      
+      FS 레이블:
     
     
       
@@ -1887,7 +1887,7 @@ The installer will quit and all changes will be lost.
     
       
       Quit
-      
+      종료
     
   
   
@@ -2111,7 +2111,7 @@ The installer will quit and all changes will be lost.
     
       
       Select your preferred Region, or use the default settings.
-      
+      원하는 지역을 선택하거나, 기본 설정을 사용하십시오.
     
     
       
@@ -2642,7 +2642,7 @@ The installer will quit and all changes will be lost.
     
       
       File System Label
-      
+      파일 시스템 레이블
     
     
       
@@ -4252,7 +4252,7 @@ Output:
     
       
       root is not allowed as username.
-      
+      루트는 사용자 이름으로 허용되지 않습니다.
     
     
       
@@ -4269,15 +4269,10 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       이 이름은 네트워크의 다른 사용자가 이 컴퓨터를 볼 수 있게 하는 경우에 사용됩니다.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
-      
+      localhost는 호스트 이름으로 허용되지 않습니다.
     
     
       
@@ -4314,6 +4309,11 @@ Output:
       Log in automatically without asking for the password
       암호를 묻지 않고 자동으로 로그인합니다
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts
index 078a35924b..5dedf63f17 100644
--- a/lang/calamares_lo.ts
+++ b/lang/calamares_lo.ts
@@ -4219,11 +4219,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4264,6 +4259,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index 5d1cfb128d..fc2dc392d1 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -4302,11 +4302,6 @@ Išvestis:
       This name will be used if you make the computer visible to others on a network.
       Šis vardas bus naudojamas, jeigu padarysite savo kompiuterį matomą kitiems naudotojams tinkle.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      Yra leidžiamos tik raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai, mažiausiai du simboliai.
-    
     
       
       localhost is not allowed as hostname.
@@ -4347,6 +4342,11 @@ Išvestis:
       Log in automatically without asking for the password
       Prisijungti automatiškai, neklausiant slaptažodžio
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Yra leidžiamos tik raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai, mažiausiai du simboliai.
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts
index b936a28ead..dc4ed67ec0 100644
--- a/lang/calamares_lv.ts
+++ b/lang/calamares_lv.ts
@@ -4241,11 +4241,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4286,6 +4281,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts
index 90b11403a7..37bd8c4aee 100644
--- a/lang/calamares_mk.ts
+++ b/lang/calamares_mk.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts
index 33acf004c6..452c86b3bd 100644
--- a/lang/calamares_ml.ts
+++ b/lang/calamares_ml.ts
@@ -4235,11 +4235,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4280,6 +4275,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts
index a379670584..5d3e3f247c 100644
--- a/lang/calamares_mr.ts
+++ b/lang/calamares_mr.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts
index dec18302f4..cc8eb5faa7 100644
--- a/lang/calamares_nb.ts
+++ b/lang/calamares_nb.ts
@@ -4231,11 +4231,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4276,6 +4271,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ne.ts b/lang/calamares_ne.ts
index d88f94b713..a8bf13fc84 100644
--- a/lang/calamares_ne.ts
+++ b/lang/calamares_ne.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts
index eceb64838c..e6aa4a9a9b 100644
--- a/lang/calamares_ne_NP.ts
+++ b/lang/calamares_ne_NP.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts
index 7dafba7ac1..ba5e57f00b 100644
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
@@ -4264,11 +4264,6 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
       This name will be used if you make the computer visible to others on a network.
       Deze naam zal worden gebruikt als u de computer zichtbaar maakt voor anderen op een netwerk.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4309,6 +4304,11 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
       Log in automatically without asking for the password
       Automatisch aanmelden zonder wachtwoord te vragen
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts
index 0b952b9d17..866f23eb52 100644
--- a/lang/calamares_pl.ts
+++ b/lang/calamares_pl.ts
@@ -4257,11 +4257,6 @@ i nie uruchomi się
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4302,6 +4297,11 @@ i nie uruchomi się
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index 842fe090b6..039b689ae9 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -4280,11 +4280,6 @@ Saída:
       This name will be used if you make the computer visible to others on a network.
       Este nome será usado se você fizer o computador ficar visível para outros numa rede.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4325,6 +4320,11 @@ Saída:
       Log in automatically without asking for the password
       Entrar automaticamente sem perguntar pela senha
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index a0bb6ca386..50a7853918 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -4280,11 +4280,6 @@ Saída de Dados:
       This name will be used if you make the computer visible to others on a network.
       Este nome será utilizado se tornar o computador visível a outros numa rede.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      Apenas letras, números, sublinhado e hífen são permitidos, com um mínimo de dois caracteres.
-    
     
       
       localhost is not allowed as hostname.
@@ -4325,6 +4320,11 @@ Saída de Dados:
       Log in automatically without asking for the password
       Iniciar sessão automaticamente sem pedir a palavra-passe
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts
index d183cd42c5..6a232aeb77 100644
--- a/lang/calamares_ro.ts
+++ b/lang/calamares_ro.ts
@@ -4248,11 +4248,6 @@ Output
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4293,6 +4288,11 @@ Output
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index 46c87aab6a..113a679d50 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -4258,11 +4258,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4303,6 +4298,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ru_RU.ts b/lang/calamares_ru_RU.ts
index 483e76a4eb..54b71d4a53 100644
--- a/lang/calamares_ru_RU.ts
+++ b/lang/calamares_ru_RU.ts
@@ -4252,11 +4252,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4297,6 +4292,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts
index 84c821a151..0b46d08582 100644
--- a/lang/calamares_si.ts
+++ b/lang/calamares_si.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index aaba86b91a..95bacfe386 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -4275,11 +4275,6 @@ Výstup:
       This name will be used if you make the computer visible to others on a network.
       Tento názov bude použitý, keď zviditeľníte počítač ostatným v sieti.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4320,6 +4315,11 @@ Výstup:
       Log in automatically without asking for the password
       Prihlásiť automaticky bez pýtania hesla
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts
index c5f8eb2654..e615f6fc62 100644
--- a/lang/calamares_sl.ts
+++ b/lang/calamares_sl.ts
@@ -4253,11 +4253,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4298,6 +4293,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts
index 339579e76b..b0edd6fc2d 100644
--- a/lang/calamares_sq.ts
+++ b/lang/calamares_sq.ts
@@ -4278,11 +4278,6 @@ Përfundim:
       This name will be used if you make the computer visible to others on a network.
       Ky emër do të përdoret nëse e bëni kompjuterin të dukshëm për të tjerët në një rrjet.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. minimumi dy shenja.
-    
     
       
       localhost is not allowed as hostname.
@@ -4323,6 +4318,11 @@ Përfundim:
       Log in automatically without asking for the password
       Kryej hyrje vetvetiu, pa kërkuar fjalëkalimin.
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts
index 70e92f84f9..18c03de1fe 100644
--- a/lang/calamares_sr.ts
+++ b/lang/calamares_sr.ts
@@ -4242,11 +4242,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4287,6 +4282,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts
index d6174a76e9..118bab6ea0 100644
--- a/lang/calamares_sr@latin.ts
+++ b/lang/calamares_sr@latin.ts
@@ -4242,11 +4242,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4287,6 +4282,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 4e4cbaff00..1a6aeb6cfa 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -895,7 +895,7 @@ Alla ändringar kommer att gå förlorade.
     
       
       OK!
-      
+      OK!
     
     
       
@@ -1888,7 +1888,7 @@ Alla ändringar kommer att gå förlorade.
     
       
       Quit
-      
+      Avsluta
     
   
   
@@ -2113,7 +2113,7 @@ Sök på kartan genom att dra
     
       
       Select your preferred Region, or use the default settings.
-      
+      Välj din föredragna Region, eller använd standardinställningarna.
     
     
       
@@ -4263,7 +4263,7 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
     
       
       root is not allowed as username.
-      
+      root är inte tillåtet som användarnamn.
     
     
       
@@ -4280,15 +4280,10 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
       This name will be used if you make the computer visible to others on a network.
       Detta namn kommer användas om du gör datorn synlig för andra i ett nätverk.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
-      
+      localhost är inte tillåtet som värdnamn.
     
     
       
@@ -4325,6 +4320,11 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
       Log in automatically without asking for the password
       Logga in automatiskt utan att fråga efter ett lösenord.
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Endast bokstäver, nummer, understreck och bindestreck är tillåtet, minst två tecken.
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts
index d351b57d91..51255dd5f9 100644
--- a/lang/calamares_te.ts
+++ b/lang/calamares_te.ts
@@ -4232,11 +4232,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4277,6 +4272,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts
index 13cb112c24..9c0f534cb9 100644
--- a/lang/calamares_tg.ts
+++ b/lang/calamares_tg.ts
@@ -4274,11 +4274,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       Ин ном истифода мешавад, агар шумо компютери худро барои дигарон дар шабака намоён кунед.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4319,6 +4314,11 @@ Output:
       Log in automatically without asking for the password
       Ба таври худкор бе дархости ниҳонвожа ворид карда шавад
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index f52e8f80a7..cc8d056101 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -4220,11 +4220,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4265,6 +4260,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts
index c2f8ab21ef..f1c3c7d0ab 100644
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@@ -4287,11 +4287,6 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.This name will be used if you make the computer visible to others on a network.
       Bilgisayarı ağ üzerinde herkese görünür yaparsanız bu ad kullanılacaktır.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4332,6 +4327,11 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.Log in automatically without asking for the password
       Parola sormadan otomatik olarak oturum açın
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts
index 6d11746b6f..a59c3c2ece 100644
--- a/lang/calamares_uk.ts
+++ b/lang/calamares_uk.ts
@@ -4302,11 +4302,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       Цю назву буде використано, якщо ви зробите комп'ютер видимим іншим у мережі.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      Можна використовувати лише латинські літери, цифри, символи підкреслювання та дефіси; не менше двох символів.
-    
     
       
       localhost is not allowed as hostname.
@@ -4347,6 +4342,11 @@ Output:
       Log in automatically without asking for the password
       Входити автоматично без пароля
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      Можна використовувати лише латинські літери, цифри, символи підкреслювання та дефіси; не менше двох символів.
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts
index 57df8714be..46230aa0aa 100644
--- a/lang/calamares_ur.ts
+++ b/lang/calamares_ur.ts
@@ -4230,11 +4230,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4275,6 +4270,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts
index 9617b5f935..3de7eccc4a 100644
--- a/lang/calamares_uz.ts
+++ b/lang/calamares_uz.ts
@@ -4219,11 +4219,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4264,6 +4259,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts
index b380bf741c..a0ff6ab6ea 100644
--- a/lang/calamares_vi.ts
+++ b/lang/calamares_vi.ts
@@ -4262,11 +4262,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       Tên này sẽ hiển thị khi bạn kết nối vào một mạng.
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4307,6 +4302,11 @@ Output:
       Log in automatically without asking for the password
       Tự động đăng nhập không hỏi mật khẩu
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts
index 3ce8df3229..9d71a3bef9 100644
--- a/lang/calamares_zh.ts
+++ b/lang/calamares_zh.ts
@@ -4219,11 +4219,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4264,6 +4259,11 @@ Output:
       Log in automatically without asking for the password
       
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index 9119483ab8..92e8b6df3b 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -4272,11 +4272,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       将计算机设置为对其他网络上计算机可见时将使用此名称。
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
-    
     
       
       localhost is not allowed as hostname.
@@ -4317,6 +4312,11 @@ Output:
       Log in automatically without asking for the password
       不询问密码自动登录
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
     
       
       Reuse user password as root password
diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts
index 9e2e2904c0..4cb526bb4f 100644
--- a/lang/calamares_zh_TW.ts
+++ b/lang/calamares_zh_TW.ts
@@ -4269,11 +4269,6 @@ Output:
       This name will be used if you make the computer visible to others on a network.
       若您將此電腦設定為讓網路上的其他電腦可見時將會使用此名稱。
     
-    
-      
-      Only letter, numbers, underscore and hyphen are allowed, minimal of two characters.
-      僅允許字母、數字、底線與連接號，最少兩個字元。
-    
     
       
       localhost is not allowed as hostname.
@@ -4314,6 +4309,11 @@ Output:
       Log in automatically without asking for the password
       自動登入，無需輸入密碼
     
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      僅允許字母、數字、底線與連接號，最少兩個字元。
+    
     
       
       Reuse user password as root password

From ec99079cdf2fd8a889ccdcd9631d776aeb7f16d3 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Wed, 14 Jul 2021 13:03:42 +0200
Subject: [PATCH 286/492] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python.pot                               | 478 ++++++++---------
 lang/python/ar/LC_MESSAGES/python.po          | 412 +++++++--------
 lang/python/as/LC_MESSAGES/python.po          | 454 ++++++++--------
 lang/python/ast/LC_MESSAGES/python.po         | 434 +++++++--------
 lang/python/az/LC_MESSAGES/python.po          | 466 +++++++++--------
 lang/python/az_AZ/LC_MESSAGES/python.po       | 466 +++++++++--------
 lang/python/be/LC_MESSAGES/python.po          | 460 ++++++++--------
 lang/python/bg/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/bn/LC_MESSAGES/python.po          | 396 +++++++-------
 lang/python/ca/LC_MESSAGES/python.po          | 482 ++++++++---------
 lang/python/ca@valencia/LC_MESSAGES/python.po | 464 ++++++++--------
 lang/python/cs_CZ/LC_MESSAGES/python.po       | 472 ++++++++---------
 lang/python/da/LC_MESSAGES/python.po          | 460 ++++++++--------
 lang/python/de/LC_MESSAGES/python.po          | 468 ++++++++---------
 lang/python/el/LC_MESSAGES/python.po          | 378 +++++++-------
 lang/python/en_GB/LC_MESSAGES/python.po       | 390 +++++++-------
 lang/python/eo/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/es/LC_MESSAGES/python.po          | 470 ++++++++---------
 lang/python/es_MX/LC_MESSAGES/python.po       | 466 +++++++++--------
 lang/python/es_PE/LC_MESSAGES/python.po       | 376 ++++++-------
 lang/python/es_PR/LC_MESSAGES/python.po       | 376 ++++++-------
 lang/python/et/LC_MESSAGES/python.po          | 394 +++++++-------
 lang/python/eu/LC_MESSAGES/python.po          | 394 +++++++-------
 lang/python/fa/LC_MESSAGES/python.po          | 448 ++++++++--------
 lang/python/fi_FI/LC_MESSAGES/python.po       | 468 +++++++++--------
 lang/python/fr/LC_MESSAGES/python.po          | 468 ++++++++---------
 lang/python/fr_CH/LC_MESSAGES/python.po       | 376 ++++++-------
 lang/python/fur/LC_MESSAGES/python.po         | 464 ++++++++--------
 lang/python/gl/LC_MESSAGES/python.po          | 394 +++++++-------
 lang/python/gu/LC_MESSAGES/python.po          | 376 ++++++-------
 lang/python/he/LC_MESSAGES/python.po          | 472 ++++++++---------
 lang/python/hi/LC_MESSAGES/python.po          | 470 +++++++++--------
 lang/python/hr/LC_MESSAGES/python.po          | 478 ++++++++---------
 lang/python/hu/LC_MESSAGES/python.po          | 458 ++++++++--------
 lang/python/id/LC_MESSAGES/python.po          | 394 +++++++-------
 lang/python/id_ID/LC_MESSAGES/python.po       | 372 ++++++-------
 lang/python/ie/LC_MESSAGES/python.po          | 424 +++++++--------
 lang/python/is/LC_MESSAGES/python.po          | 382 +++++++-------
 lang/python/it_IT/LC_MESSAGES/python.po       | 466 +++++++++--------
 lang/python/ja/LC_MESSAGES/python.po          | 461 ++++++++--------
 lang/python/kk/LC_MESSAGES/python.po          | 376 ++++++-------
 lang/python/kn/LC_MESSAGES/python.po          | 376 ++++++-------
 lang/python/ko/LC_MESSAGES/python.po          | 458 ++++++++--------
 lang/python/lo/LC_MESSAGES/python.po          | 372 ++++++-------
 lang/python/lt/LC_MESSAGES/python.po          | 486 ++++++++---------
 lang/python/lv/LC_MESSAGES/python.po          | 380 +++++++-------
 lang/python/mk/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/ml/LC_MESSAGES/python.po          | 380 +++++++-------
 lang/python/mr/LC_MESSAGES/python.po          | 376 ++++++-------
 lang/python/nb/LC_MESSAGES/python.po          | 378 +++++++-------
 lang/python/ne/LC_MESSAGES/python.po          | 376 ++++++-------
 lang/python/ne_NP/LC_MESSAGES/python.po       | 376 ++++++-------
 lang/python/nl/LC_MESSAGES/python.po          | 468 ++++++++---------
 lang/python/pl/LC_MESSAGES/python.po          | 478 ++++++++---------
 lang/python/pt_BR/LC_MESSAGES/python.po       | 462 ++++++++--------
 lang/python/pt_PT/LC_MESSAGES/python.po       | 486 ++++++++---------
 lang/python/ro/LC_MESSAGES/python.po          | 394 +++++++-------
 lang/python/ru/LC_MESSAGES/python.po          | 432 +++++++--------
 lang/python/ru_RU/LC_MESSAGES/python.po       | 384 +++++++-------
 lang/python/si/LC_MESSAGES/python.po          | 376 ++++++-------
 lang/python/sk/LC_MESSAGES/python.po          | 444 ++++++++--------
 lang/python/sl/LC_MESSAGES/python.po          | 384 +++++++-------
 lang/python/sq/LC_MESSAGES/python.po          | 482 ++++++++---------
 lang/python/sr/LC_MESSAGES/python.po          | 402 +++++++-------
 lang/python/sr@latin/LC_MESSAGES/python.po    | 380 +++++++-------
 lang/python/sv/LC_MESSAGES/python.po          | 476 +++++++++--------
 lang/python/te/LC_MESSAGES/python.po          | 376 ++++++-------
 lang/python/tg/LC_MESSAGES/python.po          | 466 +++++++++--------
 lang/python/th/LC_MESSAGES/python.po          | 372 ++++++-------
 lang/python/tr_TR/LC_MESSAGES/python.po       | 462 ++++++++--------
 lang/python/uk/LC_MESSAGES/python.po          | 494 +++++++++---------
 lang/python/ur/LC_MESSAGES/python.po          | 376 ++++++-------
 lang/python/uz/LC_MESSAGES/python.po          | 372 ++++++-------
 lang/python/vi/LC_MESSAGES/python.po          | 452 ++++++++--------
 lang/python/zh/LC_MESSAGES/python.po          | 372 ++++++-------
 lang/python/zh_CN/LC_MESSAGES/python.po       | 454 ++++++++--------
 lang/python/zh_TW/LC_MESSAGES/python.po       | 458 ++++++++--------
 77 files changed, 16463 insertions(+), 16270 deletions(-)

diff --git a/lang/python.pot b/lang/python.pot
index 0831515634..a3d128ca74 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -18,21 +18,137 @@ msgstr ""
 "Language: \n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Mounting partitions."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Configuration Error"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No partitions are defined for 
    {!s}
     to use."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure systemd services"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Cannot modify service"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Cannot enable systemd service {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Cannot enable systemd target {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Cannot disable systemd target {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Cannot mask systemd unit {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount file systems."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Filling up filesystems."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync failed with error code {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Unpacking image {}/{}, file {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Starting to unpack {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Failed to unpack image \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No mount point for root partition"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Bad mount point for root partition"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Bad unsquash configuration"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "The source filesystem \"{}\" does not exist"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "The destination \"{}\" in the target system is not a directory"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -90,161 +206,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Display manager configuration was incomplete"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creating initramfs with dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Failed to run dracut on the target"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "The exit code was {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Writing fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Configuration Error"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No partitions are defined for 
    {!s}
     to use."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "No root mount point is given for 
    {!s}
     to use."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Setting hardware clock."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Configuring mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuring initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuring locales."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "No root mount point is given for 
    {!s}
     to use."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configuring encrypted swap."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creating initramfs with mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Failed to run mkinitfs on the target"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Mounting partitions."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Saving network configuration."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuring OpenRC dmcrypt service."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Install packages."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Package Manager error"
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure Plymouth theme"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installing data."
@@ -269,11 +246,6 @@ msgstr ""
 "Unknown service-action {arg!s} for service {name!s} in run-"
 "level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Cannot modify service"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -304,102 +276,132 @@ msgstr ""
 "The path for service {name!s} is {path!s}, which does not "
 "exist."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure Plymouth theme"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Install packages."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processing packages (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "Installing %(num)d packages."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "Removing %(num)d packages."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Package Manager error"
+
+#: src/modules/packages/main.py:589
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Install bootloader."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Bootloader installation error"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount file systems."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Setting hardware clock."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creating initramfs with mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Failed to run mkinitfs on the target"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "The exit code was {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creating initramfs with dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Failed to run dracut on the target"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configuring initramfs."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuring OpenRC dmcrypt service."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Writing fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuring locales."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Saving network configuration."
diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po
index 41650c1882..2e04ea65c5 100644
--- a/lang/python/ar/LC_MESSAGES/python.po
+++ b/lang/python/ar/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: aboodilankaboot, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
@@ -22,18 +22,131 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "تثبيت محمل الإقلاع"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "جاري تركيب الأقسام"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "خطأ في الضبط"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "تعديل خدمات systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "لا يمكن تعديل الخدمة"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "الغاء تحميل ملف النظام"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "جاري ملئ أنظمة الملفات"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "فشل rsync مع رمز الخطأ {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -90,102 +203,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "إعداد مدير العرض لم يكتمل"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "كود الخروج كان {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "عملية بايثون دميه"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "عملية  دميه خطوه بايثون {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "خطأ في الضبط"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "جاري إعداد ساعة الهاردوير"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "الـ runlevel الهدف غير موجود"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "جاري تركيب الأقسام"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "الخدمة الهدف غير موجودة"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "جاري حفظ الإعدادات"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -239,157 +321,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "لا يمكن تعديل الخدمة"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "الـ runlevel الهدف غير موجود"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "الخدمة الهدف غير موجودة"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "تثبيت محمل الإقلاع"
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "تعديل خدمات systemd"
-
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:503
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "جاري إعداد ساعة الهاردوير"
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "الغاء تحميل ملف النظام"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "جاري ملئ أنظمة الملفات"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "فشل rsync مع رمز الخطأ {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "كود الخروج كان {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "عملية بايثون دميه"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "عملية  دميه خطوه بايثون {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr ""
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "جاري حفظ الإعدادات"
diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po
index 4c3df677fc..144624be7c 100644
--- a/lang/python/as/LC_MESSAGES/python.po
+++ b/lang/python/as/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Deep Jyoti Choudhury , 2020\n"
 "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n"
@@ -21,19 +21,136 @@ msgstr ""
 "Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB কনফিগাৰ কৰক।"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "বিভাজন মাউন্ট্ কৰা।"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "কনফিগাৰেচন ত্ৰুটি"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
    ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
+"অজ্ঞাত systemd কমাণ্ড্।"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ফাইল চিছটেম​বোৰ মাউণ্টৰ পৰা আতৰাওক।"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ফাইল চিছটেম​বোৰ পূৰণ কৰা হৈ আছে।"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync ক্ৰুটি কোড {}ৰ সৈতে বিফল হ'ল।"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "ইমেজ \"{}\" খোলাত ব্যৰ্থ হ'ল"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "ৰুট বিভাজনত কোনো মাউণ্ট পইণ্ট্ নাই"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ত rootMountPoint key নাই, একো কৰিব পৰা নাযায়"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "মুল বিভাজনৰ বাবে বেয়া মাউন্ট্ পইন্ট্"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint হ'ল \"{}\", যিটো উপস্থিত নাই, একো কৰিব পৰা নাযায়"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "বেয়া unsquash কনফিগাৰেচন"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" ফাইল চিছটেম উপস্থিত নাই"
+
+#: src/modules/unpackfs/main.py:465
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"unsquashfs বিচৰাত ব্যৰ্থ হ'ল, নিশ্চিত কৰক যে আপুনি squashfs-tools ইন্স্তল "
+"কৰিছে"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -89,155 +206,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "এক্সিড্ কোড্ আছিল {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ডামী Pythonৰ কায্য"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "ডামী Pythonৰ পদক্ষেপ {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab লিখি আছে।"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "কনফিগাৰেচন ত্ৰুটি"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
    ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "ব্যৱহাৰৰ বাবে 
    {!s}
    ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB কনফিগাৰ কৰক।"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "ব্যৱহাৰৰ বাবে 
    {!s}
    ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "এন্ক্ৰিপ্টেড স্ৱেপ কন্ফিগাৰ কৰি আছে।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "বিভাজন মাউন্ট্ কৰা।"
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "পেকেজ ইন্স্তল কৰক।"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "ডাটা ইন্স্তল কৰি আছে।"
@@ -262,11 +246,6 @@ msgstr ""
 "ৰান-লেভেল {level!s}ত সেৱা {name!s}ৰ বাবে অজ্ঞাত সেৱা কাৰ্য্য "
 "{arg!s} ।"
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -293,101 +272,124 @@ msgid ""
 "exist."
 msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "পেকেজ ইন্স্তল কৰক।"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
-"অজ্ঞাত systemd কমাণ্ড্।"
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ফাইল চিছটেম​বোৰ মাউণ্টৰ পৰা আতৰাওক।"
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ফাইল চিছটেম​বোৰ পূৰণ কৰা হৈ আছে।"
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync ক্ৰুটি কোড {}ৰ সৈতে বিফল হ'ল।"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "ইমেজ \"{}\" খোলাত ব্যৰ্থ হ'ল"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "ৰুট বিভাজনত কোনো মাউণ্ট পইণ্ট্ নাই"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ত rootMountPoint key নাই, একো কৰিব পৰা নাযায়"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "মুল বিভাজনৰ বাবে বেয়া মাউন্ট্ পইন্ট্"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "এক্সিড্ কোড্ আছিল {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint হ'ল \"{}\", যিটো উপস্থিত নাই, একো কৰিব পৰা নাযায়"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "বেয়া unsquash কনফিগাৰেচন"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" ফাইল চিছটেম উপস্থিত নাই"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab লিখি আছে।"
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"unsquashfs বিচৰাত ব্যৰ্থ হ'ল, নিশ্চিত কৰক যে আপুনি squashfs-tools ইন্স্তল "
-"কৰিছে"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "ডামী Pythonৰ কায্য"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "ডামী Pythonৰ পদক্ষেপ {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po
index 9deca93cb4..8e39f88a3a 100644
--- a/lang/python/ast/LC_MESSAGES/python.po
+++ b/lang/python/ast/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: enolp , 2020\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -21,19 +21,135 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalando'l xestor d'arrinque."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nun pue modificase'l serviciu"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontaxe de sistemes de ficheros."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Rellenando los sistemes de ficheros."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falló col códigu de fallu {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Fallu al desempaquetar la imaxe «{}»"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nun hai un puntu de montaxe pa la partición del raigañu"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"globalstorage nun contién una clave «rootMountPoint». Nun va facese nada"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "El puntu de montaxe ye incorreutu pa la partición del raigañu"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "La configuración d'espardimientu ye incorreuta"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de ficheros d'orixe «{}» nun esiste"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Fallu al alcontrar unsquashfs, asegúrate que tienes instaláu'l paquete "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -89,104 +205,74 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del xestor de pantalles nun se completó"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Fallu al executar dracut nel destín"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El códigu de salida foi {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabayu maniquín en Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pasu maniquín {} en Python"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurando l'intercambéu cifráu."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando datos."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando'l reló de hardware."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Nun pue amestase'l serviciu {name!s} al nivel d'execución {level!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"Nun pue desaniciase'l serviciu {name!s} del nivel d'execución {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locales."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configurando l'intercambéu cifráu."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivel d'execución de destín nun esiste"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El serviciu de destín nun esiste"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
-
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
 msgid "Install packages."
@@ -230,161 +316,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando datos."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Nun pue amestase'l serviciu {name!s} al nivel d'execución {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"Nun pue desaniciase'l serviciu {name!s} del nivel d'execución {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Nun pue modificase'l serviciu"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivel d'execución de destín nun esiste"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalando'l xestor d'arrinque."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El serviciu de destín nun esiste"
-
-#: src/modules/services-openrc/main.py:111
+#: src/modules/bootloader/main.py:503
 msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando'l reló de hardware."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El códigu de salida foi {}"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Fallu al executar dracut nel destín"
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontaxe de sistemes de ficheros."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Rellenando los sistemes de ficheros."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falló col códigu de fallu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Fallu al desempaquetar la imaxe «{}»"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nun hai un puntu de montaxe pa la partición del raigañu"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"globalstorage nun contién una clave «rootMountPoint». Nun va facese nada"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "El puntu de montaxe ye incorreutu pa la partición del raigañu"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "La configuración d'espardimientu ye incorreuta"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabayu maniquín en Python."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pasu maniquín {} en Python"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de ficheros d'orixe «{}» nun esiste"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locales."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
-"Fallu al alcontrar unsquashfs, asegúrate que tienes instaláu'l paquete "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu"
diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index 54541da9a9..8545f672e4 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: xxmn77 , 2020\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
@@ -21,19 +21,141 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Tənzimləmə xətası"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fayl sistemini ayırmaq."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fayl sistemlərini doldurmaq."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync uğursuz oldu, xəta kodu: {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
+"{}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Tərkiblərini açmağa başladılır {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
+"əməliyyat getmir"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash xətalı tənzimlənməsi"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,156 +213,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ilə initramfs yaratmaq."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hədəfdə dracut başladılmadı"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Tənzimləmə xətası"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Quraşdırılma tarixi."
@@ -265,11 +254,6 @@ msgstr ""
 "{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
 "{arg!s} xidmət fəaliyyəti."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -298,106 +282,124 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fayl sistemini ayırmaq."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fayl sistemlərini doldurmaq."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync uğursuz oldu, xəta kodu: {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
-"{}/{}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Tərkiblərini açmağa başladılır {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
-"əməliyyat getmir"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ilə initramfs yaratmaq."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash xətalı tənzimlənməsi"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hədəfdə dracut başladılmadı"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs tənzimlənir."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index b016560e73..9ee8feda17 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: xxmn77 , 2020\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
@@ -21,19 +21,141 @@ msgstr ""
 "Language: az_AZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Tənzimləmə xətası"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fayl sistemini ayırmaq."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fayl sistemlərini doldurmaq."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync uğursuz oldu, xəta kodu: {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
+"{}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Tərkiblərini açmağa başladılır {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
+"əməliyyat getmir"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash xətalı tənzimlənməsi"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,156 +213,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ilə initramfs yaratmaq."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hədəfdə dracut başladılmadı"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Tənzimləmə xətası"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Quraşdırılma tarixi."
@@ -265,11 +254,6 @@ msgstr ""
 "{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
 "{arg!s} xidmət fəaliyyəti."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -298,106 +282,124 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fayl sistemini ayırmaq."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fayl sistemlərini doldurmaq."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync uğursuz oldu, xəta kodu: {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
-"{}/{}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Tərkiblərini açmağa başladılır {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
-"əməliyyat getmir"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ilə initramfs yaratmaq."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash xətalı tənzimlənməsi"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hədəfdə dracut başladılmadı"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs tənzimlənir."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po
index 3e90116c88..eae79316fc 100644
--- a/lang/python/be/LC_MESSAGES/python.po
+++ b/lang/python/be/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Źmicier Turok , 2020\n"
 "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n"
@@ -21,19 +21,136 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Усталяваць загрузчык."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Наладзіць GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Мантаванне раздзелаў."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Памылка канфігурацыі"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Раздзелы для 
    {!s}
     не вызначаныя."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Наладзіць службы systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Немагчыма наладзіць службу"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Немагчыма ўключыць службу systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Немагчыма ўключыць мэту systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Немагчыма выключыць мэту systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Невядомыя systemd загады {command!s} і {suffix!s} "
+"для адзінкі {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Адмантаваць файлавыя сістэмы."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Запаўненне файлавых сістэм."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "памылка rsync з кодам {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Распакоўванне вобраза {}/{}, файл {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Запуск распакоўвання {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Не атрымалася распакаваць вобраз \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Для каранёвага раздзела няма пункта мантавання"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage не змяшчае ключа \"rootMountPoint\", нічога не выконваецца"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Хібны пункт мантавання для каранёвага раздзела"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" не існуе, нічога не выконваецца"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Хібная канфігурацыя unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Файлавая сістэма для \"{}\" ({}) не падтрымліваецца вашым бягучым ядром"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Зыходная файлавая сістэма \"{}\" не існуе"
+
+#: src/modules/unpackfs/main.py:465
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Не атрымалася знайсці unsquashfs, праверце ці ўсталяваны ў вас пакунак "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,103 +208,75 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Наладка дысплейнага кіраўніка не завершаная."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Стварэнне initramfs з dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не атрымалася запусціць dracut у пункце прызначэння"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхаду {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Задача Dummy python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Крок Dummy python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запіс fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Памылка канфігурацыі"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Раздзелы для 
    {!s}
     не вызначаныя."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Наладка mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Каранёвы пункт мантавання для
    {!s}
     не пададзены."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Наладка зашыфраванага swap."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Наладзіць GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Усталёўка даных."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Наладка апаратнага гадзінніка."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Наладзіць службы OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Наладка mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Не атрымалася дадаць службу {name!s} на ўзровень запуску  {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Наладка initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Не атрымалася выдаліць службу {name!s} з узроўню запуску {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Наладка лакаляў."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Невядомае дзеянне {arg!s} для службы {name!s} на ўзроўні "
+"запуску {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Наладка зашыфраванага swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} пад chroot вярнуўся з кодам памылкі {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Стварэнне initramfs праз mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Мэтавы ўзровень запуску не існуе"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "Шлях {path!s} да ўзроўня запуску {level!s} не існуе."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Мантаванне раздзелаў."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Мэтавая служба не існуе"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Захаванне сеткавай канфігурацыі."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "Шлях {path!s} да службы {level!s} не існуе."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Наладка OpenRC dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Наладзіць тэму Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -236,164 +325,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Наладзіць тэму Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Усталёўка даных."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Наладзіць службы OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Не атрымалася дадаць службу {name!s} на ўзровень запуску  {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Не атрымалася выдаліць службу {name!s} з узроўню запуску {level!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Усталяваць загрузчык."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
-"Невядомае дзеянне {arg!s} для службы {name!s} на ўзроўні "
-"запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Немагчыма наладзіць службу"
 
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:503
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"rc-update {arg!s} пад chroot вярнуўся з кодам памылкі {num!s}."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Мэтавы ўзровень запуску не існуе"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "Шлях {path!s} да ўзроўня запуску {level!s} не існуе."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Наладка апаратнага гадзінніка."
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Мэтавая служба не існуе"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Стварэнне initramfs праз mkinitfs."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "Шлях {path!s} да службы {level!s} не існуе."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Наладзіць службы systemd"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхаду {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Стварэнне initramfs з dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Немагчыма ўключыць службу systemd {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не атрымалася запусціць dracut у пункце прызначэння"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Немагчыма ўключыць мэту systemd {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Наладка initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Немагчыма выключыць мэту systemd {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Наладка OpenRC dmcrypt."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Запіс fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Невядомыя systemd загады {command!s} і {suffix!s} "
-"для адзінкі {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Адмантаваць файлавыя сістэмы."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Запаўненне файлавых сістэм."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "памылка rsync з кодам {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Распакоўванне вобраза {}/{}, файл {}/{}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Запуск распакоўвання {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Не атрымалася распакаваць вобраз \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Для каранёвага раздзела няма пункта мантавання"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage не змяшчае ключа \"rootMountPoint\", нічога не выконваецца"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Хібны пункт мантавання для каранёвага раздзела"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" не існуе, нічога не выконваецца"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Хібная канфігурацыя unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Файлавая сістэма для \"{}\" ({}) не падтрымліваецца вашым бягучым ядром"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Задача Dummy python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Зыходная файлавая сістэма \"{}\" не існуе"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Крок Dummy python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Не атрымалася знайсці unsquashfs, праверце ці ўсталяваны ў вас пакунак "
-"squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Наладка лакаляў."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Захаванне сеткавай канфігурацыі."
diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po
index 68333564d0..e54c3e9a95 100644
--- a/lang/python/bg/LC_MESSAGES/python.po
+++ b/lang/python/bg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Georgi Georgiev (Жоро) , 2020\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтирай файловите системи."
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фиктивна задача на python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фиктивна стъпка на python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Инсталирай пакетите."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обработване на пакетите (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Инсталиране на един пакет."
-msgstr[1] "Инсталиране на %(num)d пакети."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Премахване на един пакет."
-msgstr[1] "Премахване на %(num)d пакети."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Инсталирай пакетите."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработване на пакетите (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Инсталиране на един пакет."
+msgstr[1] "Инсталиране на %(num)d пакети."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Премахване на един пакет."
+msgstr[1] "Премахване на %(num)d пакети."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтирай файловите системи."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фиктивна задача на python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фиктивна стъпка на python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po
index 9f8642a63a..aca9f91ff6 100644
--- a/lang/python/bn/LC_MESSAGES/python.po
+++ b/lang/python/bn/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n"
 "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n"
@@ -21,18 +21,132 @@ msgstr ""
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "কনফিগার করুন জিআরইউবি।"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "মাউন্ট করছে পার্টিশনগুলো।"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "কনফিগারেশন ত্রুটি"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
    {!এস}
     ব্যবহার করার জন্য।"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "সেবা পরিবর্তন করতে পারে না"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "আনপ্যাক করা শুরু করছে {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,102 +203,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "কনফিগারেশন ত্রুটি"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
    {!এস}
     ব্যবহার করার জন্য।"
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "কনফিগার করুন জিআরইউবি।"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "মাউন্ট করছে পার্টিশনগুলো।"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -230,158 +313,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "সেবা পরিবর্তন করতে পারে না"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
-
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:503
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "আনপ্যাক করা শুরু করছে {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po
index 3fe5d14654..0bc9f07fbd 100644
--- a/lang/python/ca/LC_MESSAGES/python.po
+++ b/lang/python/ca/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Davidmp , 2021\n"
 "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
@@ -21,21 +21,138 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "S'instal·la el carregador d'arrencada."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Error d'instal·lació del carregador d'arrencada"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Es munten les particions."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Error de configuració"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No s'han definit particions perquè les usi 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
-"
    {!s}
    ha retornat el codi d'error {!s}."
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ordres desconegudes de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmunta els sistemes de fitxers."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "S'omplen els sistemes de fitxers."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Ha fallat rsync amb el codi d'error {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Es desempaqueta la imatge {}/{}, fitxer {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Es comença a desempaquetar {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ha fallat desempaquetar la imatge \"{}\"."
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No hi ha punt de muntatge per a la partició d'arrel."
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punt de muntatge incorrecte per a la partició d'arrel"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "El punt de muntatge d'arrel és \"{}\", que no existeix. No es fa res."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuració incorrecta d'unsquash."
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "El sistema de fitxers per a {} ({}) no és admès pel nucli actual."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de fitxers font \"{}\" no existeix."
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ha fallat trobar unsquashfs, assegureu-vos que tingueu el paquet squashfs-"
+"tools instal·lat."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -94,163 +211,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Es creen initramfs amb dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Ha fallat executar dracut a la destinació."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi de sortida ha estat {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python fictícia."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python fitctici {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "S'escriu fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Error de configuració"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No s'han definit particions perquè les usi 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Es configura mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No s'ha proporcionat el punt de muntatge perquè l'usi 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"No hi ha cap configuració de 
    {!s}
     perquè la usi 
    {!s}
    ."
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "S'estableix el rellotge del maquinari."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Es configura mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Es configuren les llengües."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Es configura l'intercanvi encriptat."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Es creen initramfs amb mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ha fallat executar mkinitfs a la destinació."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Es munten les particions."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Es desa la configuració de la xarxa."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Es configura el sevei OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instal·la els paquets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Es processen paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'instal·la un paquet."
-msgstr[1] "S'instal·len %(num)d paquets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se suprimeix un paquet."
-msgstr[1] "Se suprimeixen %(num)d paquets."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Error del gestor de paquets"
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut preparar les actualitzacions. "
-"L'ordre
    {!s}
     ha retornat el codi d'error {!s}."
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
-"
    {!s}
     ha retornat el codi d'error {!s}."
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-"El gestor de paquets podria fer canvis al sistema instal·lat. L'ordre "
-"
    {!s}
     ha retornat el codi d'error {!s}."
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "S'instal·len dades."
@@ -276,11 +253,6 @@ msgstr ""
 "Servei - acció desconeguda {arg!s} per al servei {name!s} al "
 "nivell d'execució {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -311,103 +283,133 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instal·la els paquets."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Es processen paquets (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'instal·la un paquet."
+msgstr[1] "S'instal·len %(num)d paquets."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se suprimeix un paquet."
+msgstr[1] "Se suprimeixen %(num)d paquets."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Error del gestor de paquets"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Ordres desconegudes de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
+"El gestor de paquets no ha pogut preparar les actualitzacions. "
+"L'ordre
    {!s}
     ha retornat el codi d'error {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmunta els sistemes de fitxers."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
+"
    {!s}
     ha retornat el codi d'error {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "S'omplen els sistemes de fitxers."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
+"
    {!s}
     ha retornat el codi d'error {!s}."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Ha fallat rsync amb el codi d'error {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "S'instal·la el carregador d'arrencada."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Es desempaqueta la imatge {}/{}, fitxer {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Error d'instal·lació del carregador d'arrencada"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Es comença a desempaquetar {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
+"
    {!s}
    ha retornat el codi d'error {!s}."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ha fallat desempaquetar la imatge \"{}\"."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "S'estableix el rellotge del maquinari."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No hi ha punt de muntatge per a la partició d'arrel."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Es creen initramfs amb mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ha fallat executar mkinitfs a la destinació."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punt de muntatge incorrecte per a la partició d'arrel"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi de sortida ha estat {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "El punt de muntatge d'arrel és \"{}\", que no existeix. No es fa res."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Es creen initramfs amb dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuració incorrecta d'unsquash."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Ha fallat executar dracut a la destinació."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "El sistema de fitxers per a {} ({}) no és admès pel nucli actual."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Es configuren initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de fitxers font \"{}\" no existeix."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Es configura el sevei OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "S'escriu fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Ha fallat trobar unsquashfs, assegureu-vos que tingueu el paquet squashfs-"
-"tools instal·lat."
+"No hi ha cap configuració de 
    {!s}
     perquè la usi 
    {!s}
    ."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python fictícia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python fitctici {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Es configuren les llengües."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Es desa la configuració de la xarxa."
diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po
index 466e1dc910..871140a43f 100644
--- a/lang/python/ca@valencia/LC_MESSAGES/python.po
+++ b/lang/python/ca@valencia/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Raul , 2021\n"
 "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n"
@@ -21,19 +21,140 @@ msgstr ""
 "Language: ca@valencia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instal·la el carregador d'arrancada."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "S'estan muntant les particions."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "S'ha produït un error en la configuració."
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No s'han definit particions perquè les use 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Es desconeixen les ordres de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmunta els sistemes de fitxers."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "S'estan emplenant els sistemes de fitxers."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Ha fallat rsync amb el codi d'error {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "S’està començant a desempaquetar {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No s’ha pogut desempaquetar la imatge \"{}\"."
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No hi ha cap punt de muntatge per a la partició d'arrel."
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage no conté cap clau de \"rootMountPoint\". No s'està fent res."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "El punt de muntatge per a la partició d'arrel és incorrecte."
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"El punt de muntatge d'arrel és \"{}\", que no existeix. No s’està fent res."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "La configuració d'unsquash és incorrecta."
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "El nucli actual no admet el sistema de fitxers per a \"{}\" ({})."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de fitxers font \"{}\" no existeix."
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"No s’ha pogut trobar unsquashfs. Assegureu-vos que teniu el paquet squashfs-"
+"tools instal·lat."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinació \"{}\" en el sistema de destinació no és un directori."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,156 +213,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creació d’initramfs amb dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "No s’ha pogut executar dracut en la destinació."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi d'eixida ha estat {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python de proves."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python de proves {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escriptura d’fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "S'ha produït un error en la configuració."
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No s'han definit particions perquè les use 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "S'està configurant mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No s'ha proporcionat el punt de muntatge perquè l'use 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuració del rellotge del maquinari."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "S'està configurant mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuració d’idioma."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "S’està configurant l'intercanvi encriptat."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creació d’initramfs amb mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No s’ha pogut executar mkinitfs en la destinació."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "S'estan muntant les particions."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "S'està guardant la configuració de la xarxa."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuració del servei OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instal·la els paquets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'està instal·lant un paquet."
-msgstr[1] "S'està instal·lant %(num)d paquets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "S’està eliminant un paquet."
-msgstr[1] "S’està eliminant %(num)d paquets."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "S'estan instal·lant les dades."
@@ -267,11 +255,6 @@ msgstr ""
 "Servei - acció desconeguda {arg!s} per al servei {name!s} al "
 "nivell d'execució {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -302,105 +285,124 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instal·la els paquets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'està instal·lant un paquet."
+msgstr[1] "S'està instal·lant %(num)d paquets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "S’està eliminant un paquet."
+msgstr[1] "S’està eliminant %(num)d paquets."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instal·la el carregador d'arrancada."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Es desconeixen les ordres de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmunta els sistemes de fitxers."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuració del rellotge del maquinari."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "S'estan emplenant els sistemes de fitxers."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creació d’initramfs amb mkinitfs."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Ha fallat rsync amb el codi d'error {}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No s’ha pogut executar mkinitfs en la destinació."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi d'eixida ha estat {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "S’està començant a desempaquetar {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creació d’initramfs amb dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No s’ha pogut desempaquetar la imatge \"{}\"."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "No s’ha pogut executar dracut en la destinació."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No hi ha cap punt de muntatge per a la partició d'arrel."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Es configuren initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage no conté cap clau de \"rootMountPoint\". No s'està fent res."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuració del servei OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "El punt de muntatge per a la partició d'arrel és incorrecte."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escriptura d’fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"El punt de muntatge d'arrel és \"{}\", que no existeix. No s’està fent res."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "La configuració d'unsquash és incorrecta."
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "El nucli actual no admet el sistema de fitxers per a \"{}\" ({})."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python de proves."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de fitxers font \"{}\" no existeix."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python de proves {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"No s’ha pogut trobar unsquashfs. Assegureu-vos que teniu el paquet squashfs-"
-"tools instal·lat."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuració d’idioma."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinació \"{}\" en el sistema de destinació no és un directori."
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "S'està guardant la configuració de la xarxa."
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index c2a0d8d6cb..50002805df 100644
--- a/lang/python/cs_CZ/LC_MESSAGES/python.po
+++ b/lang/python/cs_CZ/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pavel Borecki , 2020\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@@ -23,19 +23,139 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalace zavaděče systému."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Nastavování zavaděče GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Připojování oddílů."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Chyba nastavení"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Pro 
    {!s}
     nejsou zadány žádné oddíly."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Nastavit služby systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Službu se nedaří upravit"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedaří se vypnout systemd cíl {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedaří se maskovat systemd jednotku {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Neznámé systemd příkazy {command!s} a {suffix!s} "
+"pro jednotku {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojit souborové systémy."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Naplňování souborových systémů."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync se nezdařilo s chybových kódem {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbalování obrazu {}/{}, soubor {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Zahajování rozbalení {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepodařilo se rozbalit obraz „{}“"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Žádný přípojný bot pro kořenový oddíl"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage neobsahuje klíč „rootMountPoint“ – nic se nebude dělat"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Chybný přípojný bod pro kořenový oddíl"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "kořenovýPřípojnýBod je „{}“, který neexistuje – nic se nebude dělat"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Chybná nastavení unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Souborový systém „{}“ ({}) není jádrem systému, které právě používáte, "
+"podporován"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový souborový systém „{}“ neexistuje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Nepodařilo se nalézt unsquashfs – ověřte, že máte nainstalovaný balíček "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Cíl „{}“ v cílovém systému není složka"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,159 +213,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Nastavení správce displeje nebylo úplné"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Vytváření initramfs s dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Na cíli se nepodařilo spustit dracut"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Návratový kód byl {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testovací úloha python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testovací krok {} python."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisování fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Chyba nastavení"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Pro 
    {!s}
     nejsou zadány žádné oddíly."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Pro 
    {!s}
     není zadán žádný přípojný bod."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Nastavování zavaděče GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavování hardwarových hodin."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Nastavování mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Nastavování initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Nastavování místních a jazykových nastavení."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Pro 
    {!s}
     není zadán žádný přípojný bod."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Nastavování šifrovaného prostoru pro odkládání stránek paměti."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Vytváření initramfs s mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Na cíli se nepodařilo spustit mkinitfs"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Připojování oddílů."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Ukládání nastavení sítě."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Nastavování služby OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalovat balíčky."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Je instalován jeden balíček."
-msgstr[1] "Jsou instalovány %(num)d balíčky."
-msgstr[2] "Je instalováno %(num)d balíčků."
-msgstr[3] "Je instalováno %(num)d balíčků."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Odebírá se jeden balíček."
-msgstr[1] "Odebírají se %(num)d balíčky."
-msgstr[2] "Odebírá se %(num)d balíčků."
-msgstr[3] "Odebírá se %(num)d balíčků."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Nastavit téma vzhledu pro Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalace dat."
@@ -272,11 +255,6 @@ msgstr ""
 "Neznámá akce služby {arg!s} pro službu {name!s} v úrovni chodu "
 "(runlevel) {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Službu se nedaří upravit"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -307,104 +285,128 @@ msgstr ""
 "Popis umístění pro službu {name!s} je {path!s}, která "
 "neexistuje."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Nastavit služby systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Nastavit téma vzhledu pro Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalovat balíčky."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Je instalován jeden balíček."
+msgstr[1] "Jsou instalovány %(num)d balíčky."
+msgstr[2] "Je instalováno %(num)d balíčků."
+msgstr[3] "Je instalováno %(num)d balíčků."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedaří se vypnout systemd cíl {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Odebírá se jeden balíček."
+msgstr[1] "Odebírají se %(num)d balíčky."
+msgstr[2] "Odebírá se %(num)d balíčků."
+msgstr[3] "Odebírá se %(num)d balíčků."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedaří se maskovat systemd jednotku {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Neznámé systemd příkazy {command!s} a {suffix!s} "
-"pro jednotku {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odpojit souborové systémy."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Naplňování souborových systémů."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync se nezdařilo s chybových kódem {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalace zavaděče systému."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Rozbalování obrazu {}/{}, soubor {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Zahajování rozbalení {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Nepodařilo se rozbalit obraz „{}“"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavování hardwarových hodin."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Žádný přípojný bot pro kořenový oddíl"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Vytváření initramfs s mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage neobsahuje klíč „rootMountPoint“ – nic se nebude dělat"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Na cíli se nepodařilo spustit mkinitfs"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Chybný přípojný bod pro kořenový oddíl"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Návratový kód byl {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "kořenovýPřípojnýBod je „{}“, který neexistuje – nic se nebude dělat"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváření initramfs s dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Chybná nastavení unsquash"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Na cíli se nepodařilo spustit dracut"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Souborový systém „{}“ ({}) není jádrem systému, které právě používáte, "
-"podporován"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Nastavování initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Zdrojový souborový systém „{}“ neexistuje"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Nastavování služby OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisování fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Nepodařilo se nalézt unsquashfs – ověřte, že máte nainstalovaný balíček "
-"squashfs-tools"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Cíl „{}“ v cílovém systému není složka"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testovací úloha python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testovací krok {} python."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Nastavování místních a jazykových nastavení."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Ukládání nastavení sítě."
diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po
index abf1983f41..9cae3fb915 100644
--- a/lang/python/da/LC_MESSAGES/python.po
+++ b/lang/python/da/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: scootergrisen, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
@@ -22,19 +22,137 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installér bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurer GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterer partitioner."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Fejl ved konfiguration"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Der er ikke angivet nogle partitioner som 
    {!s}
     kan bruge."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurer systemd-tjenester"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Kan ikke redigere tjeneste"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kan ikke aktivere systemd-målet {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kan ikke deaktivere systemd-målet {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan ikke maskere systemd-enheden {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ukendte systemd-kommandoer {command!s} og "
+"{suffix!s} til enheden {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Afmonter filsystemer."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Udfylder filsystemer."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync mislykkede med fejlkoden {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Udpakker aftrykket {}/{}, filen {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Begynder at udpakke {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Kunne ikke udpakke aftrykket \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Intet monteringspunkt til rodpartition"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage indeholder ikke en \"rootMountPoint\"-nøgle, gør intet"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Dårligt monteringspunkt til rodpartition"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dårlig unsquash-konfiguration"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Filsystemet til \"{}\" ({}) understøttes ikke af din nuværende kerne"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Kildefilsystemet \"{}\" findes ikke"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Kunne ikke finde unsquashfs, sørg for at pakken squashfs-tools er "
+"installeret"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,156 +211,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Displayhåndtering-konfiguration er ikke komplet"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Opretter initramfs med dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Kunne ikke køre dracut på målet"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Afslutningskoden var {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python-job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python-trin {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Fejl ved konfiguration"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Der er ikke angivet nogle partitioner som 
    {!s}
     kan bruge."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerer mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Der er ikke angivet noget rodmonteringspunkt som 
    {!s}
     kan bruge."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurer GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Indstiller hardwareur."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerer mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerer initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerer lokaliteter."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurerer krypteret swap."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Opretter initramfs med mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Kunne ikke køre mkinitfs på målet"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Monterer partitioner."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Gemmer netværkskonfiguration."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installér pakker."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Forarbejder pakker (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerer én pakke."
-msgstr[1] "Installerer %(num)d pakker."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjerner én pakke."
-msgstr[1] "Fjerner %(num)d pakker."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurer Plymouth-tema"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installerer data."
@@ -267,11 +252,6 @@ msgstr ""
 "Ukendt tjenestehandling {arg!s} til tjenesten {name!s} i "
 "kørselsniveauet {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Kan ikke redigere tjeneste"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -301,102 +281,124 @@ msgid ""
 msgstr ""
 "Stien til tjenesten {name!s} er {path!s}, som ikke findes."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurer systemd-tjenester"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurer Plymouth-tema"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installér pakker."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Forarbejder pakker (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kan ikke aktivere systemd-målet {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerer én pakke."
+msgstr[1] "Installerer %(num)d pakker."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kan ikke deaktivere systemd-målet {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjerner én pakke."
+msgstr[1] "Fjerner %(num)d pakker."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan ikke maskere systemd-enheden {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Ukendte systemd-kommandoer {command!s} og "
-"{suffix!s} til enheden {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Afmonter filsystemer."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Udfylder filsystemer."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync mislykkede med fejlkoden {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installér bootloader."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Udpakker aftrykket {}/{}, filen {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Begynder at udpakke {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Kunne ikke udpakke aftrykket \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Indstiller hardwareur."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Intet monteringspunkt til rodpartition"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Opretter initramfs med mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage indeholder ikke en \"rootMountPoint\"-nøgle, gør intet"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kunne ikke køre mkinitfs på målet"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Dårligt monteringspunkt til rodpartition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Afslutningskoden var {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Opretter initramfs med dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Dårlig unsquash-konfiguration"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Kunne ikke køre dracut på målet"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Filsystemet til \"{}\" ({}) understøttes ikke af din nuværende kerne"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerer initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Kildefilsystemet \"{}\" findes ikke"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Kunne ikke finde unsquashfs, sørg for at pakken squashfs-tools er "
-"installeret"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python-job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python-trin {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerer lokaliteter."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Gemmer netværkskonfiguration."
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index 1aea8ca5d5..555d4636ff 100644
--- a/lang/python/de/LC_MESSAGES/python.po
+++ b/lang/python/de/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Andreas Eitel , 2020\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
@@ -23,19 +23,141 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installiere Bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurieren."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Hänge Partitionen ein."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Konfigurationsfehler"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Für 
    {!s}
     sind keine zu verwendenden Partitionen definiert."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriere systemd-Dienste"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Der Dienst kann nicht geändert werden."
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
+"zurück."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Unbekannte systemd-Befehle {command!s} und "
+"{suffix!s} für Einheit {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dateisysteme aushängen."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Befüllen von Dateisystemen."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync fehlgeschlagen mit Fehlercode {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Beginn des Entpackens {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kein Einhängepunkt für die Root-Partition"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage enthält keinen Schlüssel namens \"rootMountPoint\", tue nichts"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ungültiger Einhängepunkt für die Root-Partition"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ungültige unsquash-Konfiguration"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
+"Das Dateisystem für \"{}\" ({}) wird von Ihrem aktuellen Kernel nicht "
+"unterstützt"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Das Quelldateisystem \"{}\" existiert nicht"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Konnte unsquashfs nicht finden, stellen Sie sicher, dass Sie das Paket "
+"namens squashfs-tools installiert haben"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,157 +215,24 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Die Konfiguration des Displaymanager war unvollständig."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Erstelle initramfs mit dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Ausführen von dracut auf dem Ziel schlug fehl"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Der Exit-Code war {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy Python-Job"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy Python-Schritt {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Schreibe fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Konfigurationsfehler"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Für 
    {!s}
     sind keine zu verwendenden Partitionen definiert."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriere mkinitcpio. "
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Für 
    {!s}
     wurde kein Einhängepunkt für die Root-Partition "
 "angegeben."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurieren."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Einstellen der Hardware-Uhr."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriere mkinitcpio. "
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriere initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriere Lokalisierungen."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfiguriere verschlüsselten Auslagerungsspeicher."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Erstelle initramfs mit mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Hänge Partitionen ein."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Speichere Netzwerkkonfiguration."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Pakete installieren "
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installiere ein Paket"
-msgstr[1] "Installiere %(num)d Pakete."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Entferne ein Paket"
-msgstr[1] "Entferne %(num)d Pakete."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguriere Plymouth-Thema"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installiere Daten."
@@ -268,11 +257,6 @@ msgstr ""
 "Unbekannte Aktion {arg!s} für Dienst {name!s} in Runlevel "
 "{level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Der Dienst kann nicht geändert werden."
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -304,106 +288,124 @@ msgstr ""
 "Der Pfad für den Dienst {name!s} is {path!s}, welcher nicht "
 "existiert."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriere systemd-Dienste"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguriere Plymouth-Thema"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
-"zurück."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Pakete installieren "
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installiere ein Paket"
+msgstr[1] "Installiere %(num)d Pakete."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Entferne ein Paket"
+msgstr[1] "Entferne %(num)d Pakete."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Unbekannte systemd-Befehle {command!s} und "
-"{suffix!s} für Einheit {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dateisysteme aushängen."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Befüllen von Dateisystemen."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync fehlgeschlagen mit Fehlercode {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installiere Bootloader."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Beginn des Entpackens {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Einstellen der Hardware-Uhr."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kein Einhängepunkt für die Root-Partition"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Erstelle initramfs mit mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage enthält keinen Schlüssel namens \"rootMountPoint\", tue nichts"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ungültiger Einhängepunkt für die Root-Partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Der Exit-Code war {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Erstelle initramfs mit dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Ungültige unsquash-Konfiguration"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Ausführen von dracut auf dem Ziel schlug fehl"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Das Dateisystem für \"{}\" ({}) wird von Ihrem aktuellen Kernel nicht "
-"unterstützt"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriere initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Das Quelldateisystem \"{}\" existiert nicht"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Schreibe fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Konnte unsquashfs nicht finden, stellen Sie sicher, dass Sie das Paket "
-"namens squashfs-tools installiert haben"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy Python-Job"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy Python-Schritt {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriere Lokalisierungen."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Speichere Netzwerkkonfiguration."
diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po
index 09352f4185..5a9b39cf58 100644
--- a/lang/python/el/LC_MESSAGES/python.po
+++ b/lang/python/el/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Efstathios Iosifidis , 2017\n"
 "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "εγκατάσταση πακέτων."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "εγκατάσταση πακέτων."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index 36e32abe5b..88026773bf 100644
--- a/lang/python/en_GB/LC_MESSAGES/python.po
+++ b/lang/python/en_GB/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jason Collins , 2018\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount file systems."
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Install packages."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Install packages."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processing packages (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "Installing %(num)d packages."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "Removing %(num)d packages."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po
index bafb73d9e8..7a2dd43486 100644
--- a/lang/python/eo/LC_MESSAGES/python.po
+++ b/lang/python/eo/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kurt Ankh Phoenix , 2018\n"
 "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demeti dosieraj sistemoj."
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Formala python laboro."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Formala python paŝo {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instali pakaĵoj."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalante unu pakaĵo."
-msgstr[1] "Instalante %(num)d pakaĵoj."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Forigante unu pakaĵo."
-msgstr[1] "Forigante %(num)d pakaĵoj."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instali pakaĵoj."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalante unu pakaĵo."
+msgstr[1] "Instalante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Forigante unu pakaĵo."
+msgstr[1] "Forigante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Demeti dosieraj sistemoj."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Formala python laboro."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Formala python paŝo {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index 4ce37e51ce..960e280c49 100644
--- a/lang/python/es/LC_MESSAGES/python.po
+++ b/lang/python/es/LC_MESSAGES/python.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pier Jose Gotta Perez , 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
@@ -26,19 +26,143 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar gestor de arranque."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB - menú de arranque multisistema -"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No hay definidas particiones en 1{!s}1 para usar."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar servicios de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La orden  systemctl {arg!s}  en chroot  devolvió el código de "
+"error  {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede activar el servicio de systemd  {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No se puede activar el objetivo de systemd  {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No se puede desactivar el objetivo de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Órdenes desconocidas de systemd  {command!s} y "
+"{suffix!s} para la/s unidad /es {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivos."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Rellenando los sistemas de archivos."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Falló la sincronización  mediante rsync  con el código de error {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Iniciando el desempaquetado {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No se pudo desempaquetar la imagen «{}»"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+"No especificó un punto de montaje para la  partición raíz - / o root -"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"No se hace nada porque el almacenamiento no contiene una clave de  "
+"\"rootMountPoint\" punto de montaje para la raíz."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punto de montaje no válido para una partición raíz,"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "Como el punto de montaje raíz es \"{}\", y no existe, no se hace nada"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuración de \"unsquash\" no válida"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
+"actual"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos de origen  \"{}\" no existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"No se encontró unsquashfs; cerciórese de que tenga instalado el paquete "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destino \"{}\" en el sistema escogido  no es una carpeta"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -96,157 +220,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-"Creando initramfs - sistema de arranque - con dracut - su constructor -."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Falló en ejecutar dracut - constructor de arranques - en el objetivo"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarea de python ficticia."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso {} de python ficticio"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiendo la tabla de particiones fstab"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Error de configuración"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No hay definidas particiones en 1{!s}1 para usar."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio - sistema de arranque básico -."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No se facilitó un punto de montaje raíz utilizable para 
    {!s}
     "
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB - menú de arranque multisistema -"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj de la computadora."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio - sistema de arranque básico -."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs - sistema de inicio -."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando especificaciones locales o regionales."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando la memoria de intercambio - swap - encriptada."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando particiones"
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Guardando la  configuración de red."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar paquetes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando %(num)d paquetes."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Eliminando un paquete."
-msgstr[1] "Eliminando %(num)d paquetes."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure el tema de Plymouth - menú de bienvenida."
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando datos."
@@ -275,11 +265,6 @@ msgstr ""
 "Acción desconocida d/e el/los servicio/s {arg!s} para el/los "
 "servicio/s {name!s} en el/los rango/s de ejecución {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -310,108 +295,125 @@ msgstr ""
 "La ruta hacia el/los servicio/s {name!s} es {path!s}, y no "
 "existe."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar servicios de systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure el tema de Plymouth - menú de bienvenida."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La orden  systemctl {arg!s}  en chroot  devolvió el código de "
-"error  {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar paquetes."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede activar el servicio de systemd  {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No se puede activar el objetivo de systemd  {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando %(num)d paquetes."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No se puede desactivar el objetivo de systemd {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Eliminando un paquete."
+msgstr[1] "Eliminando %(num)d paquetes."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No se puede enmascarar la unidad de systemd {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Órdenes desconocidas de systemd  {command!s} y "
-"{suffix!s} para la/s unidad /es {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de archivos."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Rellenando los sistemas de archivos."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Falló la sincronización  mediante rsync  con el código de error {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar gestor de arranque."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Iniciando el desempaquetado {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No se pudo desempaquetar la imagen «{}»"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj de la computadora."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
-"No especificó un punto de montaje para la  partición raíz - / o root -"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
-"No se hace nada porque el almacenamiento no contiene una clave de  "
-"\"rootMountPoint\" punto de montaje para la raíz."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punto de montaje no válido para una partición raíz,"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "Como el punto de montaje raíz es \"{}\", y no existe, no se hace nada"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+"Creando initramfs - sistema de arranque - con dracut - su constructor -."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuración de \"unsquash\" no válida"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Falló en ejecutar dracut - constructor de arranques - en el objetivo"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
-"actual"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs - sistema de inicio -."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de archivos de origen  \"{}\" no existe"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiendo la tabla de particiones fstab"
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"No se encontró unsquashfs; cerciórese de que tenga instalado el paquete "
-"squashfs-tools"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destino \"{}\" en el sistema escogido  no es una carpeta"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarea de python ficticia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso {} de python ficticio"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando especificaciones locales o regionales."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Guardando la  configuración de red."
diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po
index c4ed2cf7c5..269b7964a0 100644
--- a/lang/python/es_MX/LC_MESSAGES/python.po
+++ b/lang/python/es_MX/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Erland Huaman , 2021\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
@@ -23,19 +23,142 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar el cargador de arranque."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No hay particiones definidas para que 
    {!s}
     use."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura los servicios de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio."
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La llamada de: systemctl {arg!s} en chroot retorna código de "
+"error {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede habilitar el servicio {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No se puede habilitar el objetivo {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"No se puede deshabilitar el objetivo {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"systemd no reconoce los comandos {command!s} y "
+"{suffix!s}para la unidad {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivo."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Llenando sistema de archivos."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falló con código de error {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Iniciando a desempaquetar {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Se falló en la desempaquetización de la imagen \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No existe punto de montaje para la partición raíz"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Mal punto de montaje para la partición raíz"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mala configuración del paquete unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" "
+"({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos fuente \"{}\" no existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools "
+"instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,103 +216,72 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creando initramfs con dracut"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Se falló al intentar correr dracut en el objetivo"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabajo python ficticio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso python ficticio {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiento fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Error de configuración"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No hay particiones definidas para que 
    {!s}
     use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurando la swap encriptada."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando data."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj del hardware."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Configura los servicios de OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio"
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configurando la swap encriptada."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creando initramfs con mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivel de ejecución del objetivo no existe"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Se falló al intentar correr mkinitfs en el objetivo"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando particiones."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El servicio objetivo no existe"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Guardando configuración de red."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio OpenRc dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurando el tema de Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -234,167 +326,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurando el tema de Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando data."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configura los servicios de OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivel de ejecución del objetivo no existe"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El servicio objetivo no existe"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar el cargador de arranque."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura los servicios de systemd"
-
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:503
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La llamada de: systemctl {arg!s} en chroot retorna código de "
-"error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede habilitar el servicio {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No se puede habilitar el objetivo {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"No se puede deshabilitar el objetivo {name!s} de systemd."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No se puede enmascarar la unidad {name!s} de systemd."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj del hardware."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"systemd no reconoce los comandos {command!s} y "
-"{suffix!s}para la unidad {name!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creando initramfs con mkinitfs."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de archivo."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Se falló al intentar correr mkinitfs en el objetivo"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Llenando sistema de archivos."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falló con código de error {}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creando initramfs con dracut"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Se falló al intentar correr dracut en el objetivo"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Iniciando a desempaquetar {}"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Se falló en la desempaquetización de la imagen \"{}\""
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio OpenRc dmcrypt."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No existe punto de montaje para la partición raíz"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiento fstab."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Mal punto de montaje para la partición raíz"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Mala configuración del paquete unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" "
-"({})"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabajo python ficticio."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de archivos fuente \"{}\" no existe"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso python ficticio {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools "
-"instalado"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locales."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Guardando configuración de red."
diff --git a/lang/python/es_PE/LC_MESSAGES/python.po b/lang/python/es_PE/LC_MESSAGES/python.po
index eba343ac1a..02528a757a 100644
--- a/lang/python/es_PE/LC_MESSAGES/python.po
+++ b/lang/python/es_PE/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Spanish (Peru) (https://www.transifex.com/calamares/teams/20061/es_PE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po
index ef354d34a6..ed3c1e041a 100644
--- a/lang/python/es_PR/LC_MESSAGES/python.po
+++ b/lang/python/es_PR/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: es_PR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po
index fd98759135..ee5b372c50 100644
--- a/lang/python/et/LC_MESSAGES/python.po
+++ b/lang/python/et/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Madis Otenurm, 2019\n"
 "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Haagi failisüsteemid lahti."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,102 +202,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testiv python'i töö."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testiv python'i aste {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -230,157 +312,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Haagi failisüsteemid lahti."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testiv python'i töö."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testiv python'i aste {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po
index 1fb9125b4a..3e5ac0ac27 100644
--- a/lang/python/eu/LC_MESSAGES/python.po
+++ b/lang/python/eu/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Ander Elortondo, 2019\n"
 "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fitxategi sistemak desmuntatu."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -90,102 +203,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python lana."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python urratsa {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -231,157 +313,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fitxategi sistemak desmuntatu."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python lana."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python urratsa {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po
index eb4253986c..92d71c9c18 100644
--- a/lang/python/fa/LC_MESSAGES/python.po
+++ b/lang/python/fa/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: alireza jamshidi , 2020\n"
 "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
@@ -22,19 +22,136 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "نصب بارکنندهٔ راه‌اندازی."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "در حال پیکربندی گراب."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "در حال سوار کردن افرازها."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "خطای پیکربندی"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "هیچ افرازی برای استفادهٔ 
    {!s}
     تعریف نشده."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "در حال پیکربندی خدمات سیستم‌دی"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "نمی‌توان خدمت را دستکاری کرد"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
+"برگرداند."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
+"{suffix!s} برای واحد {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "پیاده کردن سامانه‌های پرونده."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "در حال پر کردن سامانه‌پرونده‌ها."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "آرسینک با رمز خطای {} شکست خورد."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "در حال بسته‌گشایی تصویر {}/{}، پروندهٔ {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "در حال شروع بسته‌گشایی {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "شکست در بسته‌گشایی تصویر {}"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمی‌شود"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمی‌شود"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "پیکربندی بد unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "کرنل کنونیتان از سامانه‌پروندهٔ {} ({}) پشتیبانی نمی‌کند"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "شکست در یافتن unsquashfs. مطمئن شوید بستهٔ squashfs-tools نصب است"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -90,103 +207,72 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "پیکربندی مدیر نمایش کامل نبود"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "در حال ایجاد initramfs با dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "شکست در اجرای dracut روی هدف"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "رمز خروج {} بود"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "کار پایتونی الکی."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "گام پایتونی الکی {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "در حال نوشتن fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "خطای پیکربندی"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "هیچ افرازی برای استفادهٔ 
    {!s}
     تعریف نشده."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "پیکربندی mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
    {!s}
     داده نشده."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "در حال پیکربندی گراب."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "در حال پیکربندی مبادلهٔ رمزشده."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "در حال تنظیم ساعت سخت‌افزاری."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "داده‌های نصب"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "پیکربندی mkinitcpio."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "پیکربندی خدمات OpenRC"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "در حال پیکربندی initramfs."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "نمی‌توان خدمت {name!s} را به سطح اجرایی {level!s} افزود."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "پیکربندی مکانها"
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "نمی‌توان خدمت {name!s} را از سطح اجرایی {level!s} برداشت."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "در حال پیکربندی مبادلهٔ رمزشده."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "سطح اجرایی هدف وجود ندارد."
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "در حال سوار کردن افرازها."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "خدمت هدف وجود ندارد"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "در حال ذخیرهٔ پیکربندی شبکه."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -231,161 +317,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "داده‌های نصب"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "پیکربندی خدمات OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "نمی‌توان خدمت {name!s} را به سطح اجرایی {level!s} افزود."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "نمی‌توان خدمت {name!s} را از سطح اجرایی {level!s} برداشت."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "نصب بارکنندهٔ راه‌اندازی."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "نمی‌توان خدمت را دستکاری کرد"
-
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:503
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "سطح اجرایی هدف وجود ندارد."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "در حال تنظیم ساعت سخت‌افزاری."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "خدمت هدف وجود ندارد"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "در حال پیکربندی خدمات سیستم‌دی"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "رمز خروج {} بود"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
-"برگرداند."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "در حال ایجاد initramfs با dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "شکست در اجرای dracut روی هدف"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "در حال پیکربندی initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "در حال نوشتن fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
-"{suffix!s} برای واحد {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "پیاده کردن سامانه‌های پرونده."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "در حال پر کردن سامانه‌پرونده‌ها."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "آرسینک با رمز خطای {} شکست خورد."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "در حال بسته‌گشایی تصویر {}/{}، پروندهٔ {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "در حال شروع بسته‌گشایی {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "شکست در بسته‌گشایی تصویر {}"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمی‌شود"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمی‌شود"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "پیکربندی بد unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "کرنل کنونیتان از سامانه‌پروندهٔ {} ({}) پشتیبانی نمی‌کند"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "کار پایتونی الکی."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "گام پایتونی الکی {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "شکست در یافتن unsquashfs. مطمئن شوید بستهٔ squashfs-tools نصب است"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "پیکربندی مکانها"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "در حال ذخیرهٔ پیکربندی شبکه."
diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po
index ae0b10775b..9646e5c64c 100644
--- a/lang/python/fi_FI/LC_MESSAGES/python.po
+++ b/lang/python/fi_FI/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kimmo Kujansuu , 2021\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
@@ -21,19 +21,136 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Asenna bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Määritä GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Yhdistä osiot."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Määritysvirhe"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Ei ole määritetty käyttämään osioita 
    {!s}
     ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Määritä systemd palvelut"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Palvelua ei voi muokata"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd-palvelua ei saa käyttöön {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd-kohdetta ei saa käyttöön {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd-kohdetta ei-voi poistaa käytöstä {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ei voi peittää systemd-yksikköä {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Tuntematon systemd komento {command!s} ja "
+"{suffix!s} laite {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Irrota tiedostojärjestelmät käytöstä."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Paikannetaan tiedostojärjestelmiä."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync epäonnistui virhekoodilla {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Pakkauksen purkaminen alkaa {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Kuvan purkaminen epäonnistui \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ei liitoskohtaa juuri root osiolle"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ei sisällä \"rootMountPoint\" avainta, eikä tee mitään"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Huono kiinnityspiste root-osioon"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint on \"{}\", jota ei ole, eikä tee mitään"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Huono epäpuhdas kokoonpano"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Tiedostojärjestelmä \"{}\" ({}) ei tue sinun nykyistä kerneliä "
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Lähde tiedostojärjestelmää \"{}\" ei ole olemassa"
+
+#: src/modules/unpackfs/main.py:465
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti "
+"asennettuna"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Kohdejärjestelmän \"{}\" kohde ei ole hakemisto"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,156 +208,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Näytönhallinnan kokoonpano oli puutteellinen"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Initramfs luominen dracut:lla."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Dracut-ohjelman suorittaminen ei onnistunut"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Poistumiskoodi oli {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Harjoitus python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Harjoitus python vaihe {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab kirjoittaminen."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Määritysvirhe"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Ei ole määritetty käyttämään osioita 
    {!s}
     ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Määritetään mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Root-juuri kiinnityspistettä  
    {!s}
     ei ole annettu käytettäväksi."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Määritä GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Laitteiston kellon asettaminen."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Määritetään mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Määritetään initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Määritetään locales."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Salatun swapin määrittäminen."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Initramfs luominen mkinitfs avulla."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Kohteen mkinitfs-suoritus epäonnistui."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Yhdistä osiot."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Tallennetaan verkon määrityksiä."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt-palvelun määrittäminen."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Asenna paketit."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakettien käsittely (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Asentaa "
-msgstr[1] "Asentaa %(num)d paketteja."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Poistaa %(num)d paketteja."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Määritä Plymouthin teema"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Asennetaan tietoja."
@@ -265,11 +249,6 @@ msgstr ""
 "Tuntematon  huoltotoiminto{arg!s} palvelun {name!s} "
 "palvelutasolle  {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Palvelua ei voi muokata"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -297,101 +276,132 @@ msgid ""
 msgstr ""
 "Palvelun polku {name!s} on {path!s},  jota ei ole olemassa."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Määritä systemd palvelut"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Määritä Plymouthin teema"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Asenna paketit."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd-palvelua ei saa käyttöön {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakettien käsittely (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd-kohdetta ei saa käyttöön {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Asentaa "
+msgstr[1] "Asentaa %(num)d paketteja."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd-kohdetta ei-voi poistaa käytöstä {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "Poistaa %(num)d paketteja."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ei voi peittää systemd-yksikköä {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Paketinhallinnan virhe"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Tuntematon systemd komento {command!s} ja "
-"{suffix!s} laite {name!s}."
+"Paketinhallinta ei voinut valmistella päivityksiä. Komento 
    {!s}
     "
+"palautti virhekoodin {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Irrota tiedostojärjestelmät käytöstä."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut päivittää järjestelmää. Komento 
    {!s}
     "
+"palautti virhekoodin {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Paikannetaan tiedostojärjestelmiä."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Paketinhallinta ei voinut tehdä muutoksia asennettuun järjestelmään. Komento"
+" 
    {!s}
     palautti virhekoodin {!s}."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync epäonnistui virhekoodilla {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Asenna bootloader."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Bootloader asennusvirhe"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Pakkauksen purkaminen alkaa {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"Bootloaderia ei voitu asentaa. Asennuskomento 
    {!s}
     palautti "
+"virhekoodin {!s}."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Kuvan purkaminen epäonnistui \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Laitteiston kellon asettaminen."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ei liitoskohtaa juuri root osiolle"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Initramfs luominen mkinitfs avulla."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ei sisällä \"rootMountPoint\" avainta, eikä tee mitään"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kohteen mkinitfs-suoritus epäonnistui."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Huono kiinnityspiste root-osioon"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Poistumiskoodi oli {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint on \"{}\", jota ei ole, eikä tee mitään"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Initramfs luominen dracut:lla."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Huono epäpuhdas kokoonpano"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Dracut-ohjelman suorittaminen ei onnistunut"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Tiedostojärjestelmä \"{}\" ({}) ei tue sinun nykyistä kerneliä "
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Määritetään initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Lähde tiedostojärjestelmää \"{}\" ei ole olemassa"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt-palvelun määrittäminen."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti "
-"asennettuna"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab kirjoittaminen."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Kohdejärjestelmän \"{}\" kohde ei ole hakemisto"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "Ei 
    {!s}
     määritys annetaan 
    {!s}
     varten."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Harjoitus python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Harjoitus python vaihe {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Määritetään locales."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Tallennetaan verkon määrityksiä."
diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index 469799254a..300c553f72 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: roxfr , 2021\n"
 "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
@@ -30,19 +30,141 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installation du bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configuration du GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montage des partitions."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Erreur de configuration"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
+"Aucune partition n'est définie pour être utilisée par 
    {!s}
    ."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurer les services systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impossible de modifier le service"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
+"{num!s}"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossible d'activer le service systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossible d'activer la cible systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Impossible de désactiver la cible systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossible de masquer l'unit systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Commandes systemd {command!s} et {suffix!s} "
+"inconnues pour l'unit {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Démonter les systèmes de fichiers"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Remplir les systèmes de fichiers."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync a échoué avec le code d'erreur {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Décompression de l'image {}/{}, fichier {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Commencer à décompresser {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Impossible de décompresser l'image \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Pas de point de montage pour la partition racine"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ne contient pas de clé \"rootMountPoint\", ne fait rien"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Mauvais point de montage pour la partition racine"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint est \"{}\", ce qui n'existe pas, ne fait rien"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mauvaise configuration unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
+"Le système de fichiers pour \"{}\" ({}) n'est pas pris en charge par votre "
+"noyau actuel"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Le système de fichiers source \"{}\" n'existe pas"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Échec de la recherche de unsquashfs, assurez-vous que le paquetage squashfs-"
+"tools est installé."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -102,158 +224,24 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuration du gestionnaire d'affichage était incomplète"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Configuration du initramfs avec dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Erreur d'exécution de dracut sur la cible."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Le code de sortie était {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tâche factice de python"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Étape factice de python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Écriture du fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Erreur de configuration"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-"Aucune partition n'est définie pour être utilisée par 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configuration de mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Aucun point de montage racine n'a été donné pour être utilisé par "
 "
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configuration du GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuration de l'horloge matériel."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configuration de mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuration du initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuration des locales."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configuration du swap chiffrée."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Création d'initramfs avec mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Échec de l'exécution de mkinitfs sur la cible"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montage des partitions."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Sauvegarde de la configuration du réseau en cours."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuration du service OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installer les paquets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Traitement des paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installation d'un paquet."
-msgstr[1] "Installation de %(num)d paquets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Suppression d'un paquet."
-msgstr[1] "Suppression de %(num)d paquets."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurer le thème Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installation de données."
@@ -278,11 +266,6 @@ msgstr ""
 "Service-action {arg!s} inconnue pour le service {name!s} dans "
 "le run-level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Impossible de modifier le service"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -314,105 +297,124 @@ msgstr ""
 "Le chemin pour le service {name!s} est {path!s}, qui n'existe "
 "pas."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurer les services systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurer le thème Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
-"{num!s}"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installer les paquets."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossible d'activer le service systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Traitement des paquets (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossible d'activer la cible systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installation d'un paquet."
+msgstr[1] "Installation de %(num)d paquets."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Impossible de désactiver la cible systemd {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Suppression d'un paquet."
+msgstr[1] "Suppression de %(num)d paquets."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossible de masquer l'unit systemd {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Commandes systemd {command!s} et {suffix!s} "
-"inconnues pour l'unit {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Démonter les systèmes de fichiers"
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Remplir les systèmes de fichiers."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync a échoué avec le code d'erreur {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installation du bootloader."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Décompression de l'image {}/{}, fichier {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Commencer à décompresser {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Impossible de décompresser l'image \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuration de l'horloge matériel."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Pas de point de montage pour la partition racine"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Création d'initramfs avec mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ne contient pas de clé \"rootMountPoint\", ne fait rien"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Échec de l'exécution de mkinitfs sur la cible"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Mauvais point de montage pour la partition racine"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Le code de sortie était {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint est \"{}\", ce qui n'existe pas, ne fait rien"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Configuration du initramfs avec dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Mauvaise configuration unsquash"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Erreur d'exécution de dracut sur la cible."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Le système de fichiers pour \"{}\" ({}) n'est pas pris en charge par votre "
-"noyau actuel"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configuration du initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Le système de fichiers source \"{}\" n'existe pas"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuration du service OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Écriture du fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Échec de la recherche de unsquashfs, assurez-vous que le paquetage squashfs-"
-"tools est installé."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tâche factice de python"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Étape factice de python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuration des locales."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Sauvegarde de la configuration du réseau en cours."
diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po
index 57ada0388c..1e9cdb4dfc 100644
--- a/lang/python/fr_CH/LC_MESSAGES/python.po
+++ b/lang/python/fr_CH/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: fr_CH\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po
index d22dfa2a09..455138a9d2 100644
--- a/lang/python/fur/LC_MESSAGES/python.po
+++ b/lang/python/fur/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Fabio Tomat , 2020\n"
 "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n"
@@ -21,19 +21,140 @@ msgstr ""
 "Language: fur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instale il bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaç des partizions."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Erôr di configurazion"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No je stade definide nissune partizion di doprâ par 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure i servizis di systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impussibil modificâ il servizi"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
+"erôr {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impussibil disabilitâ la destinazion di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comants di systemd {command!s} e {suffix!s} no "
+"cognossûts pe unitât {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dismonte i file-systems."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Daûr a jemplâ i filesystems."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Sincronizazion cun rsync falide cun codiç di erôr {}. "
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazion imagjin {}/{}, file {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Daûr a scomençâ la estrazion {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No si è rivâts a estrai la imagjin \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nissun pont di montaç pe partizion lidrîs"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nol conten une clâf \"rootMountPoint\", duncje no si fâs nuie"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Pont di montaç sbaliât pe partizion lidrîs"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint al è \"{}\", che nol esist, duncje no si fâs nuie"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazion di \"unsquash\" sbaliade"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Il filesystem par \"{}\" ({}) nol è supuartât dal to kernel atuâl"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorzint \"{}\" nol esist"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"No si è rivâts a cjatâ unsquashfs, controle di vê instalât il pachet "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,156 +212,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazion dal gjestôr dai visôrs no jere complete"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Daûr a creâ initramfs cun dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "No si è rivâts a eseguî dracut su la destinazion"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codiç di jessude al jere {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Lavôr di python pustiç."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passaç di python pustiç {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Daûr a scrivi fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Erôr di configurazion"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No je stade definide nissune partizion di doprâ par 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Daûr a configurâ di mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nol è stât indicât nissun pont di montaç di doprâ par 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Daûr a configurâ l'orloi hardware."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Daûr a configurâ di mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Daûr a configurâ initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Daûr a configurâ la localizazion."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Daûr a configurâ la memorie di scambi (swap) cifrade."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Daûr a creâ il initramfs cun mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montaç des partizions."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Salvament de configurazion di rêt."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instale pachets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Daûr a instalâ un pachet."
-msgstr[1] "Daûr a instalâ %(num)d pachets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Daûr a gjavâ un pachet."
-msgstr[1] "Daûr a gjavâ %(num)d pachets."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure il teme di Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Daûr a instalâ i dâts."
@@ -265,11 +253,6 @@ msgstr ""
 "Azion dal servizi {arg!s} no cognossude pal servizi {name!s} "
 "tal run-level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Impussibil modificâ il servizi"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -299,105 +282,124 @@ msgid ""
 msgstr ""
 "Il percors pal servizi {name!s} al è {path!s}, che nol esist."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure i servizis di systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure il teme di Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
-"erôr {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instale pachets."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Daûr a instalâ un pachet."
+msgstr[1] "Daûr a instalâ %(num)d pachets."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Daûr a gjavâ un pachet."
+msgstr[1] "Daûr a gjavâ %(num)d pachets."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
-"Impussibil disabilitâ la destinazion di systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:601
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
-"Comants di systemd {command!s} e {suffix!s} no "
-"cognossûts pe unitât {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dismonte i file-systems."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Daûr a jemplâ i filesystems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instale il bootloader."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Sincronizazion cun rsync falide cun codiç di erôr {}. "
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Estrazion imagjin {}/{}, file {}/{}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Daûr a scomençâ la estrazion {}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Daûr a configurâ l'orloi hardware."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No si è rivâts a estrai la imagjin \"{}\""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Daûr a creâ il initramfs cun mkinitfs."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nissun pont di montaç pe partizion lidrîs"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nol conten une clâf \"rootMountPoint\", duncje no si fâs nuie"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codiç di jessude al jere {}"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Pont di montaç sbaliât pe partizion lidrîs"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Daûr a creâ initramfs cun dracut."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint al è \"{}\", che nol esist, duncje no si fâs nuie"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "No si è rivâts a eseguî dracut su la destinazion"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configurazion di \"unsquash\" sbaliade"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Daûr a configurâ initramfs."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Il filesystem par \"{}\" ({}) nol è supuartât dal to kernel atuâl"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Il filesystem sorzint \"{}\" nol esist"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Daûr a scrivi fstab."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"No si è rivâts a cjatâ unsquashfs, controle di vê instalât il pachet "
-"squashfs-tools"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Lavôr di python pustiç."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passaç di python pustiç {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Daûr a configurâ la localizazion."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Salvament de configurazion di rêt."
diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po
index 2646ae5988..6537946102 100644
--- a/lang/python/gl/LC_MESSAGES/python.po
+++ b/lang/python/gl/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Xosé, 2018\n"
 "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -90,102 +203,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuración do xestor de pantalla foi incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa parva de python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso parvo de python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -231,157 +313,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de ficheiros."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa parva de python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso parvo de python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po
index 0bbae30e3e..8a08b7bf6e 100644
--- a/lang/python/gu/LC_MESSAGES/python.po
+++ b/lang/python/gu/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po
index 28e0acf8eb..e84547385b 100644
--- a/lang/python/he/LC_MESSAGES/python.po
+++ b/lang/python/he/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yaron Shahrabani , 2021\n"
 "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n"
@@ -23,21 +23,135 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "התקנת מנהל אתחול."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "הגדרת GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "שגיאת התקנת מנהל אתחול"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "מחיצות מעוגנות."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "שגיאת הגדרות"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "לא הוגדרו מחיצות לשימוש של 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "הגדרת שירותי systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "לא ניתן לשנות את השירות"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
    {!s}
     החזירה את קוד "
-"השגיאה {!s}."
+"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"פקודות לא ידועות של systemd‏ {command!s} "
+"ו־{suffix!s} עבור היחידה {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ניתוק עיגון מערכות קבצים."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "מערכות הקבצים מתמלאות."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync נכשל עם קוד השגיאה {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "קובץ הדמות נפרס {}/{}, קובץ {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "הפריסה של {} מתחילה"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "פריסת קובץ הדמות \"{}\" נכשלה"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "אין נקודת עגינה למחיצת העל"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "נקודת העגינה של מחיצת השורה שגויה"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "תצורת unsquash שגויה"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "מערכת הקבצים עבור „{}” ‏({}) אינה נתמכת על ידי הליבה הנוכחית שלך."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "מערכת הקבצים במקור „{}” אינה קיימת"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "איתור unsquashfs לא צלח, נא לוודא שהחבילה squashfs-tools מותקנת"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,103 +209,77 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "תצורת מנהל התצוגה אינה שלמה"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "נוצר initramfs עם dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "הרצת dracut על היעד נכשלה"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "קוד היציאה היה {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "משימת דמה של Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "צעד דמה של Python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab נכתב."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "שגיאת הגדרות"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "לא הוגדרו מחיצות לשימוש של 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio מותקן."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "לא סופקה תצורת 
    {!s}
     לשימוש 
    {!s}
    ."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "מוגדר שטח החלפה מוצפן."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "הגדרת GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "הנתונים מותקנים."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "שעון החומרה מוגדר."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "הגדרת שירותי OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio מותקן."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "לא ניתן להוסיף את השירות {name!s} לשכבת ההפעלה {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs מוגדר."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "לא ניתן להסיר את השירות {name!s} משכבת ההפעלה {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "השפות מוגדרות."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"service-action‏ (פעולת שירות) {arg!s} בלתי ידועה עבור השירות "
+"{name!s} בשכבת ההפעלה {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "מוגדר שטח החלפה מוצפן."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"הקריאה rc-update {arg!s} במצב chroot החזירה את קוד השגיאה "
+"{num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "initramfs נוצר בעזרת mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "יעד שכבת ההפעלה אינו קיים"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "הרצת mkinitfs על היעד נכשלה"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"הנתיב לשכבת ההפעלה {level!s} הוא {path!s} ונתיב זה אינו קיים."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "מחיצות מעוגנות."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "שירות היעד אינו קיים"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "הגדרות הרשת נשמרות."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "שירות dmcrypt ל־OpenRC מוגדר."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "הגדרת ערכת עיצוב של Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -244,167 +332,81 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 "מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה 
    {!s}
     "
 "החזירה את קוד השגיאה {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "הגדרת ערכת עיצוב של Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "הנתונים מותקנים."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "הגדרת שירותי OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "לא ניתן להוסיף את השירות {name!s} לשכבת ההפעלה {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "לא ניתן להסיר את השירות {name!s} משכבת ההפעלה {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"service-action‏ (פעולת שירות) {arg!s} בלתי ידועה עבור השירות "
-"{name!s} בשכבת ההפעלה {level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "לא ניתן לשנות את השירות"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"הקריאה rc-update {arg!s} במצב chroot החזירה את קוד השגיאה "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "יעד שכבת ההפעלה אינו קיים"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"הנתיב לשכבת ההפעלה {level!s} הוא {path!s} ונתיב זה אינו קיים."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "שירות היעד אינו קיים"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "הגדרת שירותי systemd"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "התקנת מנהל אתחול."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "שגיאת התקנת מנהל אתחול"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"פקודות לא ידועות של systemd‏ {command!s} "
-"ו־{suffix!s} עבור היחידה {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ניתוק עיגון מערכות קבצים."
+"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
    {!s}
     החזירה את קוד "
+"השגיאה {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "מערכות הקבצים מתמלאות."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "שעון החומרה מוגדר."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync נכשל עם קוד השגיאה {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "initramfs נוצר בעזרת mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "קובץ הדמות נפרס {}/{}, קובץ {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "הרצת mkinitfs על היעד נכשלה"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "הפריסה של {} מתחילה"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "קוד היציאה היה {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "פריסת קובץ הדמות \"{}\" נכשלה"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "נוצר initramfs עם dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "אין נקודת עגינה למחיצת העל"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "הרצת dracut על היעד נכשלה"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs מוגדר."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "נקודת העגינה של מחיצת השורה שגויה"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "שירות dmcrypt ל־OpenRC מוגדר."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab נכתב."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "תצורת unsquash שגויה"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "לא סופקה תצורת 
    {!s}
     לשימוש 
    {!s}
    ."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "מערכת הקבצים עבור „{}” ‏({}) אינה נתמכת על ידי הליבה הנוכחית שלך."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "משימת דמה של Python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "מערכת הקבצים במקור „{}” אינה קיימת"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "צעד דמה של Python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "איתור unsquashfs לא צלח, נא לוודא שהחבילה squashfs-tools מותקנת"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "השפות מוגדרות."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "הגדרות הרשת נשמרות."
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index 470500c5f2..fc9607a8b3 100644
--- a/lang/python/hi/LC_MESSAGES/python.po
+++ b/lang/python/hi/LC_MESSAGES/python.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Panwar108 , 2020
+# Panwar108 , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Panwar108 , 2020\n"
+"Last-Translator: Panwar108 , 2021\n"
 "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,19 +21,135 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "बूट लोडर इंस्टॉल करना।"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB विन्यस्त करना।"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "विभाजन माउंट करना।"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "विन्यास त्रुटि"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd सेवाएँ विन्यस्त करना"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "सेवा को संशोधित नहीं किया जा सकता"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
+"{suffix!s}।"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "फ़ाइल सिस्टम माउंट से हटाना।"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "फाइल सिस्टम भरना।"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync त्रुटि कोड {} के साथ विफल।"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "इमेज फ़ाइल {}/{}, फ़ाइल {}/{} सम्पीड़ित की जा रही है"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} हेतु संपीड़न प्रक्रिया आरंभ हो रही है "
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "इमेज फ़ाइल \"{}\" को खोलने में विफल"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "रुट विभाजन हेतु कोई माउंट पॉइंट नहीं है"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage में \"rootMountPoint\" कुंजी नहीं है, कुछ नहीं किया जाएगा"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "रुट विभाजन हेतु ख़राब माउंट पॉइंट"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "रुट माउंट पॉइंट \"{}\" है, जो कि मौजूद नहीं है, कुछ नहीं किया जाएगा"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "ख़राब unsquash विन्यास सेटिंग्स"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) हेतु फ़ाइल सिस्टम आपके वर्तमान कर्नेल द्वारा समर्थित नहीं है"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" स्रोत फ़ाइल सिस्टम मौजूद नहीं है"
+
+#: src/modules/unpackfs/main.py:465
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल है"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,156 +207,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracut के साथ initramfs बनाना।"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "लक्ष्य पर dracut निष्पादन विफल"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "त्रुटि कोड  {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "डमी पाइथन प्रक्रिया ।"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab पर राइट करना।"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "विन्यास त्रुटि"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio को विन्यस्त करना।"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB विन्यस्त करना।"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "हार्डवेयर घड़ी सेट करना।"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio को विन्यस्त करना।"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs को विन्यस्त करना। "
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "स्थानिकी को विन्यस्त करना।"
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "एन्क्रिप्टेड स्वैप को विन्यस्त करना।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs के साथ initramfs बनाना।"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "विभाजन माउंट करना।"
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "पैकेज इंस्टॉल करना।"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "पैकेज (%(count)d / %(total)d) संसाधित किए जा रहे हैं"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "एक पैकेज इंस्टॉल किया जा रहा है।"
-msgstr[1] "%(num)d पैकेज इंस्टॉल किए जा रहे हैं।"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "एक पैकेज हटाया जा रहा है।"
-msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।"
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth थीम विन्यस्त करना "
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "डाटा इंस्टॉल करना।"
@@ -265,11 +248,6 @@ msgstr ""
 "रन-लेवल {level!s} में सेवा {name!s} हेतु अज्ञात सेवा-कार्य "
 "{arg!s}।"
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "सेवा को संशोधित नहीं किया जा सकता"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -296,100 +274,134 @@ msgid ""
 "exist."
 msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd सेवाएँ विन्यस्त करना"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth थीम विन्यस्त करना "
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "पैकेज इंस्टॉल करना।"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "पैकेज (%(count)d / %(total)d) संसाधित किए जा रहे हैं"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "एक पैकेज इंस्टॉल किया जा रहा है।"
+msgstr[1] "%(num)d पैकेज इंस्टॉल किए जा रहे हैं।"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "एक पैकेज हटाया जा रहा है।"
+msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "पैकेज प्रबंधक त्रुटि"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
-"{suffix!s}।"
+"पैकेज प्रबंधक द्वारा अपडेट तैयार करना विफल। कमांड 
    {!s}
     हेतु "
+"त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "फ़ाइल सिस्टम माउंट से हटाना।"
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा सिस्टम अपडेट करना विफल। कमांड 
    {!s}
     हेतु "
+"त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "फाइल सिस्टम भरना।"
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"पैकेज प्रबंधक द्वारा इंस्टॉल हो रखें सिस्टम पर परिवर्तन करना विफल। कमांड "
+"
    {!s}
     हेतु त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync त्रुटि कोड {} के साथ विफल।"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "बूट लोडर इंस्टॉल करना।"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "इमेज फ़ाइल {}/{}, फ़ाइल {}/{} सम्पीड़ित की जा रही है"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "बूट लोडर इंस्टॉल त्रुटि"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} हेतु संपीड़न प्रक्रिया आरंभ हो रही है "
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड 
    {!s}
     हेतु त्रुटि कोड "
+"{!s} प्राप्त।"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "इमेज फ़ाइल \"{}\" को खोलने में विफल"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "हार्डवेयर घड़ी सेट करना।"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "रुट विभाजन हेतु कोई माउंट पॉइंट नहीं है"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs के साथ initramfs बनाना।"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage में \"rootMountPoint\" कुंजी नहीं है, कुछ नहीं किया जाएगा"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "रुट विभाजन हेतु ख़राब माउंट पॉइंट"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "त्रुटि कोड  {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "रुट माउंट पॉइंट \"{}\" है, जो कि मौजूद नहीं है, कुछ नहीं किया जाएगा"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracut के साथ initramfs बनाना।"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "ख़राब unsquash विन्यास सेटिंग्स"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "लक्ष्य पर dracut निष्पादन विफल"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) हेतु फ़ाइल सिस्टम आपके वर्तमान कर्नेल द्वारा समर्थित नहीं है"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs को विन्यस्त करना। "
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" स्रोत फ़ाइल सिस्टम मौजूद नहीं है"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab पर राइट करना।"
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल है"
+"कोई 
    {!s}
     विन्यास प्रदान नहीं किया गया 
    {!s}
     के उपयोग "
+"हेतु।"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "डमी पाइथन प्रक्रिया ।"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "स्थानिकी को विन्यस्त करना।"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po
index 70fe6b047c..0bfbe0ee2f 100644
--- a/lang/python/hr/LC_MESSAGES/python.po
+++ b/lang/python/hr/LC_MESSAGES/python.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Lovro Kudelić , 2020
+# Lovro Kudelić , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Lovro Kudelić , 2020\n"
+"Last-Translator: Lovro Kudelić , 2021\n"
 "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,19 +21,138 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instaliram bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurirajte GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montiranje particija."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Greška konfiguracije"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nema definiranih particija za 
    {!s}
     korištenje."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriraj systemd servise"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Ne mogu modificirati servis"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
+"{num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne mogu omogućiti systemd servis {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Ne mogu omogućiti systemd cilj {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Nepoznata systemd naredba {command!s} i {suffix!s}"
+" za jedinicu {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontiraj datotečne sustave."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Popunjavanje datotečnih sustava."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync nije uspio s kodom pogreške {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Otpakiravanje slike {}/{}, datoteka {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Početak raspakiravanja {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Otpakiravnje slike nije uspjelo \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nema točke montiranja za root particiju"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ne sadrži ključ \"rootMountPoint\", ne radi ništa"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Neispravna točka montiranja za root particiju"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Neispravna unsquash konfiguracija"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Datotečni sustav za \"{}\" ({}) nije podržan na vašem trenutnom kernelu"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Izvorni datotečni sustav \"{}\" ne postoji"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Neuspješno pronalaženje unsquashfs, provjerite imate li instaliran paket "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,158 +210,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Stvaranje initramfs s dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Izlazni kod bio je {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testni python posao."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testni python korak {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisujem fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Greška konfiguracije"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nema definiranih particija za 
    {!s}
     korištenje."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriranje mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nijedna root točka montiranja nije definirana za 
    {!s}
     korištenje."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurirajte GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Postavljanje hardverskog sata."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriranje mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriranje initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriranje lokalizacije."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfiguriranje šifriranog swapa."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Stvaranje initramfs s mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montiranje particija."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Spremanje mrežne konfiguracije."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriranje servisa OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instaliraj pakete."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Obrađujem pakete (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instaliram paket."
-msgstr[1] "Instaliram %(num)d pakete."
-msgstr[2] "Instaliram %(num)d pakete."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Uklanjam paket."
-msgstr[1] "Uklanjam %(num)d pakete."
-msgstr[2] "Uklanjam %(num)d pakete."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurirajte Plymouth temu"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instaliranje podataka."
@@ -267,11 +251,6 @@ msgstr ""
 "Nepoznat service-action {arg!s} za servis {name!s} u run-level "
 "{level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Ne mogu modificirati servis"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -302,103 +281,134 @@ msgid ""
 msgstr ""
 "Putanja servisa  {name!s} je {path!s}, međutim ona ne postoji."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriraj systemd servise"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurirajte Plymouth temu"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instaliraj pakete."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Obrađujem pakete (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instaliram paket."
+msgstr[1] "Instaliram %(num)d pakete."
+msgstr[2] "Instaliram %(num)d pakete."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Uklanjam paket."
+msgstr[1] "Uklanjam %(num)d pakete."
+msgstr[2] "Uklanjam %(num)d pakete."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Pogreška upravitelja paketa"
+
+#: src/modules/packages/main.py:589
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
-"{num!s}."
+"Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba 
    {!s}
     "
+"je vratila kôd pogreške {!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne mogu omogućiti systemd servis {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao ažurirati sustav. Naredba 
    {!s}
     je "
+"vratila kod pogreške {!s}."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Ne mogu omogućiti systemd cilj {name!s}."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
+"Naredba 
    {!s}
     je vratila kôd pogreške {!s}."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instaliram bootloader."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Greška prilikom instalacije bootloadera"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nepoznata systemd naredba {command!s} i {suffix!s}"
-" za jedinicu {name!s}."
+"Bootloader nije mogao biti instaliran. Instalacijska naredba 
    {!s}
    "
+" je vratila kod pogreške {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odmontiraj datotečne sustave."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Popunjavanje datotečnih sustava."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Postavljanje hardverskog sata."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync nije uspio s kodom pogreške {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Stvaranje initramfs s mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Otpakiravanje slike {}/{}, datoteka {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Početak raspakiravanja {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Izlazni kod bio je {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Otpakiravnje slike nije uspjelo \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Stvaranje initramfs s dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nema točke montiranja za root particiju"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ne sadrži ključ \"rootMountPoint\", ne radi ništa"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriranje initramfs."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Neispravna točka montiranja za root particiju"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriranje servisa OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisujem fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Neispravna unsquash konfiguracija"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "Nije dana konfiguracija 
    {!s}
     za 
    {!s}
     upotrebu."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Datotečni sustav za \"{}\" ({}) nije podržan na vašem trenutnom kernelu"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testni python posao."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Izvorni datotečni sustav \"{}\" ne postoji"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testni python korak {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Neuspješno pronalaženje unsquashfs, provjerite imate li instaliran paket "
-"squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriranje lokalizacije."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Spremanje mrežne konfiguracije."
diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po
index d6d519bb5c..70b3ec2f7f 100644
--- a/lang/python/hu/LC_MESSAGES/python.po
+++ b/lang/python/hu/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lajos Pasztor , 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
@@ -24,19 +24,139 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Rendszerbetöltő telepítése."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurálása."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partíciók csatolása."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Konfigurációs hiba"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nincsenek partíciók meghatározva a 
    {!s}
     használatához."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd szolgáltatások beállítása"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "a szolgáltatást nem lehet módosítani"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nem sikerült a systemd cél {name!s} letiltása."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nem maszkolható systemd egység: {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Ismeretlen systemd parancsok {command!s} és "
+"{suffix!s} a {name!s} egységhez. "
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fájlrendszerek leválasztása."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fájlrendszerek betöltése."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "az rsync elhalt a(z) {} hibakóddal"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kép kicsomagolása nem sikerült"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nincs betöltési pont a root partíciónál"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nem tartalmaz \"rootMountPoint\" kulcsot, semmi nem történik"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Rossz betöltési pont a root partíciónál"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint is \"{}\", ami nem létezik, semmi nem történik"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Rossz unsquash konfiguráció"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "A forrás fájlrendszer \"{}\" nem létezik"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs nem található, győződj meg róla a squashfs-tools csomag telepítve"
+" van."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,155 +212,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A kijelzőkezelő konfigurációja hiányos volt"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "initramfs létrehozása ezzel: dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "dracut futtatása nem sikerült a célon."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "A kilépési kód {} volt."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Hamis Python feladat."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hamis {}. Python lépés"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab írása."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Konfigurációs hiba"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nincsenek partíciók meghatározva a 
    {!s}
     használatához."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Nincs root csatolási pont megadva a 
    {!s}
     használatához."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurálása."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Rendszeridő beállítása."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "mkinitcpio konfigurálása."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs konfigurálása."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "nyelvi értékek konfigurálása."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Nincs root csatolási pont megadva a 
    {!s}
     használatához."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Titkosított swap konfigurálása."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Partíciók csatolása."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Hálózati konfiguráció mentése."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Csomagok telepítése."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Egy csomag telepítése."
-msgstr[1] "%(num)d csomag telepítése."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Egy csomag eltávolítása."
-msgstr[1] "%(num)d csomag eltávolítása."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth téma beállítása"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Adatok telepítése."
@@ -265,11 +252,6 @@ msgstr ""
 "Ismeretlen service-action {arg!s} a szolgáltatáshoz {name!s} in"
 " run-level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "a szolgáltatást nem lehet módosítani"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -299,104 +281,124 @@ msgid ""
 msgstr ""
 "A szolgáltatás {name!s} elérési útja {path!s}, nem létezik."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd szolgáltatások beállítása"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth téma beállítása"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Csomagok telepítése."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Egy csomag telepítése."
+msgstr[1] "%(num)d csomag telepítése."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nem sikerült a systemd cél {name!s} letiltása."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Egy csomag eltávolítása."
+msgstr[1] "%(num)d csomag eltávolítása."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nem maszkolható systemd egység: {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Ismeretlen systemd parancsok {command!s} és "
-"{suffix!s} a {name!s} egységhez. "
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fájlrendszerek leválasztása."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fájlrendszerek betöltése."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "az rsync elhalt a(z) {} hibakóddal"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Rendszerbetöltő telepítése."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" kép kicsomagolása nem sikerült"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Rendszeridő beállítása."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nincs betöltési pont a root partíciónál"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
-"globalstorage nem tartalmaz \"rootMountPoint\" kulcsot, semmi nem történik"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Rossz betöltési pont a root partíciónál"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "A kilépési kód {} volt."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", ami nem létezik, semmi nem történik"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "initramfs létrehozása ezzel: dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Rossz unsquash konfiguráció"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "dracut futtatása nem sikerült a célon."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs konfigurálása."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "A forrás fájlrendszer \"{}\" nem létezik"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab írása."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"unsquashfs nem található, győződj meg róla a squashfs-tools csomag telepítve"
-" van."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Hamis Python feladat."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hamis {}. Python lépés"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "nyelvi értékek konfigurálása."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Hálózati konfiguráció mentése."
diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po
index 2501a445a0..8496ab1045 100644
--- a/lang/python/id/LC_MESSAGES/python.po
+++ b/lang/python/id/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Drajat Hasan , 2021\n"
 "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
@@ -24,18 +24,131 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Kesalahan Konfigurasi"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Lepaskan sistem berkas."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -92,102 +205,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurasi display manager belum rampung"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tugas dumi python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Langkah {} dumi python"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Kesalahan Konfigurasi"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -231,157 +313,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Lepaskan sistem berkas."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tugas dumi python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Langkah {} dumi python"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/id_ID/LC_MESSAGES/python.po b/lang/python/id_ID/LC_MESSAGES/python.po
index 4c78ec0424..0d18c44909 100644
--- a/lang/python/id_ID/LC_MESSAGES/python.po
+++ b/lang/python/id_ID/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/calamares/teams/20061/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po
index ee8ba7f276..9bf156d179 100644
--- a/lang/python/ie/LC_MESSAGES/python.po
+++ b/lang/python/ie/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Caarmi, 2020\n"
 "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n"
@@ -21,18 +21,133 @@ msgstr ""
 "Language: ie\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installante li bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurante GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montente partitiones."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Errore de configuration"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Null partition es definit por usa de 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurante servicios de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Invocation de systemctl {arg!s} in chroot retrodat li code "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne successat activar li servicio de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ne successat depaccar li image \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ínvalid configuration de unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,155 +204,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Li code de termination esset {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrition de fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Errore de configuration"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Null partition es definit por usa de 
    {!s}
    ."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurante GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr ""
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Configurante mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurante initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurante locales."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montente partitiones."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr ""
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installante paccages."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurante li tema de Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installante li data."
@@ -260,11 +242,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -292,99 +269,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurante servicios de systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurante li tema de Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installante paccages."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
-"Invocation de systemctl {arg!s} in chroot retrodat li code "
-"{num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne successat activar li servicio de systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installante li bootloader."
+
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ne successat depaccar li image \"{}\""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Li code de termination esset {}"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurante initramfs."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Ínvalid configuration de unsquash"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrition de fstab."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurante locales."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po
index 3b6bdcec7e..a2b35e4a9e 100644
--- a/lang/python/is/LC_MESSAGES/python.po
+++ b/lang/python/is/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kristján Magnússon, 2018\n"
 "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Aftengja skráarkerfi."
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Setja upp pakka."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Vinnslupakkar (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Setja upp einn pakka."
-msgstr[1] "Setur upp %(num)d pakka."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjarlægi einn pakka."
-msgstr[1] "Fjarlægi %(num)d pakka."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Setja upp pakka."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Vinnslupakkar (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Setja upp einn pakka."
+msgstr[1] "Setur upp %(num)d pakka."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjarlægi einn pakka."
+msgstr[1] "Fjarlægi %(num)d pakka."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Aftengja skráarkerfi."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po
index b947aae012..87c9e38b02 100644
--- a/lang/python/it_IT/LC_MESSAGES/python.po
+++ b/lang/python/it_IT/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Giuseppe Pignataro , 2021\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
@@ -24,19 +24,141 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installa il bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaggio partizioni."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Errore di Configurazione"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nessuna partizione definita per l'uso con 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura servizi  systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impossibile modificare il servizio"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
+" di errore {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossibile abilitare il servizio systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossibile abilitare la destinazione systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impossibile disabilitare la destinazione systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossibile mascherare l'unità systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandi systemd sconosciuti {command!s} "
+"e{suffix!s} per l'unità {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Smonta i file system."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Copia dei file system."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync fallita con codice d'errore {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazione immagine {}/{}, file {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Avvio dell'estrazione {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Estrazione dell'immagine \"{}\" fallita"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nessun punto di montaggio per la partizione di root"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"globalstorage non contiene una chiave \"rootMountPoint\", nessuna azione "
+"prevista"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punto di montaggio per la partizione di root errato"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint è \"{}\" ma non esiste, nessuna azione prevista"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazione unsquash errata"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Il filesystem per \"{}\" ({}) non è supportato dal kernel corrente"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorgente \"{}\" non esiste"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Impossibile trovare unsquashfs, assicurarsi di aver installato il pacchetto "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinazione del sistema \"{}\" non è una directory"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,155 +217,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazione del display manager è incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creazione di initramfs con dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Impossibile eseguire dracut sulla destinazione"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codice di uscita era {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fittizio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Python step {} fittizio"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrittura di fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Errore di Configurazione"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nessuna partizione definita per l'uso con 
    {!s}
    ."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Nessun punto di mount root è dato in l'uso per 
    {!s}
    "
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Impostazione del clock hardware."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Configurazione di mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurazione di initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurazione della localizzazione."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Nessun punto di mount root è dato in l'uso per 
    {!s}
    "
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurazione per lo swap cifrato."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Sto creando initramfs con mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Impossibile eseguire mkinitfs sulla destinazione"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montaggio partizioni."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Salvataggio della configurazione di rete."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurazione del servizio OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installa pacchetti."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installando un pacchetto."
-msgstr[1] "Installazione di %(num)d pacchetti."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Rimuovendo un pacchetto."
-msgstr[1] "Rimozione di %(num)d pacchetti."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura il tema Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installazione dei dati."
@@ -268,11 +257,6 @@ msgstr ""
 "Service-action sconosciuta {arg!s} per il servizio {name!s} nel"
 " run-level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Impossibile modificare il servizio"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -302,106 +286,124 @@ msgid ""
 msgstr ""
 "Il percorso del servizio {name!s} è {path!s}, ma non esiste."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura servizi  systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura il tema Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
-" di errore {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installa pacchetti."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossibile abilitare il servizio systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossibile abilitare la destinazione systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installando un pacchetto."
+msgstr[1] "Installazione di %(num)d pacchetti."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Rimuovendo un pacchetto."
+msgstr[1] "Rimozione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
-"Impossibile disabilitare la destinazione systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossibile mascherare l'unità systemd {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:601
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
-"Comandi systemd sconosciuti {command!s} "
-"e{suffix!s} per l'unità {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Smonta i file system."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Copia dei file system."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installa il bootloader."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync fallita con codice d'errore {}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Estrazione immagine {}/{}, file {}/{}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Avvio dell'estrazione {}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Impostazione del clock hardware."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Estrazione dell'immagine \"{}\" fallita"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Sto creando initramfs con mkinitfs."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nessun punto di montaggio per la partizione di root"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Impossibile eseguire mkinitfs sulla destinazione"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage non contiene una chiave \"rootMountPoint\", nessuna azione "
-"prevista"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codice di uscita era {}"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punto di montaggio per la partizione di root errato"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creazione di initramfs con dracut."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint è \"{}\" ma non esiste, nessuna azione prevista"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Impossibile eseguire dracut sulla destinazione"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configurazione unsquash errata"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurazione di initramfs."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Il filesystem per \"{}\" ({}) non è supportato dal kernel corrente"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurazione del servizio OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Il filesystem sorgente \"{}\" non esiste"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrittura di fstab."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Impossibile trovare unsquashfs, assicurarsi di aver installato il pacchetto "
-"squashfs-tools"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinazione del sistema \"{}\" non è una directory"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fittizio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Python step {} fittizio"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurazione della localizzazione."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Salvataggio della configurazione di rete."
diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po
index a57e4d132c..3732bc8d05 100644
--- a/lang/python/ja/LC_MESSAGES/python.po
+++ b/lang/python/ja/LC_MESSAGES/python.po
@@ -6,16 +6,16 @@
 # Translators:
 # ブラシックデービッド, 2019
 # Takefumi Nagata, 2019
-# UTUMI Hirosi , 2020
+# UTUMI Hirosi , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: UTUMI Hirosi , 2020\n"
+"Last-Translator: UTUMI Hirosi , 2021\n"
 "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,19 +23,135 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ブートローダーをインストール"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUBを設定にします。"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "パーティションのマウント。"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "コンフィグレーションエラー"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     に使用するパーティションが定義されていません。"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemdサービスを設定"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "サービスが変更できません"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s}というsystemdサービスが可能にすることができません"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が開始できません。"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が停止できません。"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd ユニット {name!s} をマスクできません。"
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
+"{suffix!s}。"
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ファイルシステムをアンマウント。"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ファイルシステムに書き込んでいます。"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "エラーコード {} によりrsyncを失敗。"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "イメージ {}/{}, ファイル {}/{} を解凍しています"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} の解凍を開始しています"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "イメージ  \"{}\" の展開に失敗"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントがありません"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントが不正です"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "unsquash の設定が不正です"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) のファイルシステムは、現在のカーネルではサポートされていません"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "ソースファイルシステム  \"{}\" は存在しません"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "unsquashfs が見つかりませんでした。 squashfs-toolsがインストールされているか、確認してください。"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,153 +207,22 @@ msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リ
 msgid "Display manager configuration was incomplete"
 msgstr "ディスプレイマネージャの設定が不完全です"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutとinitramfsを作成しています。"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "ターゲット上で dracut の実行に失敗"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "停止コードは {} でした"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstabを書き込んでいます。"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "コンフィグレーションエラー"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     に使用するパーティションが定義されていません。"
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr " 
    {!s}
     を使用するのにルートマウントポイントが与えられていません。"
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUBを設定にします。"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "ハードウェアクロックの設定"
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "mkinitcpioを設定しています。"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfsを設定しています。"
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "ロケールを設定しています。"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr " 
    {!s}
     を使用するのにルートマウントポイントが与えられていません。"
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "暗号化したswapを設定しています。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfsを使用してinitramfsを作成します。"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "ターゲットでmkinitfsを実行できませんでした"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "パーティションのマウント。"
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "ネットワーク設定を保存しています。"
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcryptサービスを設定しています。"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "パッケージのインストール"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "パッケージを処理しています (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] " %(num)d パッケージをインストールしています。"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] " %(num)d パッケージを削除しています。"
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouthテーマを設定"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "データのインストール。"
@@ -261,11 +246,6 @@ msgid ""
 msgstr ""
 "ランレベル {level!s} 内のサービス {name!s} に対する未知のサービスアクション {arg!s}。"
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "サービスが変更できません"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -291,100 +271,127 @@ msgid ""
 "exist."
 msgstr "サービス {name!s} のパスが {path!s} です。これは存在しません。"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemdサービスを設定"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouthテーマを設定"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "パッケージのインストール"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "パッケージを処理しています (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] " %(num)d パッケージをインストールしています。"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] " %(num)d パッケージを削除しています。"
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "パッケージマネージャーのエラー"
+
+#: src/modules/packages/main.py:589
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
+"パッケージマネージャーはアップデートを準備できませんでした。コマンド 
    {!s}
     はエラーコード {!s} を返しました。"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s}というsystemdサービスが可能にすることができません"
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはシステムをアップデートできませんでした。 コマンド 
    {!s}
     はエラーコード {!s} を返しました。"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が開始できません。"
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド 
    {!s}
     はエラーコード {!s} "
+"を返しました。"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が停止できません。"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ブートローダーをインストール"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd ユニット {name!s} をマスクできません。"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "ブートローダーのインストールエラー"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
-"{suffix!s}。"
+"ブートローダーをインストールできませんでした。インストールコマンド 
    {!s}
     がエラーコード {!s} を返しました。"
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ファイルシステムをアンマウント。"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ファイルシステムに書き込んでいます。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "ハードウェアクロックの設定"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "エラーコード {} によりrsyncを失敗。"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfsを使用してinitramfsを作成します。"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "イメージ {}/{}, ファイル {}/{} を解凍しています"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "ターゲットでmkinitfsを実行できませんでした"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} の解凍を開始しています"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "停止コードは {} でした"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "イメージ  \"{}\" の展開に失敗"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracutとinitramfsを作成しています。"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "ルートパーティションのためのマウントポイントがありません"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "ターゲット上で dracut の実行に失敗"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfsを設定しています。"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "ルートパーティションのためのマウントポイントが不正です"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcryptサービスを設定しています。"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstabを書き込んでいます。"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "unsquash の設定が不正です"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "
    {!s}
     が使用する 
    {!s}
     設定が指定されていません。"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) のファイルシステムは、現在のカーネルではサポートされていません"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "ソースファイルシステム  \"{}\" は存在しません"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "unsquashfs が見つかりませんでした。 squashfs-toolsがインストールされているか、確認してください。"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "ロケールを設定しています。"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "ネットワーク設定を保存しています。"
diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po
index d4981db3c7..7017f998e9 100644
--- a/lang/python/kk/LC_MESSAGES/python.po
+++ b/lang/python/kk/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: kk\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po
index 593f86ec1f..38989f06cb 100644
--- a/lang/python/kn/LC_MESSAGES/python.po
+++ b/lang/python/kn/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index d29cefce71..e6f1f1c8ba 100644
--- a/lang/python/ko/LC_MESSAGES/python.po
+++ b/lang/python/ko/LC_MESSAGES/python.po
@@ -5,16 +5,16 @@
 # 
 # Translators:
 # Ji-Hyeon Gim , 2018
-# JungHee Lee , 2020
+# JungHee Lee , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: JungHee Lee , 2020\n"
+"Last-Translator: JungHee Lee , 2021\n"
 "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,19 +22,134 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "부트로더 설치."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB 구성"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "파티션 마운트 중."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "구성 오류"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "사용할 
    {!s}
    에 대해 정의된 파티션이 없음."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd 서비스 구성"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "서비스를 수정할 수 없음"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
+"s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "파일 시스템 마운트를 해제합니다."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "파일 시스템을 채우는 중."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync가 {} 오류 코드로 실패했습니다."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "이미지 {}/{}, 파일 {}/{} 압축푸는 중"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} 압축 풀기 시작 중"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다."
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "루트 파티션에 대한 마운트 위치 없음"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "루트 파티션에 대한 잘못된 마운트 위치"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "잘못된 unsquash 구성"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({})에 대한 파일 시스템은 현재 커널에서 지원되지 않습니다."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다."
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치되어 있는지 확인하십시오."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,153 +207,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracut을 사용하여 initramfs 만들기."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "대상에서 dracut을 실행하지 못함"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "종료 코드 {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "더미 파이썬 작업."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "더미 파이썬 단계 {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab 쓰기."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "구성 오류"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "사용할 
    {!s}
    에 대해 정의된 파티션이 없음."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "
    {!s}
    에서 사용할 루트 마운트 지점이 제공되지 않음."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB 구성"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "하드웨어 클럭 설정 중."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "mkinitcpio 구성 중."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs 구성 중."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "로컬 구성 중."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "
    {!s}
    에서 사용할 루트 마운트 지점이 제공되지 않음."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "암호화된 스왑 구성 중."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs로 initramfs 생성 중."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "파티션 마운트 중."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "네트워크 구성 저장 중."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt 서비스 구성 중."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "패키지를 설치합니다."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "패키지 처리중 (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "플리머스 테마 구성"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "데이터 설치중."
@@ -263,11 +247,6 @@ msgstr ""
 "run-level {level!s}의 service {name!s}에 대해 알 수 없는 service-action "
 "{arg!s}입니다."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "서비스를 수정할 수 없음"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -293,99 +272,122 @@ msgid ""
 "exist."
 msgstr "{name!s} 서비스에 대한 경로는 {path!s}이고, 존재하지 않습니다."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd 서비스 구성"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "플리머스 테마 구성"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "패키지를 설치합니다."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "패키지 처리중 (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "패키지 관리자 오류"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
-"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
-"s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "파일 시스템 마운트를 해제합니다."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "부트로더 설치."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "파일 시스템을 채우는 중."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "부트로더 설치 오류"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync가 {} 오류 코드로 실패했습니다."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr "부트로더를 설치할 수 없습니다. 
    {!s}
     설치 명령에서  {!s} 오류 코드를 반환했습니다."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "이미지 {}/{}, 파일 {}/{} 압축푸는 중"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "하드웨어 클럭 설정 중."
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} 압축 풀기 시작 중"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs로 initramfs 생성 중."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "루트 파티션에 대한 마운트 위치 없음"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "종료 코드 {}"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracut을 사용하여 initramfs 만들기."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "루트 파티션에 대한 잘못된 마운트 위치"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "대상에서 dracut을 실행하지 못함"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs 구성 중."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "잘못된 unsquash 구성"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt 서비스 구성 중."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({})에 대한 파일 시스템은 현재 커널에서 지원되지 않습니다."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab 쓰기."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "
    {!s}
     구성 없음은 
    {!s}
    을(를) 사용할 수 있도록 제공됩니다."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치되어 있는지 확인하십시오."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "더미 파이썬 작업."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "더미 파이썬 단계 {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "로컬 구성 중."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "네트워크 구성 저장 중."
diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po
index eff5c79ddd..c4515f106a 100644
--- a/lang/python/lo/LC_MESSAGES/python.po
+++ b/lang/python/lo/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po
index abed5af2ec..6ceb39a273 100644
--- a/lang/python/lt/LC_MESSAGES/python.po
+++ b/lang/python/lt/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Moo, 2021\n"
 "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
@@ -22,21 +22,138 @@ msgstr ""
 "Language: lt\n"
 "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Įdiegti operacinės sistemos paleidyklę."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigūruoti GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Operacinės sistemos paleidyklės diegimo klaida"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Prijungiami skaidiniai."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Konfigūracijos klaida"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
    {!s}
     naudojimui."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigūruoti systemd tarnybas"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nepavyksta modifikuoti tarnybos"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
-"
    {!s}
     grąžino klaidos kodą {!s}."
+"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Nežinomos systemd komandos {command!s} ir "
+"{suffix!s} įtaisui {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Atjungti failų sistemas."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Užpildomos failų sistemos."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync patyrė nesėkmę su klaidos kodu {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Išpakuojamas atvaizdis {}/{}, failas {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Pradedama išpakuoti {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepavyko išpakuoti atvaizdį „{}“"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nėra prijungimo taško šaknies skaidiniui"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage viduje nėra „rootMountPoint“ rakto, nieko nedaroma"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Blogas šaknies skaidinio prijungimo taškas"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint yra „{}“, kurio nėra, nieko nedaroma"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Bloga unsquash konfigūracija"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta \"{}\" ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Šaltinio failų sistemos „{}“ nėra"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nepavyko rasti unsquashfs, įsitikinkite, kad esate įdiegę squashfs-tools "
+"paketą"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -94,107 +211,81 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Sukuriama initramfs naudojant dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nepavyko paskirties vietoje paleisti dracut"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Išėjimo kodas buvo {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktyvi python užduotis."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktyvus python žingsnis {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Rašoma fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Konfigūracijos klaida"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
    {!s}
     naudojimui."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigūruojama mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nėra nurodyta jokių šaknies prijungimo taškų, skirtų 
    {!s}
     "
 "naudojimui."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Nenurodyta jokia 
    {!s}
     konfigūracija, kurią 
    {!s}
     galėtų"
-" naudoti."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigūruojamas šifruotas sukeitimų skaidinys."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigūruoti GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Įdiegiami duomenys."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nustatomas aparatinės įrangos laikrodis."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigūruoti OpenRC tarnybas"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigūruojama mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Nepavyksta pridėti tarnybą {name!s} į vykdymo lygmenį {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigūruojama initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Nepavyksta pašalinti tarnybą {name!s} iš vykdymo lygmens {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigūruojamos lokalės."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Nežinomas tarnybos veiksmas {arg!s}, skirtas tarnybai {name!s} "
+"vykdymo lygmenyje {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigūruojamas šifruotas sukeitimų skaidinys."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Kuriama initramfs naudojant mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Paskirties vykdymo lygmens nėra"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Vykdymo lygmens {level!s} kelias yra {path!s}, kurio savo "
+"ruožtu nėra."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Prijungiami skaidiniai."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Paskirties tarnybos nėra"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Įrašoma tinklo konfigūracija."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigūruoti Plymouth temą"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -247,170 +338,83 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
+"Paketų tvarkytuvei nepavyko atlikti pakeitimų įdiegtoje sistemoje. Komanda "
+"
    {!s}
     grąžino klaidos kodą {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigūruoti Plymouth temą"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Įdiegiami duomenys."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigūruoti OpenRC tarnybas"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Nepavyksta pridėti tarnybą {name!s} į vykdymo lygmenį {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Nepavyksta pašalinti tarnybą {name!s} iš vykdymo lygmens {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Nežinomas tarnybos veiksmas {arg!s}, skirtas tarnybai {name!s} "
-"vykdymo lygmenyje {level!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Įdiegti operacinės sistemos paleidyklę."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Nepavyksta modifikuoti tarnybos"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Operacinės sistemos paleidyklės diegimo klaida"
 
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:503
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"rc-update {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Paskirties vykdymo lygmens nėra"
+"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
+"
    {!s}
     grąžino klaidos kodą {!s}."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Vykdymo lygmens {level!s} kelias yra {path!s}, kurio savo "
-"ruožtu nėra."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nustatomas aparatinės įrangos laikrodis."
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Paskirties tarnybos nėra"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Kuriama initramfs naudojant mkinitfs."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigūruoti systemd tarnybas"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Išėjimo kodas buvo {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Sukuriama initramfs naudojant dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nepavyko paskirties vietoje paleisti dracut"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigūruojama initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Rašoma fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Nežinomos systemd komandos {command!s} ir "
-"{suffix!s} įtaisui {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Atjungti failų sistemas."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Užpildomos failų sistemos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync patyrė nesėkmę su klaidos kodu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Išpakuojamas atvaizdis {}/{}, failas {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Pradedama išpakuoti {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Nepavyko išpakuoti atvaizdį „{}“"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nėra prijungimo taško šaknies skaidiniui"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage viduje nėra „rootMountPoint“ rakto, nieko nedaroma"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Blogas šaknies skaidinio prijungimo taškas"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint yra „{}“, kurio nėra, nieko nedaroma"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Bloga unsquash konfigūracija"
+"Nenurodyta jokia 
    {!s}
     konfigūracija, kurią 
    {!s}
     galėtų"
+" naudoti."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta \"{}\" ({})"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktyvi python užduotis."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Šaltinio failų sistemos „{}“ nėra"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktyvus python žingsnis {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Nepavyko rasti unsquashfs, įsitikinkite, kad esate įdiegę squashfs-tools "
-"paketą"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigūruojamos lokalės."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Įrašoma tinklo konfigūracija."
diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po
index f08ec43a40..9c1a06033b 100644
--- a/lang/python/lv/LC_MESSAGES/python.po
+++ b/lang/python/lv/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,223 +17,201 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -258,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -288,97 +261,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po
index d05e86b805..4edd1b7ece 100644
--- a/lang/python/mk/LC_MESSAGES/python.po
+++ b/lang/python/mk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Martin Ristovski , 2018\n"
 "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,102 +202,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -230,157 +312,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po
index 2473ecc7cc..03ff8a7c2c 100644
--- a/lang/python/ml/LC_MESSAGES/python.po
+++ b/lang/python/ml/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Balasankar C , 2019\n"
 "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n"
@@ -22,221 +22,201 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
-msgstr ""
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -261,11 +241,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -291,97 +266,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
+
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po
index b5f28db3fd..16b6cd832c 100644
--- a/lang/python/mr/LC_MESSAGES/python.po
+++ b/lang/python/mr/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po
index 3844542189..5041680d79 100644
--- a/lang/python/nb/LC_MESSAGES/python.po
+++ b/lang/python/nb/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 865ac004d9acf2568b2e4b389e0007c7_fba755c <3516cc82d94f87187da1e036e5f09e42_616112>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installer pakker."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installer pakker."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ne/LC_MESSAGES/python.po b/lang/python/ne/LC_MESSAGES/python.po
index 285a1a9964..a681def560 100644
--- a/lang/python/ne/LC_MESSAGES/python.po
+++ b/lang/python/ne/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Nepali (https://www.transifex.com/calamares/teams/20061/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po
index b92fd7db16..95117a1b1d 100644
--- a/lang/python/ne_NP/LC_MESSAGES/python.po
+++ b/lang/python/ne_NP/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: ne_NP\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po
index a69e2e0598..222c5169d0 100644
--- a/lang/python/nl/LC_MESSAGES/python.po
+++ b/lang/python/nl/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Adriaan de Groot , 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
@@ -22,19 +22,143 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installeer bootloader"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB instellen."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partities mounten."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Configuratiefout"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Geen partities gedefinieerd voor 
    {!s}
     om te gebruiken."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configureer systemd services "
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "De service kan niet worden gewijzigd"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
+"{num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+"De systemd service {name!s} kon niet worden ingeschakeld."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Onbekende systemd opdrachten {command!s} en "
+"{suffix!s} voor unit {name!s}. "
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount bestandssystemen."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Bestandssystemen opvullen."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync mislukte met foutcode {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Bestandssysteem uitpakken {}/{}, bestand {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Beginnen met uitpakken van {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Uitpakken van bestandssysteem \"{}\" mislukt"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Geen mount-punt voor de root-partitie"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage bevat geen sleutel \"rootMountPoint\", er wordt niks gedaan"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Onjuist mount-punt voor de root-partitie"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"rootMountPoint is ingesteld op \"{}\", welke niet bestaat, er wordt niks "
+"gedaan"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Foutieve unsquash configuratie"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
+"Het bestandssysteem voor \"{}\" ({}) wordt niet ondersteund door je huidige "
+"kernel"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Het bronbestandssysteem \"{}\" bestaat niet"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs niet gevonden, verifieer dat je het squashfs-tools pakket heb "
+"geïnstalleerd"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,156 +216,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Display manager configuratie was incompleet"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "initramfs aanmaken met dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Uitvoeren van dracut op het doel is mislukt"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "De afsluitcode was {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Voorbeeld Python-taak"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Voorbeeld Python-stap {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab schrijven."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Configuratiefout"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Geen partities gedefinieerd voor 
    {!s}
     om te gebruiken."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Instellen van mkinitcpio"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Geen hoofd mount punt is gegeven voor 
    {!s}
     om te gebruiken. "
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB instellen."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Instellen van hardwareklok"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Instellen van mkinitcpio"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Instellen van initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Taal en locatie instellen."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Instellen van versleutelde swap."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Een initramfs wordt aangemaakt met mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Partities mounten."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Netwerk-configuratie opslaan."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configureren van OpenRC dmcrypt service."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Pakketten installeren."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Pakket installeren."
-msgstr[1] "%(num)d pakketten installeren."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Pakket verwijderen."
-msgstr[1] "%(num)d pakketten verwijderen."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth thema instellen"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Data aan het installeren."
@@ -266,11 +257,6 @@ msgstr ""
 "Onbekende serviceactie {arg!s} voor service {name!s} in "
 "runlevel {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "De service kan niet worden gewijzigd"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -300,108 +286,124 @@ msgid ""
 msgstr ""
 "Het pad voor service {level!s} is {path!s}, welke niet bestaat"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configureer systemd services "
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth thema instellen"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Pakketten installeren."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Pakket installeren."
+msgstr[1] "%(num)d pakketten installeren."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Pakket verwijderen."
+msgstr[1] "%(num)d pakketten verwijderen."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
-"{num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
-"De systemd service {name!s} kon niet worden ingeschakeld."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installeer bootloader"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Onbekende systemd opdrachten {command!s} en "
-"{suffix!s} voor unit {name!s}. "
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount bestandssystemen."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Instellen van hardwareklok"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Bestandssystemen opvullen."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Een initramfs wordt aangemaakt met mkinitfs."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync mislukte met foutcode {}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Bestandssysteem uitpakken {}/{}, bestand {}/{}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "De afsluitcode was {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Beginnen met uitpakken van {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "initramfs aanmaken met dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Uitpakken van bestandssysteem \"{}\" mislukt"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Uitvoeren van dracut op het doel is mislukt"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Geen mount-punt voor de root-partitie"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Instellen van initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage bevat geen sleutel \"rootMountPoint\", er wordt niks gedaan"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configureren van OpenRC dmcrypt service."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Onjuist mount-punt voor de root-partitie"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab schrijven."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"rootMountPoint is ingesteld op \"{}\", welke niet bestaat, er wordt niks "
-"gedaan"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Foutieve unsquash configuratie"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Het bestandssysteem voor \"{}\" ({}) wordt niet ondersteund door je huidige "
-"kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Voorbeeld Python-taak"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Het bronbestandssysteem \"{}\" bestaat niet"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Voorbeeld Python-stap {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"unsquashfs niet gevonden, verifieer dat je het squashfs-tools pakket heb "
-"geïnstalleerd"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Taal en locatie instellen."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Netwerk-configuratie opslaan."
diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po
index 20e0ff1514..3085d44afc 100644
--- a/lang/python/pl/LC_MESSAGES/python.po
+++ b/lang/python/pl/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jacob B. , 2021\n"
 "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
@@ -24,19 +24,143 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalacja programu rozruchowego."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfiguracja GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montowanie partycji."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Błąd konfiguracji"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nie ma zdefiniowanych partycji dla 
    {!s}
     do użytku."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguracja usług systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nie można zmodyfikować usług"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nie można włączyć usługi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nie można włączyć celu w systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nie można wyłączyć celu w systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nie można zamaskować jednostki systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Nieznana komenda systemd {command!s} oraz "
+"{suffix!s} dla jednostki {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontuj systemy plików."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Zapełnianie systemu plików."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync zakończyło działanie kodem błędu {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Rozpoczynanie odpakowywania {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Błąd rozpakowywania obrazu \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Brak punktu montowania partycji root"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nie zawiera klucza \"rootMountPoint\", nic nie zostanie "
+"zrobione"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Błędny punkt montowania partycji root"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"Punkt montowania partycji root (rootMountPoint) jest \"{}\", które nie "
+"istnieje; nic nie zostanie zrobione"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Błędna konfiguracja unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego "
+"systemu"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Źródłowy system plików \"{}\" nie istnieje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nie można odnaleźć unsquashfs, upewnij się, że masz zainstalowany pakiet "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -94,160 +218,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracja menedżera wyświetlania była niekompletna"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Tworzenie initramfs z dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nie udało się włączyć dracut."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Kod wyjściowy to {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Zadanie fikcyjne Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Krok fikcyjny Python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisywanie fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Błąd konfiguracji"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nie ma zdefiniowanych partycji dla 
    {!s}
     do użytku."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurowanie mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nie znaleziono głównego punktu montowania dla 
    {!s}
     do użycia."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfiguracja GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ustawianie zegara systemowego."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurowanie mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurowanie initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurowanie ustawień lokalnych."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurowanie zaszyfrowanej przestrzeni wymiany."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Tworzenie initramfs z mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nie udało się włączyć mkinitfs."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montowanie partycji."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Zapisywanie konfiguracji sieci."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurowanie usługi OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Zainstaluj pakiety."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalowanie jednego pakietu."
-msgstr[1] "Instalowanie %(num)d pakietów."
-msgstr[2] "Instalowanie %(num)d pakietów."
-msgstr[3] "Instalowanie%(num)d pakietów."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Usuwanie jednego pakietu."
-msgstr[1] "Usuwanie %(num)d pakietów."
-msgstr[2] "Usuwanie %(num)d pakietów."
-msgstr[3] "Usuwanie %(num)d pakietów."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguracja motywu Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalowanie danych."
@@ -274,11 +261,6 @@ msgstr ""
 "Nieznana akcja-usługi {arg!s} dla usługi {name!s} w poziomie-"
 "uruchamiania {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Nie można zmodyfikować usług"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -307,108 +289,128 @@ msgid ""
 "exist."
 msgstr "Ścieżka do usługi {name!s} to {path!s},  nie istnieje."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguracja usług systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguracja motywu Plymouth"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Zainstaluj pakiety."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalowanie jednego pakietu."
+msgstr[1] "Instalowanie %(num)d pakietów."
+msgstr[2] "Instalowanie %(num)d pakietów."
+msgstr[3] "Instalowanie%(num)d pakietów."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Usuwanie jednego pakietu."
+msgstr[1] "Usuwanie %(num)d pakietów."
+msgstr[2] "Usuwanie %(num)d pakietów."
+msgstr[3] "Usuwanie %(num)d pakietów."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nie można włączyć usługi systemd {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nie można włączyć celu w systemd {name!s}."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nie można wyłączyć celu w systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalacja programu rozruchowego."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nie można zamaskować jednostki systemd {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nieznana komenda systemd {command!s} oraz "
-"{suffix!s} dla jednostki {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odmontuj systemy plików."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ustawianie zegara systemowego."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Zapełnianie systemu plików."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Tworzenie initramfs z mkinitfs."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync zakończyło działanie kodem błędu {}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nie udało się włączyć mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Kod wyjściowy to {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Rozpoczynanie odpakowywania {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Tworzenie initramfs z dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Błąd rozpakowywania obrazu \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nie udało się włączyć dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Brak punktu montowania partycji root"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurowanie initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nie zawiera klucza \"rootMountPoint\", nic nie zostanie "
-"zrobione"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurowanie usługi OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Błędny punkt montowania partycji root"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisywanie fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Punkt montowania partycji root (rootMountPoint) jest \"{}\", które nie "
-"istnieje; nic nie zostanie zrobione"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Błędna konfiguracja unsquash"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego "
-"systemu"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Zadanie fikcyjne Python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Źródłowy system plików \"{}\" nie istnieje"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Krok fikcyjny Python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Nie można odnaleźć unsquashfs, upewnij się, że masz zainstalowany pakiet "
-"squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurowanie ustawień lokalnych."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Zapisywanie konfiguracji sieci."
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index 5ae907dafd..8a9f235b4b 100644
--- a/lang/python/pt_BR/LC_MESSAGES/python.po
+++ b/lang/python/pt_BR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Guilherme Marçal Silva, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
@@ -22,19 +22,138 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando partições."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Erro de Configuração."
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Sem partições definidas para uso por 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços do systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Não é possível modificar o serviço"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"A chamada systemctl {arg!s} no chroot retornou o código de erro"
+" {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível habilitar o serviço {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível habilitar o alvo {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Comandos desconhecidos do systemd {command!s} e "
+"{suffix!s} para a unidade {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar os sistemas de arquivos."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Preenchendo sistemas de arquivos."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "O rsync falhou com o código de erro {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Descompactando imagem {}/{}, arquivo {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Começando a descompactar {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "O globalstorage não contém uma chave \"rootMountPoint\". Nada foi feito."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem incorreto para a partição root"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "O rootMountPoint é \"{}\", mas ele não existe. Nada foi feito."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuração incorreta do unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Não há suporte para o sistema de arquivos \"{}\" ({}) no seu kernel atual"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de arquivos de origem \"{}\" não existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ocorreu uma falha ao localizar o unsquashfs, certifique-se de que o pacote "
+"squashfs-tools esteja instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "A destinação \"{}\" no sistema de destino não é um diretório"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,156 +212,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gerenciador de exibição está incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Criando initramfs com dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Erro ao executar dracut no alvo"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa modelo python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Etapa modelo python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escrevendo fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Erro de Configuração."
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Sem partições definidas para uso por 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nenhum ponto de montagem para o root fornecido para uso por 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando relógio de hardware."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locais."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando swap encriptada."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Criando initramfs com mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar mkinitfs no alvo"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando partições."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Salvando configuração de rede."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando serviço dmcrypt do OpenRC."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar pacotes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processando pacotes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando um pacote."
-msgstr[1] "Instalando %(num)d pacotes."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removendo um pacote."
-msgstr[1] "Removendo %(num)d pacotes."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando os dados."
@@ -269,11 +255,6 @@ msgstr ""
 "Serviço de ação {arg!s} desconhecido para o serviço {name!s} no"
 " nível de execução {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Não é possível modificar o serviço"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -305,103 +286,124 @@ msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, o qual não "
 "existe."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços do systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"A chamada systemctl {arg!s} no chroot retornou o código de erro"
-" {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar pacotes."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível habilitar o serviço {name!s} do systemd."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processando pacotes (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível habilitar o alvo {name!s} do systemd."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando um pacote."
+msgstr[1] "Instalando %(num)d pacotes."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removendo um pacote."
+msgstr[1] "Removendo %(num)d pacotes."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade {name!s} do systemd."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Comandos desconhecidos do systemd {command!s} e "
-"{suffix!s} para a unidade {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar os sistemas de arquivos."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Preenchendo sistemas de arquivos."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "O rsync falhou com o código de erro {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar bootloader."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Descompactando imagem {}/{}, arquivo {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Começando a descompactar {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando relógio de hardware."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nenhum ponto de montagem para a partição root"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Criando initramfs com mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "O globalstorage não contém uma chave \"rootMountPoint\". Nada foi feito."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar mkinitfs no alvo"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ponto de montagem incorreto para a partição root"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "O rootMountPoint é \"{}\", mas ele não existe. Nada foi feito."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando initramfs com dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuração incorreta do unsquash"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Erro ao executar dracut no alvo"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Não há suporte para o sistema de arquivos \"{}\" ({}) no seu kernel atual"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "O sistema de arquivos de origem \"{}\" não existe"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando serviço dmcrypt do OpenRC."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escrevendo fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Ocorreu uma falha ao localizar o unsquashfs, certifique-se de que o pacote "
-"squashfs-tools esteja instalado"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "A destinação \"{}\" no sistema de destino não é um diretório"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa modelo python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Etapa modelo python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locais."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Salvando configuração de rede."
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index 7f48c9a2e1..66cabb331b 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Hugo Carvalho , 2021\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
@@ -23,21 +23,140 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar o carregador de arranque."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar o GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de arranque"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "A montar partições."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Erro de configuração"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nenhuma partição está definida para 
    {!s}
     usar."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Não é possível modificar serviço"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Não foi possível instalar o carregador de arranque. O comando de instalação "
-"
    {!s}
     apresentou o código de erro {!s}."
+"systemctl {arg!s} chamar pelo chroot retornou com código de "
+"erro {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível ativar o serviço systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível ativar o destino do systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desativar o destino do systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade do systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandos do systemd desconhecidos {command!s} e "
+"{suffix!s} por unidade {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "A preencher os sistemas de ficheiros."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falhou com código de erro {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "A descompactar imagem {}/{}, ficheiro {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "A começar a descompactação {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Falha ao descompactar imagem \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage não contém um \"rootMountPoint\" chave, nada a fazer"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem mau para partição root"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Má configuração unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"O sistema de ficheiros para \"{}\" ({}) não é suportado pelo seu kernel "
+"atual"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de ficheiros fonte \"{}\" não existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Falha ao procurar unsquashfs, certifique-se que tem o pacote squashfs-tools "
+"instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "O destino \"{}\" no sistema de destino não é um diretório"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -96,163 +215,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gestor de exibição estava incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Criando o initramfs com o dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Falha ao executar o dracut no destino"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa Dummy python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passo Dummy python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "A escrever o fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Erro de configuração"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nenhuma partição está definida para 
    {!s}
     usar."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Nenhum ponto de montagem root é fornecido para 
    {!s}
     usar."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Não é dada nenhuma configuração 
    {!s}
     para 
    {!s}
     "
-"utilizar."
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar o GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "A definir o relógio do hardware."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "A configurar o mkintcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "A configurar o initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "A configurar a localização."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Nenhum ponto de montagem root é fornecido para 
    {!s}
     usar."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando a swap criptografada."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "A criar o initramfs com o mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar o mkintfs no destino"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "A montar partições."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "A guardar a configuração de rede."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "A configurar o serviço OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar pacotes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "A processar pacotes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "A instalar um pacote."
-msgstr[1] "A instalar %(num)d pacotes."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "A remover um pacote."
-msgstr[1] "A remover %(num)d pacotes."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Erro do gestor de pacotes"
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu preparar atualizações. O comando "
-"
    {!s}
     apresentou o código de erro {!s}."
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
-"
    {!s}
     apresentou o código de erro {!s}."
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-"O gestor de pacotes poderia fazer alterações ao sistema instalado. O comando"
-" 
    {!s}
     apresentou o código de erro {!s}."
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "A instalar dados."
@@ -279,11 +257,6 @@ msgstr ""
 "Serviço de ação desconhecido {arg!s} para serviço {name!s} em "
 "nível de execução {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Não é possível modificar serviço"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -314,105 +287,132 @@ msgid ""
 msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, que não existe."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chamar pelo chroot retornou com código de "
-"erro {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar pacotes."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível ativar o serviço systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "A processar pacotes (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível ativar o destino do systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "A instalar um pacote."
+msgstr[1] "A instalar %(num)d pacotes."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desativar o destino do systemd {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "A remover um pacote."
+msgstr[1] "A remover %(num)d pacotes."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade do systemd {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Erro do gestor de pacotes"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Comandos do systemd desconhecidos {command!s} e "
-"{suffix!s} por unidade {name!s}."
+"O gestor de pacotes não conseguiu preparar atualizações. O comando "
+"
    {!s}
     apresentou o código de erro {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de ficheiros."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
+"
    {!s}
     apresentou o código de erro {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "A preencher os sistemas de ficheiros."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falhou com código de erro {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar o carregador de arranque."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "A descompactar imagem {}/{}, ficheiro {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de arranque"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "A começar a descompactação {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"Não foi possível instalar o carregador de arranque. O comando de instalação "
+"
    {!s}
     apresentou o código de erro {!s}."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Falha ao descompactar imagem \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "A definir o relógio do hardware."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nenhum ponto de montagem para a partição root"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "A criar o initramfs com o mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage não contém um \"rootMountPoint\" chave, nada a fazer"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar o mkintfs no destino"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ponto de montagem mau para partição root"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando o initramfs com o dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Má configuração unsquash"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Falha ao executar o dracut no destino"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"O sistema de ficheiros para \"{}\" ({}) não é suportado pelo seu kernel "
-"atual"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "A configurar o initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "O sistema de ficheiros fonte \"{}\" não existe"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "A configurar o serviço OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "A escrever o fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Falha ao procurar unsquashfs, certifique-se que tem o pacote squashfs-tools "
-"instalado"
+"Não é dada nenhuma configuração 
    {!s}
     para 
    {!s}
     "
+"utilizar."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "O destino \"{}\" no sistema de destino não é um diretório"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa Dummy python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passo Dummy python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "A configurar a localização."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "A guardar a configuração de rede."
diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po
index 0cddb0e9c8..9affed1db9 100644
--- a/lang/python/ro/LC_MESSAGES/python.po
+++ b/lang/python/ro/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Sebastian Brici , 2018\n"
 "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
@@ -22,223 +22,201 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demonteaza sistemul de fisiere"
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fictiv."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalează pachetele."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Se procesează pachetele (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalează un pachet."
-msgstr[1] "Se instalează %(num)d pachete."
-msgstr[2] "Se instalează %(num)d din pachete."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se elimină un pachet."
-msgstr[1] "Se elimină %(num)d pachet."
-msgstr[2] "Se elimină %(num)d de pachete."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -263,11 +241,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -293,97 +266,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalează pachetele."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Se procesează pachetele (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalează un pachet."
+msgstr[1] "Se instalează %(num)d pachete."
+msgstr[2] "Se instalează %(num)d din pachete."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se elimină un pachet."
+msgstr[1] "Se elimină %(num)d pachet."
+msgstr[2] "Se elimină %(num)d de pachete."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Demonteaza sistemul de fisiere"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fictiv."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po
index 56f641f1a9..06c62fbeb5 100644
--- a/lang/python/ru/LC_MESSAGES/python.po
+++ b/lang/python/ru/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: ZIzA, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
@@ -22,18 +22,132 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Установить загрузчик."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Настройте GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтирование разделов."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Ошибка конфигурации"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Не определены разделы для использования 
    {!S}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Настройка systemd сервисов"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не могу изменить сервис"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Размонтирование файловой системы."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Наполнение файловой системы."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -90,103 +204,72 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Создание initramfs с помощью dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не удалось запустить dracut на цели"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхода {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запись fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Ошибка конфигурации"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Не определены разделы для использования 
    {!S}
    ."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Настройка зашифрованного swap."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Настройте GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Установка данных."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Установка аппаратных часов."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Настройка служб OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Настройка initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Настройка языка."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Настройка зашифрованного swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтирование разделов."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Целевой сервис не существует."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Сохранение настроек сети."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Настройка службы OpenRC dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Настроить тему Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -235,158 +318,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Настроить тему Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Установка данных."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Настройка служб OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Не могу изменить сервис"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Целевой сервис не существует."
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Настройка systemd сервисов"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Установить загрузчик."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Размонтирование файловой системы."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Наполнение файловой системы."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Установка аппаратных часов."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхода {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Создание initramfs с помощью dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не удалось запустить dracut на цели"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Настройка initramfs."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Настройка службы OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Запись fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Настройка языка."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr ""
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Сохранение настроек сети."
diff --git a/lang/python/ru_RU/LC_MESSAGES/python.po b/lang/python/ru_RU/LC_MESSAGES/python.po
index 85ccaac501..77ca09d205 100644
--- a/lang/python/ru_RU/LC_MESSAGES/python.po
+++ b/lang/python/ru_RU/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Russian (Russia) (https://www.transifex.com/calamares/teams/20061/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,225 +17,201 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +261,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po
index 14373e73da..dc92f2203d 100644
--- a/lang/python/si/LC_MESSAGES/python.po
+++ b/lang/python/si/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po
index 466293383d..12948a6700 100644
--- a/lang/python/sk/LC_MESSAGES/python.po
+++ b/lang/python/sk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Dušan Kazik , 2020\n"
 "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
@@ -21,20 +21,137 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Inštalácia zavádzača."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurácia zavádzača GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Pripájanie oddielov."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Chyba konfigurácie"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nie sú určené žiadne oddiely na použitie pre 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurácia služieb systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nedá sa upraviť služba"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
+"kód {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedá sa povoliť služba systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Neznáme príkazy systému systemd {command!s} a "
+"{suffix!s} pre jednotku {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojenie súborových systémov."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Napĺňanie súborových systémov."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Príkaz rsync zlyhal s chybovým kódom {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbaľuje sa obraz {}/{}, súbor {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Spúšťa sa rozbaľovanie {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Zlyhalo rozbalenie obrazu „{}“"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Žiadny bod pripojenia pre koreňový oddiel"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Zlý bod pripojenia pre koreňový oddiel"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Nesprávna konfigurácia nástroja unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Súborový systém pre \"{}\" ({}) nie je podporovaný vaším aktuálnym jadrom"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový súborový systém \"{}\" neexistuje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
+
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Nedá sa zapísať konfiguračný súbor správcu KDM"
@@ -89,103 +206,72 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurácia správcu zobrazenia nebola úplná"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Vytváranie initramfs pomocou nástroja dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Zlyhalo spustenie nástroja dracut v cieli"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Kód skončenia bol {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktívna úloha jazyka python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktívny krok {} jazyka python"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisovanie fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Chyba konfigurácie"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nie sú určené žiadne oddiely na použitie pre 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurácia mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigurácia zašifrovaného odkladacieho priestoru."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurácia zavádzača GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Inštalácia údajov."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavovanie hardvérových hodín."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigurácia služieb OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurácia mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurácia initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurácia miestnych nastavení."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigurácia zašifrovaného odkladacieho priestoru."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Pripájanie oddielov."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Cieľová služba neexistuje"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Ukladanie sieťovej konfigurácie."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurácia motívu služby Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -234,161 +320,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurácia motívu služby Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Inštalácia údajov."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigurácia služieb OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Nedá sa upraviť služba"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Inštalácia zavádzača."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
+#: src/modules/bootloader/main.py:503
 msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Cieľová služba neexistuje"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurácia služieb systemd"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavovanie hardvérových hodín."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
-"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
-"kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedá sa povoliť služba systému systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
-"Neznáme príkazy systému systemd {command!s} a "
-"{suffix!s} pre jednotku {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odpojenie súborových systémov."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Napĺňanie súborových systémov."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Príkaz rsync zlyhal s chybovým kódom {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Rozbaľuje sa obraz {}/{}, súbor {}/{}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Kód skončenia bol {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Spúšťa sa rozbaľovanie {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváranie initramfs pomocou nástroja dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Zlyhalo rozbalenie obrazu „{}“"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Zlyhalo spustenie nástroja dracut v cieli"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Žiadny bod pripojenia pre koreňový oddiel"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurácia initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Zlý bod pripojenia pre koreňový oddiel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisovanie fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Nesprávna konfigurácia nástroja unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Súborový systém pre \"{}\" ({}) nie je podporovaný vaším aktuálnym jadrom"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktívna úloha jazyka python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Zdrojový súborový systém \"{}\" neexistuje"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktívny krok {} jazyka python"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurácia miestnych nastavení."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Ukladanie sieťovej konfigurácie."
diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po
index cc41347c9b..42abdc76bb 100644
--- a/lang/python/sl/LC_MESSAGES/python.po
+++ b/lang/python/sl/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,225 +17,201 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +261,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po
index 032742c210..a920c1e01d 100644
--- a/lang/python/sq/LC_MESSAGES/python.po
+++ b/lang/python/sq/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Besnik Bleta , 2021\n"
 "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
@@ -21,21 +21,139 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalo ngarkues nisjesh."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Formësoni GRUB-in."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Gabim instalimi Ngarkuesi Nisësi"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Po montohen pjesë."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Gabim Formësimi"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "S’ka pjesë të përkufizuara për 
    {!s}
     për t’u përdorur."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Formësoni shërbime systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "S’modifikohet dot shërbimi"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
    {!s}
     u "
-"përgjigj me kod gabimi {!s}."
+"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "S’aktivizohet dot objektivi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "S’maskohet dot njësia systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Urdhra të panjohur systemd {command!s} dhe "
+"{suffix!s} për njësi {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Çmontoni sisteme kartelash."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Po mbushen sisteme kartelash."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync dështoi me kod gabimi {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Po shpaketohet paketa {}/{}, kartela {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Po fillohet të shpaketohet {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Dështoi shpaketimi i figurës \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "S’ka pikë montimi për ndarjen rrënjë"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage nuk përmban një vlerë \"rootMountPoint\", s’po bëhet gjë"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Pikë e gabuar montimi për ndarjen rrënjë"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint është \"{}\", që s’ekziston, s’po bëhet gjë"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Formësim i keq i unsquash-it"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Sistemi i kartelave për \"{}\" ({}) nuk mbulohet nga kerneli juaj i tanishëm"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"S’u arrit të gjendej unsquashfs, sigurohuni se e keni të instaluar paketën "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,163 +211,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Po krijohet initramfs me dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "S’u arrit të xhirohej dracut mbi objektivin"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Kodi i daljes qe {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Akt python dummy."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hap python {} dummy"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Po shkruhet fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Gabim Formësimi"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "S’ka pjesë të përkufizuara për 
    {!s}
     për t’u përdorur."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Po formësohet mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "S’është dhënë pikë montimi rrënjë për 
    {!s}
     për t’u përdorur."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"S’është dhënë formësim 
    {!s}
     për t’u përdorur nga 
    {!s}
    ."
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Formësoni GRUB-in."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Po caktohet ora hardware."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Po formësohet mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Po formësohet initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Po formësohen vendoret."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Po formësohet pjesë swap e fshehtëzuar."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Po krijohet initramfs me mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Po montohen pjesë."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Po ruhet formësimi i rrjetit."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Po formësohet shërbim OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalo paketa."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Po instalohet një paketë."
-msgstr[1] "Po instalohen %(num)d paketa."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Po hiqet një paketë."
-msgstr[1] "Po hiqen %(num)d paketa."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Gabim Përgjegjësi Paketash"
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri 
    {!s}
     u"
-" përgjigj me kod gabimi {!s}."
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri 
    {!s}
     u "
-"përgjigj me kod gabimi {!s}."
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
-"
    {!s}
     u përgjigj me kod gabimi {!s}."
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Formësoni temën Plimuth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Po instalohen të dhëna."
@@ -274,11 +252,6 @@ msgstr ""
 "Service-action {arg!s} i panjohur për shërbimin {name!s} te "
 "run-level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "S’modifikohet dot shërbimi"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -310,104 +283,131 @@ msgstr ""
 "Shtegu për shërbimin {name!s} është {path!s}, i cili nuk "
 "ekziston."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Formësoni shërbime systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Formësoni temën Plimuth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
-"{num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalo paketa."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "S’aktivizohet dot objektivi systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Po instalohet një paketë."
+msgstr[1] "Po instalohen %(num)d paketa."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Po hiqet një paketë."
+msgstr[1] "Po hiqen %(num)d paketa."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "S’maskohet dot njësia systemd {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Gabim Përgjegjësi Paketash"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Urdhra të panjohur systemd {command!s} dhe "
-"{suffix!s} për njësi {name!s}."
+"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri 
    {!s}
     u"
+" përgjigj me kod gabimi {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Çmontoni sisteme kartelash."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri 
    {!s}
     u "
+"përgjigj me kod gabimi {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Po mbushen sisteme kartelash."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync dështoi me kod gabimi {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalo ngarkues nisjesh."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Po shpaketohet paketa {}/{}, kartela {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Gabim instalimi Ngarkuesi Nisësi"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Po fillohet të shpaketohet {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
    {!s}
     u "
+"përgjigj me kod gabimi {!s}."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Dështoi shpaketimi i figurës \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Po caktohet ora hardware."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "S’ka pikë montimi për ndarjen rrënjë"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Po krijohet initramfs me mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage nuk përmban një vlerë \"rootMountPoint\", s’po bëhet gjë"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Pikë e gabuar montimi për ndarjen rrënjë"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Kodi i daljes qe {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint është \"{}\", që s’ekziston, s’po bëhet gjë"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Po krijohet initramfs me dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Formësim i keq i unsquash-it"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "S’u arrit të xhirohej dracut mbi objektivin"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Sistemi i kartelave për \"{}\" ({}) nuk mbulohet nga kerneli juaj i tanishëm"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Po formësohet initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Po formësohet shërbim OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Po shkruhet fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"S’u arrit të gjendej unsquashfs, sigurohuni se e keni të instaluar paketën "
-"squashfs-tools"
+"S’është dhënë formësim 
    {!s}
     për t’u përdorur nga 
    {!s}
    ."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Akt python dummy."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hap python {} dummy"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Po formësohen vendoret."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Po ruhet formësimi i rrjetit."
diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po
index ce1a2ac0b8..f581621a8f 100644
--- a/lang/python/sr/LC_MESSAGES/python.po
+++ b/lang/python/sr/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Slobodan Simić , 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Подеси ГРУБ"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтирање партиција."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Грешка поставе"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Подеси „systemd“ сервисе"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не могу да мењам сервис"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтирање фајл-система."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Попуњавање фајл-система."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync неуспешан са кодом грешке {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Неуспело распакивање одраза \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Нема тачке мотирања за root партицију"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Лоша тачка монтирања за корену партицију"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,102 +202,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Уписивање fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Грешка поставе"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Инсталирање података."
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Подеси ГРУБ"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Подешавање локалитета."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтирање партиција."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Упис поставе мреже."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -232,157 +314,77 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Инсталирање података."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Не могу да мењам сервис"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Подеси „systemd“ сервисе"
-
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:503
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтирање фајл-система."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Попуњавање фајл-система."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync неуспешан са кодом грешке {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Неуспело распакивање одраза \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Нема тачке мотирања за root партицију"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Лоша тачка монтирања за корену партицију"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Уписивање fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Подешавање локалитета."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr ""
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Упис поставе мреже."
diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po
index 805e0a31ea..143777e541 100644
--- a/lang/python/sr@latin/LC_MESSAGES/python.po
+++ b/lang/python/sr@latin/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,223 +17,201 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -258,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -288,97 +261,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po
index 79b08ab0ea..c0dba7b0b9 100644
--- a/lang/python/sv/LC_MESSAGES/python.po
+++ b/lang/python/sv/LC_MESSAGES/python.po
@@ -6,16 +6,16 @@
 # Translators:
 # Jan-Olof Svensson, 2019
 # Tobias Olausson , 2020
-# Luna Jernberg , 2020
+# Luna Jernberg , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Luna Jernberg , 2020\n"
+"Last-Translator: Luna Jernberg , 2021\n"
 "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,19 +23,138 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installera starthanterare."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurera GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterar partitioner."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Konfigurationsfel"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Inga partitioner är definerade för 
    {!s}
     att använda."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurera systemd tjänster"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Kunde inte modifiera tjänst"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Anrop till systemctl {arg!s}i chroot returnerade felkod "
+"{num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kunde inte aktivera systemd tjänst {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kunde inte aktivera systemd målsystem {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan inte maskera systemd unit {name!s}"
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Okända systemd kommandon {command!s} och {suffix!s} för "
+"enhet {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Avmontera filsystem."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Packar upp filsystem."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync misslyckades med felkod {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Packar upp avbild {}/{}, fil {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Börjar att packa upp {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Misslyckades att packa upp avbild \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ingen monteringspunkt för root partition"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage innehåller ingen \"rootMountPoint\"-nyckel, så gör inget"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Dålig monteringspunkt för root partition"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint är \"{}\", vilket inte finns, så gör inget"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dålig unsquash konfiguration"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Filsystemet för \"{}\" ({}) stöds inte av din nuvarande kärna"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Källfilsystemet \"{}\" existerar inte"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Kunde inte hitta unsquashfs, se till att du har paketet squashfs-tools "
+"installerat"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,156 +212,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguration för displayhanteraren var inkomplett"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Skapar initramfs med dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Misslyckades att köra dracut på målet "
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Felkoden var {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Exempel python jobb"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Exempel python steg {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Konfigurationsfel"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Inga partitioner är definerade för 
    {!s}
     att använda."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerar mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Ingen root monteringspunkt är angiven för 
    {!s}
     att använda."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurera GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ställer hårdvaruklockan."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerar mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerar initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerar språkinställningar"
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurerar krypterad swap."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Skapar initramfs med mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Misslyckades att köra mkinitfs på målet "
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Monterar partitioner."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Sparar nätverkskonfiguration."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerar OpenRC dmcrypt tjänst."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installera paket."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Bearbetar paket (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerar ett paket."
-msgstr[1] "Installerar %(num)d paket."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Tar bort ett paket."
-msgstr[1] "Tar bort %(num)d paket."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurera Plymouth tema"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installerar data."
@@ -267,11 +253,6 @@ msgstr ""
 "Okänt tjänst-anrop {arg!s}för tjänsten {name!s} i körnivå "
 "{level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Kunde inte modifiera tjänst"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -302,103 +283,134 @@ msgid ""
 msgstr ""
 "Sökvägen för tjänst {name!s} är {path!s}, som inte existerar."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurera systemd tjänster"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurera Plymouth tema"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Anrop till systemctl {arg!s}i chroot returnerade felkod "
-"{num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installera paket."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kunde inte aktivera systemd tjänst {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Bearbetar paket (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kunde inte aktivera systemd målsystem {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerar ett paket."
+msgstr[1] "Installerar %(num)d paket."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Tar bort ett paket."
+msgstr[1] "Tar bort %(num)d paket."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan inte maskera systemd unit {name!s}"
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "Pakethanterare fel"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Okända systemd kommandon {command!s} och {suffix!s} för "
-"enhet {name!s}."
+"Pakethanteraren kunde inte förbereda uppdateringar kommandot 
    {!s}
    "
+" returnerade felkod {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Avmontera filsystem."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte uppdatera systemet. kommandot 
    {!s}
     "
+"returnerade felkod {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Packar upp filsystem."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
+"kommandot 
    {!s}
     returnerade felkod {!s}."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync misslyckades med felkod {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installera starthanterare."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Packar upp avbild {}/{}, fil {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Starthanterare installationsfel"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Börjar att packa upp {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"Starthanterare kunde inte installeras. Installationskommandot "
+"
    {!s}
    returnerade felkod {!s}."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Misslyckades att packa upp avbild \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ställer hårdvaruklockan."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ingen monteringspunkt för root partition"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Skapar initramfs med mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage innehåller ingen \"rootMountPoint\"-nyckel, så gör inget"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Misslyckades att köra mkinitfs på målet "
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Dålig monteringspunkt för root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Felkoden var {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint är \"{}\", vilket inte finns, så gör inget"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Skapar initramfs med dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Dålig unsquash konfiguration"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Misslyckades att köra dracut på målet "
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Filsystemet för \"{}\" ({}) stöds inte av din nuvarande kärna"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerar initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Källfilsystemet \"{}\" existerar inte"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerar OpenRC dmcrypt tjänst."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Kunde inte hitta unsquashfs, se till att du har paketet squashfs-tools "
-"installerat"
+"Ingen 
    {!s}
     konfiguration är angiven för 
    {!s}
     att "
+"använda. "
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Exempel python jobb"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Exempel python steg {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerar språkinställningar"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Sparar nätverkskonfiguration."
diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po
index ec04917b85..35ad32465b 100644
--- a/lang/python/te/LC_MESSAGES/python.po
+++ b/lang/python/te/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po
index 8227f42645..bc26911935 100644
--- a/lang/python/tg/LC_MESSAGES/python.po
+++ b/lang/python/tg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Victor Ibragimov , 2020\n"
 "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n"
@@ -21,19 +21,140 @@ msgstr ""
 "Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Насбкунии боркунандаи роҳандозӣ."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Танзимоти GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Васлкунии қисмҳои диск."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Хатои танзимкунӣ"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Ягон қисми диск барои истифодаи 
    {!s}
     муайян карда нашуд."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Танзимоти хидматҳои systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Хидмат тағйир дода намешавад"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
+" вуҷуд овард."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Фармонҳои systemd-и номаълум {command!s} ва "
+"{suffix!s} барои воҳиди {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Ҷудо кардани низомҳои файлӣ."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Пурборкунӣ бо низомҳои файлӣ."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync бо рамзи хатои {} қатъ шуд."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Баровардани тимсол: {}/{}, файл: {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Оғози барориши {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Тимсоли \"{}\" бароварда нашуд"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ягон нуқтаи васл барои қисми диски реша (root) нест"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"globalstorage калиди \"rootMountPoint\"-ро дар бар намегирад, ҳeҷ кop "
+"намeкyнад"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Нуқтаи васли нодуруст барои қисми диски реша (root)"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint аз \"{}\" иборат аст, ки вуҷуд надорад, ҳeҷ кop намeкyнад"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Танзимоти unsquash нодуруст аст"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Низоми файлӣ барои \"{}\" ({}) бо ҳастаи ҷории шумо дастгирӣ намешавад"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Низоми файлии манбаи \"{}\" вуҷуд надорад"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs ёфт нашуд, мутмаин шавед, ки бастаи squashfs-tools насб карда "
+"шудааст"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,155 +212,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Эҷодкунии initramfs бо dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "dracut дар низоми интихобшуда иҷро нашуд"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Рамзи барориш: {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Вазифаи амсилаи python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Қадами амсилаи python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Сабткунии fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Хатои танзимкунӣ"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Ягон қисми диск барои истифодаи 
    {!s}
     муайян карда нашуд."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Нуқтаи васли реша (root) барои истифодаи 
    {!s}
     дода нашуд."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Танзимоти GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Танзимкунии соати сахтафзор."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Танзимкунии mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Танзимкунии initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Танзимкунии маҳаллигардониҳо."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Нуқтаи васли реша (root) барои истифодаи 
    {!s}
     дода нашуд."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Танзимкунии мубодилаи рамзгузоришуда."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Эҷодкунии initramfs бо mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Васлкунии қисмҳои диск."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Нигоҳдории танзимоти шабака."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Танзимкунии хидмати OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Насбкунии қуттиҳо."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Насбкунии як баста."
-msgstr[1] "Насбкунии %(num)d баста."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Тозакунии як баста"
-msgstr[1] "Тозакунии %(num)d баста."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Танзимоти мавзӯи Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Насбкунии иттилоот."
@@ -264,11 +252,6 @@ msgstr ""
 "Хидмати амалии {arg!s} барои хидмати {name!s} дар run-level "
 "{level!s} номаълум аст."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Хидмат тағйир дода намешавад"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -300,105 +283,124 @@ msgstr ""
 "Масир барои хидмати {name!s} аз {path!s} иборат аст, аммо он "
 "вуҷуд надорад."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Танзимоти хидматҳои systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Танзимоти мавзӯи Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
-" вуҷуд овард."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Насбкунии қуттиҳо."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Насбкунии як баста."
+msgstr[1] "Насбкунии %(num)d баста."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Тозакунии як баста"
+msgstr[1] "Тозакунии %(num)d баста."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Фармонҳои systemd-и номаълум {command!s} ва "
-"{suffix!s} барои воҳиди {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Ҷудо кардани низомҳои файлӣ."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Пурборкунӣ бо низомҳои файлӣ."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync бо рамзи хатои {} қатъ шуд."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Насбкунии боркунандаи роҳандозӣ."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Баровардани тимсол: {}/{}, файл: {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Оғози барориши {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Тимсоли \"{}\" бароварда нашуд"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Танзимкунии соати сахтафзор."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ягон нуқтаи васл барои қисми диски реша (root) нест"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Эҷодкунии initramfs бо mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage калиди \"rootMountPoint\"-ро дар бар намегирад, ҳeҷ кop "
-"намeкyнад"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Нуқтаи васли нодуруст барои қисми диски реша (root)"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Рамзи барориш: {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint аз \"{}\" иборат аст, ки вуҷуд надорад, ҳeҷ кop намeкyнад"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Эҷодкунии initramfs бо dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Танзимоти unsquash нодуруст аст"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "dracut дар низоми интихобшуда иҷро нашуд"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Низоми файлӣ барои \"{}\" ({}) бо ҳастаи ҷории шумо дастгирӣ намешавад"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Танзимкунии initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Низоми файлии манбаи \"{}\" вуҷуд надорад"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Танзимкунии хидмати OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Сабткунии fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"unsquashfs ёфт нашуд, мутмаин шавед, ки бастаи squashfs-tools насб карда "
-"шудааст"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Вазифаи амсилаи python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Қадами амсилаи python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Танзимкунии маҳаллигардониҳо."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Нигоҳдории танзимоти шабака."
diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po
index 5a9d718cc1..e17496846d 100644
--- a/lang/python/th/LC_MESSAGES/python.po
+++ b/lang/python/th/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po
index 745fe2ea50..c1884715ff 100644
--- a/lang/python/tr_TR/LC_MESSAGES/python.po
+++ b/lang/python/tr_TR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Demiray Muhterem , 2020\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@@ -22,19 +22,138 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükleyici kuruluyor"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB'u yapılandır."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölümlemeleri bağlanıyor."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Yapılandırma Hatası"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     kullanması için hiçbir bölüm tanımlanmadı."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd hizmetlerini yapılandır"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Hizmet değiştirilemiyor"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
+"{num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Systemd birimi maskeleyemiyor {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Bilinmeyen sistem komutları {command!s} ve "
+"{suffix!s}  {name!s} birimi için."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dosya sistemlerini ayırın."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Dosya sistemlerini dolduruyorum."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync {} hata koduyla başarısız oldu."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Açılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Dışa aktarım başlatılıyor {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kurulum medyası aktarılamadı"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "kök disk bölümü için bağlama noktası yok"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage bir \"rootMountPoint\" anahtarı içermiyor, hiçbirşey yapılmadı"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök disk bölümü için hatalı bağlama noktası"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash yapılandırma sorunlu"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) Dosya sistemi mevcut çekirdeğiniz tarafından desteklenmiyor"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" Kaynak dosya sistemi mevcut değil"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Unsquashfs bulunamadı, squashfs-tools paketinin kurulu olduğundan emin olun."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,155 +211,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ile initramfs oluşturuluyor."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hedef üzerinde dracut çalıştırılamadı"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıkış kodu {} idi"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab dosyasına yazılıyor."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Yapılandırma Hatası"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     kullanması için hiçbir bölüm tanımlanmadı."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "
    {!s}
     kullanması için kök bağlama noktası verilmedi."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB'u yapılandır."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Donanım saati ayarlanıyor."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Mkinitcpio yapılandırılıyor."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Initramfs yapılandırılıyor."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Sistem yerelleri yapılandırılıyor."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "
    {!s}
     kullanması için kök bağlama noktası verilmedi."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Şifreli takas alanı yapılandırılıyor."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Mkinitfs ile initramfs oluşturuluyor."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hedefte mkinitfs çalıştırılamadı"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölümlemeleri bağlanıyor."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Ağ yapılandırması kaydediliyor."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketleri yükle"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketler işleniyor (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d paket yükleniyor"
-msgstr[1] "%(num)d paket yükleniyor"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d paket kaldırılıyor."
-msgstr[1] "%(num)d paket kaldırılıyor."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth temasını yapılandır"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Veri yükleniyor."
@@ -265,11 +251,6 @@ msgstr ""
 "Çalışma düzeyinde {level!s} hizmetinde {name!s} servisi için bilinmeyen "
 "hizmet eylemi {arg!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Hizmet değiştirilemiyor"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -297,103 +278,124 @@ msgid ""
 "exist."
 msgstr "{name!s} hizmetinin yolu {path!s}, ki mevcut değil."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd hizmetlerini yapılandır"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth temasını yapılandır"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
-"{num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketleri yükle"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paketler işleniyor (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d paket yükleniyor"
+msgstr[1] "%(num)d paket yükleniyor"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d paket kaldırılıyor."
+msgstr[1] "%(num)d paket kaldırılıyor."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Systemd birimi maskeleyemiyor {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Bilinmeyen sistem komutları {command!s} ve "
-"{suffix!s}  {name!s} birimi için."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dosya sistemlerini ayırın."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Dosya sistemlerini dolduruyorum."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync {} hata koduyla başarısız oldu."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükleyici kuruluyor"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Açılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Dışa aktarım başlatılıyor {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" kurulum medyası aktarılamadı"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Donanım saati ayarlanıyor."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "kök disk bölümü için bağlama noktası yok"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Mkinitfs ile initramfs oluşturuluyor."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage bir \"rootMountPoint\" anahtarı içermiyor, hiçbirşey yapılmadı"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hedefte mkinitfs çalıştırılamadı"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök disk bölümü için hatalı bağlama noktası"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıkış kodu {} idi"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ile initramfs oluşturuluyor."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash yapılandırma sorunlu"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hedef üzerinde dracut çalıştırılamadı"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) Dosya sistemi mevcut çekirdeğiniz tarafından desteklenmiyor"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Initramfs yapılandırılıyor."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" Kaynak dosya sistemi mevcut değil"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab dosyasına yazılıyor."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Unsquashfs bulunamadı, squashfs-tools paketinin kurulu olduğundan emin olun."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Sistem yerelleri yapılandırılıyor."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Ağ yapılandırması kaydediliyor."
diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po
index 1cbc379aaa..d4ef292bdc 100644
--- a/lang/python/uk/LC_MESSAGES/python.po
+++ b/lang/python/uk/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yuri Chornoivan , 2021\n"
 "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
@@ -23,21 +23,143 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Встановити завантажувач."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Налаштовування GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Помилка встановлення завантажувача"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтування розділів."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Помилка налаштовування"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Не визначено розділів для використання 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Налаштуйте служби systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не вдалося змінити службу"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Не вдалося встановити завантажувач. Програмою для встановлення "
-"
    {!s}
     повернуто код помилки {!s}."
+"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
+"повідомлення з кодом помилки {num! s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Не вдалося ввімкнути службу systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Не вдалося вимкнути завдання systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Не вдалося замаскувати вузол systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Невідомі команди systemd {command!s} та {suffix!s}"
+" для пристрою {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтувати файлові системи."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Заповнення файлових систем."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Розпаковуємо образ {} з {}, файл {} з {}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Починаємо розпаковувати {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Не вдалося розпакувати образ «{}»"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Немає точки монтування для кореневого розділу"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо "
+"ніяких дій."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Помилкова точна монтування для кореневого розділу"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не "
+"виконуватимемо ніяких дій."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Помилкові налаштування unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"У поточному ядрі системи не передбачено підтримки файлової системи «{}» ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Вихідної файлової системи «{}» не існує"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Не вдалося знайти unsquashfs; переконайтеся, що встановлено пакет squashfs-"
+"tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Призначення «{}» у цільовій системі не є каталогом"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,105 +217,81 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Налаштування засобу керування дисплеєм є неповними"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Створюємо initramfs за допомогою dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не вдалося виконати dracut над призначенням"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Код виходу — {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фіктивне завдання python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фіктивний крок python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Записуємо fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Помилка налаштовування"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Не визначено розділів для використання 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Налаштовуємо mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Не вказано кореневої точки монтування для використання у 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Не надано налаштувань 
    {!s}
     для використання у 
    {!s}
    ."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Налаштовуємо зашифрований розділ резервної пам'яті."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Налаштовування GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Встановлюємо дані."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Встановлюємо значення для апаратного годинника."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Налаштувати служби OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Налаштовуємо mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Не вдалося додати службу {name!s} до рівня запуску {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Налаштовуємо initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Не вдалося вилучити службу {name!s} з рівня запуску {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Налаштовуємо локалі."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Невідома дія зі службою {arg!s} для служби {name!s} на рівні "
+"запуску {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Налаштовуємо зашифрований розділ резервної пам'яті."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Унаслідок виконання виклику rc-update {arg!s} chroot повернуто "
+"повідомлення про помилку із кодом {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Створення initramfs за допомогою mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Шляху до рівня запуску не існує"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не вдалося виконати mkinitfs над призначенням"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Шляхом до рівня запуску {level!s} вказано {path!s}. Такого "
+"шляху не існує."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтування розділів."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Служби призначення не існує"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Зберігаємо налаштування мережі."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
+"існує."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Налаштовуємо службу dmcrypt OpenRC."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Налаштувати тему Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -246,178 +344,82 @@ msgstr ""
 
 #: src/modules/packages/main.py:629
 msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 "Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
 "Програмою 
    {!s}
     повернуто код помилки {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Налаштувати тему Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Встановлюємо дані."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Налаштувати служби OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Не вдалося додати службу {name!s} до рівня запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Не вдалося вилучити службу {name!s} з рівня запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Невідома дія зі службою {arg!s} для служби {name!s} на рівні "
-"запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Не вдалося змінити службу"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Унаслідок виконання виклику rc-update {arg!s} chroot повернуто "
-"повідомлення про помилку із кодом {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Шляху до рівня запуску не існує"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Шляхом до рівня запуску {level!s} вказано {path!s}. Такого "
-"шляху не існує."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Служби призначення не існує"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
-"існує."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Налаштуйте служби systemd"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
-"повідомлення з кодом помилки {num! s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Не вдалося ввімкнути службу systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Не вдалося вимкнути завдання systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Встановити завантажувач."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Не вдалося замаскувати вузол systemd {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "Помилка встановлення завантажувача"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Невідомі команди systemd {command!s} та {suffix!s}"
-" для пристрою {name!s}."
+"Не вдалося встановити завантажувач. Програмою для встановлення "
+"
    {!s}
     повернуто код помилки {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтувати файлові системи."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Встановлюємо значення для апаратного годинника."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Заповнення файлових систем."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Створення initramfs за допомогою mkinitfs."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не вдалося виконати mkinitfs над призначенням"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Розпаковуємо образ {} з {}, файл {} з {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Код виходу — {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Починаємо розпаковувати {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Створюємо initramfs за допомогою dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Не вдалося розпакувати образ «{}»"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не вдалося виконати dracut над призначенням"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Немає точки монтування для кореневого розділу"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Налаштовуємо initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо "
-"ніяких дій."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Налаштовуємо службу dmcrypt OpenRC."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Помилкова точна монтування для кореневого розділу"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Записуємо fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не "
-"виконуватимемо ніяких дій."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Помилкові налаштування unsquash"
+"Не надано налаштувань 
    {!s}
     для використання у 
    {!s}
    ."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"У поточному ядрі системи не передбачено підтримки файлової системи «{}» ({})"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фіктивне завдання python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Вихідної файлової системи «{}» не існує"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фіктивний крок python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Не вдалося знайти unsquashfs; переконайтеся, що встановлено пакет squashfs-"
-"tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Налаштовуємо локалі."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Призначення «{}» у цільовій системі не є каталогом"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Зберігаємо налаштування мережі."
diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po
index c8944a7407..8d58fc4261 100644
--- a/lang/python/ur/LC_MESSAGES/python.po
+++ b/lang/python/ur/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po
index db5831cebc..5c38cbb89e 100644
--- a/lang/python/uz/LC_MESSAGES/python.po
+++ b/lang/python/uz/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po
index cedba816e2..c33a759092 100644
--- a/lang/python/vi/LC_MESSAGES/python.po
+++ b/lang/python/vi/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: T. Tran , 2020\n"
 "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n"
@@ -21,19 +21,135 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Đang cài đặt bộ khởi động."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Cấu hình GRUB"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Đang gắn kết các phân vùng."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Lỗi cấu hình"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Không có phân vùng nào được định nghĩa cho 
    {!s}
     để dùng."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Cấu hình các dịch vụ systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Không thể sửa đổi dịch vụ"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Không thể bật dịch vụ systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Không nhận ra lệnh systemd {command!s} và "
+"{suffix!s} cho đơn vị {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Gỡ kết nối các hệ thống tập tin."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Đang làm đầy các hệ thống tập tin."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync thất bại với lỗi {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Bắt đầu bung nội dung {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Bung hình ảnh thất bại \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Không có điểm kết nối cho phân vùng gốc"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage không có khoá \"rootMountPoint\", sẽ không làm gì cả"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Sai điểm kết nối cho phân vùng gốc"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint không tồn tại, có giá trị là \"{}\", sẽ không làm gì cả"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Sai cấu hình bung nén"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Hệ thống tập tin cho \"{}\" ({}) không được hỗ trợ bởi nhân hiện tại"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Hệ thống tập tin nguồn \"{}\" không tồn tại"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "Không tìm thấy lệnh unsquashfs, vui lòng cài đặt gói squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,153 +208,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Cầu hình quản lý hiện thị không hoàn tất"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Đang tạo initramfs bằng dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Chạy dracut thất bại ở hệ thống đích"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Mã lỗi trả về là {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Ví dụ công việc python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Ví dụ python bước {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Đang viết vào fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Lỗi cấu hình"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Không có phân vùng nào được định nghĩa cho 
    {!s}
     để dùng."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Không có điểm kết nối gốc cho 
    {!s}
     để dùng."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Cấu hình GRUB"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Đang thiết lập đồng hồ máy tính."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Đang cấu hình mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Đang cấu hình initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Đang cấu hình ngôn ngữ."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Không có điểm kết nối gốc cho 
    {!s}
     để dùng."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Đang cấu hình hoán đổi mã hoá"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Đang tạo initramfs bằng mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Đang gắn kết các phân vùng."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Đang lưu cấu hình mạng."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Đang cài đặt các gói ứng dụng."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Đang xử lý gói (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Cấu hình giao diện Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Đang cài đặt dữ liệu."
@@ -263,11 +248,6 @@ msgstr ""
 "Không nhận ra thao tác {arg!s} cho dịch vụ {name!s} ở run-level"
 " {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Không thể sửa đổi dịch vụ"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -299,100 +279,122 @@ msgstr ""
 "Đường dẫn cho dịch vụ {name!s} là {path!s}, nhưng không tồn "
 "tại."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Cấu hình các dịch vụ systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Cấu hình giao diện Plymouth"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Đang cài đặt các gói ứng dụng."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Đang xử lý gói (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Không thể bật dịch vụ systemd {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Đang cài đặt bộ khởi động."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:503
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Không nhận ra lệnh systemd {command!s} và "
-"{suffix!s} cho đơn vị {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Gỡ kết nối các hệ thống tập tin."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Đang làm đầy các hệ thống tập tin."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Đang thiết lập đồng hồ máy tính."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync thất bại với lỗi {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Đang tạo initramfs bằng mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Bắt đầu bung nội dung {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Mã lỗi trả về là {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Bung hình ảnh thất bại \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Đang tạo initramfs bằng dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Không có điểm kết nối cho phân vùng gốc"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Chạy dracut thất bại ở hệ thống đích"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage không có khoá \"rootMountPoint\", sẽ không làm gì cả"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Đang cấu hình initramfs."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Sai điểm kết nối cho phân vùng gốc"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint không tồn tại, có giá trị là \"{}\", sẽ không làm gì cả"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Đang viết vào fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Sai cấu hình bung nén"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Hệ thống tập tin cho \"{}\" ({}) không được hỗ trợ bởi nhân hiện tại"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Ví dụ công việc python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Hệ thống tập tin nguồn \"{}\" không tồn tại"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Ví dụ python bước {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "Không tìm thấy lệnh unsquashfs, vui lòng cài đặt gói squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Đang cấu hình ngôn ngữ."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Đang lưu cấu hình mạng."
diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po
index ed87981046..7471fe96c1 100644
--- a/lang/python/zh/LC_MESSAGES/python.po
+++ b/lang/python/zh/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (https://www.transifex.com/calamares/teams/20061/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:629
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index 785fb9e2d6..1e8e85009f 100644
--- a/lang/python/zh_CN/LC_MESSAGES/python.po
+++ b/lang/python/zh_CN/LC_MESSAGES/python.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 玉堂白鹤 , 2020\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
@@ -25,19 +25,134 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安装启动加载器。"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "配置 GRUB."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "挂载分区。"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "配置错误"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "没有分配分区给 
    {!s}
    。"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "配置 systemd 服务"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "无法修改服务"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "无法启用 systemd 服务 {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "无法启用 systemd 目标 {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "无法禁用 systemd 目标 {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "无法屏蔽 systemd 单元 {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
+"{suffix!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "卸载文件系统。"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "写入文件系统。"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync 报错，错误码 {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "解压镜像 {}/{}，文件{}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "开始解压 {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "解压镜像失败 \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "无 root 分区挂载点"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "错误的 root 分区挂载点"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "错误的 unsquash 配置"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "你当前的内核不支持文件系统 \"{}\" ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "源文件系统 \"{}\" 不存在"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "未找到 unsquashfs，请确保安装了 squashfs-tools 软件包"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "目标系统中的 \"{}\" 不是一个目录"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,153 +208,22 @@ msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显
 msgid "Display manager configuration was incomplete"
 msgstr "显示管理器配置不完全"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "用 dracut 创建 initramfs."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "无法在目标中运行 dracut "
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "退出码是 {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "占位 Python 任务。"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "占位 Python 步骤 {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在写入 fstab。"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "配置错误"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "没有分配分区给 
    {!s}
    。"
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr " 未设置 
    {!s}
     要使用的根挂载点。"
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "配置 GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "设置硬件时钟。"
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "配置 mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在配置初始内存文件系统。"
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在进行本地化配置。"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr " 未设置 
    {!s}
     要使用的根挂载点。"
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "配置加密交换分区。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在用 mkinitfs 创建initramfs。"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "无法在目标中运行 mkinitfs"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "挂载分区。"
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "正在保存网络配置。"
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "配置 OpenRC dmcrypt 服务。"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "安装软件包。"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "软件包处理中（%(count)d/%(total)d）"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "安装%(num)d软件包。"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "移除%(num)d软件包。"
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "配置 Plymouth 主题"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "安装数据."
@@ -262,11 +246,6 @@ msgid ""
 "level {level!s}."
 msgstr "未知的服务动作 {arg!s}，服务名: {name!s}，运行级别: {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "无法修改服务"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -292,99 +271,122 @@ msgid ""
 "exist."
 msgstr "服务 {name!s} 的路径 {path!s} 不存在。"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "配置 systemd 服务"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "配置 Plymouth 主题"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "安装软件包。"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "无法启用 systemd 服务 {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "软件包处理中（%(count)d/%(total)d）"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "无法启用 systemd 目标 {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "安装%(num)d软件包。"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "无法禁用 systemd 目标 {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "移除%(num)d软件包。"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "无法屏蔽 systemd 单元 {name!s}."
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
-"{suffix!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "卸载文件系统。"
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "写入文件系统。"
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync 报错，错误码 {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安装启动加载器。"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "解压镜像 {}/{}，文件{}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "开始解压 {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "解压镜像失败 \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "设置硬件时钟。"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "无 root 分区挂载点"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在用 mkinitfs 创建initramfs。"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "无法在目标中运行 mkinitfs"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "错误的 root 分区挂载点"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "退出码是 {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "用 dracut 创建 initramfs."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "错误的 unsquash 配置"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "无法在目标中运行 dracut "
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "你当前的内核不支持文件系统 \"{}\" ({})"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在配置初始内存文件系统。"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "源文件系统 \"{}\" 不存在"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "配置 OpenRC dmcrypt 服务。"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "未找到 unsquashfs，请确保安装了 squashfs-tools 软件包"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在写入 fstab。"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "目标系统中的 \"{}\" 不是一个目录"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "占位 Python 任务。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "占位 Python 步骤 {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在进行本地化配置。"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "正在保存网络配置。"
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po
index a81d8e5b73..967bad991f 100644
--- a/lang/python/zh_TW/LC_MESSAGES/python.po
+++ b/lang/python/zh_TW/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-12 14:14+0200\n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 黃柏諺 , 2021\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
@@ -22,19 +22,134 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安裝開機載入程式。"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "設定 GRUB。"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "開機載入程式安裝錯誤"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "正在掛載分割區。"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "設定錯誤"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "沒有分割區被定義為 
    {!s}
     以供使用。"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "設定 systemd 服務"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "無法修改服務"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr "無法安裝開機載入程式。安裝指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "無法啟用 systemd 服務 {name!s}。"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "無法啟用 systemd 目標 {name!s}。"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "無法停用 systemd 目標 {name!s}。"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "無法 mask systemd 單位 {name!s}。"
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
+"{name!s}。"
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "解除掛載檔案系統。"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "填滿檔案系統。"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync 失敗，錯誤碼 {} 。"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "正在解壓縮 {}/{}，檔案 {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "開始解壓縮 {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "無法解開映像檔 \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "沒有 root 分割區的掛載點"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "root 分割區掛載點錯誤"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "錯誤的 unsquash 設定"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "來源檔案系統 \"{}\" 不存在"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "找不到 unsquashfs，請確定已安裝 squashfs-tools 軟體包"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "目標系統中的目的地 \"{}\" 不是目錄"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -90,153 +205,22 @@ msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf
 msgid "Display manager configuration was incomplete"
 msgstr "顯示管理器設定不完整"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "正在使用 dracut 建立 initramfs。"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "在目標上執行 dracut 失敗"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "結束碼為 {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "假的 python 工作。"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "假的 python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在寫入 fstab。"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:39 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "設定錯誤"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "沒有分割區被定義為 
    {!s}
     以供使用。"
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:40 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "沒有給定的根掛載點 
    {!s}
     以供使用。"
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "無 
    {!s}
     設定可供 
    {!s}
     使用。"
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "設定 GRUB。"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "正在設定硬體時鐘。"
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "正在設定 mkinitcpio。"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在設定 initramfs。"
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在設定語系。"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "沒有給定的根掛載點 
    {!s}
     以供使用。"
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "正在設定已加密的 swap。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在使用 mkinitfs 建立 initramfs。"
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "在目標上執行 mkinitfs 失敗"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "正在掛載分割區。"
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "正在儲存網路設定。"
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "正在設定 OpenRC dmcrypt 服務。"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "安裝軟體包。"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "正在處理軟體包 (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "正在安裝 %(num)d 軟體包。"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "正在移除 %(num)d 軟體包。"
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "軟體包管理程式錯誤"
-
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr "軟體包管理程式無法準備更新。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
-
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr "軟體包管理程式無法更新系統。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
-
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could make changes to the installed system. The command "
-"
    {!s}
     returned error code {!s}."
-msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "設定 Plymouth 主題"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "正在安裝資料。"
@@ -259,11 +243,6 @@ msgid ""
 "level {level!s}."
 msgstr "未知的服務動作 {arg!s} 給服務 {name!s} 在執行層級 {level!s}。"
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "無法修改服務"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -289,99 +268,122 @@ msgid ""
 "exist."
 msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "設定 systemd 服務"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "設定 Plymouth 主題"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "安裝軟體包。"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "無法啟用 systemd 服務 {name!s}。"
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "正在處理軟體包 (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "無法啟用 systemd 目標 {name!s}。"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "正在安裝 %(num)d 軟體包。"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "無法停用 systemd 目標 {name!s}。"
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "正在移除 %(num)d 軟體包。"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "無法 mask systemd 單位 {name!s}。"
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr "軟體包管理程式錯誤"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:589
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
-"{name!s}。"
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr "軟體包管理程式無法準備更新。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "解除掛載檔案系統。"
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr "軟體包管理程式無法更新系統。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "填滿檔案系統。"
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync 失敗，錯誤碼 {} 。"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安裝開機載入程式。"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "正在解壓縮 {}/{}，檔案 {}/{}"
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr "開機載入程式安裝錯誤"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "開始解壓縮 {}"
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr "無法安裝開機載入程式。安裝指令 
    {!s}
     回傳了錯誤碼 {!s}。"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "無法解開映像檔 \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "正在設定硬體時鐘。"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "沒有 root 分割區的掛載點"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在使用 mkinitfs 建立 initramfs。"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "在目標上執行 mkinitfs 失敗"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "root 分割區掛載點錯誤"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "結束碼為 {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "正在使用 dracut 建立 initramfs。"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "錯誤的 unsquash 設定"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "在目標上執行 dracut 失敗"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在設定 initramfs。"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "來源檔案系統 \"{}\" 不存在"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "正在設定 OpenRC dmcrypt 服務。"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "找不到 unsquashfs，請確定已安裝 squashfs-tools 軟體包"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在寫入 fstab。"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "目標系統中的目的地 \"{}\" 不是目錄"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "無 
    {!s}
     設定可供 
    {!s}
     使用。"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "假的 python 工作。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "假的 python step {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在設定語系。"
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "正在儲存網路設定。"

From 56f71501cc84e7894e1c2ea9c51fe87762448783 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 15 Jul 2021 16:54:02 +0200
Subject: [PATCH 287/492] [usersq] Back out color-scheme merge

---
 src/modules/usersq/usersq.qml | 44 +++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml
index fdaaa79e71..8b4ec92cf9 100644
--- a/src/modules/usersq/usersq.qml
+++ b/src/modules/usersq/usersq.qml
@@ -23,6 +23,9 @@ Kirigami.ScrollablePage {
     width: parent.width
     height: parent.height
 
+    Kirigami.Theme.backgroundColor: "#EFF0F1"
+    Kirigami.Theme.textColor: "#1F1F1F"
+
     header: Kirigami.Heading {
         Layout.fillWidth: true
         height: 50
@@ -54,8 +57,8 @@ Kirigami.ScrollablePage {
                 text: config.fullName
                 onTextChanged: config.setFullName(text)
 
-                palette.base: _userNameField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.backgroundColor
-                palette.highlight : _userNameField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
+                palette.base: _userNameField.text.length ? "#f0fff0" : "#FBFBFB"
+                palette.highlight : _userNameField.text.length ? "#dcffdc" : "#FBFBFB"
             }
         }
 
@@ -86,8 +89,8 @@ Kirigami.ScrollablePage {
                 palette.base: _userLoginField.text.length
                     ? ( acceptableInput
                     ? ( _userLoginField.text === "root"
-                    ? Kirigami.Theme.negativeBackgroundColor : Kirigami.Theme.backgroundColor ) : Kirigami.Theme.negativeBackgroundColor ) : Kirigami.Theme.backgroundColor
-                palette.highlight : _userLoginField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
+                    ? "#ffdae0" : "#f0fff0" ) : "#ffdae0" ) : "#FBFBFB"
+                palette.highlight : _userLoginField.text.length ? "#dcffdc" : "#FBFBFB"
             }
 
             Label {
@@ -95,6 +98,7 @@ Kirigami.ScrollablePage {
                 text: qsTr("If more than one person will use this computer, you can create multiple accounts after installation.")
                 font.weight: Font.Thin
                 font.pointSize: 8
+                color: "#6D6D6D"
             }
         }
 
@@ -129,7 +133,7 @@ Kirigami.ScrollablePage {
                 placeholderText: qsTr("Computer Name")
                 text: config.hostName
                 validator: RegularExpressionValidator { regularExpression: /[a-zA-Z0-9][-a-zA-Z0-9_]+/ }
-                color: Kirigami.Theme.textColor
+
                 onTextChanged: acceptableInput
                     ? ( _hostName.text === "localhost"
                     ? forbiddenHost.visible=true
@@ -139,10 +143,10 @@ Kirigami.ScrollablePage {
 
                 palette.base: _hostName.text.length
                     ? ( acceptableInput
-                    ? ( _hostName.text === "localhost" ? Kirigami.Theme.negativeBackgroundColor : Kirigami.Theme.backgroundColor )
-                    : Kirigami.Theme.negativeBackgroundColor)
-                    : Kirigami.Theme.backgroundColor
-                palette.highlight : _hostName.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
+                    ? ( _hostName.text === "localhost" ? "#ffdae0" : "#f0fff0" )
+                    : "#ffdae0")
+                    : "#FBFBFB"
+                palette.highlight : _hostName.text.length ? "#dcffdc" : "#FBFBFB"
             }
 
             Label {
@@ -150,6 +154,7 @@ Kirigami.ScrollablePage {
                 text: qsTr("This name will be used if you make the computer visible to others on a network.")
                 font.weight: Font.Thin
                 font.pointSize: 8
+                color: "#6D6D6D"
             }
         }
 
@@ -189,8 +194,8 @@ Kirigami.ScrollablePage {
                     text: config.userPassword
                     onTextChanged: config.setUserPassword(text)
 
-                    palette.base: _passwordField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.neutralBackgroundColor
-                    palette.highlight : _passwordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
+                    palette.base: _passwordField.text.length ? "#f0fff0" : "#FBFBFB"
+                    palette.highlight : _passwordField.text.length ? "#dcffdc" : "#FBFBFB"
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -212,9 +217,9 @@ Kirigami.ScrollablePage {
 
                     palette.base: _verificationPasswordField.text.length
                         ? ( _passwordField.text === _verificationPasswordField.text
-                        ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeBackgroundColor )
-                        : Kirigami.Theme.backgroundColor
-                    palette.highlight : _verificationPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
+                        ? "#f0fff0" : "#ffdae0" )
+                        : "#FBFBFB"
+                    palette.highlight : _verificationPasswordField.text.length ? "#dcffdc" : "#FBFBFB"
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -228,6 +233,7 @@ Kirigami.ScrollablePage {
                 font.weight: Font.Thin
                 font.pointSize: 8
                 wrapMode: Text.WordWrap
+                color: "#6D6D6D"
             }
         }
 
@@ -266,6 +272,7 @@ Kirigami.ScrollablePage {
             text: qsTr("Use the same password for the administrator account.")
             font.weight: Font.Thin
             font.pointSize: 8
+            color: "#6D6D6D"
         }
 
         Column {
@@ -290,8 +297,8 @@ Kirigami.ScrollablePage {
 
                     onTextChanged: config.setRootPassword(text)
 
-                    palette.base: _rootPasswordField.text.length ? Kirigami.Theme.backgroundColor : Kirigami.Theme.neutralBackgroundColor
-                    palette.highlight : _rootPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
+                    palette.base: _rootPasswordField.text.length ? "#f0fff0" : "#FBFBFB"
+                    palette.highlight : _rootPasswordField.text.length ? "#dcffdc" : "#FBFBFB"
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -313,8 +320,8 @@ Kirigami.ScrollablePage {
 
                     palette.base: _verificationRootPasswordField.text.length
                         ? ( _rootPasswordField.text === _verificationRootPasswordField.text
-                        ? Kirigami.Theme.backgroundColor : Kirigami.Theme.negativeBackgroundColor) : Kirigami.Theme.backgroundColor
-                    palette.highlight : _verificationRootPasswordField.text.length ? Kirigami.Theme.positiveBackgroundColor : Kirigami.Theme.backgroundColor
+                        ? "#f0fff0" : "#ffdae0") : "#FBFBFB"
+                    palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : "#FBFBFB"
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -376,6 +383,7 @@ Kirigami.ScrollablePage {
             text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password.")
             font.weight: Font.Thin
             font.pointSize: 8
+            color: "#6D6D6D"
         }
     }
 }

From 1bf73c29c4bb783588987b914fd77e7a8d133bf0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 15 Jul 2021 16:59:38 +0200
Subject: [PATCH 288/492] [usersq] Use a name instead of a magic number

---
 src/modules/usersq/usersq.qml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml
index 8b4ec92cf9..76c9f8c912 100644
--- a/src/modules/usersq/usersq.qml
+++ b/src/modules/usersq/usersq.qml
@@ -19,6 +19,9 @@ import QtGraphicalEffects 1.0
 import QtQuick.Window 2.3
 
 Kirigami.ScrollablePage {
+    // You can hard-code a color here, or bind to a Kirigami theme color,
+    // or use a color from Calamares branding, or ..
+    readonly property color unfilledFieldColor : "#FBFBFB"; // Kirigami.Theme.backgroundColor;
 
     width: parent.width
     height: parent.height
@@ -57,8 +60,8 @@ Kirigami.ScrollablePage {
                 text: config.fullName
                 onTextChanged: config.setFullName(text)
 
-                palette.base: _userNameField.text.length ? "#f0fff0" : "#FBFBFB"
-                palette.highlight : _userNameField.text.length ? "#dcffdc" : "#FBFBFB"
+                palette.base: _userNameField.text.length ? "#f0fff0" : unfilledFieldColor
+                palette.highlight : _userNameField.text.length ? "#dcffdc" : unfilledFieldColor
             }
         }
 
@@ -89,8 +92,8 @@ Kirigami.ScrollablePage {
                 palette.base: _userLoginField.text.length
                     ? ( acceptableInput
                     ? ( _userLoginField.text === "root"
-                    ? "#ffdae0" : "#f0fff0" ) : "#ffdae0" ) : "#FBFBFB"
-                palette.highlight : _userLoginField.text.length ? "#dcffdc" : "#FBFBFB"
+                    ? "#ffdae0" : "#f0fff0" ) : "#ffdae0" ) : unfilledFieldColor
+                palette.highlight : _userLoginField.text.length ? "#dcffdc" : unfilledFieldColor
             }
 
             Label {
@@ -145,8 +148,8 @@ Kirigami.ScrollablePage {
                     ? ( acceptableInput
                     ? ( _hostName.text === "localhost" ? "#ffdae0" : "#f0fff0" )
                     : "#ffdae0")
-                    : "#FBFBFB"
-                palette.highlight : _hostName.text.length ? "#dcffdc" : "#FBFBFB"
+                    : unfilledFieldColor
+                palette.highlight : _hostName.text.length ? "#dcffdc" : unfilledFieldColor
             }
 
             Label {
@@ -194,8 +197,8 @@ Kirigami.ScrollablePage {
                     text: config.userPassword
                     onTextChanged: config.setUserPassword(text)
 
-                    palette.base: _passwordField.text.length ? "#f0fff0" : "#FBFBFB"
-                    palette.highlight : _passwordField.text.length ? "#dcffdc" : "#FBFBFB"
+                    palette.base: _passwordField.text.length ? "#f0fff0" : unfilledFieldColor
+                    palette.highlight : _passwordField.text.length ? "#dcffdc" : unfilledFieldColor
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -218,8 +221,8 @@ Kirigami.ScrollablePage {
                     palette.base: _verificationPasswordField.text.length
                         ? ( _passwordField.text === _verificationPasswordField.text
                         ? "#f0fff0" : "#ffdae0" )
-                        : "#FBFBFB"
-                    palette.highlight : _verificationPasswordField.text.length ? "#dcffdc" : "#FBFBFB"
+                        : unfilledFieldColor
+                    palette.highlight : _verificationPasswordField.text.length ? "#dcffdc" : unfilledFieldColor
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -297,8 +300,8 @@ Kirigami.ScrollablePage {
 
                     onTextChanged: config.setRootPassword(text)
 
-                    palette.base: _rootPasswordField.text.length ? "#f0fff0" : "#FBFBFB"
-                    palette.highlight : _rootPasswordField.text.length ? "#dcffdc" : "#FBFBFB"
+                    palette.base: _rootPasswordField.text.length ? "#f0fff0" : unfilledFieldColor
+                    palette.highlight : _rootPasswordField.text.length ? "#dcffdc" : unfilledFieldColor
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -320,8 +323,8 @@ Kirigami.ScrollablePage {
 
                     palette.base: _verificationRootPasswordField.text.length
                         ? ( _rootPasswordField.text === _verificationRootPasswordField.text
-                        ? "#f0fff0" : "#ffdae0") : "#FBFBFB"
-                    palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : "#FBFBFB"
+                        ? "#f0fff0" : "#ffdae0") : unfilledFieldColor
+                    palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : unfilledFieldColor
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300

From 6bdc6557198e1e466d0185d8c465c09eaf5de3a7 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Thu, 15 Jul 2021 19:30:43 +0200
Subject: [PATCH 289/492] [usersq] complete using names for colors add line
 breaks add negative outline color

---
 src/modules/usersq/usersq.qml | 87 +++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 29 deletions(-)

diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml
index 76c9f8c912..6b06940368 100644
--- a/src/modules/usersq/usersq.qml
+++ b/src/modules/usersq/usersq.qml
@@ -21,14 +21,17 @@ import QtQuick.Window 2.3
 Kirigami.ScrollablePage {
     // You can hard-code a color here, or bind to a Kirigami theme color,
     // or use a color from Calamares branding, or ..
-    readonly property color unfilledFieldColor : "#FBFBFB"; // Kirigami.Theme.backgroundColor;
+    readonly property color unfilledFieldColor: "#FBFBFB" //Kirigami.Theme.backgroundColor
+    readonly property color positiveFieldColor: "#F0FFF0" //Kirigami.Theme.positiveBackgroundColor
+    readonly property color negativeFieldColor: "#EBCED1" //Kirigami.Theme.negativeBackgroundColor
+    readonly property color unfilledFieldOutlineColor: "#F1F1F1"
+    readonly property color positiveFieldOutlineColor: "#DCFFDC"
+    readonly property color negativeFieldOutlineColor: "#BE5F68"
+    readonly property color commentsColor: "#6D6D6D"
 
     width: parent.width
     height: parent.height
 
-    Kirigami.Theme.backgroundColor: "#EFF0F1"
-    Kirigami.Theme.textColor: "#1F1F1F"
-
     header: Kirigami.Heading {
         Layout.fillWidth: true
         height: 50
@@ -60,8 +63,10 @@ Kirigami.ScrollablePage {
                 text: config.fullName
                 onTextChanged: config.setFullName(text)
 
-                palette.base: _userNameField.text.length ? "#f0fff0" : unfilledFieldColor
-                palette.highlight : _userNameField.text.length ? "#dcffdc" : unfilledFieldColor
+                palette.base: _userNameField.text.length
+                    ? positiveFieldColor : unfilledFieldColor
+                palette.highlight : _userNameField.text.length
+                    ? positiveFieldOutlineColor : unfilledFieldOutlineColor
             }
         }
 
@@ -92,8 +97,17 @@ Kirigami.ScrollablePage {
                 palette.base: _userLoginField.text.length
                     ? ( acceptableInput
                     ? ( _userLoginField.text === "root"
-                    ? "#ffdae0" : "#f0fff0" ) : "#ffdae0" ) : unfilledFieldColor
-                palette.highlight : _userLoginField.text.length ? "#dcffdc" : unfilledFieldColor
+                    ? negativeFieldColor
+                    : positiveFieldColor )
+                    : negativeFieldColor )
+                    : unfilledFieldColor
+                palette.highlight : _userLoginField.text.length
+                    ? ( acceptableInput
+                    ? ( _userLoginField.text === "root"
+                    ? negativeFieldOutlineColor
+                    : positiveFieldOutlineColor )
+                    : negativeFieldOutlineColor )
+                    : unfilledFieldOutlineColor
             }
 
             Label {
@@ -101,7 +115,7 @@ Kirigami.ScrollablePage {
                 text: qsTr("If more than one person will use this computer, you can create multiple accounts after installation.")
                 font.weight: Font.Thin
                 font.pointSize: 8
-                color: "#6D6D6D"
+                color: commentsColor
             }
         }
 
@@ -146,10 +160,16 @@ Kirigami.ScrollablePage {
 
                 palette.base: _hostName.text.length
                     ? ( acceptableInput
-                    ? ( _hostName.text === "localhost" ? "#ffdae0" : "#f0fff0" )
-                    : "#ffdae0")
+                    ? ( _hostName.text === "localhost"
+                    ? negativeFieldColor : positiveFieldColor )
+                    : negativeFieldColor)
                     : unfilledFieldColor
-                palette.highlight : _hostName.text.length ? "#dcffdc" : unfilledFieldColor
+                palette.highlight : _hostName.text.length
+                    ? ( acceptableInput
+                    ? ( _hostName.text === "localhost"
+                    ? negativeFieldOutlineColor : positiveFieldOutlineColor )
+                    : negativeFieldOutlineColor)
+                    : unfilledFieldOutlineColor
             }
 
             Label {
@@ -157,7 +177,7 @@ Kirigami.ScrollablePage {
                 text: qsTr("This name will be used if you make the computer visible to others on a network.")
                 font.weight: Font.Thin
                 font.pointSize: 8
-                color: "#6D6D6D"
+                color: commentsColor
             }
         }
 
@@ -197,8 +217,10 @@ Kirigami.ScrollablePage {
                     text: config.userPassword
                     onTextChanged: config.setUserPassword(text)
 
-                    palette.base: _passwordField.text.length ? "#f0fff0" : unfilledFieldColor
-                    palette.highlight : _passwordField.text.length ? "#dcffdc" : unfilledFieldColor
+                    palette.base: _passwordField.text.length
+                        ? positiveFieldColor : unfilledFieldColor
+                    palette.highlight : _passwordField.text.length
+                        ? positiveFieldOutlineColor : unfilledFieldOutlineColor
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -220,9 +242,12 @@ Kirigami.ScrollablePage {
 
                     palette.base: _verificationPasswordField.text.length
                         ? ( _passwordField.text === _verificationPasswordField.text
-                        ? "#f0fff0" : "#ffdae0" )
+                        ? positiveFieldColor : negativeFieldColor )
                         : unfilledFieldColor
-                    palette.highlight : _verificationPasswordField.text.length ? "#dcffdc" : unfilledFieldColor
+                    palette.highlight : _verificationPasswordField.text.length
+                        ? ( _passwordField.text === _verificationPasswordField.text
+                        ? positiveFieldOutlineColor : negativeFieldOutlineColor )
+                        : unfilledFieldOutlineColor
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -236,7 +261,7 @@ Kirigami.ScrollablePage {
                 font.weight: Font.Thin
                 font.pointSize: 8
                 wrapMode: Text.WordWrap
-                color: "#6D6D6D"
+                color: commentsColor
             }
         }
 
@@ -275,7 +300,7 @@ Kirigami.ScrollablePage {
             text: qsTr("Use the same password for the administrator account.")
             font.weight: Font.Thin
             font.pointSize: 8
-            color: "#6D6D6D"
+            color: commentsColor
         }
 
         Column {
@@ -300,8 +325,10 @@ Kirigami.ScrollablePage {
 
                     onTextChanged: config.setRootPassword(text)
 
-                    palette.base: _rootPasswordField.text.length ? "#f0fff0" : unfilledFieldColor
-                    palette.highlight : _rootPasswordField.text.length ? "#dcffdc" : unfilledFieldColor
+                    palette.base: _rootPasswordField.text.length
+                        ? positiveFieldColor : unfilledFieldColor
+                    palette.highlight : _rootPasswordField.text.length
+                        ? positiveFieldOutlineColor : unfilledFieldOutlineColor
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -316,15 +343,17 @@ Kirigami.ScrollablePage {
 
                     onTextChanged: _rootPasswordField.text === _verificationRootPasswordField.text
                         ? ( config.setRootPasswordSecondary(text),
-                        rootPassMessage.visible = false,
-                        rootValidityMessage.visible = true )
-                        : ( rootPassMessage.visible = true,
-                        rootValidityMessage.visible = false )
+                        rootPassMessage.visible = false,rootValidityMessage.visible = true )
+                        : ( rootPassMessage.visible = true,rootValidityMessage.visible = false )
 
                     palette.base: _verificationRootPasswordField.text.length
                         ? ( _rootPasswordField.text === _verificationRootPasswordField.text
-                        ? "#f0fff0" : "#ffdae0") : unfilledFieldColor
-                    palette.highlight : _verificationRootPasswordField.text.length ? "#dcffdc" : unfilledFieldColor
+                        ? positiveFieldColor : negativeFieldColor)
+                        : unfilledFieldColor
+                    palette.highlight : _verificationRootPasswordField.text.length
+                        ? ( _rootPasswordField.text === _verificationRootPasswordField.text
+                        ? positiveFieldOutlineColor : negativeFieldOutlineColor)
+                        : unfilledFieldOutlineColor
 
                     echoMode: TextInput.Password
                     passwordMaskDelay: 300
@@ -338,7 +367,7 @@ Kirigami.ScrollablePage {
                 text: qsTr("Enter the same password twice, so that it can be checked for typing errors.")
                 font.weight: Font.Thin
                 font.pointSize: 8
-                color: "#6D6D6D"
+                color: commentsColor
             }
         }
 
@@ -386,7 +415,7 @@ Kirigami.ScrollablePage {
             text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password.")
             font.weight: Font.Thin
             font.pointSize: 8
-            color: "#6D6D6D"
+            color: commentsColor
         }
     }
 }

From c98b5d7667177736256c9715e047b0ecf1238562 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Fri, 16 Jul 2021 18:19:10 +0200
Subject: [PATCH 290/492] [usersq] replace one more (missed) kirigami color

---
 src/modules/usersq/usersq.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml
index 6b06940368..71155af4b9 100644
--- a/src/modules/usersq/usersq.qml
+++ b/src/modules/usersq/usersq.qml
@@ -27,6 +27,7 @@ Kirigami.ScrollablePage {
     readonly property color unfilledFieldOutlineColor: "#F1F1F1"
     readonly property color positiveFieldOutlineColor: "#DCFFDC"
     readonly property color negativeFieldOutlineColor: "#BE5F68"
+    readonly property color headerTextColor: "#1F1F1F"
     readonly property color commentsColor: "#6D6D6D"
 
     width: parent.width
@@ -36,7 +37,7 @@ Kirigami.ScrollablePage {
         Layout.fillWidth: true
         height: 50
         horizontalAlignment: Qt.AlignHCenter
-        color: Kirigami.Theme.textColor
+        color: headerTextColor
         font.weight: Font.Medium
         font.pointSize: 12
         text: qsTr("Pick your user name and credentials to login and perform admin tasks")

From 6c7e7a6d55cc8d0307a093d6dbed832708f0954d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 20 Jul 2021 14:45:55 +0200
Subject: [PATCH 291/492] [summaryq] a handful of code-style fixes

---
 src/modules/summaryq/SummaryQmlViewStep.cpp | 6 ++++--
 src/modules/summaryq/SummaryQmlViewStep.h   | 7 ++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/modules/summaryq/SummaryQmlViewStep.cpp b/src/modules/summaryq/SummaryQmlViewStep.cpp
index 2ea1599841..0be2b16157 100644
--- a/src/modules/summaryq/SummaryQmlViewStep.cpp
+++ b/src/modules/summaryq/SummaryQmlViewStep.cpp
@@ -57,15 +57,17 @@ SummaryQmlViewStep::isAtEnd() const
 }
 
 
-QList< Calamares::job_ptr >
+Calamares::JobList
 SummaryQmlViewStep::jobs() const
 {
-    return QList< Calamares::job_ptr >();
+    return {};
 }
 
 
 void
 SummaryQmlViewStep::onActivate()
 {
+    // Collect the steps before this one: those need to have their
+    // summary (text or widget) displayed.
     m_config->init();
 }
diff --git a/src/modules/summaryq/SummaryQmlViewStep.h b/src/modules/summaryq/SummaryQmlViewStep.h
index 42febd145d..8668d0afef 100644
--- a/src/modules/summaryq/SummaryQmlViewStep.h
+++ b/src/modules/summaryq/SummaryQmlViewStep.h
@@ -12,14 +12,11 @@
 #define SUMMARYQMLVIEWSTEP_H
 
 #include "Config.h"
+
 #include "DllMacro.h"
 #include "utils/PluginFactory.h"
 #include "viewpages/QmlViewStep.h"
 
-#include 
-
-class SummaryPage;
-
 class PLUGINDLLEXPORT SummaryQmlViewStep : public Calamares::QmlViewStep
 {
     Q_OBJECT
@@ -37,7 +34,7 @@ class PLUGINDLLEXPORT SummaryQmlViewStep : public Calamares::QmlViewStep
     bool isAtBeginning() const override;
     bool isAtEnd() const override;
 
-    QList< Calamares::job_ptr > jobs() const override;
+    Calamares::JobList jobs() const override;
 
     void onActivate() override;
 

From f8c3b76367c6ba9da1fffde0ea0b752e64c61b8a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 20 Jul 2021 14:49:08 +0200
Subject: [PATCH 292/492] [summary] Stylistic fixes before moving Config
 objects around

---
 src/modules/summary/SummaryViewStep.cpp | 4 ++--
 src/modules/summary/SummaryViewStep.h   | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/modules/summary/SummaryViewStep.cpp b/src/modules/summary/SummaryViewStep.cpp
index c5b6841edd..3c3a48ff25 100644
--- a/src/modules/summary/SummaryViewStep.cpp
+++ b/src/modules/summary/SummaryViewStep.cpp
@@ -72,10 +72,10 @@ SummaryViewStep::isAtEnd() const
 }
 
 
-QList< Calamares::job_ptr >
+Calamares::JobList
 SummaryViewStep::jobs() const
 {
-    return QList< Calamares::job_ptr >();
+    return {};
 }
 
 
diff --git a/src/modules/summary/SummaryViewStep.h b/src/modules/summary/SummaryViewStep.h
index c89efc42fc..0564e34aa0 100644
--- a/src/modules/summary/SummaryViewStep.h
+++ b/src/modules/summary/SummaryViewStep.h
@@ -10,13 +10,10 @@
 #ifndef SUMMARYPAGEPLUGIN_H
 #define SUMMARYPAGEPLUGIN_H
 
-#include 
-
+#include "DllMacro.h"
 #include "utils/PluginFactory.h"
 #include "viewpages/ViewStep.h"
 
-#include "DllMacro.h"
-
 class SummaryPage;
 
 class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep
@@ -37,7 +34,7 @@ class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep
     bool isAtBeginning() const override;
     bool isAtEnd() const override;
 
-    QList< Calamares::job_ptr > jobs() const override;
+    Calamares::JobList jobs() const override;
 
     void onActivate() override;
     void onLeave() override;

From aba212d70096a83480bf06c3d9b6146e77abc708 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 20 Jul 2021 14:57:09 +0200
Subject: [PATCH 293/492] [summary*] Move Config to the non-QML module, so it
 can be shared

---
 src/modules/summary/CMakeLists.txt           | 3 ++-
 src/modules/{summaryq => summary}/Config.cpp | 3 +--
 src/modules/{summaryq => summary}/Config.h   | 0
 src/modules/summaryq/CMakeLists.txt          | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename src/modules/{summaryq => summary}/Config.cpp (97%)
 rename src/modules/{summaryq => summary}/Config.h (100%)

diff --git a/src/modules/summary/CMakeLists.txt b/src/modules/summary/CMakeLists.txt
index 57dc731cb1..746b22493a 100644
--- a/src/modules/summary/CMakeLists.txt
+++ b/src/modules/summary/CMakeLists.txt
@@ -8,8 +8,9 @@ calamares_add_plugin( summary
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
-        SummaryViewStep.cpp
+        Config.cpp
         SummaryPage.cpp
+        SummaryViewStep.cpp
     UI
     LINK_PRIVATE_LIBRARIES
         calamaresui
diff --git a/src/modules/summaryq/Config.cpp b/src/modules/summary/Config.cpp
similarity index 97%
rename from src/modules/summaryq/Config.cpp
rename to src/modules/summary/Config.cpp
index 0f98891a64..bbbb103c31 100644
--- a/src/modules/summaryq/Config.cpp
+++ b/src/modules/summary/Config.cpp
@@ -9,7 +9,6 @@
  */
 
 #include "Config.h"
-#include "SummaryQmlViewStep.h"
 
 #include "Branding.h"
 #include "Settings.h"
@@ -70,7 +69,7 @@ SummaryModel::setSummaryList( const Calamares::ViewStepList& steps, bool withWid
 
 Config::Config( Calamares::ViewStep* parent )
     : QObject( parent )
-    , m_thisViewStep( static_cast< SummaryQmlViewStep* >( parent ) )
+    , m_thisViewStep( parent )
     , m_summary( new SummaryModel( this ) )
 
 {
diff --git a/src/modules/summaryq/Config.h b/src/modules/summary/Config.h
similarity index 100%
rename from src/modules/summaryq/Config.h
rename to src/modules/summary/Config.h
diff --git a/src/modules/summaryq/CMakeLists.txt b/src/modules/summaryq/CMakeLists.txt
index 0df854140f..cdf520b24e 100644
--- a/src/modules/summaryq/CMakeLists.txt
+++ b/src/modules/summaryq/CMakeLists.txt
@@ -4,15 +4,14 @@ if( NOT WITH_QML )
 endif()
 
 set( _summary ${CMAKE_CURRENT_SOURCE_DIR}/../summary )
-include_directories( ${_finished} )
+include_directories( ${_summary} )
 
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
 calamares_add_plugin( summaryq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         SummaryQmlViewStep.cpp
-        Config.cpp
+        ${_summary}/Config.cpp
     UI
     RESOURCES
         summaryq.qrc

From 9eee00c286dc5d88efb1e8d1281b532cbc1c9c94 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 20 Jul 2021 15:17:35 +0200
Subject: [PATCH 294/492] [summary] Create Config object

- Create Config object, even if it's not used just yet
- Introduce onLeave() for the Page, better name than
  (re-)creating the content (!?) when leaving
---
 src/modules/summary/SummaryPage.cpp     | 7 +++++++
 src/modules/summary/SummaryPage.h       | 5 ++++-
 src/modules/summary/SummaryViewStep.cpp | 5 ++++-
 src/modules/summary/SummaryViewStep.h   | 5 ++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp
index b56793e7ea..083a6d1726 100644
--- a/src/modules/summary/SummaryPage.cpp
+++ b/src/modules/summary/SummaryPage.cpp
@@ -166,6 +166,13 @@ SummaryPage::createContentWidget()
     CalamaresUtils::unmarginLayout( m_layout );
 }
 
+void
+SummaryPage::onLeave()
+{
+    delete m_contentWidget;
+    m_contentWidget = nullptr;
+}
+
 QLabel*
 SummaryPage::createTitleLabel( const QString& text ) const
 {
diff --git a/src/modules/summary/SummaryPage.h b/src/modules/summary/SummaryPage.h
index 1adb670170..d7da7bfe03 100644
--- a/src/modules/summary/SummaryPage.h
+++ b/src/modules/summary/SummaryPage.h
@@ -44,11 +44,14 @@ class SummaryPage : public QWidget
 public:
     explicit SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent = nullptr );
 
+    /// @brief Create contents showing all of the summary
     void onActivate();
-    void createContentWidget();
+    /// @brief Clean up the widgets
+    void onLeave();
 
 private:
     Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
+    void createContentWidget();
 
     const SummaryViewStep* m_thisViewStep;
 
diff --git a/src/modules/summary/SummaryViewStep.cpp b/src/modules/summary/SummaryViewStep.cpp
index 3c3a48ff25..04af6b5245 100644
--- a/src/modules/summary/SummaryViewStep.cpp
+++ b/src/modules/summary/SummaryViewStep.cpp
@@ -16,6 +16,7 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( SummaryViewStepFactory, registerPlugin< Sum
 SummaryViewStep::SummaryViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_widget( new SummaryPage( this ) )
+    , m_config( new Config( this ) )
 {
     emit nextStatusChanged( true );
 }
@@ -27,6 +28,7 @@ SummaryViewStep::~SummaryViewStep()
     {
         m_widget->deleteLater();
     }
+    delete m_config;
 }
 
 
@@ -82,6 +84,7 @@ SummaryViewStep::jobs() const
 void
 SummaryViewStep::onActivate()
 {
+    m_config->init();
     m_widget->onActivate();
 }
 
@@ -89,5 +92,5 @@ SummaryViewStep::onActivate()
 void
 SummaryViewStep::onLeave()
 {
-    m_widget->createContentWidget();
+    m_widget->onLeave();
 }
diff --git a/src/modules/summary/SummaryViewStep.h b/src/modules/summary/SummaryViewStep.h
index 0564e34aa0..f1b81b2cb5 100644
--- a/src/modules/summary/SummaryViewStep.h
+++ b/src/modules/summary/SummaryViewStep.h
@@ -10,6 +10,8 @@
 #ifndef SUMMARYPAGEPLUGIN_H
 #define SUMMARYPAGEPLUGIN_H
 
+#include "Config.h"
+
 #include "DllMacro.h"
 #include "utils/PluginFactory.h"
 #include "viewpages/ViewStep.h"
@@ -40,7 +42,8 @@ class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep
     void onLeave() override;
 
 private:
-    SummaryPage* m_widget;
+    SummaryPage* m_widget = nullptr;
+    Config* m_config = nullptr;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( SummaryViewStepFactory )

From 4e588584d7780408331133bf25c71907952e7798 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 20 Jul 2021 15:49:03 +0200
Subject: [PATCH 295/492] [summary] Hook up Config message to page

- the Page displays a simple message describing what the
  summary is all about; Config has the same message,
  use that. Needed some re-jigging to get the signals
  and slots right.
---
 src/modules/summary/Config.cpp          |  4 ++--
 src/modules/summary/Config.h            | 15 +++++++++------
 src/modules/summary/SummaryPage.cpp     | 10 ++++------
 src/modules/summary/SummaryPage.h       |  7 +++++--
 src/modules/summary/SummaryViewStep.cpp |  2 +-
 src/modules/summary/SummaryViewStep.h   |  2 +-
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/modules/summary/Config.cpp b/src/modules/summary/Config.cpp
index bbbb103c31..18ce9354dd 100644
--- a/src/modules/summary/Config.cpp
+++ b/src/modules/summary/Config.cpp
@@ -92,8 +92,8 @@ Config::retranslate()
         m_message = ( tr( "This is an overview of what will happen once you start "
                           "the install procedure." ) );
     }
-    Q_EMIT titleChanged();
-    Q_EMIT messageChanged();
+    Q_EMIT titleChanged( m_title );
+    Q_EMIT messageChanged( m_message );
 }
 
 void
diff --git a/src/modules/summary/Config.h b/src/modules/summary/Config.h
index 524aeee8ee..19cd6212c9 100644
--- a/src/modules/summary/Config.h
+++ b/src/modules/summary/Config.h
@@ -63,9 +63,9 @@ class Config : public QObject
     Q_OBJECT
 
     ///@brief Name of this summary (generally, "Summary")
-    Q_PROPERTY( QString title MEMBER m_title NOTIFY titleChanged )
+    Q_PROPERTY( QString title READ title NOTIFY titleChanged )
     ///@brief Description of what the summary means
-    Q_PROPERTY( QString message MEMBER m_message NOTIFY messageChanged )
+    Q_PROPERTY( QString message READ message NOTIFY messageChanged )
 
     Q_PROPERTY( QAbstractListModel* summaryModel READ summaryModel CONSTANT FINAL )
 
@@ -77,6 +77,9 @@ class Config : public QObject
 
     QAbstractListModel* summaryModel() const { return m_summary; }
 
+    QString title() const { return m_title; }
+    QString message() const { return m_message; }
+
 private:
     Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
     void retranslate();
@@ -84,11 +87,11 @@ class Config : public QObject
     const Calamares::ViewStep* m_thisViewStep;
     SummaryModel* m_summary;
 
-    QString m_message;
     QString m_title;
+    QString m_message;
 
-signals:
-    void messageChanged();
-    void titleChanged();
+Q_SIGNALS:
+    void titleChanged( QString title );
+    void messageChanged( QString message );
 };
 #endif
diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp
index 083a6d1726..084b366e87 100644
--- a/src/modules/summary/SummaryPage.cpp
+++ b/src/modules/summary/SummaryPage.cpp
@@ -29,7 +29,7 @@
 
 static const int SECTION_SPACING = 12;
 
-SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
+SummaryPage::SummaryPage( Config* config, const SummaryViewStep* thisViewStep, QWidget* parent )
     : QWidget()
     , m_thisViewStep( thisViewStep )
     , m_contentWidget( nullptr )
@@ -37,6 +37,7 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
 {
     Q_UNUSED( parent )
 
+
     this->setObjectName( "summaryStep" );
 
     Q_ASSERT( m_thisViewStep );
@@ -45,11 +46,8 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
 
     QLabel* headerLabel = new QLabel( this );
     headerLabel->setObjectName( "summaryTitle" );
-    CALAMARES_RETRANSLATE( if ( Calamares::Settings::instance()->isSetupMode() )
-                               headerLabel->setText( tr( "This is an overview of what will happen once you start "
-                                                         "the setup procedure." ) );
-                           else headerLabel->setText( tr( "This is an overview of what will happen once you start "
-                                                          "the install procedure." ) ); );
+    headerLabel->setText( config->message() );
+    connect( config, &Config::messageChanged, headerLabel, &QLabel::setText );
     layout->addWidget( headerLabel );
     layout->addWidget( m_scrollArea );
     m_scrollArea->setWidgetResizable( true );
diff --git a/src/modules/summary/SummaryPage.h b/src/modules/summary/SummaryPage.h
index d7da7bfe03..6e5f25c052 100644
--- a/src/modules/summary/SummaryPage.h
+++ b/src/modules/summary/SummaryPage.h
@@ -14,10 +14,13 @@
 
 #include 
 
+class Config;
+class SummaryViewStep;
+
 class QLabel;
 class QScrollArea;
 class QVBoxLayout;
-class SummaryViewStep;
+
 
 /** @brief Provide a summary view with to-be-done action descriptions.
 *
@@ -42,7 +45,7 @@ class SummaryPage : public QWidget
 {
     Q_OBJECT
 public:
-    explicit SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent = nullptr );
+    explicit SummaryPage( Config* config, const SummaryViewStep* thisViewStep, QWidget* parent = nullptr );
 
     /// @brief Create contents showing all of the summary
     void onActivate();
diff --git a/src/modules/summary/SummaryViewStep.cpp b/src/modules/summary/SummaryViewStep.cpp
index 04af6b5245..e29fbae03d 100644
--- a/src/modules/summary/SummaryViewStep.cpp
+++ b/src/modules/summary/SummaryViewStep.cpp
@@ -15,8 +15,8 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( SummaryViewStepFactory, registerPlugin< Sum
 
 SummaryViewStep::SummaryViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
-    , m_widget( new SummaryPage( this ) )
     , m_config( new Config( this ) )
+    , m_widget( new SummaryPage( m_config, this ) )
 {
     emit nextStatusChanged( true );
 }
diff --git a/src/modules/summary/SummaryViewStep.h b/src/modules/summary/SummaryViewStep.h
index f1b81b2cb5..e2ee0566e9 100644
--- a/src/modules/summary/SummaryViewStep.h
+++ b/src/modules/summary/SummaryViewStep.h
@@ -42,8 +42,8 @@ class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep
     void onLeave() override;
 
 private:
-    SummaryPage* m_widget = nullptr;
     Config* m_config = nullptr;
+    SummaryPage* m_widget = nullptr;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( SummaryViewStepFactory )

From 5de99d53d20e92b363e4556e6f9b41d2e5953f2a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 20 Jul 2021 16:00:53 +0200
Subject: [PATCH 296/492] [summary] Move title to Config object

Rather than Config asking its (owning) ViewStep what the title
is -- all existing implementations have a prettyName() for that --
move the title into Config and re-do-the ViewSteps to use it.

Rename init() to something meaningful.
---
 src/modules/summary/Config.cpp              | 17 ++++++++---------
 src/modules/summary/Config.h                |  5 ++---
 src/modules/summary/SummaryViewStep.cpp     |  4 ++--
 src/modules/summaryq/SummaryQmlViewStep.cpp |  4 ++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/modules/summary/Config.cpp b/src/modules/summary/Config.cpp
index 18ce9354dd..5110e09a65 100644
--- a/src/modules/summary/Config.cpp
+++ b/src/modules/summary/Config.cpp
@@ -67,9 +67,8 @@ SummaryModel::setSummaryList( const Calamares::ViewStepList& steps, bool withWid
     Q_EMIT endResetModel();
 }
 
-Config::Config( Calamares::ViewStep* parent )
+Config::Config( QObject* parent )
     : QObject( parent )
-    , m_thisViewStep( parent )
     , m_summary( new SummaryModel( this ) )
 
 {
@@ -80,24 +79,24 @@ Config::Config( Calamares::ViewStep* parent )
 void
 Config::retranslate()
 {
-    m_title = m_thisViewStep->prettyName();
+    m_title = tr( "Summary" );
 
     if ( Calamares::Settings::instance()->isSetupMode() )
     {
-        m_message = ( tr( "This is an overview of what will happen once you start "
-                          "the setup procedure." ) );
+        m_message = tr( "This is an overview of what will happen once you start "
+                          "the setup procedure." );
     }
     else
     {
-        m_message = ( tr( "This is an overview of what will happen once you start "
-                          "the install procedure." ) );
+        m_message = tr( "This is an overview of what will happen once you start "
+                          "the install procedure." );
     }
     Q_EMIT titleChanged( m_title );
     Q_EMIT messageChanged( m_message );
 }
 
 void
-Config::init()
+Config::collectSummaries( const Calamares::ViewStep* upToHere )
 {
     Calamares::ViewStepList steps;
     for ( Calamares::ViewStep* step : Calamares::ViewManager::instance()->viewSteps() )
@@ -116,7 +115,7 @@ Config::init()
         // we know we're providing a summary of steps up until this
         // view step, so we now have steps since the previous exec, up
         // to this summary.
-        if ( m_thisViewStep == step )
+        if ( upToHere == step )
         {
             break;
         }
diff --git a/src/modules/summary/Config.h b/src/modules/summary/Config.h
index 19cd6212c9..15604d9333 100644
--- a/src/modules/summary/Config.h
+++ b/src/modules/summary/Config.h
@@ -70,10 +70,10 @@ class Config : public QObject
     Q_PROPERTY( QAbstractListModel* summaryModel READ summaryModel CONSTANT FINAL )
 
 public:
-    explicit Config( Calamares::ViewStep* parent = nullptr );
+    explicit Config( QObject* parent = nullptr );
 
     ///@brief Called later, to load the model once all viewsteps are there
-    void init();
+    void collectSummaries( const Calamares::ViewStep* upToHere );
 
     QAbstractListModel* summaryModel() const { return m_summary; }
 
@@ -84,7 +84,6 @@ class Config : public QObject
     Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
     void retranslate();
 
-    const Calamares::ViewStep* m_thisViewStep;
     SummaryModel* m_summary;
 
     QString m_title;
diff --git a/src/modules/summary/SummaryViewStep.cpp b/src/modules/summary/SummaryViewStep.cpp
index e29fbae03d..d4e439ae33 100644
--- a/src/modules/summary/SummaryViewStep.cpp
+++ b/src/modules/summary/SummaryViewStep.cpp
@@ -35,7 +35,7 @@ SummaryViewStep::~SummaryViewStep()
 QString
 SummaryViewStep::prettyName() const
 {
-    return tr( "Summary" );
+    return m_config->title();
 }
 
 
@@ -84,7 +84,7 @@ SummaryViewStep::jobs() const
 void
 SummaryViewStep::onActivate()
 {
-    m_config->init();
+    m_config->collectSummaries( this );
     m_widget->onActivate();
 }
 
diff --git a/src/modules/summaryq/SummaryQmlViewStep.cpp b/src/modules/summaryq/SummaryQmlViewStep.cpp
index 0be2b16157..23e18a8612 100644
--- a/src/modules/summaryq/SummaryQmlViewStep.cpp
+++ b/src/modules/summaryq/SummaryQmlViewStep.cpp
@@ -25,7 +25,7 @@ SummaryQmlViewStep::~SummaryQmlViewStep() {}
 QString
 SummaryQmlViewStep::prettyName() const
 {
-    return tr( "Summary" );
+    return m_config->title();
 }
 
 
@@ -69,5 +69,5 @@ SummaryQmlViewStep::onActivate()
 {
     // Collect the steps before this one: those need to have their
     // summary (text or widget) displayed.
-    m_config->init();
+    m_config->collectSummaries( this );
 }

From d6fe30dfdb240270a8004dd8c6c092956d6973ac Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 20 Jul 2021 16:21:59 +0200
Subject: [PATCH 297/492] [summary] No need for widget-creation to be a method
 of the Page

---
 src/modules/summary/SummaryPage.cpp | 62 +++++++++++++++--------------
 src/modules/summary/SummaryPage.h   |  3 --
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp
index 084b366e87..1c44a30630 100644
--- a/src/modules/summary/SummaryPage.cpp
+++ b/src/modules/summary/SummaryPage.cpp
@@ -61,6 +61,29 @@ SummaryPage::SummaryPage( Config* config, const SummaryViewStep* thisViewStep, Q
 }
 
 
+static QLabel*
+createTitleLabel( const QString& text, const QFont& titleFont )
+{
+    QLabel* label = new QLabel( text );
+    label->setObjectName( "summaryItemTitle" );
+    label->setFont( titleFont );
+    label->setContentsMargins( 0, 0, 0, 0 );
+
+    return label;
+}
+
+static QLabel*
+createBodyLabel( const QString& text, const QPalette& bodyPalette )
+{
+    QLabel* label = new QLabel;
+    label->setObjectName( "summaryItemBody" );
+    label->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
+    label->setAutoFillBackground( true );
+    label->setPalette( bodyPalette );
+    label->setText( text );
+    return label;
+}
+
 // Adds a widget for those ViewSteps that want a summary;
 // see SummaryPage documentation and also ViewStep docs.
 void
@@ -68,6 +91,13 @@ SummaryPage::onActivate()
 {
     createContentWidget();
 
+    QFont titleFont = font();
+    titleFont.setWeight( QFont::Light );
+    titleFont.setPointSize( CalamaresUtils::defaultFontSize() * 2 );
+
+    QPalette bodyPalette( palette() );
+    bodyPalette.setColor( WindowBackground, palette().window().color().lighter( 108 ) );
+
     bool first = true;
     const Calamares::ViewStepList steps = stepsForSummary( Calamares::ViewManager::instance()->viewSteps() );
 
@@ -90,7 +120,7 @@ SummaryPage::onActivate()
             m_layout->addSpacing( SECTION_SPACING );
         }
 
-        m_layout->addWidget( createTitleLabel( step->prettyName() ) );
+        m_layout->addWidget( createTitleLabel( step->prettyName(), titleFont ) );
         QHBoxLayout* itemBodyLayout = new QHBoxLayout;
         m_layout->addSpacing( CalamaresUtils::defaultFontHeight() / 2 );
         m_layout->addLayout( itemBodyLayout );
@@ -100,7 +130,7 @@ SummaryPage::onActivate()
         CalamaresUtils::unmarginLayout( itemBodyLayout );
         if ( !text.isEmpty() )
         {
-            itemBodyCoreLayout->addWidget( createBodyLabel( text ) );
+            itemBodyCoreLayout->addWidget( createBodyLabel( text, bodyPalette ) );
         }
         if ( widget )
         {
@@ -170,31 +200,3 @@ SummaryPage::onLeave()
     delete m_contentWidget;
     m_contentWidget = nullptr;
 }
-
-QLabel*
-SummaryPage::createTitleLabel( const QString& text ) const
-{
-    QLabel* label = new QLabel( text );
-    label->setObjectName( "summaryItemTitle" );
-    QFont fnt = font();
-    fnt.setWeight( QFont::Light );
-    fnt.setPointSize( CalamaresUtils::defaultFontSize() * 2 );
-    label->setFont( fnt );
-    label->setContentsMargins( 0, 0, 0, 0 );
-
-    return label;
-}
-
-QLabel*
-SummaryPage::createBodyLabel( const QString& text ) const
-{
-    QLabel* label = new QLabel;
-    label->setObjectName( "summaryItemBody" );
-    label->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
-    QPalette pal( palette() );
-    pal.setColor( WindowBackground, palette().window().color().lighter( 108 ) );
-    label->setAutoFillBackground( true );
-    label->setPalette( pal );
-    label->setText( text );
-    return label;
-}
diff --git a/src/modules/summary/SummaryPage.h b/src/modules/summary/SummaryPage.h
index 6e5f25c052..718328c8f4 100644
--- a/src/modules/summary/SummaryPage.h
+++ b/src/modules/summary/SummaryPage.h
@@ -61,9 +61,6 @@ class SummaryPage : public QWidget
     QVBoxLayout* m_layout = nullptr;
     QWidget* m_contentWidget = nullptr;
 
-    QLabel* createTitleLabel( const QString& text ) const;
-    QLabel* createBodyLabel( const QString& text ) const;
-
     QScrollArea* m_scrollArea;
 };
 

From 949f9e466f726f0c25950c8cab7f696e90676722 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 20 Jul 2021 16:24:09 +0200
Subject: [PATCH 298/492] [summary] createContentWidget is called exactly once,
 refactor

---
 src/modules/summary/SummaryPage.cpp | 15 ++++-----------
 src/modules/summary/SummaryPage.h   |  1 -
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp
index 1c44a30630..8abfb88041 100644
--- a/src/modules/summary/SummaryPage.cpp
+++ b/src/modules/summary/SummaryPage.cpp
@@ -89,7 +89,10 @@ createBodyLabel( const QString& text, const QPalette& bodyPalette )
 void
 SummaryPage::onActivate()
 {
-    createContentWidget();
+    delete m_contentWidget;  // It might have been created previously
+    m_contentWidget = new QWidget;
+    m_layout = new QVBoxLayout( m_contentWidget );
+    CalamaresUtils::unmarginLayout( m_layout );
 
     QFont titleFont = font();
     titleFont.setWeight( QFont::Light );
@@ -184,16 +187,6 @@ SummaryPage::stepsForSummary( const Calamares::ViewStepList& allSteps ) const
     return steps;
 }
 
-
-void
-SummaryPage::createContentWidget()
-{
-    delete m_contentWidget;
-    m_contentWidget = new QWidget;
-    m_layout = new QVBoxLayout( m_contentWidget );
-    CalamaresUtils::unmarginLayout( m_layout );
-}
-
 void
 SummaryPage::onLeave()
 {
diff --git a/src/modules/summary/SummaryPage.h b/src/modules/summary/SummaryPage.h
index 718328c8f4..7d98cc7112 100644
--- a/src/modules/summary/SummaryPage.h
+++ b/src/modules/summary/SummaryPage.h
@@ -54,7 +54,6 @@ class SummaryPage : public QWidget
 
 private:
     Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
-    void createContentWidget();
 
     const SummaryViewStep* m_thisViewStep;
 

From 4b2b74bdbdd6c63de6b07a63bdc3fc2cc5b33af1 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 23 Jul 2021 17:23:30 +0200
Subject: [PATCH 299/492] [libcalamaresui] Do not link publicly to yamlcpp

---
 src/libcalamaresui/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 4afdc66144..f3b3cd0e11 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -72,12 +72,11 @@ calamares_add_library( calamaresui
     EXPORT_MACRO UIDLLEXPORT_PRO
     LINK_LIBRARIES
         Qt5::Svg
-        yamlcpp
     RESOURCES libcalamaresui.qrc
     EXPORT Calamares
     VERSION ${CALAMARES_VERSION_SHORT}
 )
-
+target_link_libraries( calamaresui PRIVATE yamlcpp )
 if( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 )
     target_compile_definitions( calamaresui PRIVATE WITH_KOSRelease )
 endif()

From 604535f65a36a67bbf934cc056c648a79a6d03ba Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 23 Jul 2021 17:26:42 +0200
Subject: [PATCH 300/492] CMake: find YAMLCPP when asked to find Calamares

---
 CalamaresConfig.cmake.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CalamaresConfig.cmake.in b/CalamaresConfig.cmake.in
index f10fda11ae..4fb9621ca7 100644
--- a/CalamaresConfig.cmake.in
+++ b/CalamaresConfig.cmake.in
@@ -27,6 +27,9 @@ if (NOT TARGET Calamares::calamares OR NOT TARGET Calamares::calamaresui)
     message(FATAL_ERROR "Calamares found with missing CMake targets")
 endif()
 
+# Need various CMake files that are installed alongside this one.
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
 ### Dependencies
 #
 # The libraries can depend on a variety of Qt and KDE Frameworks
@@ -60,6 +63,8 @@ if(kf5_required)
     endif()
 endif()
 
+find_package(YAMLCPP REQUIRED)
+
 ### Legacy support
 #
 #
@@ -70,8 +75,6 @@ set(Calamares_LIBRARIES Calamares::calamares)
 ### CMake support
 #
 #
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-
 include(CalamaresAddBrandingSubdirectory)
 include(CalamaresAddLibrary)
 include(CalamaresAddModuleSubdirectory)

From f32671ebabb1dd30b53b5579e0f6849d95fb9b97 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 23 Jul 2021 22:51:08 +0200
Subject: [PATCH 301/492] libcalamares: remove declaration that was never
 implemented

---
 src/libcalamares/utils/Retranslator.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h
index f6169e9aa2..1b3801d163 100644
--- a/src/libcalamares/utils/Retranslator.h
+++ b/src/libcalamares/utils/Retranslator.h
@@ -73,9 +73,6 @@ class Retranslator : public QObject
     /// @brief What retranslator belongs to @p parent (may create one)
     static Retranslator* retranslatorFor( QObject* parent );
 
-    /// @brief Call @p retranslateFunc when the language changes
-    void addRetranslateFunc( std::function< void( void ) > retranslateFunc );
-
 signals:
     void languageChange();
 

From b81bc17560bd65c1b5866371efa24c28c86a6a68 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 24 Jul 2021 16:59:38 +0200
Subject: [PATCH 302/492] [welcome] Log when translation events arrive

---
 src/modules/welcome/Config.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index 097126ea60..a13a6ceb77 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -36,6 +36,8 @@ Config::Config( QObject* parent )
 void
 Config::retranslate()
 {
+    cWarning() << "Retranslated to" << QLocale().name();
+
     m_genericWelcomeMessage = genericWelcomeMessage().arg( Calamares::Branding::instance()->versionedName() );
     emit genericWelcomeMessageChanged( m_genericWelcomeMessage );
 

From 51c5c9ba26a4127d9cacc11c70170a7abeff7cdf Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 24 Jul 2021 23:15:05 +0200
Subject: [PATCH 303/492] [welcome] Switch to using the message from the Config
 object

- The Config object owns the requirements model, and has messages /
  strings describing the state of the model. Use that message,
  dropping the duplicate message from the requirements widget.
- Re-jig to pass the Config object around rather than the model
  that it owns.
- This does not work, because translation events do not arrive
  (and the slot isn't called automatically either).
---
 src/modules/welcome/Config.cpp                |  4 +-
 src/modules/welcome/WelcomePage.cpp           |  6 +-
 src/modules/welcome/WelcomePage.h             |  2 +-
 .../welcome/checker/CheckerContainer.cpp      | 19 ++---
 .../welcome/checker/CheckerContainer.h        |  5 +-
 .../welcome/checker/ResultsListWidget.cpp     | 71 +++++--------------
 .../welcome/checker/ResultsListWidget.h       |  6 +-
 7 files changed, 40 insertions(+), 73 deletions(-)

diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index a13a6ceb77..28775f326e 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -63,11 +63,11 @@ Config::retranslate()
             message = setup ? tr( "This computer does not satisfy some of the "
                                   "recommended requirements for setting up %1.
    "
                                   "Setup can continue, but some features "
-                                  "might be disabled." )
+                                  "might be reduced." )
                             : tr( "This computer does not satisfy some of the "
                                   "recommended requirements for installing %1.
    "
                                   "Installation can continue, but some features "
-                                  "might be disabled." );
+                                  "might be reduced." );
         }
 
         m_warningMessage = message.arg( Calamares::Branding::instance()->shortVersionedName() );
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 616c91bff6..376fe1ea62 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -36,12 +36,12 @@
 #include 
 #include 
 
-WelcomePage::WelcomePage( Config* conf, QWidget* parent )
+WelcomePage::WelcomePage( Config* config, QWidget* parent )
     : QWidget( parent )
     , ui( new Ui::WelcomePage )
-    , m_checkingWidget( new CheckerContainer( *( conf->requirementsModel() ), this ) )
+    , m_checkingWidget( new CheckerContainer( config, this ) )
     , m_languages( nullptr )
-    , m_conf( conf )
+    , m_conf( config )
 {
     using Branding = Calamares::Branding;
 
diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h
index 04c17d25fe..cbbc7f5103 100644
--- a/src/modules/welcome/WelcomePage.h
+++ b/src/modules/welcome/WelcomePage.h
@@ -27,7 +27,7 @@ class WelcomePage : public QWidget
 {
     Q_OBJECT
 public:
-    explicit WelcomePage( Config* conf, QWidget* parent = nullptr );
+    WelcomePage( Config* config, QWidget* parent = nullptr );
 
     enum class Button
     {
diff --git a/src/modules/welcome/checker/CheckerContainer.cpp b/src/modules/welcome/checker/CheckerContainer.cpp
index 860857c3c8..19f69ddc9b 100644
--- a/src/modules/welcome/checker/CheckerContainer.cpp
+++ b/src/modules/welcome/checker/CheckerContainer.cpp
@@ -22,12 +22,12 @@
 
 #include 
 
-CheckerContainer::CheckerContainer( const Calamares::RequirementsModel& model, QWidget* parent )
+CheckerContainer::CheckerContainer( Config* config, QWidget* parent )
     : QWidget( parent )
     , m_waitingWidget( new WaitingWidget( QString(), this ) )
     , m_checkerWidget( nullptr )
     , m_verdict( false )
-    , m_model( model )
+    , m_config( config )
 {
     QBoxLayout* mainLayout = new QHBoxLayout;
     setLayout( mainLayout );
@@ -49,13 +49,14 @@ CheckerContainer::requirementsComplete( bool ok )
 {
     if ( !ok )
     {
-        cDebug() << "Requirements not satisfied" << m_model.count() << "entries:";
-        for ( int i = 0; i < m_model.count(); ++i )
+        auto& model = *( m_config->requirementsModel() );
+        cDebug() << "Requirements not satisfied" << model.count() << "entries:";
+        for ( int i = 0; i < model.count(); ++i )
         {
-            auto index = m_model.index( i );
-            cDebug() << Logger::SubEntry << i << m_model.data( index, Calamares::RequirementsModel::Name ).toString()
-                     << "set?" << m_model.data( index, Calamares::RequirementsModel::Satisfied ).toBool() << "req?"
-                     << m_model.data( index, Calamares::RequirementsModel::Mandatory ).toBool();
+            auto index = model.index( i );
+            cDebug() << Logger::SubEntry << i << model.data( index, Calamares::RequirementsModel::Name ).toString()
+                     << "set?" << model.data( index, Calamares::RequirementsModel::Satisfied ).toBool() << "req?"
+                     << model.data( index, Calamares::RequirementsModel::Mandatory ).toBool();
         }
     }
 
@@ -63,7 +64,7 @@ CheckerContainer::requirementsComplete( bool ok )
     m_waitingWidget->deleteLater();
     m_waitingWidget = nullptr;  // Don't delete in destructor
 
-    m_checkerWidget = new ResultsListWidget( m_model, this );
+    m_checkerWidget = new ResultsListWidget( m_config, this );
     m_checkerWidget->setObjectName( "requirementsChecker" );
     layout()->addWidget( m_checkerWidget );
 
diff --git a/src/modules/welcome/checker/CheckerContainer.h b/src/modules/welcome/checker/CheckerContainer.h
index 93b75ac04b..7846f7010e 100644
--- a/src/modules/welcome/checker/CheckerContainer.h
+++ b/src/modules/welcome/checker/CheckerContainer.h
@@ -15,6 +15,7 @@
 #define CHECKERCONTAINER_H
 
 #include "Config.h"
+
 #include 
 
 class ResultsListWidget;
@@ -31,7 +32,7 @@ class CheckerContainer : public QWidget
 {
     Q_OBJECT
 public:
-    explicit CheckerContainer( const Calamares::RequirementsModel& model, QWidget* parent = nullptr );
+    explicit CheckerContainer( Config* config, QWidget* parent = nullptr );
     ~CheckerContainer() override;
 
     bool verdict() const;
@@ -49,7 +50,7 @@ public slots:
     bool m_verdict;
 
 private:
-    const Calamares::RequirementsModel& m_model;
+    Config* m_config = nullptr;
 };
 
 #endif
diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp
index a7c5caf49c..e3ef28526d 100644
--- a/src/modules/welcome/checker/ResultsListWidget.cpp
+++ b/src/modules/welcome/checker/ResultsListWidget.cpp
@@ -149,9 +149,9 @@ ResultsListDialog::retranslate()
 }
 
 
-ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel& model, QWidget* parent )
+ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent )
     : QWidget( parent )
-    , m_model( model )
+    , m_config( config )
 {
     setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
@@ -169,23 +169,25 @@ ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel& model,
     spacerLayout->addSpacing( paddingSize );
     CalamaresUtils::unmarginLayout( spacerLayout );
 
-    m_explanation = new QLabel;
-    m_explanation->setWordWrap( true );
-    m_explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
-    m_explanation->setOpenExternalLinks( false );
-    m_explanation->setObjectName( "resultsExplanation" );
-    connect( m_explanation, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked );
-    entriesLayout->addWidget( m_explanation );
+    auto* explanation = new QLabel;
+    explanation->setWordWrap( true );
+    explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+    explanation->setOpenExternalLinks( false );
+    explanation->setObjectName( "resultsExplanation" );
+    connect( explanation, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked );
+    entriesLayout->addWidget( explanation );
+
+    connect( config, &Config::warningMessageChanged, explanation, &QLabel::setText );
 
     // Check that all are satisfied (gives warnings if not) and
     // all *mandatory* entries are satisfied (gives errors if not).
 
-    const bool requirementsSatisfied = m_model.satisfiedRequirements();
+    const bool requirementsSatisfied = config->requirementsModel()->satisfiedRequirements();
     auto isUnSatisfied = []( const Calamares::RequirementsModel& m, QModelIndex i ) {
         return !m.data( i, Calamares::RequirementsModel::Satisfied ).toBool();
     };
 
-    createResultWidgets( entriesLayout, m_resultWidgets, model, isUnSatisfied );
+    createResultWidgets( entriesLayout, m_resultWidgets, *( config->requirementsModel() ), isUnSatisfied );
 
     if ( !requirementsSatisfied )
     {
@@ -220,7 +222,7 @@ ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel& model,
                 mainLayout->addWidget( imageLabel );
             }
         }
-        m_explanation->setAlignment( Qt::AlignCenter );
+        explanation->setAlignment( Qt::AlignCenter );
     }
 
     CALAMARES_RETRANSLATE_SLOT( &ResultsListWidget::retranslate );
@@ -233,7 +235,7 @@ ResultsListWidget::linkClicked( const QString& link )
 {
     if ( link == "#details" )
     {
-        auto* dialog = new ResultsListDialog( m_model, this );
+        auto* dialog = new ResultsListDialog( *( m_config->requirementsModel() ), this );
         dialog->exec();
         dialog->deleteLater();
     }
@@ -242,52 +244,15 @@ ResultsListWidget::linkClicked( const QString& link )
 void
 ResultsListWidget::retranslate()
 {
-    for ( auto i = 0; i < m_model.count(); i++ )
+    const auto& model = *( m_config->requirementsModel() );
+    for ( auto i = 0; i < model.count(); i++ )
     {
         if ( m_resultWidgets[ i ] )
         {
             m_resultWidgets[ i ]->setText(
-                m_model.data( m_model.index( i ), Calamares::RequirementsModel::NegatedText ).toString() );
+                model.data( model.index( i ), Calamares::RequirementsModel::NegatedText ).toString() );
         }
     }
-
-    // Check that all are satisfied (gives warnings if not) and
-    // all *mandatory* entries are satisfied (gives errors if not).
-
-    if ( !m_model.satisfiedRequirements() )
-    {
-        QString message;
-        const bool setup = Calamares::Settings::instance()->isSetupMode();
-        if ( !m_model.satisfiedMandatory() )
-        {
-            message = setup ? tr( "This computer does not satisfy the minimum "
-                                  "requirements for setting up %1.
    "
-                                  "Setup cannot continue. "
-                                  "Details..." )
-                            : tr( "This computer does not satisfy the minimum "
-                                  "requirements for installing %1.
    "
-                                  "Installation cannot continue. "
-                                  "Details..." );
-        }
-        else
-        {
-            message = setup ? tr( "This computer does not satisfy some of the "
-                                  "recommended requirements for setting up %1.
    "
-                                  "Setup can continue, but some features "
-                                  "might be disabled." )
-                            : tr( "This computer does not satisfy some of the "
-                                  "recommended requirements for installing %1.
    "
-                                  "Installation can continue, but some features "
-                                  "might be disabled." );
-        }
-        m_explanation->setText( message.arg( Calamares::Branding::instance()->shortVersionedName() ) );
-    }
-    else
-    {
-        m_explanation->setText( tr( "This program will ask you some questions and "
-                                    "set up %2 on your computer." )
-                                    .arg( Calamares::Branding::instance()->productName() ) );
-    }
 }
 
 #include "utils/moc-warnings.h"
diff --git a/src/modules/welcome/checker/ResultsListWidget.h b/src/modules/welcome/checker/ResultsListWidget.h
index aa6c622584..5e96b74a02 100644
--- a/src/modules/welcome/checker/ResultsListWidget.h
+++ b/src/modules/welcome/checker/ResultsListWidget.h
@@ -14,6 +14,7 @@
 #include "ResultWidget.h"
 
 #include "Config.h"
+
 #include 
 
 class QLabel;
@@ -21,16 +22,15 @@ class ResultsListWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit ResultsListWidget( const Calamares::RequirementsModel& model, QWidget* parent );
+    explicit ResultsListWidget( Config* config, QWidget* parent );
 
 private:
     /// @brief A link in the explanatory text has been clicked
     void linkClicked( const QString& link );
     void retranslate();
 
-    QLabel* m_explanation = nullptr;  ///< Explanatory text above the list, with link
-    const Calamares::RequirementsModel& m_model;
     QList< ResultWidget* > m_resultWidgets;  ///< One widget for each unsatisfied entry
+    Config* m_config = nullptr;
 };
 
 #endif  // CHECKER_RESULTSLISTWIDGET_H

From 613d076a607eaf759e3e477050c047e982ee9fb5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 24 Jul 2021 12:01:30 +0200
Subject: [PATCH 304/492] i18n: re-do the whole Retranslator infrastructure

Just have **one** Retranslator object, and install it as event-filter
(this needs to be done manually on a top-level widget) and use
signals / slots to do the actual work, rather than filtering
in multiple places and doing our own mediocre version of binding-
signal-to-lambda.
---
 CHANGES                                 | 18 ++++++++
 src/calamares/CalamaresWindow.cpp       |  2 +
 src/calamares/testmain.cpp              |  5 +++
 src/libcalamares/utils/Retranslator.cpp | 44 ++++--------------
 src/libcalamares/utils/Retranslator.h   | 60 +++++++++++++++++--------
 5 files changed, 76 insertions(+), 53 deletions(-)

diff --git a/CHANGES b/CHANGES
index ae86c42f9d..f2682e1f4d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,24 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.41 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - Anke Boersma
+
+## Core ##
+ - The (re)translation framework has been internally re-vamped to be
+   less resource-intensive and to work with all QObjects, not just
+   widgets. Consumers of the translations framework are expected to
+   set up the event filter on the top-level widget(s) manually.
+
+## Modules ##
+ - The *usersq* module has had a fair bit of QML rewritten to make it easier
+   to customize the colors used by the module in a consistent way.
+   (Thanks Anke)
+
+
+
 # 3.2.40 (2021-07-14) #
 
 This release contains contributions from (alphabetically by first name):
diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index d85d0de747..63d145e328 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -357,6 +357,8 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
     , m_debugManager( new Calamares::DebugWindowManager( this ) )
     , m_viewManager( nullptr )
 {
+    installEventFilter( CalamaresUtils::Retranslator::instance() );
+
     // If we can never cancel, don't show the window-close button
     if ( Calamares::Settings::instance()->disableCancel() )
     {
diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 0e7f4ab42c..6d75a4fbb1 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -24,6 +24,7 @@
 #include "modulesystem/ModuleManager.h"
 #include "modulesystem/ViewModule.h"
 #include "utils/Logger.h"
+#include "utils/Retranslator.h"
 #include "utils/Yaml.h"
 #include "viewpages/ExecutionViewStep.h"
 
@@ -489,6 +490,10 @@ main( int argc, char* argv[] )
             aw = replace_app;
         }
         mw = module.m_ui ? new QMainWindow() : nullptr;
+        if ( mw )
+        {
+            mw->installEventFilter( CalamaresUtils::Retranslator::instance() );
+        }
 
         (void)new Calamares::Branding( module.m_branding );
         auto* modulemanager = new Calamares::ModuleManager( QStringList(), nullptr );
diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index 7f0d89ef9e..a63e24badd 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -211,55 +211,29 @@ loadTranslator( const QLocale& locale, const QString& prefix, QTranslator* trans
     return ::tryLoad( translator, prefix, locale.name() );
 }
 
-Retranslator*
-Retranslator::retranslatorFor( QObject* parent )
-{
-    Retranslator* r = nullptr;
-    for ( QObject* child : parent->children() )
-    {
-        r = qobject_cast< Retranslator* >( child );
-        if ( r )
-        {
-            return r;
-        }
-    }
-
-    return new Retranslator( parent );
-}
-
-void
-Retranslator::attachRetranslator( QObject* parent, std::function< void( void ) > retranslateFunc )
-{
-    retranslatorFor( parent )->m_retranslateFuncList.append( retranslateFunc );
-    retranslateFunc();
-}
-
-
 Retranslator::Retranslator( QObject* parent )
     : QObject( parent )
 {
-    parent->installEventFilter( this );
 }
 
-
 bool
 Retranslator::eventFilter( QObject* obj, QEvent* e )
 {
-    if ( obj == parent() )
+    if ( e->type() == QEvent::LanguageChange )
     {
-        if ( e->type() == QEvent::LanguageChange )
-        {
-            foreach ( std::function< void() > func, m_retranslateFuncList )
-            {
-                func();
-            }
-            emit languageChange();
-        }
+        emit languageChanged();
     }
     // pass the event on to the base
     return QObject::eventFilter( obj, e );
 }
 
+Retranslator* Retranslator::instance()
+{
+    static Retranslator s_instance(nullptr);
+    return &s_instance;
+}
+
+
 void
 setAllowLocalTranslation( bool allow )
 {
diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h
index 1b3801d163..da0cc5723f 100644
--- a/src/libcalamares/utils/Retranslator.h
+++ b/src/libcalamares/utils/Retranslator.h
@@ -64,40 +64,64 @@ DLLEXPORT bool loadTranslator( const QLocale& locale, const QString& prefix, QTr
  */
 DLLEXPORT void setAllowLocalTranslation( bool allow );
 
+
+/** @brief Handles change-of-language events
+ *
+ * There is one single Retranslator object. Use `instance()` to get it.
+ * The top-level widget of the application should call
+ *      `installEventFilter( Retranslator::instance() )`
+ * to set up event-handling for translation events. The Retranslator
+ * will emit signal `languageChanged()` if there is such an event.
+ *
+ * Normal consumers should not have to use the Retranslator directly,
+ * but use the macros `CALAMARES_RETRANSLATE*` to set things up
+ * in code -- the macros will connect to the Retranslator's signals.
+ */
 class Retranslator : public QObject
 {
     Q_OBJECT
 public:
-    /// @brief Call @p retranslateFunc when the language changes
-    static void attachRetranslator( QObject* parent, std::function< void( void ) > retranslateFunc );
-    /// @brief What retranslator belongs to @p parent (may create one)
-    static Retranslator* retranslatorFor( QObject* parent );
+    static Retranslator* instance();
 
 signals:
-    void languageChange();
+    void languageChanged();
 
 protected:
     bool eventFilter( QObject* obj, QEvent* e ) override;
 
 private:
     explicit Retranslator( QObject* parent );
-
-    QList< std::function< void( void ) > > m_retranslateFuncList;
 };
 
 
 }  // namespace CalamaresUtils
 
-#define CALAMARES_RETRANSLATE( body ) CalamaresUtils::Retranslator::attachRetranslator( this, [=] { body } )
-#define CALAMARES_RETRANSLATE_WIDGET( widget, body ) \
-    CalamaresUtils::Retranslator::attachRetranslator( widget, [=] { body } )
-#define CALAMARES_RETRANSLATE_SLOT( slotfunc ) \
-    do \
-    { \
-        this->connect( CalamaresUtils::Retranslator::retranslatorFor( this ), \
-                       &CalamaresUtils::Retranslator::languageChange, \
-                       this, \
-                       slotfunc ); \
-    } while ( 0 )
+// Implementation detail: connects the retranslator to a slot or function
+#define CALAMARES_RETRANSLATE_FOR( object, body ) \
+    QObject::connect( CalamaresUtils::Retranslator::instance(), &CalamaresUtils::Retranslator::languageChanged, object, body )
+
+/** @brief Call code for this object when language changes
+ *
+ * @p body should be a code block (it does not need braces) that can be wrapped
+ * up as a lambda. When the language changes, the lambda is called. Note that
+ * this macro should be used in constructors or other code that is run only
+ * once, since otherwise you will end up with multiple calls to @p body.
+ */
+#define CALAMARES_RETRANSLATE( body ) CALAMARES_RETRANSLATE_FOR( this, [=] { body } )
+/** @brief Call code for the given object (widget) when language changes
+ *
+ * This is identical to CALAMARES_RETRANSLATE, except the @p body is called
+ * for the given widget, not this object.
+ *
+ * NOTE: this macro is deprecated.
+ */
+#define CALAMARES_RETRANSLATE_WIDGET( widget, body ) CALAMARES_RETRANSLATE_FOR( widget, [=] { body } )
+/** @brief Call a slot in this object when language changes
+ *
+ * Given a slot (in method-function-pointer notation), call that slot when the
+ * language changes. This is shorthand for connecting the Retranslator's
+ * signal to the given slot.
+ */
+#define CALAMARES_RETRANSLATE_SLOT( slotfunc ) CALAMARES_RETRANSLATE_FOR( this, slotfunc )
 
 #endif

From 59f11e9b67dce50cacda4b8e56b4cc0728fae659 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 24 Jul 2021 12:16:19 +0200
Subject: [PATCH 305/492] i18n: make retranslator more consistent

- Improve naming.
- Both lambda and slot versions call the code immediately.
---
 src/calamares/CalamaresWindow.cpp             |  2 +-
 src/libcalamares/utils/Retranslator.cpp       |  5 +++
 src/libcalamares/utils/Retranslator.h         | 33 ++++++++++++++-----
 .../viewpages/PythonQtViewStep.cpp            |  2 +-
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index 63d145e328..d95b87933f 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -134,7 +134,7 @@ getWidgetSidebar( Calamares::DebugWindowManager* debug,
     {
         QPushButton* debugWindowBtn = new QPushButton;
         debugWindowBtn->setObjectName( "debugButton" );
-        CALAMARES_RETRANSLATE_WIDGET(
+        CALAMARES_RETRANSLATE_FOR(
             debugWindowBtn,
             debugWindowBtn->setText( QCoreApplication::translate( CalamaresWindow::staticMetaObject.className(),
                                                                   "Show debug information" ) ); );
diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index a63e24badd..2e71fc0115 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -233,6 +233,11 @@ Retranslator* Retranslator::instance()
     return &s_instance;
 }
 
+void Retranslator::attach(QObject* o, std::function f)
+{
+    connect( instance(), &Retranslator::languageChanged, o, f );
+    f();
+}
 
 void
 setAllowLocalTranslation( bool allow )
diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h
index da0cc5723f..9d8617cbd1 100644
--- a/src/libcalamares/utils/Retranslator.h
+++ b/src/libcalamares/utils/Retranslator.h
@@ -81,8 +81,12 @@ class Retranslator : public QObject
 {
     Q_OBJECT
 public:
+    /// @brief Gets the global (single) Retranslator object
     static Retranslator* instance();
 
+    /// @brief Helper function for attaching lambdas
+    static void attach( QObject* o, std::function< void( void ) > f);
+
 signals:
     void languageChanged();
 
@@ -96,32 +100,43 @@ class Retranslator : public QObject
 
 }  // namespace CalamaresUtils
 
-// Implementation detail: connects the retranslator to a slot or function
-#define CALAMARES_RETRANSLATE_FOR( object, body ) \
-    QObject::connect( CalamaresUtils::Retranslator::instance(), &CalamaresUtils::Retranslator::languageChanged, object, body )
-
 /** @brief Call code for this object when language changes
  *
  * @p body should be a code block (it does not need braces) that can be wrapped
  * up as a lambda. When the language changes, the lambda is called. Note that
  * this macro should be used in constructors or other code that is run only
  * once, since otherwise you will end up with multiple calls to @p body.
+ *
+ * NOTE: unlike plain QObject::connect(), the body is **also** called
+ *       immediately after setting up the connection. This allows
+ *       setup and translation code to be mixed together.
  */
-#define CALAMARES_RETRANSLATE( body ) CALAMARES_RETRANSLATE_FOR( this, [=] { body } )
+#define CALAMARES_RETRANSLATE( body ) CalamaresUtils::Retranslator::attach( this, [=] { body } )
 /** @brief Call code for the given object (widget) when language changes
  *
  * This is identical to CALAMARES_RETRANSLATE, except the @p body is called
- * for the given widget, not this object.
+ * for the given object, not this object.
  *
- * NOTE: this macro is deprecated.
+ * NOTE: unlike plain QObject::connect(), the body is **also** called
+ *       immediately after setting up the connection. This allows
+ *       setup and translation code to be mixed together.
  */
-#define CALAMARES_RETRANSLATE_WIDGET( widget, body ) CALAMARES_RETRANSLATE_FOR( widget, [=] { body } )
+#define CALAMARES_RETRANSLATE_FOR( object, body ) CalamaresUtils::Retranslator::attach( object, [=] { body } )
 /** @brief Call a slot in this object when language changes
  *
  * Given a slot (in method-function-pointer notation), call that slot when the
  * language changes. This is shorthand for connecting the Retranslator's
  * signal to the given slot.
+ *
+ * NOTE: unlike plain QObject::connect(), the slot is **also** called
+ *       immediately after setting up the connection. This allows
+ *       setup and translation code to be mixed together.
  */
-#define CALAMARES_RETRANSLATE_SLOT( slotfunc ) CALAMARES_RETRANSLATE_FOR( this, slotfunc )
+#define CALAMARES_RETRANSLATE_SLOT( slotfunc ) \
+    do \
+    { \
+        connect( CalamaresUtils::Retranslator::instance(), &CalamaresUtils::Retranslator::languageChanged, this, slotfunc ); \
+        (this->*slotfunc)(); \
+    } while ( false )
 
 #endif
diff --git a/src/libcalamaresui/viewpages/PythonQtViewStep.cpp b/src/libcalamaresui/viewpages/PythonQtViewStep.cpp
index 29c65472f8..df3c119943 100644
--- a/src/libcalamaresui/viewpages/PythonQtViewStep.cpp
+++ b/src/libcalamaresui/viewpages/PythonQtViewStep.cpp
@@ -48,7 +48,7 @@ PythonQtViewStep::PythonQtViewStep( PythonQtObjectPtr cxt, QObject* parent )
     CalamaresUtils::unmarginLayout( m_widget->layout() );
     m_cxt.addObject( "_calamares_module_basewidget", m_widget );
 
-    CALAMARES_RETRANSLATE_WIDGET(
+    CALAMARES_RETRANSLATE_FOR(
         m_widget,
         CalamaresUtils::lookupAndCall( m_obj, { "retranslate" }, { CalamaresUtils::translatorLocaleName() } ); )
 }

From 85a1eb95eef51041aef6f2a0660c53d82d08bc50 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 25 Jul 2021 00:08:47 +0200
Subject: [PATCH 306/492] [welcome] Some translation / label fixes

- the message had been arbitrarily changed; change it back
- update (warning) message when there is progress in checking the
  model, so it doesn't stay at "unchecked" until you change language
- minor clean-ups
---
 src/modules/welcome/Config.cpp                    | 6 ++++--
 src/modules/welcome/checker/ResultsListWidget.cpp | 6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index 28775f326e..bc489d1866 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -31,6 +31,8 @@ Config::Config( QObject* parent )
     initLanguages();
 
     CALAMARES_RETRANSLATE_SLOT( &Config::retranslate );
+    // But also when the requirements model changes, update the messages
+    connect( requirementsModel(), &Calamares::RequirementsModel::progressMessageChanged, this, &Config::retranslate );
 }
 
 void
@@ -63,11 +65,11 @@ Config::retranslate()
             message = setup ? tr( "This computer does not satisfy some of the "
                                   "recommended requirements for setting up %1.
    "
                                   "Setup can continue, but some features "
-                                  "might be reduced." )
+                                  "might be disabled." )
                             : tr( "This computer does not satisfy some of the "
                                   "recommended requirements for installing %1.
    "
                                   "Installation can continue, but some features "
-                                  "might be reduced." );
+                                  "might be disabled." );
         }
 
         m_warningMessage = message.arg( Calamares::Branding::instance()->shortVersionedName() );
diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp
index e3ef28526d..acbb48e42c 100644
--- a/src/modules/welcome/checker/ResultsListWidget.cpp
+++ b/src/modules/welcome/checker/ResultsListWidget.cpp
@@ -127,7 +127,6 @@ ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model,
     connect( buttonBox, &QDialogButtonBox::clicked, this, &QDialog::close );
 
     CALAMARES_RETRANSLATE_SLOT( &ResultsListDialog::retranslate );
-    retranslate();  // Do it now to fill in the texts
 }
 
 ResultsListDialog::~ResultsListDialog() {}
@@ -169,15 +168,15 @@ ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent )
     spacerLayout->addSpacing( paddingSize );
     CalamaresUtils::unmarginLayout( spacerLayout );
 
-    auto* explanation = new QLabel;
+    auto* explanation = new QLabel( m_config->warningMessage() );
     explanation->setWordWrap( true );
     explanation->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
     explanation->setOpenExternalLinks( false );
     explanation->setObjectName( "resultsExplanation" );
-    connect( explanation, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked );
     entriesLayout->addWidget( explanation );
 
     connect( config, &Config::warningMessageChanged, explanation, &QLabel::setText );
+    connect( explanation, &QLabel::linkActivated, this, &ResultsListWidget::linkClicked );
 
     // Check that all are satisfied (gives warnings if not) and
     // all *mandatory* entries are satisfied (gives errors if not).
@@ -226,7 +225,6 @@ ResultsListWidget::ResultsListWidget( Config* config, QWidget* parent )
     }
 
     CALAMARES_RETRANSLATE_SLOT( &ResultsListWidget::retranslate );
-    retranslate();
 }
 
 

From 740f1e7fe54923964cb20dfa710f85118c8a84e1 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 25 Jul 2021 23:11:46 +0200
Subject: [PATCH 307/492] i18n: simplify Label handling of sr@latin

---
 src/libcalamares/locale/Label.cpp | 10 +++++-----
 src/libcalamares/locale/Label.h   |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/libcalamares/locale/Label.cpp b/src/libcalamares/locale/Label.cpp
index b4ec8180ca..3dd5e09ee1 100644
--- a/src/libcalamares/locale/Label.cpp
+++ b/src/libcalamares/locale/Label.cpp
@@ -56,15 +56,15 @@ Label::getLocale( const QString& localeName )
     {
         return QLocale();
     }
-    if ( localeName.contains( "@latin" ) )
+
+    // Special cases
+    if ( localeName == QStringLiteral( "sr@latin" ) )
     {
         QLocale loc( localeName );  // Ignores @latin
         return QLocale( loc.language(), QLocale::Script::LatinScript, loc.country() );
     }
-    else
-    {
-        return QLocale( localeName );
-    }
+
+    return QLocale( localeName );
 }
 
 }  // namespace Locale
diff --git a/src/libcalamares/locale/Label.h b/src/libcalamares/locale/Label.h
index 58b2a3773a..cf1d7701f9 100644
--- a/src/libcalamares/locale/Label.h
+++ b/src/libcalamares/locale/Label.h
@@ -86,8 +86,9 @@ class Label : public QObject
 
     /** @brief Get a Qt locale for the given @p localeName
      *
-     * This special-cases `sr@latin`, which is used as a translation
-     * name in Calamares, while Qt recognizes `sr@latn`.
+     * This handles special-cases in Calamares translations:
+     * - `sr@latin` is the name which Qt recognizes as `sr@latn`,
+     *   Serbian written with Latin characters (not Cyrillic).
      */
     static QLocale getLocale( const QString& localeName );
 

From 0e977a7e4295c0dfa7296219b15f0f7e08b5a0af Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 25 Jul 2021 23:18:05 +0200
Subject: [PATCH 308/492] i18n: introduce special case for ca@valencia

---
 src/libcalamares/locale/Label.cpp |  4 ++++
 src/libcalamares/locale/Label.h   | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/libcalamares/locale/Label.cpp b/src/libcalamares/locale/Label.cpp
index 3dd5e09ee1..740999e694 100644
--- a/src/libcalamares/locale/Label.cpp
+++ b/src/libcalamares/locale/Label.cpp
@@ -63,6 +63,10 @@ Label::getLocale( const QString& localeName )
         QLocale loc( localeName );  // Ignores @latin
         return QLocale( loc.language(), QLocale::Script::LatinScript, loc.country() );
     }
+    if ( localeName == QStringLiteral( "ca@valencia" ) )
+    {
+        return QLocale( localeName );  // Ignores @valencia, but there is **really** no way to handle this
+    }
 
     return QLocale( localeName );
 }
diff --git a/src/libcalamares/locale/Label.h b/src/libcalamares/locale/Label.h
index cf1d7701f9..b0f17930a9 100644
--- a/src/libcalamares/locale/Label.h
+++ b/src/libcalamares/locale/Label.h
@@ -27,6 +27,12 @@ namespace Locale
  * Support class to turn locale names (as used by Calamares's
  * translation system) into QLocales, and also into consistent
  * human-readable text labels.
+ *
+ * This handles special-cases in Calamares translations:
+ * - `sr@latin` is the name which Qt recognizes as `sr@latn`,
+ *   Serbian written with Latin characters (not Cyrillic).
+ * - `ca@valencia` is the Catalan dialect spoken in Valencia.
+ *   There is no Qt code for it.
  */
 class Label : public QObject
 {
@@ -86,9 +92,7 @@ class Label : public QObject
 
     /** @brief Get a Qt locale for the given @p localeName
      *
-     * This handles special-cases in Calamares translations:
-     * - `sr@latin` is the name which Qt recognizes as `sr@latn`,
-     *   Serbian written with Latin characters (not Cyrillic).
+     * This obeys special cases as described in the class documentation.
      */
     static QLocale getLocale( const QString& localeName );
 

From 53fb16437fffde1fedc5a8cb77282054d5e8583c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 25 Jul 2021 23:38:09 +0200
Subject: [PATCH 309/492] i18n: factor out special cases

- allow special Locale or special Name for a translation (or both)
---
 src/libcalamares/locale/Label.cpp | 55 +++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/libcalamares/locale/Label.cpp b/src/libcalamares/locale/Label.cpp
index 740999e694..fd3d6feecc 100644
--- a/src/libcalamares/locale/Label.cpp
+++ b/src/libcalamares/locale/Label.cpp
@@ -11,6 +11,35 @@
 
 #include "Label.h"
 
+#include 
+
+/** @brief Handle special cases of Calamares language names
+ *
+ * If a given @p localeName (e.g. en_US, or sr@latin) has special handling,
+ * returns a pair of pointers:
+ * - a pointer to a QLocale; this is the locale to use, or may be @c nullptr
+ *   to indicate that the Qt locale derived from @p localeName is accepatable.
+ * - a pointer to a QString; this is the native language name to use, or may
+ *   be @c nullptr to indicate that the Qt value is acceptable.
+ *
+ * Returns a pair of nullptrs for non-special cases.
+ */
+static std::pair< QLocale*, QString* > specialCase( const QString& localeName )
+{
+    if ( localeName == "sr@latin" )
+    {
+        static QLocale loc( QLocale::Language::Serbian, QLocale::Script::LatinScript, QLocale::Country::Serbia );
+        return { &loc, nullptr };
+    }
+    if ( localeName == "ca@valencia" )
+    {
+        static QString name = QStringLiteral( "Català (Valencia)" );
+        return { nullptr, &name };
+    }
+
+    return { nullptr, nullptr };
+}
+
 namespace CalamaresUtils
 {
 namespace Locale
@@ -26,11 +55,12 @@ Label::Label( const QString& locale, LabelFormat format, QObject* parent )
     , m_locale( Label::getLocale( locale ) )
     , m_localeId( locale.isEmpty() ? m_locale.name() : locale )
 {
+    auto special = specialCase( locale );
+
     QString longFormat = QObject::tr( "%1 (%2)" );
 
-    QString languageName = m_locale.nativeLanguageName();
+    QString languageName = special.second ? *special.second : m_locale.nativeLanguageName();
     QString englishName = m_locale.languageToString( m_locale.language() );
-    QString countryName;
 
     if ( languageName.isEmpty() )
     {
@@ -39,11 +69,10 @@ Label::Label( const QString& locale, LabelFormat format, QObject* parent )
 
     bool needsCountryName = ( format == LabelFormat::AlwaysWithCountry )
         || ( locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 1 );
+    QString countryName =
+    ( needsCountryName ?
 
-    if ( needsCountryName )
-    {
-        countryName = m_locale.nativeCountryName();
-    }
+        m_locale.nativeCountryName() : QString() );
     m_label = needsCountryName ? longFormat.arg( languageName, countryName ) : languageName;
     m_englishLabel = needsCountryName ? longFormat.arg( englishName, QLocale::countryToString( m_locale.country() ) )
                                       : englishName;
@@ -57,18 +86,8 @@ Label::getLocale( const QString& localeName )
         return QLocale();
     }
 
-    // Special cases
-    if ( localeName == QStringLiteral( "sr@latin" ) )
-    {
-        QLocale loc( localeName );  // Ignores @latin
-        return QLocale( loc.language(), QLocale::Script::LatinScript, loc.country() );
-    }
-    if ( localeName == QStringLiteral( "ca@valencia" ) )
-    {
-        return QLocale( localeName );  // Ignores @valencia, but there is **really** no way to handle this
-    }
-
-    return QLocale( localeName );
+    auto special = specialCase( localeName );
+    return special.first ? *special.first : QLocale( localeName );
 }
 
 }  // namespace Locale

From a1fb83bdc466effcf73dc939277a07601a09fe7b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 11:16:26 +0200
Subject: [PATCH 310/492] i18n: fix typo and code-style

---
 src/libcalamares/locale/Label.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/libcalamares/locale/Label.cpp b/src/libcalamares/locale/Label.cpp
index fd3d6feecc..e2cfbc70ad 100644
--- a/src/libcalamares/locale/Label.cpp
+++ b/src/libcalamares/locale/Label.cpp
@@ -24,7 +24,8 @@
  *
  * Returns a pair of nullptrs for non-special cases.
  */
-static std::pair< QLocale*, QString* > specialCase( const QString& localeName )
+static std::pair< QLocale*, QString* >
+specialCase( const QString& localeName )
 {
     if ( localeName == "sr@latin" )
     {
@@ -33,7 +34,7 @@ static std::pair< QLocale*, QString* > specialCase( const QString& localeName )
     }
     if ( localeName == "ca@valencia" )
     {
-        static QString name = QStringLiteral( "Català (Valencia)" );
+        static QString name = QStringLiteral( "Català (València)" );
         return { nullptr, &name };
     }
 
@@ -69,10 +70,10 @@ Label::Label( const QString& locale, LabelFormat format, QObject* parent )
 
     bool needsCountryName = ( format == LabelFormat::AlwaysWithCountry )
         || ( locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 1 );
-    QString countryName =
-    ( needsCountryName ?
+    QString countryName = ( needsCountryName ?
 
-        m_locale.nativeCountryName() : QString() );
+                                             m_locale.nativeCountryName()
+                                             : QString() );
     m_label = needsCountryName ? longFormat.arg( languageName, countryName ) : languageName;
     m_englishLabel = needsCountryName ? longFormat.arg( englishName, QLocale::countryToString( m_locale.country() ) )
                                       : englishName;

From cbb1a5ef3686b836b357573ca4ed554382ccbd24 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 14:22:28 +0200
Subject: [PATCH 311/492] CMake: within Calamares repo, use the (eventual)
 imported names of libraries

---
 src/libcalamares/CMakeLists.txt   | 2 ++
 src/libcalamaresui/CMakeLists.txt | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 9615cedb89..8e46a9453c 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -166,6 +166,8 @@ target_link_libraries( calamares
         ${OPTIONAL_PUBLIC_LIBRARIES}
 )
 
+add_library(Calamares::calamares ALIAS calamares)
+
 ### Installation
 #
 #
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index f3b3cd0e11..a7c6e79066 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -89,6 +89,8 @@ if( WITH_QML )
     target_link_libraries( calamaresui PUBLIC Qt5::QuickWidgets )
 endif()
 
+add_library(Calamares::calamaresui ALIAS calamaresui)
+
 
 ### Installation
 #

From 4d1630bf8b98215bb4160a95076fc43551d6d028 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 14:27:52 +0200
Subject: [PATCH 312/492] CMake: tidy up automatic linking of Calamares
 libraries

- Modules and plugins don't need to mention libcalamares themselves
  for linking -- we can do that automatically. Use the IMPORTED names
  so that it works in Calamares main repo and external repositories.
- Complain about unknown module types.
---
 CMakeModules/CalamaresAddPlugin.cmake | 9 +++++++++
 CMakeModules/CalamaresAddTest.cmake   | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CMakeModules/CalamaresAddPlugin.cmake b/CMakeModules/CalamaresAddPlugin.cmake
index 5186bc54b1..7e2a3f583f 100644
--- a/CMakeModules/CalamaresAddPlugin.cmake
+++ b/CMakeModules/CalamaresAddPlugin.cmake
@@ -126,6 +126,15 @@ function( calamares_add_plugin )
     # create target name once for convenience
     set( target "calamares_${PLUGIN_TYPE}_${PLUGIN_NAME}" )
 
+    # automatic library linkage
+    if(PLUGIN_TYPE STREQUAL "view" OR PLUGIN_TYPE STREQUAL "viewmodule")
+        list(APPEND PLUGIN_LINK_PRIVATE_LIBRARIES Calamares::calamaresui)
+    elseif(PLUGIN_TYPE STREQUAL "job")
+        list(APPEND PLUGIN_LINK_PRIVATE_LIBRARIES Calamares::calamares)
+    else()
+        message(FATAL_ERROR "Unknown plugin type ${PLUGIN_TYPE}")
+    endif()
+
     # determine target type
     if( NOT ${PLUGIN_SHARED_LIB} )
         set( target_type "MODULE" )
diff --git a/CMakeModules/CalamaresAddTest.cmake b/CMakeModules/CalamaresAddTest.cmake
index 228d7cbc0a..cd757bb881 100644
--- a/CMakeModules/CalamaresAddTest.cmake
+++ b/CMakeModules/CalamaresAddTest.cmake
@@ -36,7 +36,7 @@ function( calamares_add_test )
             TEST_NAME
                 ${TEST_NAME}
             LINK_LIBRARIES
-                calamares
+                Calamares::calamares
                 ${TEST_LIBRARIES}
                 Qt5::Core
                 Qt5::Test
@@ -46,7 +46,7 @@ function( calamares_add_test )
         # compiled, so that it can find test-files in that source dir.
         target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST="${CMAKE_CURRENT_SOURCE_DIR}"  ${TEST_DEFINITIONS} )
         if( TEST_GUI )
-            target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui )
+            target_link_libraries( ${TEST_NAME} Calamares::calamaresui Qt5::Gui )
         endif()
         if( TEST_RESOURCES )
             calamares_autorcc( ${TEST_NAME} ${TEST_RESOURCES} )

From 03e621f4a2f03afa1fccb363c698e05c5be15d9c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 14:55:12 +0200
Subject: [PATCH 313/492] Modules: clean up linking

- do not link (explicitly) to Calamares libraries, the CMake
  functions do that automatically.
- while here, tidy and remove commented-out-bits
- while here, remove unneeded includes
---
 src/modules/contextualprocess/CMakeLists.txt   |  2 --
 src/modules/dracutlukscfg/CMakeLists.txt       |  2 --
 src/modules/dummycpp/CMakeLists.txt            |  2 --
 src/modules/finished/CMakeLists.txt            |  1 -
 src/modules/finishedq/CMakeLists.txt           |  1 -
 src/modules/fsresizer/CMakeLists.txt           |  1 -
 src/modules/hostinfo/CMakeLists.txt            |  2 --
 src/modules/initcpio/CMakeLists.txt            |  2 --
 src/modules/initramfs/CMakeLists.txt           |  2 --
 src/modules/interactiveterminal/CMakeLists.txt |  2 --
 src/modules/keyboard/CMakeLists.txt            |  2 --
 src/modules/keyboardq/CMakeLists.txt           |  2 --
 src/modules/license/CMakeLists.txt             |  2 --
 src/modules/locale/CMakeLists.txt              |  1 -
 src/modules/localeq/CMakeLists.txt             |  1 -
 src/modules/luksbootkeyfile/CMakeLists.txt     |  2 --
 src/modules/machineid/CMakeLists.txt           |  2 --
 src/modules/netinstall/CMakeLists.txt          |  3 ---
 src/modules/notesqml/CMakeLists.txt            |  2 --
 src/modules/oemid/CMakeLists.txt               |  1 -
 src/modules/packagechooser/CMakeLists.txt      |  1 -
 src/modules/partition/CMakeLists.txt           |  1 -
 src/modules/plasmalnf/CMakeLists.txt           |  1 -
 src/modules/preservefiles/CMakeLists.txt       |  2 --
 src/modules/removeuser/CMakeLists.txt          |  2 --
 src/modules/shellprocess/CMakeLists.txt        |  2 --
 src/modules/summary/CMakeLists.txt             |  2 --
 src/modules/tracking/CMakeLists.txt            |  2 --
 src/modules/users/CMakeLists.txt               |  1 -
 src/modules/usersq/CMakeLists.txt              |  1 -
 src/modules/webview/CMakeLists.txt             |  5 +----
 src/modules/welcome/CMakeLists.txt             |  1 -
 src/modules/welcomeq/CMakeLists.txt            | 13 +------------
 33 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/src/modules/contextualprocess/CMakeLists.txt b/src/modules/contextualprocess/CMakeLists.txt
index 113b504dbe..0798407ab0 100644
--- a/src/modules/contextualprocess/CMakeLists.txt
+++ b/src/modules/contextualprocess/CMakeLists.txt
@@ -8,8 +8,6 @@ calamares_add_plugin( contextualprocess
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         ContextualProcessJob.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
 )
 
diff --git a/src/modules/dracutlukscfg/CMakeLists.txt b/src/modules/dracutlukscfg/CMakeLists.txt
index dd9faf9d45..aaa7a8c172 100644
--- a/src/modules/dracutlukscfg/CMakeLists.txt
+++ b/src/modules/dracutlukscfg/CMakeLists.txt
@@ -8,8 +8,6 @@ calamares_add_plugin( dracutlukscfg
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         DracutLuksCfgJob.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
     NO_CONFIG
 )
diff --git a/src/modules/dummycpp/CMakeLists.txt b/src/modules/dummycpp/CMakeLists.txt
index e199d50272..2916b4d675 100644
--- a/src/modules/dummycpp/CMakeLists.txt
+++ b/src/modules/dummycpp/CMakeLists.txt
@@ -8,7 +8,5 @@ calamares_add_plugin( dummycpp
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         DummyCppJob.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
 )
diff --git a/src/modules/finished/CMakeLists.txt b/src/modules/finished/CMakeLists.txt
index b4d59db8ff..619f6d8b08 100644
--- a/src/modules/finished/CMakeLists.txt
+++ b/src/modules/finished/CMakeLists.txt
@@ -17,7 +17,6 @@ calamares_add_plugin( finished
     UI
         FinishedPage.ui
     LINK_PRIVATE_LIBRARIES
-        calamaresui
         Qt5::DBus
     SHARED_LIB
 )
diff --git a/src/modules/finishedq/CMakeLists.txt b/src/modules/finishedq/CMakeLists.txt
index 5b3793a6f0..facc2d691e 100644
--- a/src/modules/finishedq/CMakeLists.txt
+++ b/src/modules/finishedq/CMakeLists.txt
@@ -26,7 +26,6 @@ calamares_add_plugin( finishedq
     RESOURCES
         finishedq.qrc
     LINK_PRIVATE_LIBRARIES
-        calamaresui
         Qt5::DBus
     SHARED_LIB
 )
diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt
index 17b72b68ab..6e9a879074 100644
--- a/src/modules/fsresizer/CMakeLists.txt
+++ b/src/modules/fsresizer/CMakeLists.txt
@@ -21,7 +21,6 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
             ResizeFSJob.cpp
         LINK_PRIVATE_LIBRARIES
             kpmcore
-            calamares
         COMPILE_DEFINITIONS ${KPMcore_API_DEFINITIONS}
         SHARED_LIB
     )
diff --git a/src/modules/hostinfo/CMakeLists.txt b/src/modules/hostinfo/CMakeLists.txt
index cdf5857e6d..8ceae0798b 100644
--- a/src/modules/hostinfo/CMakeLists.txt
+++ b/src/modules/hostinfo/CMakeLists.txt
@@ -28,8 +28,6 @@ calamares_add_plugin( hostinfo
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         HostInfoJob.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
     NO_CONFIG
 )
diff --git a/src/modules/initcpio/CMakeLists.txt b/src/modules/initcpio/CMakeLists.txt
index e8d90e7fae..d4b4e8b437 100644
--- a/src/modules/initcpio/CMakeLists.txt
+++ b/src/modules/initcpio/CMakeLists.txt
@@ -8,8 +8,6 @@ calamares_add_plugin( initcpio
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         InitcpioJob.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
 )
 
diff --git a/src/modules/initramfs/CMakeLists.txt b/src/modules/initramfs/CMakeLists.txt
index b8bcc9681b..9937b7fb46 100644
--- a/src/modules/initramfs/CMakeLists.txt
+++ b/src/modules/initramfs/CMakeLists.txt
@@ -8,8 +8,6 @@ calamares_add_plugin( initramfs
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         InitramfsJob.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
 )
 
diff --git a/src/modules/interactiveterminal/CMakeLists.txt b/src/modules/interactiveterminal/CMakeLists.txt
index fea99a5dd4..20aee82578 100644
--- a/src/modules/interactiveterminal/CMakeLists.txt
+++ b/src/modules/interactiveterminal/CMakeLists.txt
@@ -25,8 +25,6 @@ if ( KF5Parts_FOUND AND KF5Service_FOUND )
         SOURCES
             InteractiveTerminalViewStep.cpp
             InteractiveTerminalPage.cpp
-        LINK_PRIVATE_LIBRARIES
-            calamaresui
         LINK_LIBRARIES
             KF5::Service
             KF5::Parts
diff --git a/src/modules/keyboard/CMakeLists.txt b/src/modules/keyboard/CMakeLists.txt
index 32e9a0592e..fe341cef05 100644
--- a/src/modules/keyboard/CMakeLists.txt
+++ b/src/modules/keyboard/CMakeLists.txt
@@ -18,8 +18,6 @@ calamares_add_plugin( keyboard
         KeyboardPage.ui
     RESOURCES
         keyboard.qrc
-    LINK_PRIVATE_LIBRARIES
-        calamaresui
     SHARED_LIB
 )
 
diff --git a/src/modules/keyboardq/CMakeLists.txt b/src/modules/keyboardq/CMakeLists.txt
index cc1e7e2c3a..2b0577aa73 100644
--- a/src/modules/keyboardq/CMakeLists.txt
+++ b/src/modules/keyboardq/CMakeLists.txt
@@ -23,7 +23,5 @@ calamares_add_plugin( keyboardq
         ${_keyboard}/keyboardwidget/keyboardglobal.cpp
     RESOURCES
         keyboardq.qrc
-    LINK_PRIVATE_LIBRARIES
-        calamaresui
     SHARED_LIB
 )
diff --git a/src/modules/license/CMakeLists.txt b/src/modules/license/CMakeLists.txt
index baaf34b435..0cd8387992 100644
--- a/src/modules/license/CMakeLists.txt
+++ b/src/modules/license/CMakeLists.txt
@@ -14,7 +14,5 @@ calamares_add_plugin( license
         LicenseWidget.cpp
     UI
         LicensePage.ui
-    LINK_PRIVATE_LIBRARIES
-        calamaresui
     SHARED_LIB
 )
diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index 3802f92b25..29b7fe813b 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -31,7 +31,6 @@ calamares_add_plugin( locale
     RESOURCES
         locale.qrc
     LINK_PRIVATE_LIBRARIES
-        calamaresui
         Qt5::Network
         ${geoip_libs}
         yamlcpp
diff --git a/src/modules/localeq/CMakeLists.txt b/src/modules/localeq/CMakeLists.txt
index 55c16091ca..ee3f073143 100644
--- a/src/modules/localeq/CMakeLists.txt
+++ b/src/modules/localeq/CMakeLists.txt
@@ -43,7 +43,6 @@ calamares_add_plugin( localeq
     RESOURCES
         localeq.qrc
     LINK_PRIVATE_LIBRARIES
-        calamaresui
         Qt5::Network
     SHARED_LIB
 )
diff --git a/src/modules/luksbootkeyfile/CMakeLists.txt b/src/modules/luksbootkeyfile/CMakeLists.txt
index 1782e7e0ed..6e98af4686 100644
--- a/src/modules/luksbootkeyfile/CMakeLists.txt
+++ b/src/modules/luksbootkeyfile/CMakeLists.txt
@@ -8,8 +8,6 @@ calamares_add_plugin( luksbootkeyfile
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         LuksBootKeyFileJob.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
     NO_CONFIG
 )
diff --git a/src/modules/machineid/CMakeLists.txt b/src/modules/machineid/CMakeLists.txt
index 360c0cc8aa..0ab035ab4d 100644
--- a/src/modules/machineid/CMakeLists.txt
+++ b/src/modules/machineid/CMakeLists.txt
@@ -9,8 +9,6 @@ calamares_add_plugin( machineid
     SOURCES
         MachineIdJob.cpp
         Workers.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
 )
 
diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt
index 6b7270db1e..f31ac6d79f 100644
--- a/src/modules/netinstall/CMakeLists.txt
+++ b/src/modules/netinstall/CMakeLists.txt
@@ -16,9 +16,7 @@ calamares_add_plugin( netinstall
     UI
         page_netinst.ui
     LINK_PRIVATE_LIBRARIES
-        calamaresui
         Qt5::Network
-        yamlcpp
     SHARED_LIB
 )
 
@@ -32,6 +30,5 @@ calamares_add_test(
         PackageModel.cpp
     LIBRARIES
         Qt5::Gui
-        yamlcpp
 )
 
diff --git a/src/modules/notesqml/CMakeLists.txt b/src/modules/notesqml/CMakeLists.txt
index a5edc7d048..5eab06663c 100644
--- a/src/modules/notesqml/CMakeLists.txt
+++ b/src/modules/notesqml/CMakeLists.txt
@@ -15,7 +15,5 @@ calamares_add_plugin( notesqml
         NotesQmlViewStep.cpp
     RESOURCES
         notesqml.qrc
-    LINK_PRIVATE_LIBRARIES
-        calamaresui
     SHARED_LIB
 )
diff --git a/src/modules/oemid/CMakeLists.txt b/src/modules/oemid/CMakeLists.txt
index 68a1b653e3..af7fe1ff74 100644
--- a/src/modules/oemid/CMakeLists.txt
+++ b/src/modules/oemid/CMakeLists.txt
@@ -12,7 +12,6 @@ calamares_add_plugin( oemid
     UI
         OEMPage.ui
     LINK_PRIVATE_LIBRARIES
-        calamaresui
         Qt5::Widgets
     SHARED_LIB
 )
diff --git a/src/modules/packagechooser/CMakeLists.txt b/src/modules/packagechooser/CMakeLists.txt
index f08658037c..d2e6ff1183 100644
--- a/src/modules/packagechooser/CMakeLists.txt
+++ b/src/modules/packagechooser/CMakeLists.txt
@@ -55,7 +55,6 @@ calamares_add_plugin( packagechooser
     UI
         page_package.ui
     LINK_PRIVATE_LIBRARIES
-        calamaresui
         ${_extra_libraries}
     SHARED_LIB
 )
diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index 26d4ffae78..96378d98d0 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -108,7 +108,6 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
             gui/VolumeGroupBaseDialog.ui
         LINK_PRIVATE_LIBRARIES
             kpmcore
-            calamaresui
             KF5::CoreAddons
         COMPILE_DEFINITIONS ${_partition_defs}
         SHARED_LIB
diff --git a/src/modules/plasmalnf/CMakeLists.txt b/src/modules/plasmalnf/CMakeLists.txt
index 3a85d9598d..8ae205aedd 100644
--- a/src/modules/plasmalnf/CMakeLists.txt
+++ b/src/modules/plasmalnf/CMakeLists.txt
@@ -44,7 +44,6 @@ if ( KF5Plasma_FOUND AND KF5Package_FOUND )
         UI
             page_plasmalnf.ui
         LINK_PRIVATE_LIBRARIES
-            calamaresui
             KF5::Package
             KF5::Plasma
         SHARED_LIB
diff --git a/src/modules/preservefiles/CMakeLists.txt b/src/modules/preservefiles/CMakeLists.txt
index d19645089d..820c50a2b9 100644
--- a/src/modules/preservefiles/CMakeLists.txt
+++ b/src/modules/preservefiles/CMakeLists.txt
@@ -10,8 +10,6 @@ calamares_add_plugin( preservefiles
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         PreserveFiles.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     # REQUIRES mount  # To set the rootMountPoint
     SHARED_LIB
     EMERGENCY
diff --git a/src/modules/removeuser/CMakeLists.txt b/src/modules/removeuser/CMakeLists.txt
index cf4243e7d4..7663b3472c 100644
--- a/src/modules/removeuser/CMakeLists.txt
+++ b/src/modules/removeuser/CMakeLists.txt
@@ -8,7 +8,5 @@ calamares_add_plugin( removeuser
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         RemoveUserJob.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
 )
diff --git a/src/modules/shellprocess/CMakeLists.txt b/src/modules/shellprocess/CMakeLists.txt
index 448be06256..ff6008d134 100644
--- a/src/modules/shellprocess/CMakeLists.txt
+++ b/src/modules/shellprocess/CMakeLists.txt
@@ -8,8 +8,6 @@ calamares_add_plugin( shellprocess
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         ShellProcessJob.cpp
-    LINK_PRIVATE_LIBRARIES
-        calamares
     SHARED_LIB
 )
 
diff --git a/src/modules/summary/CMakeLists.txt b/src/modules/summary/CMakeLists.txt
index 57dc731cb1..2c30dc31a6 100644
--- a/src/modules/summary/CMakeLists.txt
+++ b/src/modules/summary/CMakeLists.txt
@@ -11,8 +11,6 @@ calamares_add_plugin( summary
         SummaryViewStep.cpp
         SummaryPage.cpp
     UI
-    LINK_PRIVATE_LIBRARIES
-        calamaresui
     SHARED_LIB
     NO_CONFIG
 )
diff --git a/src/modules/tracking/CMakeLists.txt b/src/modules/tracking/CMakeLists.txt
index fe0b315e35..a878961b0b 100644
--- a/src/modules/tracking/CMakeLists.txt
+++ b/src/modules/tracking/CMakeLists.txt
@@ -15,8 +15,6 @@ calamares_add_plugin( tracking
         page_trackingstep.ui
     RESOURCES
         page_trackingstep.qrc
-    LINK_PRIVATE_LIBRARIES
-        calamaresui
     SHARED_LIB
 )
 
diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index 2772a6b394..8203ecf089 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -71,7 +71,6 @@ calamares_add_plugin( users
         users.qrc
     LINK_PRIVATE_LIBRARIES
         users_internal
-        calamaresui
         ${CRYPT_LIBRARIES}
         ${USER_EXTRA_LIB}
     SHARED_LIB
diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt
index 583a3384b7..8465b02463 100644
--- a/src/modules/usersq/CMakeLists.txt
+++ b/src/modules/usersq/CMakeLists.txt
@@ -50,7 +50,6 @@ calamares_add_plugin( usersq
         usersq.qrc
     LINK_PRIVATE_LIBRARIES
         users_internal
-        calamaresui
         ${CRYPT_LIBRARIES}
         ${USER_EXTRA_LIB}
         Qt5::DBus
diff --git a/src/modules/webview/CMakeLists.txt b/src/modules/webview/CMakeLists.txt
index 8de5e690cc..54e1d18b0a 100644
--- a/src/modules/webview/CMakeLists.txt
+++ b/src/modules/webview/CMakeLists.txt
@@ -3,8 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot 
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-set( CALA_WEBVIEW_INCLUDE_DIRECTORIES ${PROJECT_BINARY_DIR}/src/libcalamaresui )
-set( CALA_WEBVIEW_LINK_LIBRARIES calamaresui )
+set( CALA_WEBVIEW_LINK_LIBRARIES "" )
 
 option( WEBVIEW_FORCE_WEBKIT "Always build webview with WebKit instead of WebEngine regardless of Qt version." OFF)
 
@@ -46,8 +45,6 @@ else()
 endif()
 
 if ( NOT _reason )
-    include_directories( ${CALA_WEBVIEW_INCLUDE_DIRECTORIES} )
-
     configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/WebViewConfig.h.in
                     ${CMAKE_CURRENT_BINARY_DIR}/WebViewConfig.h )
 
diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt
index a468af102a..9240626527 100644
--- a/src/modules/welcome/CMakeLists.txt
+++ b/src/modules/welcome/CMakeLists.txt
@@ -37,7 +37,6 @@ calamares_add_plugin( welcome
     RESOURCES
         welcome.qrc
     LINK_PRIVATE_LIBRARIES
-        calamaresui
         ${CHECKER_LINK_LIBRARIES}
         Qt5::DBus
         Qt5::Network
diff --git a/src/modules/welcomeq/CMakeLists.txt b/src/modules/welcomeq/CMakeLists.txt
index c9cafe7a8c..b6f950dadd 100644
--- a/src/modules/welcomeq/CMakeLists.txt
+++ b/src/modules/welcomeq/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 
 set( _welcome ${CMAKE_CURRENT_SOURCE_DIR}/../welcome )
 
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ${CMAKE_CURRENT_SOURCE_DIR}/../../libcalamares ${_welcome} )
+include_directories( ${_welcome} )
 
 # DUPLICATED WITH WELCOME MODULE
 find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
@@ -44,19 +44,8 @@ calamares_add_plugin( welcomeq
     RESOURCES
         welcomeq.qrc
     LINK_PRIVATE_LIBRARIES
-        calamaresui
         ${CHECKER_LINK_LIBRARIES}
         Qt5::DBus
         Qt5::Network
     SHARED_LIB
 )
-
-# add_executable( welcomeqmltest qmlmain.cpp Config.cpp WelcomeQmlViewStep.cpp ${CHECKER_SOURCES} )
-# target_link_libraries( welcomeqmltest PRIVATE calamaresui Qt5::Core Qt5::Network Qt5::DBus ${CHECKER_LINK_LIBRARIES})
-# set_target_properties( welcomeqmltest
-#     PROPERTIES
-#         ENABLE_EXPORTS TRUE
-#         RUNTIME_OUTPUT_NAME welcomeqmltest
-# )
-# calamares_automoc( welcomeqmltest )
-# calamares_autouic( welcomeqmltest )

From ce67712009ee03fd43348a2889357b699073007e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 14:34:10 +0200
Subject: [PATCH 314/492] CMake: rename imported yamlcpp library

- call it yamlcpp::yamlcpp

This is source-incompatible if targets link explicitly to yamlcpp
---
 CMakeModules/FindYAMLCPP.cmake | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeModules/FindYAMLCPP.cmake b/CMakeModules/FindYAMLCPP.cmake
index 0752c7bd7c..f8ea4394c6 100644
--- a/CMakeModules/FindYAMLCPP.cmake
+++ b/CMakeModules/FindYAMLCPP.cmake
@@ -13,7 +13,7 @@
 #   YAMLCPP_LIBRARY, where to find yaml-cpp
 #   YAMLCPP_INCLUDE_DIR, where to find yaml.h
 # There is also one IMPORTED library target,
-#   yamlcpp
+#   yamlcpp::yamlcpp
 #
 # By default, the dynamic libraries of yaml-cpp will be found. To find the static ones instead,
 # you must set the YAMLCPP_STATIC_LIBRARY variable to TRUE before calling find_package(YamlCpp ...).
@@ -21,6 +21,10 @@
 # If yaml-cpp is not installed in a standard path, you can use the YAMLCPP_DIR CMake variable
 # to tell CMake where yaml-cpp is.
 
+if(TARGET yamlcpp::yamlcpp)
+    return()
+endif()
+
 # attempt to find static library first if this is set
 if(YAMLCPP_STATIC_LIBRARY)
     set(YAMLCPP_STATIC libyaml-cpp.a)
@@ -61,9 +65,9 @@ mark_as_advanced(YAMLCPP_INCLUDE_DIR YAMLCPP_LIBRARY)
 
 # Add an imported target
 if( YAMLCPP_LIBRARY )
-    add_library( yamlcpp UNKNOWN IMPORTED )
-    set_property( TARGET yamlcpp PROPERTY IMPORTED_LOCATION ${YAMLCPP_LIBRARY} )
+    add_library( yamlcpp::yamlcpp UNKNOWN IMPORTED )
+    set_property( TARGET yamlcpp::yamlcpp PROPERTY IMPORTED_LOCATION ${YAMLCPP_LIBRARY} )
     if ( YAMLCPP_INCLUDE_DIR )
-        set_property( TARGET yamlcpp PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${YAMLCPP_INCLUDE_DIR} )
+        set_property( TARGET yamlcpp::yamlcpp PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${YAMLCPP_INCLUDE_DIR} )
     endif()
 endif()

From 4114a2bbe86308d242f80582991c62ed5f47c00b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 15:08:29 +0200
Subject: [PATCH 315/492] CMake: chase renamed YAMLCPP

---
 src/calamares/CMakeLists.txt                 | 2 +-
 src/libcalamares/CMakeLists.txt              | 4 ++--
 src/libcalamaresui/CMakeLists.txt            | 2 +-
 src/modules/contextualprocess/CMakeLists.txt | 2 +-
 src/modules/fsresizer/CMakeLists.txt         | 2 +-
 src/modules/hostinfo/CMakeLists.txt          | 2 +-
 src/modules/initcpio/CMakeLists.txt          | 2 +-
 src/modules/initramfs/CMakeLists.txt         | 2 +-
 src/modules/locale/CMakeLists.txt            | 2 +-
 src/modules/shellprocess/CMakeLists.txt      | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index abea69a269..cf00dca37c 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -123,5 +123,5 @@ if( BUILD_TESTING )
     target_link_libraries( loadmodule PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui )
 
     add_executable( test_conf test_conf.cpp )
-    target_link_libraries( test_conf PUBLIC yamlcpp Qt5::Core )
+    target_link_libraries( test_conf PUBLIC yamlcpp::yamlcpp Qt5::Core )
 endif()
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 8e46a9453c..2f542450b9 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -160,7 +160,7 @@ target_link_libraries( calamares
     LINK_PRIVATE
         ${OPTIONAL_PRIVATE_LIBRARIES}
     LINK_PUBLIC
-        yamlcpp
+        yamlcpp::yamlcpp
         Qt5::Core
         KF5::CoreAddons
         ${OPTIONAL_PUBLIC_LIBRARIES}
@@ -315,7 +315,7 @@ calamares_add_test(
 # This is not an actual test, it's a test / demo application
 # for experimenting with GeoIP.
 add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} )
-target_link_libraries( test_geoip calamares Qt5::Network yamlcpp )
+target_link_libraries( test_geoip calamares Qt5::Network yamlcpp::yamlcpp )
 calamares_automoc( test_geoip )
 
 if ( Qt5DBus_FOUND )
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index a7c6e79066..20fae9a19d 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -76,7 +76,7 @@ calamares_add_library( calamaresui
     EXPORT Calamares
     VERSION ${CALAMARES_VERSION_SHORT}
 )
-target_link_libraries( calamaresui PRIVATE yamlcpp )
+target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp )
 if( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 )
     target_compile_definitions( calamaresui PRIVATE WITH_KOSRelease )
 endif()
diff --git a/src/modules/contextualprocess/CMakeLists.txt b/src/modules/contextualprocess/CMakeLists.txt
index 0798407ab0..d7716bbfb4 100644
--- a/src/modules/contextualprocess/CMakeLists.txt
+++ b/src/modules/contextualprocess/CMakeLists.txt
@@ -17,5 +17,5 @@ calamares_add_test(
         Tests.cpp
         ContextualProcessJob.cpp  # Builds it a second time
     LIBRARIES
-        yamlcpp
+        yamlcpp::yamlcpp
 )
diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt
index 6e9a879074..e721d7f6bc 100644
--- a/src/modules/fsresizer/CMakeLists.txt
+++ b/src/modules/fsresizer/CMakeLists.txt
@@ -31,7 +31,7 @@ if ( KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND
             Tests.cpp
         LIBRARIES
             calamares_job_fsresizer  # From above
-            yamlcpp
+            yamlcpp::yamlcpp
         DEFINITIONS ${KPMcore_API_DEFINITIONS}
     )
 else()
diff --git a/src/modules/hostinfo/CMakeLists.txt b/src/modules/hostinfo/CMakeLists.txt
index 8ceae0798b..55be66f819 100644
--- a/src/modules/hostinfo/CMakeLists.txt
+++ b/src/modules/hostinfo/CMakeLists.txt
@@ -42,5 +42,5 @@ calamares_add_test(
         Tests.cpp
         HostInfoJob.cpp
     LIBRARIES
-        yamlcpp
+        yamlcpp::yamlcpp
 )
diff --git a/src/modules/initcpio/CMakeLists.txt b/src/modules/initcpio/CMakeLists.txt
index d4b4e8b437..48fd093711 100644
--- a/src/modules/initcpio/CMakeLists.txt
+++ b/src/modules/initcpio/CMakeLists.txt
@@ -17,5 +17,5 @@ calamares_add_test(
         Tests.cpp
     LIBRARIES
         calamares_job_initcpio # From above
-        yamlcpp
+        yamlcpp::yamlcpp
 )
diff --git a/src/modules/initramfs/CMakeLists.txt b/src/modules/initramfs/CMakeLists.txt
index 9937b7fb46..2dec41cba5 100644
--- a/src/modules/initramfs/CMakeLists.txt
+++ b/src/modules/initramfs/CMakeLists.txt
@@ -17,5 +17,5 @@ calamares_add_test(
         Tests.cpp
     LIBRARIES
         calamares_job_initramfs # From above
-        yamlcpp
+        yamlcpp::yamlcpp
 )
diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index 29b7fe813b..272dea3ded 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -33,7 +33,7 @@ calamares_add_plugin( locale
     LINK_PRIVATE_LIBRARIES
         Qt5::Network
         ${geoip_libs}
-        yamlcpp
+        yamlcpp::yamlcpp
     SHARED_LIB
 )
 
diff --git a/src/modules/shellprocess/CMakeLists.txt b/src/modules/shellprocess/CMakeLists.txt
index ff6008d134..ac6630c6d2 100644
--- a/src/modules/shellprocess/CMakeLists.txt
+++ b/src/modules/shellprocess/CMakeLists.txt
@@ -16,5 +16,5 @@ calamares_add_test(
     SOURCES
         Tests.cpp
     LIBRARIES
-        yamlcpp
+        yamlcpp::yamlcpp
 )

From 954e8ee3f8ffdbaa4125838c5e91beebf2d9e48c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 15:18:21 +0200
Subject: [PATCH 316/492] [libcalamares] warnings-- with a deduction guide

---
 src/libcalamares/utils/RAII.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libcalamares/utils/RAII.h b/src/libcalamares/utils/RAII.h
index f3adb90f65..0b8c9b2aa1 100644
--- a/src/libcalamares/utils/RAII.h
+++ b/src/libcalamares/utils/RAII.h
@@ -75,4 +75,6 @@ struct cPointerSetter
 
     const T& operator=(const T& v) { m_value = v; return v; }
 };
+
+template < typename T > cPointerSetter( T p ) -> cPointerSetter;
 #endif

From e0b8942242648b076ec608062fd95b6d5fe3bff3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 16:12:41 +0200
Subject: [PATCH 317/492] [partition] Introduce retranslate slot for
 ChoicePage, code style

---
 src/modules/partition/gui/ChoicePage.cpp | 25 ++++++++++++++----------
 src/modules/partition/gui/ChoicePage.h   |  2 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 4eac761e69..ddddf45122 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -118,9 +118,7 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
     CalamaresUtils::unmarginLayout( m_itemsLayout );
 
     // Drive selector + preview
-    CALAMARES_RETRANSLATE( retranslateUi( this ); m_drivesLabel->setText( tr( "Select storage de&vice:" ) );
-                           m_previewBeforeLabel->setText( tr( "Current:" ) );
-                           m_previewAfterLabel->setText( tr( "After:" ) ); );
+    CALAMARES_RETRANSLATE_SLOT( retranslate );
 
     m_previewBeforeFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
     m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
@@ -134,6 +132,15 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
 
 ChoicePage::~ChoicePage() {}
 
+void
+ChoicePage::retranslate()
+{
+    retranslateUi( this );
+    m_drivesLabel->setText( tr( "Select storage de&vice:" ) );
+    m_previewBeforeLabel->setText( tr( "Current:" ) );
+    m_previewAfterLabel->setText( tr( "After:" ) );
+}
+
 
 /** @brief Sets the @p model for the given @p box and adjusts UI sizes to match.
  *
@@ -174,10 +181,7 @@ ChoicePage::init( PartitionCoreModule* core )
     } );
     setModelToComboBox( m_drivesCombo, core->deviceModel() );
 
-    connect( m_drivesCombo,
-             qOverload( &QComboBox::currentIndexChanged ),
-             this,
-             &ChoicePage::applyDeviceChoice );
+    connect( m_drivesCombo, qOverload< int >( &QComboBox::currentIndexChanged ), this, &ChoicePage::applyDeviceChoice );
 
     connect( m_encryptWidget, &EncryptWidget::stateChanged, this, &ChoicePage::onEncryptWidgetStateChanged );
     connect( m_reuseHomeCheckBox, &QCheckBox::stateChanged, this, &ChoicePage::onHomeCheckBoxStateChanged );
@@ -270,11 +274,12 @@ ChoicePage::setupChoices()
         m_eraseButton->addOptionsComboBox( m_eraseSwapChoiceComboBox );
     }
 
-    if ( m_config->eraseFsTypes().count() > 1)
+    if ( m_config->eraseFsTypes().count() > 1 )
     {
         m_eraseFsTypesChoiceComboBox = new QComboBox;
-        m_eraseFsTypesChoiceComboBox->addItems(m_config->eraseFsTypes());
-        connect( m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, m_config, &Config::setEraseFsTypeChoice );
+        m_eraseFsTypesChoiceComboBox->addItems( m_config->eraseFsTypes() );
+        connect(
+            m_eraseFsTypesChoiceComboBox, &QComboBox::currentTextChanged, m_config, &Config::setEraseFsTypeChoice );
         connect( m_config, &Config::eraseModeFilesystemChanged, this, &ChoicePage::onActionChanged );
         m_eraseButton->addOptionsComboBox( m_eraseFsTypesChoiceComboBox );
     }
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index 5e0a24d438..c340bfe4a0 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -101,6 +101,8 @@ private slots:
     /// @brief Calls onActionChanged() as needed.
     void onEraseSwapChoiceChanged();
 
+    void retranslate();
+
 private:
     bool calculateNextEnabled() const;
     void updateNextEnabled();

From 616f3d4fd7feb0ebfcab0b664403026866da1950 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 16:18:31 +0200
Subject: [PATCH 318/492] [partition] Simplify retranslation of swap choices
 and manual partitioning

---
 src/modules/partition/gui/ChoicePage.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index ddddf45122..fc11a6046e 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -139,6 +139,10 @@ ChoicePage::retranslate()
     m_drivesLabel->setText( tr( "Select storage de&vice:" ) );
     m_previewBeforeLabel->setText( tr( "Current:" ) );
     m_previewAfterLabel->setText( tr( "After:" ) );
+
+    m_somethingElseButton->setText( tr( "Manual partitioning
    "
+                                        "You can create or resize partitions yourself." ) );
+    updateSwapChoicesTr( m_eraseSwapChoiceComboBox );
 }
 
 
@@ -329,14 +333,12 @@ ChoicePage::setupChoices()
 
     connect( this, &ChoicePage::actionChosen, this, &ChoicePage::onActionChanged );
     if ( m_eraseSwapChoiceComboBox )
+    {
         connect( m_eraseSwapChoiceComboBox,
                  QOverload< int >::of( &QComboBox::currentIndexChanged ),
                  this,
                  &ChoicePage::onEraseSwapChoiceChanged );
-
-    CALAMARES_RETRANSLATE( m_somethingElseButton->setText( tr( "Manual partitioning
    "
-                                                               "You can create or resize partitions yourself." ) );
-                           updateSwapChoicesTr( m_eraseSwapChoiceComboBox ); );
+    }
 }
 
 

From e8cb5c621a1b1383c2f1648bd8ecc49fea99c829 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 20:54:43 +0200
Subject: [PATCH 319/492] [partition] Fix build

---
 src/modules/partition/gui/ChoicePage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index fc11a6046e..11f1504c10 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -118,7 +118,7 @@ ChoicePage::ChoicePage( Config* config, QWidget* parent )
     CalamaresUtils::unmarginLayout( m_itemsLayout );
 
     // Drive selector + preview
-    CALAMARES_RETRANSLATE_SLOT( retranslate );
+    CALAMARES_RETRANSLATE_SLOT( &ChoicePage::retranslate );
 
     m_previewBeforeFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
     m_previewAfterFrame->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );

From 7e0e063c3f990747342d9a67031f3c5d856dfd43 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 30 Jul 2021 12:54:47 +0200
Subject: [PATCH 320/492] Changes: pre-release housekeeping

---
 CHANGES        | 12 ++++++++++--
 CMakeLists.txt |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index f2682e1f4d..7df3989a7d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,18 +11,26 @@ website will have to do for older versions.
 
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma
+ - Camilo Higuita
 
 ## Core ##
  - The (re)translation framework has been internally re-vamped to be
    less resource-intensive and to work with all QObjects, not just
    widgets. Consumers of the translations framework are expected to
-   set up the event filter on the top-level widget(s) manually.
+   set up the event filter on the top-level widget(s) manually. Since
+   Calamares and the Calamares-test-applications have been adjusted already,
+   no further action is needed.
 
 ## Modules ##
+ - Logic for handling installation lists has been moved around in the
+   *packages* module so that package managers can, in principle,
+   adjust how to handle critical and non-critical package lists.
+ - In the *partition* module, translation code has been simplified.
  - The *usersq* module has had a fair bit of QML rewritten to make it easier
    to customize the colors used by the module in a consistent way.
    (Thanks Anke)
-
+ - *Welcome* now uses a translated message from the Config object,
+   increasing the sharing between widgets- and QML-modules.
 
 
 # 3.2.40 (2021-07-14) #
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3db9050d1..1c2b6e02cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.40
+    VERSION 3.2.41
     LANGUAGES C CXX
 )
 

From f38b518e861d154611461bf9740f0a7359082081 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 30 Jul 2021 13:22:40 +0200
Subject: [PATCH 321/492] [keyboard] Factor out lambdas to regular slots

- Long and complicated, nested, lambdas are not convenient for reasoning.
- The debug messages from the innermost lambda have a totally useless
  function name, which makes debugging harder.
---
 src/modules/keyboard/Config.cpp | 86 ++++++++++++++++++---------------
 src/modules/keyboard/Config.h   | 12 +++++
 2 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index d286e26fdc..489f4a1acc 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -168,54 +168,64 @@ Config::Config( QObject* parent )
         emit prettyStatusChanged();
     } );
 
-    connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, [&]( int index ) {
-        // Set Xorg keyboard layout + variant
-        m_selectedVariant = m_keyboardVariantsModel->key( index );
+    connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, this, &Config::xkbChanged );
 
-        if ( m_setxkbmapTimer.isActive() )
-        {
-            m_setxkbmapTimer.stop();
-            m_setxkbmapTimer.disconnect( this );
-        }
+    m_selectedModel = m_keyboardModelsModel->key( m_keyboardModelsModel->currentIndex() );
+    m_selectedLayout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).first;
+    m_selectedVariant = m_keyboardVariantsModel->key( m_keyboardVariantsModel->currentIndex() );
+}
 
-        connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
-            m_additionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
+void
+Config::xkbChanged( int index )
+{
+    // Set Xorg keyboard layout + variant
+    m_selectedVariant = m_keyboardVariantsModel->key( index );
 
-            if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() )
-            {
-                m_additionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
+    if ( m_setxkbmapTimer.isActive() )
+    {
+        m_setxkbmapTimer.stop();
+        m_setxkbmapTimer.disconnect( this );
+    }
 
-                if ( m_additionalLayoutInfo.groupSwitcher.isEmpty() )
-                {
-                    m_additionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle";
-                }
+    connect( &m_setxkbmapTimer, &QTimer::timeout, this, &Config::xkbApply );
 
-                QProcess::execute( "setxkbmap",
-                                   xkbmap_layout_args( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout },
-                                                       { m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
-                                                       m_additionalLayoutInfo.groupSwitcher ) );
+    m_setxkbmapTimer.start( QApplication::keyboardInputInterval() );
+    emit prettyStatusChanged();
+}
 
+void
+Config::xkbApply()
+{
+    m_additionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
 
-                cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added "
-                         << m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant
-                         << " since current layout is not ASCII-capable)";
-            }
-            else
-            {
-                QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
-                cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
-            }
-            m_setxkbmapTimer.disconnect( this );
-        } );
-        m_setxkbmapTimer.start( QApplication::keyboardInputInterval() );
-        emit prettyStatusChanged();
-    } );
+    if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() )
+    {
+        m_additionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
 
-    m_selectedModel = m_keyboardModelsModel->key( m_keyboardModelsModel->currentIndex() );
-    m_selectedLayout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).first;
-    m_selectedVariant = m_keyboardVariantsModel->key( m_keyboardVariantsModel->currentIndex() );
+        if ( m_additionalLayoutInfo.groupSwitcher.isEmpty() )
+        {
+            m_additionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle";
+        }
+
+        QProcess::execute( "setxkbmap",
+                           xkbmap_layout_args( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout },
+                                               { m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
+                                               m_additionalLayoutInfo.groupSwitcher ) );
+
+
+        cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added "
+                 << m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant
+                 << " since current layout is not ASCII-capable)";
+    }
+    else
+    {
+        QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
+        cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
+    }
+    m_setxkbmapTimer.disconnect( this );
 }
 
+
 KeyboardModelsModel*
 Config::keyboardModels() const
 {
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index 90eeb0e7b7..4919a154cd 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -76,6 +76,18 @@ class Config : public QObject
     void guessLayout( const QStringList& langParts );
     void updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant = QString() );
 
+    /* These two methods are used in tandem to apply changes to the
+     * keyboard layout. This introduces a slight delay between selecting
+     * a keyboard, and applying it to the system -- so that if you
+     * scroll through or down-arrow through the list of keyboards,
+     * you don't get buried under xkbset processes.
+     *
+     * xkbChanged() is called when the selection changes, and triggers
+     * a delayed call to xkbApply() which does the actual work.
+     */
+    void xkbChanged( int index );
+    void xkbApply();
+
     KeyboardModelsModel* m_keyboardModelsModel;
     KeyboardLayoutModel* m_keyboardLayoutsModel;
     KeyboardVariantsModel* m_keyboardVariantsModel;

From 12b23db28613cad4eb2f0c1c4fe37c0fa2bcf0c0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 30 Jul 2021 22:17:26 +0200
Subject: [PATCH 322/492] [keyboard] Re-phrase API

- expose only intended API, guessLayout() becomes internal and static
- rename onActivate() since it was *called* for activation, but does
  something totally different.
---
 src/modules/keyboard/Config.cpp               | 23 +++++++++----------
 src/modules/keyboard/Config.h                 | 10 ++++----
 src/modules/keyboard/KeyboardViewStep.cpp     |  2 +-
 src/modules/keyboardq/KeyboardQmlViewStep.cpp |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 489f4a1acc..b137927b46 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -366,22 +366,22 @@ Config::createJobs()
     return list;
 }
 
-void
-Config::guessLayout( const QStringList& langParts )
+static void
+guessLayout( const QStringList& langParts, KeyboardLayoutModel* layouts, KeyboardVariantsModel* variants )
 {
     bool foundCountryPart = false;
     for ( auto countryPart = langParts.rbegin(); !foundCountryPart && countryPart != langParts.rend(); ++countryPart )
     {
         cDebug() << Logger::SubEntry << "looking for locale part" << *countryPart;
-        for ( int i = 0; i < m_keyboardLayoutsModel->rowCount(); ++i )
+        for ( int i = 0; i < layouts->rowCount(); ++i )
         {
-            QModelIndex idx = m_keyboardLayoutsModel->index( i );
+            QModelIndex idx = layouts->index( i );
             QString name
                 = idx.isValid() ? idx.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString() : QString();
             if ( idx.isValid() && ( name.compare( *countryPart, Qt::CaseInsensitive ) == 0 ) )
             {
                 cDebug() << Logger::SubEntry << "matched" << name;
-                m_keyboardLayoutsModel->setCurrentIndex( i );
+                layouts->setCurrentIndex( i );
                 foundCountryPart = true;
                 break;
             }
@@ -392,14 +392,13 @@ Config::guessLayout( const QStringList& langParts )
             if ( countryPart != langParts.rend() )
             {
                 cDebug() << "Next level:" << *countryPart;
-                for ( int variantnumber = 0; variantnumber < m_keyboardVariantsModel->rowCount(); ++variantnumber )
+                for ( int variantnumber = 0; variantnumber < variants->rowCount(); ++variantnumber )
                 {
-                    if ( m_keyboardVariantsModel->key( variantnumber ).compare( *countryPart, Qt::CaseInsensitive )
-                         == 0 )
+                    if ( variants->key( variantnumber ).compare( *countryPart, Qt::CaseInsensitive ) == 0 )
                     {
-                        m_keyboardVariantsModel->setCurrentIndex( variantnumber );
+                        variants->setCurrentIndex( variantnumber );
                         cDebug() << Logger::SubEntry << "matched variant" << *countryPart << ' '
-                                 << m_keyboardVariantsModel->key( variantnumber );
+                                 << variants->key( variantnumber );
                     }
                 }
             }
@@ -408,7 +407,7 @@ Config::guessLayout( const QStringList& langParts )
 }
 
 void
-Config::onActivate()
+Config::guessLocaleKeyboardLayout()
 {
     /* Guessing a keyboard layout based on the locale means
      * mapping between language identifiers in _
@@ -495,7 +494,7 @@ Config::onActivate()
         QString country = QLocale::countryToString( QLocale( lang ).country() );
         cDebug() << Logger::SubEntry << "extracted country" << country << "::" << langParts;
 
-        guessLayout( langParts );
+        guessLayout( langParts, m_keyboardLayoutsModel, m_keyboardVariantsModel );
     }
 }
 
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index 4919a154cd..d4090bafc8 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -32,16 +32,17 @@ class Config : public QObject
 public:
     Config( QObject* parent = nullptr );
 
+    /// @brief Based on current xkb settings, pick a layout
     void detectCurrentKeyboardLayout();
+    /// @brief Based on current locale, pick a layout
+    void guessLocaleKeyboardLayout();
 
     Calamares::JobList createJobs();
     QString prettyStatus() const;
 
-    void onActivate();
+    /// @brief When leaving the page, write to GS
     void finalize();
 
-    void setConfigurationMap( const QVariantMap& configurationMap );
-
     static AdditionalLayoutInfo getAdditionalLayoutInfo( const QString& layout );
 
     /* A model is a physical configuration of a keyboard, e.g. 105-key PC
@@ -69,11 +70,12 @@ class Config : public QObject
      */
     void retranslate();
 
+    void setConfigurationMap( const QVariantMap& configurationMap );
+
 signals:
     void prettyStatusChanged();
 
 private:
-    void guessLayout( const QStringList& langParts );
     void updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant = QString() );
 
     /* These two methods are used in tandem to apply changes to the
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index d1eb3eb68b..029e1ae856 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -95,7 +95,7 @@ KeyboardViewStep::jobs() const
 void
 KeyboardViewStep::onActivate()
 {
-    m_config->onActivate();
+    m_config->guessLocaleKeyboardLayout();
 }
 
 
diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
index e8ae630e7c..231d2a0902 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
@@ -71,7 +71,7 @@ KeyboardQmlViewStep::jobs() const
 void
 KeyboardQmlViewStep::onActivate()
 {
-    m_config->onActivate();
+    m_config->guessLocaleKeyboardLayout();
 }
 
 void

From a65723d4da1af40f4a790b689b8a95a5748a892e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 31 Jul 2021 00:20:27 +0200
Subject: [PATCH 323/492] [libcalamares] Extend cPointerSetter with
 initial-value

This is a convenience for "set  to 
at end of scope".
---
 src/libcalamares/utils/RAII.h | 39 +++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/libcalamares/utils/RAII.h b/src/libcalamares/utils/RAII.h
index 0b8c9b2aa1..00e276ec6f 100644
--- a/src/libcalamares/utils/RAII.h
+++ b/src/libcalamares/utils/RAII.h
@@ -70,11 +70,42 @@ struct cPointerSetter
     std::optional< T > m_value;
     T* m_pointer;
 
-    cPointerSetter( T* p ) : m_pointer(p) {}
-    ~cPointerSetter() { if ( m_pointer && m_value.has_value() ) { *m_pointer = m_value.value(); } }
+    /** @brief Create a setter with no value set
+     *
+     * Until a value is set via operator=(), this pointer-setter
+     * will do nothing on destruction, leaving the pointed-to
+     * value unchanged.
+     */
+    cPointerSetter( T* p )
+        : m_pointer( p )
+    {
+    }
+    /** @brief Create a setter with a value already set
+     *
+     * This ensures that on destruction, the value @p v will be written;
+     * it is equivalent to assigning @p v immediately. The pointed-to
+     * value is **not** changed (until destruction).
+     */
+    cPointerSetter( T* p, T v )
+        : m_value( v )
+        , m_pointer( p )
+    {
+    }
+    ~cPointerSetter()
+    {
+        if ( m_pointer && m_value.has_value() )
+        {
+            *m_pointer = m_value.value();
+        }
+    }
 
-    const T& operator=(const T& v) { m_value = v; return v; }
+    const T& operator=( const T& v )
+    {
+        m_value = v;
+        return v;
+    }
 };
 
-template < typename T > cPointerSetter( T p ) -> cPointerSetter;
+template < typename T >
+cPointerSetter( T p )->cPointerSetter< decltype( *p ) >;
 #endif

From 2b485a5e5951dfea1b47bf8e142b054a748dac85 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 31 Jul 2021 00:24:10 +0200
Subject: [PATCH 324/492] [keyboard] Only guess layouts until the user picks
 one

- when activating the page, the "guess" functions do their
  work and afterwards the config is left in a "guessable"
  state, but if the user makes a specific choice, then
  the config leaves the "guessable" state and the user's
  explicit choice is preserved.

FIXES #1744
---
 src/modules/keyboard/Config.cpp | 30 ++++++++++++++++++++++++++++++
 src/modules/keyboard/Config.h   | 18 ++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index b137927b46..b77282a18c 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -16,6 +16,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "utils/Logger.h"
+#include "utils/RAII.h"
 #include "utils/Retranslator.h"
 #include "utils/String.h"
 #include "utils/Variant.h"
@@ -170,6 +171,12 @@ Config::Config( QObject* parent )
 
     connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, this, &Config::xkbChanged );
 
+    // If the user picks something explicitly -- not a consequence of
+    // a guess -- then move to UserSelected state and stay there.
+    connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, this, &Config::selectionChange );
+    connect( m_keyboardLayoutsModel, &KeyboardLayoutModel::currentIndexChanged, this, &Config::selectionChange );
+    connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, this, &Config::selectionChange );
+
     m_selectedModel = m_keyboardModelsModel->key( m_keyboardModelsModel->currentIndex() );
     m_selectedLayout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).first;
     m_selectedVariant = m_keyboardVariantsModel->key( m_keyboardVariantsModel->currentIndex() );
@@ -264,6 +271,13 @@ findLayout( const KeyboardLayoutModel* klm, const QString& currentLayout )
 void
 Config::detectCurrentKeyboardLayout()
 {
+    if ( m_state != State::Initial )
+    {
+        return;
+    }
+    cPointerSetter returnToIntial( &m_state, State::Initial );
+    m_state = State::Guessing;
+
     //### Detect current keyboard layout and variant
     QString currentLayout;
     QString currentVariant;
@@ -409,6 +423,13 @@ guessLayout( const QStringList& langParts, KeyboardLayoutModel* layouts, Keyboar
 void
 Config::guessLocaleKeyboardLayout()
 {
+    if ( m_state != State::Initial )
+    {
+        return;
+    }
+    cPointerSetter returnToIntial( &m_state, State::Initial );
+    m_state = State::Guessing;
+
     /* Guessing a keyboard layout based on the locale means
      * mapping between language identifiers in _
      * format to keyboard mappings, which are _
@@ -556,3 +577,12 @@ Config::retranslate()
 {
     retranslateKeyboardModels();
 }
+
+void
+Config::selectionChange()
+{
+    if ( m_state == State::Initial )
+    {
+        m_state = State::UserSelected;
+    }
+}
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index d4090bafc8..436ead4b51 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -107,6 +107,24 @@ class Config : public QObject
     QString m_xOrgConfFileName;
     QString m_convertedKeymapPath;
     bool m_writeEtcDefaultKeyboard = true;
+
+    // The state determines whether we guess settings or preserve them:
+    // - Initial -> Guessing
+    // - Initial -> UserSelected
+    // - Guessing -> Initial
+    enum class State
+    {
+        Initial,  // after configuration, nothing special going on
+        Guessing,  // on activation
+        UserSelected  // explicit choice is made, preserve that
+    };
+    State m_state = State::Initial;
+
+    /** @brief Handles state change when selections in model, variant, layout
+     *
+     * This handles the Initial -> UserSelected transition in particular.
+     */
+    void selectionChange();
 };
 
 

From 9bf721245849dfbbf7b02566cd77287fdee6fe00 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Mon, 26 Jul 2021 20:56:52 +0200
Subject: [PATCH 325/492] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_az.ts    |   28 +-
 lang/calamares_az_AZ.ts |   28 +-
 lang/calamares_bn.ts    |   10 +-
 lang/calamares_fr.ts    |   12 +-
 lang/calamares_ko_KR.ts | 4332 +++++++++++++++++++++++++++++++++++++++
 lang/calamares_sk.ts    |   41 +-
 lang/calamares_sq.ts    |    2 +-
 lang/calamares_sv.ts    |   14 +-
 lang/calamares_th.ts    |  178 +-
 lang/calamares_zh_CN.ts |   40 +-
 lang/calamares_zh_HK.ts | 4332 +++++++++++++++++++++++++++++++++++++++
 11 files changed, 8843 insertions(+), 174 deletions(-)
 create mode 100644 lang/calamares_ko_KR.ts
 create mode 100644 lang/calamares_zh_HK.ts

diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts
index 277a0413bc..e6a97ab0bd 100644
--- a/lang/calamares_az.ts
+++ b/lang/calamares_az.ts
@@ -510,17 +510,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Set filesystem label on %1.
-      
+      Fayl sistemi yarlığını %1 üzərində qurun.
         
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      <strong>%1</strong> fayl sistemi yarlığını <strong>%2</strong> bölməsinə qurun.
     
     
       
       The installer failed to update partition table on disk '%1'.
-      
+      Quraşdırıcının '%1' diskindəki bölməni yeniləməsi baş tutmadı.
     
       
   
@@ -896,7 +896,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       OK!
-      
+      OLDU!
     
     
       
@@ -1012,12 +1012,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Label for the filesystem
-      
+      Fayl sitemi üçün yarlıq
     
     
       
       FS Label:
-      
+      FS yarlığı:
     
     
       
@@ -1376,12 +1376,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Label for the filesystem
-      
+      Fayl sitemi üçün yarlıq
     
     
       
       FS Label:
-      
+      FS yarlığı:
     
     
       
@@ -1889,7 +1889,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Quit
-      
+      Çıxış
     
   
   
@@ -2113,7 +2113,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Select your preferred Region, or use the default settings.
-      
+      Üstünlük verdiyiniz Bölgənizi seçin və ilkin ayarlardan istifadə edin.
     
     
       
@@ -2653,7 +2653,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       File System Label
-      
+      Fayl sistemi yarlığı
     
     
       
@@ -4262,7 +4262,7 @@ Output:
     
       
       root is not allowed as username.
-      
+      kökə istifadəçi_adı kimi icazə verilmir.
     
     
       
@@ -4282,7 +4282,7 @@ Output:
     
       
       localhost is not allowed as hostname.
-      
+      yerli hosta host_adı kimi icazə verilmir.
     
     
       
@@ -4322,7 +4322,7 @@ Output:
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      Yalnız hərflərə, saylara, alt cizgisinə və tire işarəsinə icazə verilir, ən az iki simvol.
     
     
       
diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts
index 08aa89be9a..8fa6b0ca2d 100644
--- a/lang/calamares_az_AZ.ts
+++ b/lang/calamares_az_AZ.ts
@@ -510,17 +510,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Set filesystem label on %1.
-      
+      Fayl sistemi yarlığını %1 üzərində qurun.
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      <strong>%1</strong> fayl sistemi yarlığını <strong>%2</strong> bölməsinə qurun.
     
     
       
       The installer failed to update partition table on disk '%1'.
-      
+      Quraşdırıcının '%1' diskindəki bölməni yeniləməsi baş tutmadı.
     
   
   
@@ -896,7 +896,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       OK!
-      
+      OLDU!
     
     
       
@@ -1012,12 +1012,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Label for the filesystem
-      
+      Fayl sitemi üçün yarlıq
     
     
       
       FS Label:
-      
+      FS yarlığı:
     
     
       
@@ -1376,12 +1376,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Label for the filesystem
-      
+      Fayl sitemi üçün yarlıq
     
     
       
       FS Label:
-      
+      FS yarlığı:
     
     
       
@@ -1889,7 +1889,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Quit
-      
+      Çıxış
     
   
   
@@ -2113,7 +2113,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Select your preferred Region, or use the default settings.
-      
+      Üstünlük verdiyiniz Bölgənizi seçin və ilkin ayarlardan istifadə edin.
     
     
       
@@ -2653,7 +2653,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       File System Label
-      
+      Fayl sistemi yarlığı
     
     
       
@@ -4262,7 +4262,7 @@ Output:
     
       
       root is not allowed as username.
-      
+      kökə istifadəçi_adı kimi icazə verilmir.
     
     
       
@@ -4282,7 +4282,7 @@ Output:
     
       
       localhost is not allowed as hostname.
-      
+      yerli hosta host_adı kimi icazə verilmir.
     
     
       
@@ -4322,7 +4322,7 @@ Output:
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      Yalnız hərflərə, saylara, alt cizgisinə və tire işarəsinə icazə verilir, ən az iki simvol.
     
     
       
diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts
index 231aa11766..15905ef64d 100644
--- a/lang/calamares_bn.ts
+++ b/lang/calamares_bn.ts
@@ -32,7 +32,7 @@
     
       
       Master Boot Record of %1
-      1% মাস্টার বুট রেকর্ড
+      %1 মাস্টার বুট রেকর্ড
     
     
       
@@ -217,7 +217,7 @@
     
       
       Working directory %1 for python job %2 is not readable.
-      ওয়ার্কিং ডিরেক্টরি 1% পাইথন কাজের জন্য %2 পাঠযোগ্য নয়।
+      ওয়ার্কিং ডিরেক্টরি %1 পাইথন কাজের জন্য %2 পাঠযোগ্য নয়।
     
     
       
@@ -227,12 +227,12 @@
     
       
       Main script file %1 for python job %2 is not readable.
-      মূল স্ক্রিপ্ট ফাইল 1% পাইথন কাজের জন্য 2% পাঠযোগ্য নয়।
+      মূল স্ক্রিপ্ট ফাইল %1 পাইথন কাজের জন্য %2 পাঠযোগ্য নয়।
     
     
       
       Boost.Python error in job "%1".
-      বুস্ট.পাইথন কাজে 1% ত্রুটি
+      বুস্ট.পাইথন কাজে %1 ত্রুটি
     
   
   
@@ -497,7 +497,7 @@ The installer will quit and all changes will be lost.
     
       
       %1 Installer
-      1% ইনস্টল
+      %1 ইনস্টল
     
   
   
diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts
index 6161ecde40..b78233af2f 100644
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -515,7 +515,7 @@ L'installateur se fermera et les changements seront perdus.
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      Mettre le nom du système de fichier <strong>%1</strong> à la partition <strong>%2</strong>.
     
     
       
@@ -896,7 +896,7 @@ L'installateur se fermera et les changements seront perdus.
     
       
       OK!
-      
+      OK!
     
     
       
@@ -1889,7 +1889,7 @@ L'installateur se fermera et les changements seront perdus.
     
       
       Quit
-      
+      Quiter
     
   
   
@@ -4262,7 +4262,7 @@ Sortie
     
       
       root is not allowed as username.
-      
+      root n'est pas autorisé en tant que nom d'utilisateur.
     
     
       
@@ -4282,7 +4282,7 @@ Sortie
     
       
       localhost is not allowed as hostname.
-      
+      localhost n'est pas autorisé en tant que nom d'utilisateur.
     
     
       
@@ -4322,7 +4322,7 @@ Sortie
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      Seuls les lettres, les chiffres, les underscores et les trait d'union sont autorisés et un minimum de deux caractères.
     
     
       
diff --git a/lang/calamares_ko_KR.ts b/lang/calamares_ko_KR.ts
new file mode 100644
index 0000000000..d82a46fa02
--- /dev/null
+++ b/lang/calamares_ko_KR.ts
@@ -0,0 +1,4332 @@
+
+
+
+  
+    AutoMountManagementJob
+    
+      
+      Manage auto-mount settings
+      
+    
+  
+  
+    BootInfoWidget
+    
+      
+      The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode.
+      
+    
+    
+      
+      This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.
+      
+    
+    
+      
+      This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.
+      
+    
+  
+  
+    BootLoaderModel
+    
+      
+      Master Boot Record of %1
+      
+    
+    
+      
+      Boot Partition
+      
+    
+    
+      
+      System Partition
+      
+    
+    
+      
+      Do not install a boot loader
+      
+    
+    
+      
+      %1 (%2)
+      
+    
+  
+  
+    Calamares::BlankViewStep
+    
+      
+      Blank Page
+      
+    
+  
+  
+    Calamares::DebugWindow
+    
+      
+      Form
+      
+    
+    
+      
+      GlobalStorage
+      
+    
+    
+      
+      JobQueue
+      
+    
+    
+      
+      Modules
+      
+    
+    
+      
+      Type:
+      
+    
+    
+      
+      
+      none
+      
+    
+    
+      
+      Interface:
+      
+    
+    
+      
+      Crashes Calamares, so that Dr. Konqui can look at it.
+      
+    
+    
+      
+      Reloads the stylesheet from the branding directory.
+      
+    
+    
+      
+      Uploads the session log to the configured pastebin.
+      
+    
+    
+      
+      Send Session Log
+      
+    
+    
+      
+      Reload Stylesheet
+      
+    
+    
+      
+      Displays the tree of widget names in the log (for stylesheet debugging).
+      
+    
+    
+      
+      Widget Tree
+      
+    
+    
+      
+      Debug information
+      
+    
+  
+  
+    Calamares::ExecutionViewStep
+    
+      
+      Set up
+      
+    
+    
+      
+      Install
+      
+    
+  
+  
+    Calamares::FailJob
+    
+      
+      Job failed (%1)
+      
+    
+    
+      
+      Programmed job failure was explicitly requested.
+      
+    
+  
+  
+    Calamares::JobThread
+    
+      
+      Done
+      
+    
+  
+  
+    Calamares::NamedJob
+    
+      
+      Example job (%1)
+      
+    
+  
+  
+    Calamares::ProcessJob
+    
+      
+      Run command '%1' in target system.
+      
+    
+    
+      
+       Run command '%1'.
+      
+    
+    
+      
+      Running command %1 %2
+      
+    
+  
+  
+    Calamares::PythonJob
+    
+      
+      Running %1 operation.
+      
+    
+    
+      
+      Bad working directory path
+      
+    
+    
+      
+      Working directory %1 for python job %2 is not readable.
+      
+    
+    
+      
+      Bad main script file
+      
+    
+    
+      
+      Main script file %1 for python job %2 is not readable.
+      
+    
+    
+      
+      Boost.Python error in job "%1".
+      
+    
+  
+  
+    Calamares::QmlViewStep
+    
+      
+      Loading ...
+      
+    
+    
+      
+      QML Step <i>%1</i>.
+      
+    
+    
+      
+      Loading failed.
+      
+    
+  
+  
+    Calamares::RequirementsChecker
+    
+      
+      Requirements checking for module <i>%1</i> is complete.
+      
+    
+    
+      
+      Waiting for %n module(s).
+      
+        
+      
+    
+    
+      
+      (%n second(s))
+      
+        
+      
+    
+    
+      
+      System-requirements checking is complete.
+      
+    
+  
+  
+    Calamares::ViewManager
+    
+      
+      Setup Failed
+      
+    
+    
+      
+      Installation Failed
+      
+    
+    
+      
+      Would you like to paste the install log to the web?
+      
+    
+    
+      
+      Error
+      
+    
+    
+      
+      
+      &Yes
+      
+    
+    
+      
+      
+      &No
+      
+    
+    
+      
+      &Close
+      
+    
+    
+      
+      Install Log Paste URL
+      
+    
+    
+      
+      The upload was unsuccessful. No web-paste was done.
+      
+    
+    
+      
+      Install log posted to
+
+%1
+
+Link copied to clipboard
+      
+    
+    
+      
+      Calamares Initialization Failed
+      
+    
+    
+      
+      %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
+      
+    
+    
+      
+      <br/>The following modules could not be loaded:
+      
+    
+    
+      
+      Continue with setup?
+      
+    
+    
+      
+      Continue with installation?
+      
+    
+    
+      
+      The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
+      
+    
+    
+      
+      The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
+      
+    
+    
+      
+      &Set up now
+      
+    
+    
+      
+      &Install now
+      
+    
+    
+      
+      Go &back
+      
+    
+    
+      
+      &Set up
+      
+    
+    
+      
+      &Install
+      
+    
+    
+      
+      Setup is complete. Close the setup program.
+      
+    
+    
+      
+      The installation is complete. Close the installer.
+      
+    
+    
+      
+      Cancel setup without changing the system.
+      
+    
+    
+      
+      Cancel installation without changing the system.
+      
+    
+    
+      
+      &Next
+      
+    
+    
+      
+      &Back
+      
+    
+    
+      
+      &Done
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      Cancel setup?
+      
+    
+    
+      
+      Cancel installation?
+      
+    
+    
+      
+      Do you really want to cancel the current setup process?
+The setup program will quit and all changes will be lost.
+      
+    
+    
+      
+      Do you really want to cancel the current install process?
+The installer will quit and all changes will be lost.
+      
+    
+  
+  
+    CalamaresPython::Helper
+    
+      
+      Unknown exception type
+      
+    
+    
+      
+      unparseable Python error
+      
+    
+    
+      
+      unparseable Python traceback
+      
+    
+    
+      
+      Unfetchable Python error.
+      
+    
+  
+  
+    CalamaresWindow
+    
+      
+      %1 Setup Program
+      
+    
+    
+      
+      %1 Installer
+      
+    
+  
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
+  
+    CheckerContainer
+    
+      
+      Gathering system information...
+      
+    
+  
+  
+    ChoicePage
+    
+      
+      Form
+      
+    
+    
+      
+      Select storage de&vice:
+      
+    
+    
+      
+      
+      
+      
+      Current:
+      
+    
+    
+      
+      After:
+      
+    
+    
+      
+      <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
+      
+    
+    
+      
+      Reuse %1 as home partition for %2.
+      
+    
+    
+      
+      <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
+      
+    
+    
+      
+      %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
+      
+    
+    
+      
+      Boot loader location:
+      
+    
+    
+      
+      <strong>Select a partition to install on</strong>
+      
+    
+    
+      
+      An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
+      
+    
+    
+      
+      The EFI system partition at %1 will be used for starting %2.
+      
+    
+    
+      
+      EFI system partition:
+      
+    
+    
+      
+      This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      
+      
+      
+      <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
+      
+    
+    
+      
+      
+      
+      
+      <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
+      
+    
+    
+      
+      
+      
+      
+      <strong>Replace a partition</strong><br/>Replaces a partition with %1.
+      
+    
+    
+      
+      This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
+      
+    
+    
+      
+      This storage device has one of its partitions <strong>mounted</strong>.
+      
+    
+    
+      
+      This storage device is a part of an <strong>inactive RAID</strong> device.
+      
+    
+    
+      
+      No Swap
+      
+    
+    
+      
+      Reuse Swap
+      
+    
+    
+      
+      Swap (no Hibernate)
+      
+    
+    
+      
+      Swap (with Hibernate)
+      
+    
+    
+      
+      Swap to file
+      
+    
+  
+  
+    ClearMountsJob
+    
+      
+      Clear mounts for partitioning operations on %1
+      
+    
+    
+      
+      Clearing mounts for partitioning operations on %1.
+      
+    
+    
+      
+      Cleared all mounts for %1
+      
+    
+  
+  
+    ClearTempMountsJob
+    
+      
+      Clear all temporary mounts.
+      
+    
+    
+      
+      Clearing all temporary mounts.
+      
+    
+    
+      
+      Cannot get list of temporary mounts.
+      
+    
+    
+      
+      Cleared all temporary mounts.
+      
+    
+  
+  
+    CommandList
+    
+      
+      
+      Could not run command.
+      
+    
+    
+      
+      The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.
+      
+    
+    
+      
+      The command needs to know the user's name, but no username is defined.
+      
+    
+  
+  
+    Config
+    
+      
+      Set keyboard model to %1.<br/>
+      
+    
+    
+      
+      Set keyboard layout to %1/%2.
+      
+    
+    
+      
+      Set timezone to %1/%2.
+      
+    
+    
+      
+      The system language will be set to %1.
+      
+    
+    
+      
+      The numbers and dates locale will be set to %1.
+      
+    
+    
+      
+      Network Installation. (Disabled: Incorrect configuration)
+      
+    
+    
+      
+      Network Installation. (Disabled: Received invalid groups data)
+      
+    
+    
+      
+      Network Installation. (Disabled: Internal error)
+      
+    
+    
+      
+      Network Installation. (Disabled: No package list)
+      
+    
+    
+      
+      Package selection
+      
+    
+    
+      
+      Network Installation. (Disabled: Unable to fetch package lists, check your network connection)
+      
+    
+    
+      
+      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
+      
+    
+    
+      
+      This program will ask you some questions and set up %2 on your computer.
+      
+    
+    
+      
+      <h1>Welcome to the Calamares setup program for %1</h1>
+      
+    
+    
+      
+      <h1>Welcome to %1 setup</h1>
+      
+    
+    
+      
+      <h1>Welcome to the Calamares installer for %1</h1>
+      
+    
+    
+      
+      <h1>Welcome to the %1 installer</h1>
+      
+    
+    
+      
+      Your username is too long.
+      
+    
+    
+      
+      '%1' is not allowed as username.
+      
+    
+    
+      
+      Your username must start with a lowercase letter or underscore.
+      
+    
+    
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      Your hostname is too short.
+      
+    
+    
+      
+      Your hostname is too long.
+      
+    
+    
+      
+      '%1' is not allowed as hostname.
+      
+    
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      Your passwords do not match!
+      
+    
+    
+      
+      OK!
+      
+    
+    
+      
+      Setup Failed
+      
+    
+    
+      
+      Installation Failed
+      
+    
+    
+      
+      The setup of %1 did not complete successfully.
+      
+    
+    
+      
+      The installation of %1 did not complete successfully.
+      
+    
+    
+      
+      Setup Complete
+      
+    
+    
+      
+      Installation Complete
+      
+    
+    
+      
+      The setup of %1 is complete.
+      
+    
+    
+      
+      The installation of %1 is complete.
+      
+    
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
+  
+  
+    ContextualProcessJob
+    
+      
+      Contextual Processes Job
+      
+    
+  
+  
+    CreatePartitionDialog
+    
+      
+      Create a Partition
+      
+    
+    
+      
+      Si&ze:
+      
+    
+    
+      
+       MiB
+      
+    
+    
+      
+      Partition &Type:
+      
+    
+    
+      
+      &Primary
+      
+    
+    
+      
+      E&xtended
+      
+    
+    
+      
+      Fi&le System:
+      
+    
+    
+      
+      LVM LV name
+      
+    
+    
+      
+      &Mount Point:
+      
+    
+    
+      
+      Flags:
+      
+    
+    
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
+      En&crypt
+      
+    
+    
+      
+      Logical
+      
+    
+    
+      
+      Primary
+      
+    
+    
+      
+      GPT
+      
+    
+    
+      
+      Mountpoint already in use. Please select another one.
+      
+    
+  
+  
+    CreatePartitionJob
+    
+      
+      Create new %1MiB partition on %3 (%2) with entries %4.
+      
+    
+    
+      
+      Create new %1MiB partition on %3 (%2).
+      
+    
+    
+      
+      Create new %2MiB partition on %4 (%3) with file system %1.
+      
+    
+    
+      
+      Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
+      
+    
+    
+      
+      Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
+      
+    
+    
+      
+      Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
+      
+    
+    
+      
+      
+      Creating new %1 partition on %2.
+      
+    
+    
+      
+      The installer failed to create partition on disk '%1'.
+      
+    
+  
+  
+    CreatePartitionTableDialog
+    
+      
+      Create Partition Table
+      
+    
+    
+      
+      Creating a new partition table will delete all existing data on the disk.
+      
+    
+    
+      
+      What kind of partition table do you want to create?
+      
+    
+    
+      
+      Master Boot Record (MBR)
+      
+    
+    
+      
+      GUID Partition Table (GPT)
+      
+    
+  
+  
+    CreatePartitionTableJob
+    
+      
+      Create new %1 partition table on %2.
+      
+    
+    
+      
+      Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3).
+      
+    
+    
+      
+      Creating new %1 partition table on %2.
+      
+    
+    
+      
+      The installer failed to create a partition table on %1.
+      
+    
+  
+  
+    CreateUserJob
+    
+      
+      Create user %1
+      
+    
+    
+      
+      Create user <strong>%1</strong>.
+      
+    
+    
+      
+      Preserving home directory
+      
+    
+    
+      
+      
+      Creating user %1
+      
+    
+    
+      
+      Configuring user %1
+      
+    
+    
+      
+      Setting file permissions
+      
+    
+  
+  
+    CreateVolumeGroupDialog
+    
+      
+      Create Volume Group
+      
+    
+  
+  
+    CreateVolumeGroupJob
+    
+      
+      Create new volume group named %1.
+      
+    
+    
+      
+      Create new volume group named <strong>%1</strong>.
+      
+    
+    
+      
+      Creating new volume group named %1.
+      
+    
+    
+      
+      The installer failed to create a volume group named '%1'.
+      
+    
+  
+  
+    DeactivateVolumeGroupJob
+    
+      
+      
+      Deactivate volume group named %1.
+      
+    
+    
+      
+      Deactivate volume group named <strong>%1</strong>.
+      
+    
+    
+      
+      The installer failed to deactivate a volume group named %1.
+      
+    
+  
+  
+    DeletePartitionJob
+    
+      
+      Delete partition %1.
+      
+    
+    
+      
+      Delete partition <strong>%1</strong>.
+      
+    
+    
+      
+      Deleting partition %1.
+      
+    
+    
+      
+      The installer failed to delete partition %1.
+      
+    
+  
+  
+    DeviceInfoWidget
+    
+      
+      This device has a <strong>%1</strong> partition table.
+      
+    
+    
+      
+      This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem.
+      
+    
+    
+      
+      This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page.
+      
+    
+    
+      
+      <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment.
+      
+    
+    
+      
+      <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions.
+      
+    
+    
+      
+      The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred.
+      
+    
+  
+  
+    DeviceModel
+    
+      
+      %1 - %2 (%3)
+      device[name] - size[number] (device-node[name])
+      
+    
+    
+      
+      %1 - (%2)
+      device[name] - (device-node[name])
+      
+    
+  
+  
+    DracutLuksCfgJob
+    
+      
+      Write LUKS configuration for Dracut to %1
+      
+    
+    
+      
+      Skip writing LUKS configuration for Dracut: "/" partition is not encrypted
+      
+    
+    
+      
+      Failed to open %1
+      
+    
+  
+  
+    DummyCppJob
+    
+      
+      Dummy C++ Job
+      
+    
+  
+  
+    EditExistingPartitionDialog
+    
+      
+      Edit Existing Partition
+      
+    
+    
+      
+      Content:
+      
+    
+    
+      
+      &Keep
+      
+    
+    
+      
+      Format
+      
+    
+    
+      
+      Warning: Formatting the partition will erase all existing data.
+      
+    
+    
+      
+      &Mount Point:
+      
+    
+    
+      
+      Si&ze:
+      
+    
+    
+      
+       MiB
+      
+    
+    
+      
+      Fi&le System:
+      
+    
+    
+      
+      Flags:
+      
+    
+    
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
+      Mountpoint already in use. Please select another one.
+      
+    
+  
+  
+    EncryptWidget
+    
+      
+      Form
+      
+    
+    
+      
+      En&crypt system
+      
+    
+    
+      
+      Passphrase
+      
+    
+    
+      
+      Confirm passphrase
+      
+    
+    
+      
+      
+      Please enter the same passphrase in both boxes.
+      
+    
+  
+  
+    FillGlobalStorageJob
+    
+      
+      Set partition information
+      
+    
+    
+      
+      Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
+      
+    
+    
+      
+      Install %1 on <strong>new</strong> %2 system partition.
+      
+    
+    
+      
+      Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
+      
+    
+    
+      
+      Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
+      
+    
+    
+      
+      Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
+      
+    
+    
+      
+      Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
+      
+    
+    
+      
+      Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
+      
+    
+    
+      
+      Install %2 on %3 system partition <strong>%1</strong>.
+      
+    
+    
+      
+      Install boot loader on <strong>%1</strong>.
+      
+    
+    
+      
+      Setting up mount points.
+      
+    
+  
+  
+    FinishedPage
+    
+      
+      Form
+      
+    
+    
+      
+      &Restart now
+      
+    
+    
+      
+      <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system.
+      
+    
+    
+      
+      <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html>
+      
+    
+    
+      
+      <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment.
+      
+    
+    
+      
+      <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html>
+      
+    
+    
+      
+      <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.
+      
+    
+    
+      
+      <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.
+      
+    
+  
+  
+    FinishedQmlViewStep
+    
+      
+      Finish
+      
+    
+  
+  
+    FinishedViewStep
+    
+      
+      Finish
+      
+    
+  
+  
+    FormatPartitionJob
+    
+      
+      Format partition %1 (file system: %2, size: %3 MiB) on %4.
+      
+    
+    
+      
+      Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.
+      
+    
+    
+      
+      Formatting partition %1 with file system %2.
+      
+    
+    
+      
+      The installer failed to format partition %1 on disk '%2'.
+      
+    
+  
+  
+    GeneralRequirements
+    
+      
+      has at least %1 GiB available drive space
+      
+    
+    
+      
+      There is not enough drive space. At least %1 GiB is required.
+      
+    
+    
+      
+      has at least %1 GiB working memory
+      
+    
+    
+      
+      The system does not have enough working memory. At least %1 GiB is required.
+      
+    
+    
+      
+      is plugged in to a power source
+      
+    
+    
+      
+      The system is not plugged in to a power source.
+      
+    
+    
+      
+      is connected to the Internet
+      
+    
+    
+      
+      The system is not connected to the Internet.
+      
+    
+    
+      
+      is running the installer as an administrator (root)
+      
+    
+    
+      
+      The setup program is not running with administrator rights.
+      
+    
+    
+      
+      The installer is not running with administrator rights.
+      
+    
+    
+      
+      has a screen large enough to show the whole installer
+      
+    
+    
+      
+      The screen is too small to display the setup program.
+      
+    
+    
+      
+      The screen is too small to display the installer.
+      
+    
+  
+  
+    HostInfoJob
+    
+      
+      Collecting information about your machine.
+      
+    
+  
+  
+    IDJob
+    
+      
+      
+      
+      
+      OEM Batch Identifier
+      
+    
+    
+      
+      Could not create directories <code>%1</code>.
+      
+    
+    
+      
+      Could not open file <code>%1</code>.
+      
+    
+    
+      
+      Could not write to file <code>%1</code>.
+      
+    
+  
+  
+    InitcpioJob
+    
+      
+      Creating initramfs with mkinitcpio.
+      
+    
+  
+  
+    InitramfsJob
+    
+      
+      Creating initramfs.
+      
+    
+  
+  
+    InteractiveTerminalPage
+    
+      
+      Konsole not installed
+      
+    
+    
+      
+      Please install KDE Konsole and try again!
+      
+    
+    
+      
+      Executing script: &nbsp;<code>%1</code>
+      
+    
+  
+  
+    InteractiveTerminalViewStep
+    
+      
+      Script
+      
+    
+  
+  
+    KeyboardQmlViewStep
+    
+      
+      Keyboard
+      
+    
+  
+  
+    KeyboardViewStep
+    
+      
+      Keyboard
+      
+    
+  
+  
+    LCLocaleDialog
+    
+      
+      System locale setting
+      
+    
+    
+      
+      The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>.
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &OK
+      
+    
+  
+  
+    LicensePage
+    
+      
+      Form
+      
+    
+    
+      
+      <h1>License Agreement</h1>
+      
+    
+    
+      
+      I accept the terms and conditions above.
+      
+    
+    
+      
+      Please review the End User License Agreements (EULAs).
+      
+    
+    
+      
+      This setup procedure will install proprietary software that is subject to licensing terms.
+      
+    
+    
+      
+      If you do not agree with the terms, the setup procedure cannot continue.
+      
+    
+    
+      
+      This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
+      
+    
+    
+      
+      If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
+      
+    
+  
+  
+    LicenseViewStep
+    
+      
+      License
+      
+    
+  
+  
+    LicenseWidget
+    
+      
+      URL: %1
+      
+    
+    
+      
+      <strong>%1 driver</strong><br/>by %2
+      %1 is an untranslatable product name, example: Creative Audigy driver
+      
+    
+    
+      
+      <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font>
+      %1 is usually a vendor name, example: Nvidia graphics driver
+      
+    
+    
+      
+      <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      <strong>%1 codec</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      <strong>%1 package</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      <strong>%1</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      File: %1
+      
+    
+    
+      
+      Hide license text
+      
+    
+    
+      
+      Show the license text
+      
+    
+    
+      
+      Open license agreement in browser.
+      
+    
+  
+  
+    LocalePage
+    
+      
+      Region:
+      
+    
+    
+      
+      Zone:
+      
+    
+    
+      
+      
+      &Change...
+      
+    
+  
+  
+    LocaleQmlViewStep
+    
+      
+      Location
+      
+    
+  
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
+  
+    LocaleViewStep
+    
+      
+      Location
+      
+    
+  
+  
+    LuksBootKeyFileJob
+    
+      
+      Configuring LUKS key file.
+      
+    
+    
+      
+      
+      No partitions are defined.
+      
+    
+    
+      
+      
+      
+      Encrypted rootfs setup error
+      
+    
+    
+      
+      Root partition %1 is LUKS but no passphrase has been set.
+      
+    
+    
+      
+      Could not create LUKS key file for root partition %1.
+      
+    
+    
+      
+      Could not configure LUKS key file on partition %1.
+      
+    
+  
+  
+    MachineIdJob
+    
+      
+      Generate machine-id.
+      
+    
+    
+      
+      Configuration Error
+      
+    
+    
+      
+      No root mount point is set for MachineId.
+      
+    
+  
+  
+    Map
+    
+      
+      Timezone: %1
+      
+    
+    
+      
+      Please select your preferred location on the map so the installer can suggest the locale
+            and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging
+            to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.
+      
+    
+  
+  
+    NetInstallViewStep
+    
+      
+      Package selection
+      
+    
+    
+      
+      Office software
+      
+    
+    
+      
+      Office package
+      
+    
+    
+      
+      Browser software
+      
+    
+    
+      
+      Browser package
+      
+    
+    
+      
+      Web browser
+      
+    
+    
+      
+      Kernel
+      
+    
+    
+      
+      Services
+      
+    
+    
+      
+      Login
+      
+    
+    
+      
+      Desktop
+      
+    
+    
+      
+      Applications
+      
+    
+    
+      
+      Communication
+      
+    
+    
+      
+      Development
+      
+    
+    
+      
+      Office
+      
+    
+    
+      
+      Multimedia
+      
+    
+    
+      
+      Internet
+      
+    
+    
+      
+      Theming
+      
+    
+    
+      
+      Gaming
+      
+    
+    
+      
+      Utilities
+      
+    
+  
+  
+    NotesQmlViewStep
+    
+      
+      Notes
+      
+    
+  
+  
+    OEMPage
+    
+      
+      Ba&tch:
+      
+    
+    
+      
+      <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html>
+      
+    
+    
+      
+      <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html>
+      
+    
+  
+  
+    OEMViewStep
+    
+      
+      OEM Configuration
+      
+    
+    
+      
+      Set the OEM Batch Identifier to <code>%1</code>.
+      
+    
+  
+  
+    Offline
+    
+      
+      Select your preferred Region, or use the default settings.
+      
+    
+    
+      
+      
+      
+      Timezone: %1
+      
+    
+    
+      
+      Select your preferred Zone within your Region.
+      
+    
+    
+      
+      Zones
+      
+    
+    
+      
+      You can fine-tune Language and Locale settings below.
+      
+    
+  
+  
+    PWQ
+    
+      
+      Password is too short
+      
+    
+    
+      
+      Password is too long
+      
+    
+    
+      
+      Password is too weak
+      
+    
+    
+      
+      Memory allocation error when setting '%1'
+      
+    
+    
+      
+      Memory allocation error
+      
+    
+    
+      
+      The password is the same as the old one
+      
+    
+    
+      
+      The password is a palindrome
+      
+    
+    
+      
+      The password differs with case changes only
+      
+    
+    
+      
+      The password is too similar to the old one
+      
+    
+    
+      
+      The password contains the user name in some form
+      
+    
+    
+      
+      The password contains words from the real name of the user in some form
+      
+    
+    
+      
+      The password contains forbidden words in some form
+      
+    
+    
+      
+      The password contains too few digits
+      
+    
+    
+      
+      The password contains too few uppercase letters
+      
+    
+    
+      
+      The password contains fewer than %n lowercase letters
+      
+        
+      
+    
+    
+      
+      The password contains too few lowercase letters
+      
+    
+    
+      
+      The password contains too few non-alphanumeric characters
+      
+    
+    
+      
+      The password is too short
+      
+    
+    
+      
+      The password does not contain enough character classes
+      
+    
+    
+      
+      The password contains too many same characters consecutively
+      
+    
+    
+      
+      The password contains too many characters of the same class consecutively
+      
+    
+    
+      
+      The password contains fewer than %n digits
+      
+        
+      
+    
+    
+      
+      The password contains fewer than %n uppercase letters
+      
+        
+      
+    
+    
+      
+      The password contains fewer than %n non-alphanumeric characters
+      
+        
+      
+    
+    
+      
+      The password is shorter than %n characters
+      
+        
+      
+    
+    
+      
+      The password is a rotated version of the previous one
+      
+    
+    
+      
+      The password contains fewer than %n character classes
+      
+        
+      
+    
+    
+      
+      The password contains more than %n same characters consecutively
+      
+        
+      
+    
+    
+      
+      The password contains more than %n characters of the same class consecutively
+      
+        
+      
+    
+    
+      
+      The password contains monotonic sequence longer than %n characters
+      
+        
+      
+    
+    
+      
+      The password contains too long of a monotonic character sequence
+      
+    
+    
+      
+      No password supplied
+      
+    
+    
+      
+      Cannot obtain random numbers from the RNG device
+      
+    
+    
+      
+      Password generation failed - required entropy too low for settings
+      
+    
+    
+      
+      The password fails the dictionary check - %1
+      
+    
+    
+      
+      The password fails the dictionary check
+      
+    
+    
+      
+      Unknown setting - %1
+      
+    
+    
+      
+      Unknown setting
+      
+    
+    
+      
+      Bad integer value of setting - %1
+      
+    
+    
+      
+      Bad integer value
+      
+    
+    
+      
+      Setting %1 is not of integer type
+      
+    
+    
+      
+      Setting is not of integer type
+      
+    
+    
+      
+      Setting %1 is not of string type
+      
+    
+    
+      
+      Setting is not of string type
+      
+    
+    
+      
+      Opening the configuration file failed
+      
+    
+    
+      
+      The configuration file is malformed
+      
+    
+    
+      
+      Fatal failure
+      
+    
+    
+      
+      Unknown error
+      
+    
+    
+      
+      Password is empty
+      
+    
+  
+  
+    PackageChooserPage
+    
+      
+      Form
+      
+    
+    
+      
+      Product Name
+      
+    
+    
+      
+      TextLabel
+      
+    
+    
+      
+      Long Product Description
+      
+    
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
+  
+  
+    PackageChooserViewStep
+    
+      
+      Packages
+      
+    
+  
+  
+    PackageModel
+    
+      
+      Name
+      
+    
+    
+      
+      Description
+      
+    
+  
+  
+    Page_Keyboard
+    
+      
+      Form
+      
+    
+    
+      
+      Keyboard Model:
+      
+    
+    
+      
+      Type here to test your keyboard
+      
+    
+  
+  
+    Page_UserSetup
+    
+      
+      Form
+      
+    
+    
+      
+      What is your name?
+      
+    
+    
+      
+      Your Full Name
+      
+    
+    
+      
+      What name do you want to use to log in?
+      
+    
+    
+      
+      login
+      
+    
+    
+      
+      What is the name of this computer?
+      
+    
+    
+      
+      <small>This name will be used if you make the computer visible to others on a network.</small>
+      
+    
+    
+      
+      Computer Name
+      
+    
+    
+      
+      Choose a password to keep your account safe.
+      
+    
+    
+      
+      
+      <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small>
+      
+    
+    
+      
+      
+      Password
+      
+    
+    
+      
+      
+      Repeat Password
+      
+    
+    
+      
+      When this box is checked, password-strength checking is done and you will not be able to use a weak password.
+      
+    
+    
+      
+      Require strong passwords.
+      
+    
+    
+      
+      Log in automatically without asking for the password.
+      
+    
+    
+      
+      Use the same password for the administrator account.
+      
+    
+    
+      
+      Choose a password for the administrator account.
+      
+    
+    
+      
+      
+      <small>Enter the same password twice, so that it can be checked for typing errors.</small>
+      
+    
+  
+  
+    PartitionLabelsView
+    
+      
+      Root
+      
+    
+    
+      
+      Home
+      
+    
+    
+      
+      Boot
+      
+    
+    
+      
+      EFI system
+      
+    
+    
+      
+      Swap
+      
+    
+    
+      
+      New partition for %1
+      
+    
+    
+      
+      New partition
+      
+    
+    
+      
+      %1  %2
+      size[number] filesystem[name]
+      
+    
+  
+  
+    PartitionModel
+    
+      
+      
+      Free Space
+      
+    
+    
+      
+      
+      New partition
+      
+    
+    
+      
+      Name
+      
+    
+    
+      
+      File System
+      
+    
+    
+      
+      File System Label
+      
+    
+    
+      
+      Mount Point
+      
+    
+    
+      
+      Size
+      
+    
+  
+  
+    PartitionPage
+    
+      
+      Form
+      
+    
+    
+      
+      Storage de&vice:
+      
+    
+    
+      
+      &Revert All Changes
+      
+    
+    
+      
+      New Partition &Table
+      
+    
+    
+      
+      Cre&ate
+      
+    
+    
+      
+      &Edit
+      
+    
+    
+      
+      &Delete
+      
+    
+    
+      
+      New Volume Group
+      
+    
+    
+      
+      Resize Volume Group
+      
+    
+    
+      
+      Deactivate Volume Group
+      
+    
+    
+      
+      Remove Volume Group
+      
+    
+    
+      
+      I&nstall boot loader on:
+      
+    
+    
+      
+      Are you sure you want to create a new partition table on %1?
+      
+    
+    
+      
+      Can not create new partition
+      
+    
+    
+      
+      The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
+      
+    
+  
+  
+    PartitionViewStep
+    
+      
+      Gathering system information...
+      
+    
+    
+      
+      Partitions
+      
+    
+    
+      
+      Install %1 <strong>alongside</strong> another operating system.
+      
+    
+    
+      
+      <strong>Erase</strong> disk and install %1.
+      
+    
+    
+      
+      <strong>Replace</strong> a partition with %1.
+      
+    
+    
+      
+      <strong>Manual</strong> partitioning.
+      
+    
+    
+      
+      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+    
+    
+      
+      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+    
+    
+      
+      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+    
+    
+      
+      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+    
+    
+      
+      Disk <strong>%1</strong> (%2)
+      
+    
+    
+      
+      Current:
+      
+    
+    
+      
+      After:
+      
+    
+    
+      
+      No EFI system partition configured
+      
+    
+    
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+    
+    
+      
+      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+    
+    
+      
+      EFI system partition flag not set
+      
+    
+    
+      
+      Option to use GPT on BIOS
+      
+    
+    
+      
+      A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
+      
+    
+    
+      
+      Boot partition not encrypted
+      
+    
+    
+      
+      A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
+      
+    
+    
+      
+      has at least one disk device available.
+      
+    
+    
+      
+      There are no partitions to install on.
+      
+    
+  
+  
+    PlasmaLnfJob
+    
+      
+      Plasma Look-and-Feel Job
+      
+    
+    
+      
+      
+      Could not select KDE Plasma Look-and-Feel package
+      
+    
+  
+  
+    PlasmaLnfPage
+    
+      
+      Form
+      
+    
+    
+      
+      Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.
+      
+    
+    
+      
+      Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.
+      
+    
+  
+  
+    PlasmaLnfViewStep
+    
+      
+      Look-and-Feel
+      
+    
+  
+  
+    PreserveFiles
+    
+      
+      Saving files for later ...
+      
+    
+    
+      
+      No files configured to save for later.
+      
+    
+    
+      
+      Not all of the configured files could be preserved.
+      
+    
+  
+  
+    ProcessResult
+    
+      
+      
+There was no output from the command.
+      
+    
+    
+      
+      
+Output:
+
+      
+    
+    
+      
+      External command crashed.
+      
+    
+    
+      
+      Command <i>%1</i> crashed.
+      
+    
+    
+      
+      External command failed to start.
+      
+    
+    
+      
+      Command <i>%1</i> failed to start.
+      
+    
+    
+      
+      Internal error when starting command.
+      
+    
+    
+      
+      Bad parameters for process job call.
+      
+    
+    
+      
+      External command failed to finish.
+      
+    
+    
+      
+      Command <i>%1</i> failed to finish in %2 seconds.
+      
+    
+    
+      
+      External command finished with errors.
+      
+    
+    
+      
+      Command <i>%1</i> finished with exit code %2.
+      
+    
+  
+  
+    QObject
+    
+      
+      %1 (%2)
+      
+    
+    
+      
+      unknown
+      
+    
+    
+      
+      extended
+      
+    
+    
+      
+      unformatted
+      
+    
+    
+      
+      swap
+      
+    
+    
+      
+      
+      Default
+      
+    
+    
+      
+      
+      
+      
+      File not found
+      
+    
+    
+      
+      Path <pre>%1</pre> must be an absolute path.
+      
+    
+    
+      
+      Directory not found
+      
+    
+    
+      
+      
+      Could not create new random file <pre>%1</pre>.
+      
+    
+    
+      
+      No product
+      
+    
+    
+      
+      No description provided.
+      
+    
+    
+      
+      (no mount point)
+      
+    
+    
+      
+      Unpartitioned space or unknown partition table
+      
+    
+  
+  
+    Recommended
+    
+      
+      <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
+        Setup can continue, but some features might be disabled.</p>
+      
+    
+  
+  
+    RemoveUserJob
+    
+      
+      Remove live user from target system
+      
+    
+  
+  
+    RemoveVolumeGroupJob
+    
+      
+      
+      Remove Volume Group named %1.
+      
+    
+    
+      
+      Remove Volume Group named <strong>%1</strong>.
+      
+    
+    
+      
+      The installer failed to remove a volume group named '%1'.
+      
+    
+  
+  
+    ReplaceWidget
+    
+      
+      Form
+      
+    
+    
+      
+      Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.
+      
+    
+    
+      
+      The selected item does not appear to be a valid partition.
+      
+    
+    
+      
+      %1 cannot be installed on empty space. Please select an existing partition.
+      
+    
+    
+      
+      %1 cannot be installed on an extended partition. Please select an existing primary or logical partition.
+      
+    
+    
+      
+      %1 cannot be installed on this partition.
+      
+    
+    
+      
+      Data partition (%1)
+      
+    
+    
+      
+      Unknown system partition (%1)
+      
+    
+    
+      
+      %1 system partition (%2)
+      
+    
+    
+      
+      <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.
+      
+    
+    
+      
+      <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
+      
+    
+    
+      
+      
+      
+      <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.
+      
+    
+    
+      
+      The EFI system partition at %1 will be used for starting %2.
+      
+    
+    
+      
+      EFI system partition:
+      
+    
+  
+  
+    Requirements
+    
+      
+      <p>This computer does not satisfy the minimum requirements for installing %1.<br/>
+        Installation cannot continue.</p>
+      
+    
+    
+      
+      <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
+        Setup can continue, but some features might be disabled.</p>
+      
+    
+  
+  
+    ResizeFSJob
+    
+      
+      Resize Filesystem Job
+      
+    
+    
+      
+      Invalid configuration
+      
+    
+    
+      
+      The file-system resize job has an invalid configuration and will not run.
+      
+    
+    
+      
+      KPMCore not Available
+      
+    
+    
+      
+      Calamares cannot start KPMCore for the file-system resize job.
+      
+    
+    
+      
+      
+      
+      
+      
+      Resize Failed
+      
+    
+    
+      
+      The filesystem %1 could not be found in this system, and cannot be resized.
+      
+    
+    
+      
+      The device %1 could not be found in this system, and cannot be resized.
+      
+    
+    
+      
+      
+      The filesystem %1 cannot be resized.
+      
+    
+    
+      
+      
+      The device %1 cannot be resized.
+      
+    
+    
+      
+      The filesystem %1 must be resized, but cannot.
+      
+    
+    
+      
+      The device %1 must be resized, but cannot
+      
+    
+  
+  
+    ResizePartitionJob
+    
+      
+      Resize partition %1.
+      
+    
+    
+      
+      Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.
+      
+    
+    
+      
+      Resizing %2MiB partition %1 to %3MiB.
+      
+    
+    
+      
+      The installer failed to resize partition %1 on disk '%2'.
+      
+    
+  
+  
+    ResizeVolumeGroupDialog
+    
+      
+      Resize Volume Group
+      
+    
+  
+  
+    ResizeVolumeGroupJob
+    
+      
+      
+      Resize volume group named %1 from %2 to %3.
+      
+    
+    
+      
+      Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>.
+      
+    
+    
+      
+      The installer failed to resize a volume group named '%1'.
+      
+    
+  
+  
+    ResultsListDialog
+    
+      
+      For best results, please ensure that this computer:
+      
+    
+    
+      
+      System requirements
+      
+    
+  
+  
+    ResultsListWidget
+    
+      
+      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
+      
+    
+    
+      
+      This program will ask you some questions and set up %2 on your computer.
+      
+    
+  
+  
+    ScanningDialog
+    
+      
+      Scanning storage devices...
+      
+    
+    
+      
+      Partitioning
+      
+    
+  
+  
+    SetHostNameJob
+    
+      
+      Set hostname %1
+      
+    
+    
+      
+      Set hostname <strong>%1</strong>.
+      
+    
+    
+      
+      Setting hostname %1.
+      
+    
+    
+      
+      
+      Internal Error
+      
+    
+    
+      
+      
+      Cannot write hostname to target system
+      
+    
+  
+  
+    SetKeyboardLayoutJob
+    
+      
+      Set keyboard model to %1, layout to %2-%3
+      
+    
+    
+      
+      Failed to write keyboard configuration for the virtual console.
+      
+    
+    
+      
+      
+      
+      Failed to write to %1
+      
+    
+    
+      
+      Failed to write keyboard configuration for X11.
+      
+    
+    
+      
+      Failed to write keyboard configuration to existing /etc/default directory.
+      
+    
+  
+  
+    SetPartFlagsJob
+    
+      
+      Set flags on partition %1.
+      
+    
+    
+      
+      Set flags on %1MiB %2 partition.
+      
+    
+    
+      
+      Set flags on new partition.
+      
+    
+    
+      
+      Clear flags on partition <strong>%1</strong>.
+      
+    
+    
+      
+      Clear flags on %1MiB <strong>%2</strong> partition.
+      
+    
+    
+      
+      Clear flags on new partition.
+      
+    
+    
+      
+      Flag partition <strong>%1</strong> as <strong>%2</strong>.
+      
+    
+    
+      
+      Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.
+      
+    
+    
+      
+      Flag new partition as <strong>%1</strong>.
+      
+    
+    
+      
+      Clearing flags on partition <strong>%1</strong>.
+      
+    
+    
+      
+      Clearing flags on %1MiB <strong>%2</strong> partition.
+      
+    
+    
+      
+      Clearing flags on new partition.
+      
+    
+    
+      
+      Setting flags <strong>%2</strong> on partition <strong>%1</strong>.
+      
+    
+    
+      
+      Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.
+      
+    
+    
+      
+      Setting flags <strong>%1</strong> on new partition.
+      
+    
+    
+      
+      The installer failed to set flags on partition %1.
+      
+    
+  
+  
+    SetPasswordJob
+    
+      
+      Set password for user %1
+      
+    
+    
+      
+      Setting password for user %1.
+      
+    
+    
+      
+      Bad destination system path.
+      
+    
+    
+      
+      rootMountPoint is %1
+      
+    
+    
+      
+      Cannot disable root account.
+      
+    
+    
+      
+      passwd terminated with error code %1.
+      
+    
+    
+      
+      Cannot set password for user %1.
+      
+    
+    
+      
+      usermod terminated with error code %1.
+      
+    
+  
+  
+    SetTimezoneJob
+    
+      
+      Set timezone to %1/%2
+      
+    
+    
+      
+      Cannot access selected timezone path.
+      
+    
+    
+      
+      Bad path: %1
+      
+    
+    
+      
+      Cannot set timezone.
+      
+    
+    
+      
+      Link creation failed, target: %1; link name: %2
+      
+    
+    
+      
+      Cannot set timezone,
+      
+    
+    
+      
+      Cannot open /etc/timezone for writing
+      
+    
+  
+  
+    SetupGroupsJob
+    
+      
+      Preparing groups.
+      
+    
+    
+      
+      
+      Could not create groups in target system
+      
+    
+    
+      
+      These groups are missing in the target system: %1
+      
+    
+  
+  
+    SetupSudoJob
+    
+      
+      Configure <pre>sudo</pre> users.
+      
+    
+    
+      
+      Cannot chmod sudoers file.
+      
+    
+    
+      
+      Cannot create sudoers file for writing.
+      
+    
+  
+  
+    ShellProcessJob
+    
+      
+      Shell Processes Job
+      
+    
+  
+  
+    SlideCounter
+    
+      
+      %L1 / %L2
+      slide counter, %1 of %2 (numeric)
+      
+    
+  
+  
+    SummaryPage
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
+  
+  
+    SummaryViewStep
+    
+      
+      Summary
+      
+    
+  
+  
+    TrackingInstallJob
+    
+      
+      Installation feedback
+      
+    
+    
+      
+      Sending installation feedback.
+      
+    
+    
+      
+      Internal error in install-tracking.
+      
+    
+    
+      
+      HTTP request timed out.
+      
+    
+  
+  
+    TrackingKUserFeedbackJob
+    
+      
+      KDE user feedback
+      
+    
+    
+      
+      Configuring KDE user feedback.
+      
+    
+    
+      
+      
+      Error in KDE user feedback configuration.
+      
+    
+    
+      
+      Could not configure KDE user feedback correctly, script error %1.
+      
+    
+    
+      
+      Could not configure KDE user feedback correctly, Calamares error %1.
+      
+    
+  
+  
+    TrackingMachineUpdateManagerJob
+    
+      
+      Machine feedback
+      
+    
+    
+      
+      Configuring machine feedback.
+      
+    
+    
+      
+      
+      Error in machine feedback configuration.
+      
+    
+    
+      
+      Could not configure machine feedback correctly, script error %1.
+      
+    
+    
+      
+      Could not configure machine feedback correctly, Calamares error %1.
+      
+    
+  
+  
+    TrackingPage
+    
+      
+      Form
+      
+    
+    
+      
+      Placeholder
+      
+    
+    
+      
+      <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html>
+      
+    
+    
+      
+      <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html>
+      
+    
+    
+      
+      Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area.
+      
+    
+    
+      
+      By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes.
+      
+    
+    
+      
+      By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1.
+      
+    
+    
+      
+      By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1.
+      
+    
+  
+  
+    TrackingViewStep
+    
+      
+      Feedback
+      
+    
+  
+  
+    UsersPage
+    
+      
+      <small>If more than one person will use this computer, you can create multiple accounts after setup.</small>
+      
+    
+    
+      
+      <small>If more than one person will use this computer, you can create multiple accounts after installation.</small>
+      
+    
+  
+  
+    UsersQmlViewStep
+    
+      
+      Users
+      
+    
+  
+  
+    UsersViewStep
+    
+      
+      Users
+      
+    
+  
+  
+    VariantModel
+    
+      
+      Key
+      Column header for key/value
+      
+    
+    
+      
+      Value
+      Column header for key/value
+      
+    
+  
+  
+    VolumeGroupBaseDialog
+    
+      
+      Create Volume Group
+      
+    
+    
+      
+      List of Physical Volumes
+      
+    
+    
+      
+      Volume Group Name:
+      
+    
+    
+      
+      Volume Group Type:
+      
+    
+    
+      
+      Physical Extent Size:
+      
+    
+    
+      
+       MiB
+      
+    
+    
+      
+      Total Size:
+      
+    
+    
+      
+      Used Size:
+      
+    
+    
+      
+      Total Sectors:
+      
+    
+    
+      
+      Quantity of LVs:
+      
+    
+  
+  
+    WelcomePage
+    
+      
+      Form
+      
+    
+    
+      
+      
+      Select application and system language
+      
+    
+    
+      
+      &About
+      
+    
+    
+      
+      Open donations website
+      
+    
+    
+      
+      &Donate
+      
+    
+    
+      
+      Open help and support website
+      
+    
+    
+      
+      &Support
+      
+    
+    
+      
+      Open issues and bug-tracking website
+      
+    
+    
+      
+      &Known issues
+      
+    
+    
+      
+      Open release notes website
+      
+    
+    
+      
+      &Release notes
+      
+    
+    
+      
+      <h1>Welcome to the Calamares setup program for %1.</h1>
+      
+    
+    
+      
+      <h1>Welcome to %1 setup.</h1>
+      
+    
+    
+      
+      <h1>Welcome to the Calamares installer for %1.</h1>
+      
+    
+    
+      
+      <h1>Welcome to the %1 installer.</h1>
+      
+    
+    
+      
+      %1 support
+      
+    
+    
+      
+      About %1 setup
+      
+    
+    
+      
+      About %1 installer
+      
+    
+    
+      
+      <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.
+      
+    
+  
+  
+    WelcomeQmlViewStep
+    
+      
+      Welcome
+      
+    
+  
+  
+    WelcomeViewStep
+    
+      
+      Welcome
+      
+    
+  
+  
+    about
+    
+      
+      <h1>%1</h1><br/>
+                        <strong>%2<br/>
+                        for %3</strong><br/><br/>
+                        Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>
+                        Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>
+                        Thanks to <a href='https://calamares.io/team/'>the Calamares team</a>
+                        and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares
+                        translators team</a>.<br/><br/>
+                        <a href='https://calamares.io/'>Calamares</a>
+                        development is sponsored by <br/>
+                        <a href='http://www.blue-systems.com/'>Blue Systems</a> -
+                        Liberating Software.
+      
+    
+    
+      
+      Back
+      
+    
+  
+  
+    calamares-sidebar
+    
+      
+      Show debug information
+      
+    
+  
+  
+    finishedq
+    
+      
+      Installation Completed
+      
+    
+    
+      
+      %1 has been installed on your computer.<br/>
+            You may now restart into your new system, or continue using the Live environment.
+      
+    
+    
+      
+      Close Installer
+      
+    
+    
+      
+      Restart System
+      
+    
+    
+      
+      <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
+            This log is copied to /var/log/installation.log of the target system.</p>
+      
+    
+  
+  
+    i18n
+    
+      
+      <h1>Languages</h1> </br>
+                    The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
+      
+    
+    
+      
+      <h1>Locales</h1> </br>
+                    The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
+      
+    
+    
+      
+      Back
+      
+    
+  
+  
+    keyboardq
+    
+      
+      Keyboard Model
+      
+    
+    
+      
+      Layouts
+      
+    
+    
+      
+      Keyboard Layout
+      
+    
+    
+      
+      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      
+    
+    
+      
+      Models
+      
+    
+    
+      
+      Variants
+      
+    
+    
+      
+      Keyboard Variant
+      
+    
+    
+      
+      Test your keyboard
+      
+    
+  
+  
+    localeq
+    
+      
+      Change
+      
+    
+  
+  
+    notesqml
+    
+      
+      <h3>%1</h3>
+            <p>These are example release notes.</p>
+      
+    
+  
+  
+    release_notes
+    
+      
+      <h3>%1</h3>
+            <p>This an example QML file, showing options in RichText with Flickable content.</p>
+
+            <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p>
+
+            <p><b>This is bold text</b></p>
+            <p><i>This is italic text</i></p>
+            <p><u>This is underlined text</u></p>
+            <p><center>This text will be center-aligned.</center></p>
+            <p><s>This is strikethrough</s></p>
+
+            <p>Code example:
+            <code>ls -l /home</code></p>
+
+            <p><b>Lists:</b></p>
+            <ul>
+                <li>Intel CPU systems</li>
+                <li>AMD CPU systems</li>
+            </ul>
+
+            <p>The vertical scrollbar is adjustable, current width set to 10.</p>
+      
+    
+    
+      
+      Back
+      
+    
+  
+  
+    usersq
+    
+      
+      Pick your user name and credentials to login and perform admin tasks
+      
+    
+    
+      
+      What is your name?
+      
+    
+    
+      
+      Your Full Name
+      
+    
+    
+      
+      What name do you want to use to log in?
+      
+    
+    
+      
+      Login Name
+      
+    
+    
+      
+      If more than one person will use this computer, you can create multiple accounts after installation.
+      
+    
+    
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
+      What is the name of this computer?
+      
+    
+    
+      
+      Computer Name
+      
+    
+    
+      
+      This name will be used if you make the computer visible to others on a network.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
+      Choose a password to keep your account safe.
+      
+    
+    
+      
+      Password
+      
+    
+    
+      
+      Repeat Password
+      
+    
+    
+      
+      Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
+      
+    
+    
+      
+      Validate passwords quality
+      
+    
+    
+      
+      When this box is checked, password-strength checking is done and you will not be able to use a weak password.
+      
+    
+    
+      
+      Log in automatically without asking for the password
+      
+    
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      Reuse user password as root password
+      
+    
+    
+      
+      Use the same password for the administrator account.
+      
+    
+    
+      
+      Choose a root password to keep your account safe.
+      
+    
+    
+      
+      Root Password
+      
+    
+    
+      
+      Repeat Root Password
+      
+    
+    
+      
+      Enter the same password twice, so that it can be checked for typing errors.
+      
+    
+  
+  
+    welcomeq
+    
+      
+      <h3>Welcome to the %1 <quote>%2</quote> installer</h3>
+            <p>This program will ask you some questions and set up %1 on your computer.</p>
+      
+    
+    
+      
+      About
+      
+    
+    
+      
+      Support
+      
+    
+    
+      
+      Known issues
+      
+    
+    
+      
+      Release notes
+      
+    
+    
+      
+      Donate
+      
+    
+  
+
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index 95bacfe386..840a9415a1 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -787,12 +787,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       Network Installation. (Disabled: Internal error)
-      
+      Sieťová inštalácia. (Zakázaná: vnútorná chyba)
     
     
       
       Network Installation. (Disabled: No package list)
-      
+      Sieťová inštalácia. (Zakázaná: bez zoznamu balíkov)
     
     
       
@@ -897,7 +897,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       OK!
-      
+      OK!
     
     
       
@@ -912,12 +912,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       The setup of %1 did not complete successfully.
-      
+      Inštalácia distribúcie %1 nebola úspešne dokončená.
     
     
       
       The installation of %1 did not complete successfully.
-      
+      Inštalácia distribúcie %1 bola úspešne dokončená.
     
     
       
@@ -1013,12 +1013,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       Label for the filesystem
-      
+      Menovka systému súborov
     
     
       
       FS Label:
-      
+      Menovka SS:
     
     
       
@@ -1051,12 +1051,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       Create new %1MiB partition on %3 (%2) with entries %4.
-      
+      Vytvorenie nového %1MiB oddielu na zariadení %3 (%2) so záznamami %4.
     
     
       
       Create new %1MiB partition on %3 (%2).
-      
+      Vytvorenie nového %1MiB oddielu na zariadení %3 (%2).
     
     
       
@@ -1066,12 +1066,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
-      
+      Vytvorenie nového <strong>%1MiB</strong> oddielu na zariadení <strong>%3</strong> (%2) so záznamami <em>%4</em>.
     
     
       
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
-      
+      Vytvorenie nového <strong>%1MiB</strong> oddielu na zariadení <strong>%3</strong> (%2).
     
     
       
@@ -1377,12 +1377,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       Label for the filesystem
-      
+      Menovka systému súborov
     
     
       
       FS Label:
-      
+      Menovka SS:
     
     
       
@@ -1890,7 +1890,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       Quit
-      
+      Ukončiť
     
   
   
@@ -2113,7 +2113,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       Select your preferred Region, or use the default settings.
-      
+      Vyberte vami uprednostňovanú oblasť, alebo použite predvolené nastavenia.
     
     
       
@@ -2671,7 +2671,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
     
       
       File System Label
-      
+      Menovka systému súborov
     
     
       
@@ -4077,23 +4077,24 @@ Výstup:
     
       
       Installation Completed
-      
+      Inštalácia dokončená
     
     
       
       %1 has been installed on your computer.<br/>
             You may now restart into your new system, or continue using the Live environment.
-      
+      Distribúcia %1 bola nainštalovaná do vášho počítača.<br/>
+            Teraz môžete reštartovať váš počítač a spustiť nový systém, alebo pokračovať v používaní živého prostredia.
     
     
       
       Close Installer
-      
+      Zavrieť inštalátor
     
     
       
       Restart System
-      
+      Reštartovať systém
     
     
       
diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts
index b0edd6fc2d..a21db2c686 100644
--- a/lang/calamares_sq.ts
+++ b/lang/calamares_sq.ts
@@ -4321,7 +4321,7 @@ Përfundim:
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. minimumi dy shenja.
     
     
       
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 1a6aeb6cfa..6b6b7462d9 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -509,12 +509,12 @@ Alla ändringar kommer att gå förlorade.
     
       
       Set filesystem label on %1.
-      
+      Sätt filsystem etikett på %1.
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      Sätt filsystem etikett <strong>%1</strong> på partition <strong>%2</strong>.
     
     
       
@@ -1011,12 +1011,12 @@ Alla ändringar kommer att gå förlorade.
     
       
       Label for the filesystem
-      
+      Etikett för filsystem
     
     
       
       FS Label:
-      
+      FS Etikett:
     
     
       
@@ -1375,12 +1375,12 @@ Alla ändringar kommer att gå förlorade.
     
       
       Label for the filesystem
-      
+      Etikett för filsystem
     
     
       
       FS Label:
-      
+      FS Etikett:
     
     
       
@@ -2653,7 +2653,7 @@ Sök på kartan genom att dra
     
       
       File System Label
-      
+      Filsystem etikett
     
     
       
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index cc8d056101..27e9612932 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -37,7 +37,7 @@
     
       
       Boot Partition
-      พาร์ทิชัน Boot
+      พาร์ทิชันบูต
     
     
       
@@ -60,7 +60,7 @@
     
       
       Blank Page
-      
+      หน้าว่าง
     
   
   
@@ -94,7 +94,7 @@
       
       
       none
-      
+      ไม่มี
     
     
       
@@ -147,7 +147,7 @@
     
       
       Set up
-      
+      ตั้งค่า
     
     
       
@@ -263,15 +263,15 @@
     
       
       Waiting for %n module(s).
-      
-        
+      
+        กำลังรอ %n โมดูล
       
     
     
       
       (%n second(s))
-      
-        
+      
+        (%n วินาที)
       
     
     
@@ -361,7 +361,7 @@ Link copied to clipboard
     
       
       Continue with installation?
-      
+      ดำเนินการติดตั้งต่อหรือไม่?
     
     
       
@@ -376,7 +376,7 @@ Link copied to clipboard
     
       
       &Set up now
-      
+      &ตั้งค่าตอนนี้
     
     
       
@@ -391,12 +391,12 @@ Link copied to clipboard
     
       
       &Set up
-      
+      &ตั้งค่า
     
     
       
       &Install
-      
+      &ติดตั้ง
     
     
       
@@ -577,7 +577,7 @@ The installer will quit and all changes will be lost.
     
       
       <strong>Select a partition to install on</strong>
-      
+      <strong>เลือกพาร์ทิชันที่จะติดตั้ง</strong>
     
     
       
@@ -597,7 +597,7 @@ The installer will quit and all changes will be lost.
     
       
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
-      
+      ดูเหมือนว่าอุปกรณ์จัดเก็บนี้ไม่มีระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บของคุณ
     
     
       
@@ -764,7 +764,7 @@ The installer will quit and all changes will be lost.
     
       
       The numbers and dates locale will be set to %1.
-      
+      ตำแหน่งที่ตั้งสำหรับหมายเลขและวันที่จะถูกตั้งค่าเป็น %1
     
     
       
@@ -789,7 +789,7 @@ The installer will quit and all changes will be lost.
     
       
       Package selection
-      
+      เลือกแพ็กเกจ
     
     
       
@@ -799,12 +799,12 @@ The installer will quit and all changes will be lost.
     
       
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
+      คอมพิวเตอร์เครื่องนี้มีความต้องการไม่เพียงพอที่จะตั้งค่า %1<br/>ไม่สามารถทำการตั้งค่าต่อไปได้ <a href="#details">รายละเอียด...</a>
     
     
       
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      ขณะที่กำลังติดตั้ง ตัวติดตั้งฟ้องว่า คอมพิวเตอร์นี้มีความต้องการไม่เพียงพอที่จะติดตั้ง %1.<br/>ไม่สามารถทำการติดตั้งต่อไปได้ <a href="#details">รายละเอียด...</a>
+      คอมพิวเตอร์เครื่องนี้มีความต้องการไม่เพียงพอที่จะติดตั้ง %1<br/>ไม่สามารถทำการติดตั้งต่อไปได้ <a href="#details">รายละเอียด...</a>
     
     
       
@@ -819,7 +819,7 @@ The installer will quit and all changes will be lost.
     
       
       This program will ask you some questions and set up %2 on your computer.
-      โปรแกรมนี้จะถามคุณบางอย่าง เพื่อติดตั้ง %2 ไว้ในคอมพิวเตอร์ของคุณ
+      โปรแกรมนี้จะถามตำถามต่าง ๆ เพื่อติดตั้ง %2 ลงในคอมพิวเตอร์ของคุณ
     
     
       
@@ -829,17 +829,17 @@ The installer will quit and all changes will be lost.
     
       
       <h1>Welcome to %1 setup</h1>
-      
+      <h1>ยินดีต้อนรับสู่ตัวตั้งค่า %1</h1>
     
     
       
       <h1>Welcome to the Calamares installer for %1</h1>
-      
+      <h1>ยินดีต้อนรับสู่ตัวติดตั้ง Calamares สำหรับ %1</h1>
     
     
       
       <h1>Welcome to the %1 installer</h1>
-      
+      <h1>ยินดีต้อนรับสู่ตัวติดตั้ง %1</h1>
     
     
       
@@ -849,7 +849,7 @@ The installer will quit and all changes will be lost.
     
       
       '%1' is not allowed as username.
-      
+      ไม่อนุญาตให้ใช้ '%1' เป็นชื่อผู้ใช้
     
     
       
@@ -889,7 +889,7 @@ The installer will quit and all changes will be lost.
     
       
       OK!
-      
+      ตกลง!
     
     
       
@@ -934,12 +934,12 @@ The installer will quit and all changes will be lost.
     
       
       Package Selection
-      
+      เลือกแพ็กเกจ
     
     
       
       Please pick a product from the list. The selected product will be installed.
-      
+      เลือกผลิตภัณฑ์จากรายการ ผลิตภัณฑ์ที่เลือกไว้จะถูกติดตั้ง
     
   
   
@@ -1115,17 +1115,17 @@ The installer will quit and all changes will be lost.
     
       
       Create new %1 partition table on %2.
-      
+      สร้างตารางพาร์ทิชัน %1 ใหม่บน %2
     
     
       
       Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3).
-      
+      สร้างตารางพาร์ทิชัน <strong>%1</strong> ใหม่บน <strong>%2</strong> (%3)
     
     
       
       Creating new %1 partition table on %2.
-      
+      กำลังสร้างตารางพาร์ทิชัน %1 ใหม่บน %2
     
     
       
@@ -1143,7 +1143,7 @@ The installer will quit and all changes will be lost.
     
       
       Create user <strong>%1</strong>.
-      
+      สร้างผู้ใช้ <strong>%1</strong>
     
     
       
@@ -1154,12 +1154,12 @@ The installer will quit and all changes will be lost.
       
       
       Creating user %1
-      
+      กำลังสร้างผู้ใช้ %1
     
     
       
       Configuring user %1
-      
+      กำลังกำหนดค่าผู้ใช้ %1
     
     
       
@@ -1222,17 +1222,17 @@ The installer will quit and all changes will be lost.
     
       
       Delete partition %1.
-      
+      ลบพาร์ทิชัน %1
     
     
       
       Delete partition <strong>%1</strong>.
-      
+      ลบพาร์ทิชัน <strong>%1</strong>
     
     
       
       Deleting partition %1.
-      
+      กำลังลบพาร์ทิชัน %1
     
     
       
@@ -1245,7 +1245,7 @@ The installer will quit and all changes will be lost.
     
       
       This device has a <strong>%1</strong> partition table.
-      
+      อุปกรณ์นี้มีตารางพาร์ทิชัน <strong>%1</strong>
     
     
       
@@ -1303,7 +1303,7 @@ The installer will quit and all changes will be lost.
     
       
       Failed to open %1
-      
+      ไม่สามารถเปิด %1
     
   
   
@@ -1329,7 +1329,7 @@ The installer will quit and all changes will be lost.
     
       
       &Keep
-      
+      &เก็บไว้
     
     
       
@@ -1494,7 +1494,7 @@ The installer will quit and all changes will be lost.
     
       
       <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment.
-      <h1>เสร็จสิ้น</h1><br/>%1 ติดตั้งบนคอมพิวเตอร์ของคุณเรียบร้อย<br/>คุณสามารถเริ่มทำงานเพื่อเข้าระบบใหม่ของคุณ หรือดำเนินการใช้ %2  Live environment ต่อไป
+      <h1>เสร็จสิ้น</h1><br/>%1 ติดตั้งบนคอมพิวเตอร์ของคุณเรียบร้อย<br/>คุณสามารถเริ่มต้นใหม่เพื่อเข้าสู่ระบบใหม่ของคุณ หรือดำเนินการใช้ %2 ในแบบไม่ต้องติดตั้ง (Live) ต่อไป
     
     
       
@@ -1581,7 +1581,7 @@ The installer will quit and all changes will be lost.
     
       
       The system is not plugged in to a power source.
-      
+      ระบบนี้ไม่ได้เชื่อมต่อปลั๊กเข้ากับแหล่งจ่ายไฟ
     
     
       
@@ -1611,7 +1611,7 @@ The installer will quit and all changes will be lost.
     
       
       has a screen large enough to show the whole installer
-      
+      มีหน้าจอใหญ่พอที่จะแสดงผลตัวติดตั้งได้ทั้งหมด
     
     
       
@@ -1621,7 +1621,7 @@ The installer will quit and all changes will be lost.
     
       
       The screen is too small to display the installer.
-      
+      หน้าจอเล็กเกินกว่าที่จะแสดงผลตัวติดตั้ง
     
   
   
@@ -1629,7 +1629,7 @@ The installer will quit and all changes will be lost.
     
       
       Collecting information about your machine.
-      
+      กำลังรวบรวมข้อมูลเกี่ยวกับเครื่องของคุณ
     
   
   
@@ -1679,7 +1679,7 @@ The installer will quit and all changes will be lost.
     
       
       Konsole not installed
-      
+      ไม่ได้ติดตั้ง Konsole
     
     
       
@@ -1721,7 +1721,7 @@ The installer will quit and all changes will be lost.
     
       
       System locale setting
-      การตั้งค่า locale ระบบ
+      การตั้งค่าตำแหน่งที่ตั้งระบบ
     
     
       
@@ -1736,7 +1736,7 @@ The installer will quit and all changes will be lost.
     
       
       &OK
-      
+      &O ตกลง
     
   
   
@@ -1832,7 +1832,7 @@ The installer will quit and all changes will be lost.
     
       
       File: %1
-      
+      ไฟล์: %1
     
     
       
@@ -1882,7 +1882,7 @@ The installer will quit and all changes will be lost.
     
       
       Quit
-      
+      ออก
     
   
   
@@ -1952,7 +1952,7 @@ The installer will quit and all changes will be lost.
     
       
       Timezone: %1
-      
+      เขตเวลา: %1
     
     
       
@@ -1967,7 +1967,7 @@ The installer will quit and all changes will be lost.
     
       
       Package selection
-      
+      เลือกแพ็กเกจ
     
     
       
@@ -2007,52 +2007,52 @@ The installer will quit and all changes will be lost.
     
       
       Login
-      
+      เข้าสู่ระบบ
     
     
       
       Desktop
-      
+      เดสก์ท็อป
     
     
       
       Applications
-      
+      แอปพลิเคชัน
     
     
       
       Communication
-      
+      การสื่อสาร
     
     
       
       Development
-      
+      การพัฒนา
     
     
       
       Office
-      
+      ออฟฟิศ
     
     
       
       Multimedia
-      
+      สื่อ
     
     
       
       Internet
-      
+      อินเทอร์เน็ต
     
     
       
       Theming
-      
+      การปรับแต่ง
     
     
       
       Gaming
-      
+      เกม
     
     
       
@@ -2111,7 +2111,7 @@ The installer will quit and all changes will be lost.
       
       
       Timezone: %1
-      
+      เขตเวลา: %1
     
     
       
@@ -2121,7 +2121,7 @@ The installer will quit and all changes will be lost.
     
       
       Zones
-      
+      เขต
     
     
       
@@ -2405,7 +2405,7 @@ The installer will quit and all changes will be lost.
     
       
       Product Name
-      
+      ชื่อผลิตภัณฑ์
     
     
       
@@ -2415,17 +2415,17 @@ The installer will quit and all changes will be lost.
     
       
       Long Product Description
-      
+      คำอธิบายผลิตภัณฑ์แบบยาว
     
     
       
       Package Selection
-      
+      เลือกแพ็กเกจ
     
     
       
       Please pick a product from the list. The selected product will be installed.
-      
+      เลือกผลิตภัณฑ์จากรายการ ผลิตภัณฑ์ที่เลือกไว้จะถูกติดตั้ง
     
   
   
@@ -2433,7 +2433,7 @@ The installer will quit and all changes will be lost.
     
       
       Packages
-      
+      แพ็กเกจ
     
   
   
@@ -2477,7 +2477,7 @@ The installer will quit and all changes will be lost.
     
       
       What is your name?
-      ชื่อของคุณคือ?
+      ชื่อของคุณคืออะไร?
     
     
       
@@ -2487,7 +2487,7 @@ The installer will quit and all changes will be lost.
     
       
       What name do you want to use to log in?
-      ชื่อที่คุณต้องการใช้ในการล็อกอิน?
+      ใส่ชื่อที่คุณต้องการใช้ในการเข้าสู่ระบบ
     
     
       
@@ -2497,7 +2497,7 @@ The installer will quit and all changes will be lost.
     
       
       What is the name of this computer?
-      คอมพิวเตอร์เครื่องนี้ชื่อ?
+      คอมพิวเตอร์เครื่องนี้ชื่ออะไร?
     
     
       
@@ -2781,7 +2781,7 @@ The installer will quit and all changes will be lost.
     
       
       Disk <strong>%1</strong> (%2)
-      
+      ดิสก์ <strong>%1</strong> (%2)
     
     
       
@@ -3309,7 +3309,7 @@ Output:
     
       
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
+      คอมพิวเตอร์เครื่องนี้มีความต้องการไม่เพียงพอที่จะตั้งค่า %1<br/>ไม่สามารถทำการตั้งค่าต่อไปได้ <a href="#details">รายละเอียด...</a>
     
     
       
@@ -3593,7 +3593,7 @@ Output:
     
       
       Configure <pre>sudo</pre> users.
-      
+      กำหนดค่าผู้ใช้ <pre>sudo</pre>
     
     
       
@@ -3855,12 +3855,12 @@ Output:
     
       
       Total Size:
-      
+      ขนาดทั้งหมด:
     
     
       
       Used Size:
-      
+      ขนาดที่ใช้ไป:
     
     
       
@@ -3934,12 +3934,12 @@ Output:
     
       
       <h1>Welcome to the Calamares setup program for %1.</h1>
-      
+      <h1>ยินดีต้อนรับสู่โปรแกรมตั้งค่า Calamares สำหรับ %1</h1>
     
     
       
       <h1>Welcome to %1 setup.</h1>
-      
+      <h1>ยินดีต้อนรับสู่ตัวตั้งค่า %1</h1>
     
     
       
@@ -3959,7 +3959,7 @@ Output:
     
       
       About %1 setup
-      
+      เกี่ยวกับตัวตั้งค่า %1
     
     
       
@@ -4009,7 +4009,7 @@ Output:
     
       
       Back
-      
+      ย้อนกลับ
     
   
   
@@ -4025,7 +4025,7 @@ Output:
     
       
       Installation Completed
-      
+      การติดตั้งเสร็จสิ้น
     
     
       
@@ -4036,12 +4036,12 @@ Output:
     
       
       Close Installer
-      
+      ปิดตัวติดตั้ง
     
     
       
       Restart System
-      
+      เริ่มต้นระบบใหม่
     
     
       
@@ -4067,7 +4067,7 @@ Output:
     
       
       Back
-      
+      ย้อนกลับ
     
   
   
@@ -4110,7 +4110,7 @@ Output:
     
       
       Test your keyboard
-      
+      ทดสอบคีย์บอร์ด
     
   
   
@@ -4118,7 +4118,7 @@ Output:
     
       
       Change
-      
+      เปลี่ยน
     
   
   
@@ -4160,7 +4160,7 @@ Output:
     
       
       Back
-      
+      ย้อนกลับ
     
   
   
@@ -4173,7 +4173,7 @@ Output:
     
       
       What is your name?
-      ชื่อของคุณคือ?
+      ชื่อของคุณคืออะไร?
     
     
       
@@ -4183,7 +4183,7 @@ Output:
     
       
       What name do you want to use to log in?
-      ชื่อที่คุณต้องการใช้ในการล็อกอิน?
+      ใส่ชื่อที่คุณต้องการใช้ในการเข้าสู่ระบบ
     
     
       
@@ -4208,7 +4208,7 @@ Output:
     
       
       What is the name of this computer?
-      คอมพิวเตอร์เครื่องนี้ชื่อ?
+      คอมพิวเตอร์เครื่องนี้ชื่ออะไร?
     
     
       
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index 92e8b6df3b..a986159827 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -110,12 +110,12 @@
     
       
       Reloads the stylesheet from the branding directory.
-      
+      从Branding目录重新载入样式表
     
     
       
       Uploads the session log to the configured pastebin.
-      
+      将会话日志上传至预设的pastebin网站
     
     
       
@@ -337,7 +337,11 @@
 %1
 
 Link copied to clipboard
-      
+      发送至
+
+%1
+
+的链接已保存至剪贴板 
     
     
       
@@ -505,7 +509,7 @@ The installer will quit and all changes will be lost.
     
       
       Set filesystem label on %1.
-      
+      在%1设置文件系统卷标
     
     
       
@@ -781,12 +785,12 @@ The installer will quit and all changes will be lost.
     
       
       Network Installation. (Disabled: Internal error)
-      
+      网络安装（因内部错误而被禁用）
     
     
       
       Network Installation. (Disabled: No package list)
-      
+      网络安装（因无软件包列表而被禁用）
     
     
       
@@ -893,7 +897,7 @@ The installer will quit and all changes will be lost.
     
       
       OK!
-      
+      确定
     
     
       
@@ -908,12 +912,12 @@ The installer will quit and all changes will be lost.
     
       
       The setup of %1 did not complete successfully.
-      
+      %1的设置未成功完成
     
     
       
       The installation of %1 did not complete successfully.
-      
+      %1的安装未成功完成
     
     
       
@@ -1009,12 +1013,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      此文件系统的卷标名
     
     
       
       FS Label:
-      
+      文件系统卷标
     
     
       
@@ -1374,12 +1378,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      此文件系统的卷标名
     
     
       
       FS Label:
-      
+      文件系统卷标
     
     
       
@@ -1887,7 +1891,7 @@ The installer will quit and all changes will be lost.
     
       
       Quit
-      
+      退出
     
   
   
@@ -2111,7 +2115,7 @@ The installer will quit and all changes will be lost.
     
       
       Select your preferred Region, or use the default settings.
-      
+      请选择你偏好打地区或者使用当期默认设置
     
     
       
@@ -2642,7 +2646,7 @@ The installer will quit and all changes will be lost.
     
       
       File System Label
-      
+      文件系统卷标
     
     
       
@@ -4255,7 +4259,7 @@ Output:
     
       
       root is not allowed as username.
-      
+      用户名不能为root
     
     
       
@@ -4275,7 +4279,7 @@ Output:
     
       
       localhost is not allowed as hostname.
-      
+      localhost不能为用户名
     
     
       
diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts
new file mode 100644
index 0000000000..6c592a6d3e
--- /dev/null
+++ b/lang/calamares_zh_HK.ts
@@ -0,0 +1,4332 @@
+
+
+
+  
+    AutoMountManagementJob
+    
+      
+      Manage auto-mount settings
+      
+    
+  
+  
+    BootInfoWidget
+    
+      
+      The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode.
+      
+    
+    
+      
+      This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.
+      
+    
+    
+      
+      This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.
+      
+    
+  
+  
+    BootLoaderModel
+    
+      
+      Master Boot Record of %1
+      
+    
+    
+      
+      Boot Partition
+      
+    
+    
+      
+      System Partition
+      
+    
+    
+      
+      Do not install a boot loader
+      
+    
+    
+      
+      %1 (%2)
+      
+    
+  
+  
+    Calamares::BlankViewStep
+    
+      
+      Blank Page
+      
+    
+  
+  
+    Calamares::DebugWindow
+    
+      
+      Form
+      
+    
+    
+      
+      GlobalStorage
+      
+    
+    
+      
+      JobQueue
+      
+    
+    
+      
+      Modules
+      
+    
+    
+      
+      Type:
+      
+    
+    
+      
+      
+      none
+      
+    
+    
+      
+      Interface:
+      
+    
+    
+      
+      Crashes Calamares, so that Dr. Konqui can look at it.
+      
+    
+    
+      
+      Reloads the stylesheet from the branding directory.
+      
+    
+    
+      
+      Uploads the session log to the configured pastebin.
+      
+    
+    
+      
+      Send Session Log
+      
+    
+    
+      
+      Reload Stylesheet
+      
+    
+    
+      
+      Displays the tree of widget names in the log (for stylesheet debugging).
+      
+    
+    
+      
+      Widget Tree
+      
+    
+    
+      
+      Debug information
+      
+    
+  
+  
+    Calamares::ExecutionViewStep
+    
+      
+      Set up
+      
+    
+    
+      
+      Install
+      
+    
+  
+  
+    Calamares::FailJob
+    
+      
+      Job failed (%1)
+      
+    
+    
+      
+      Programmed job failure was explicitly requested.
+      
+    
+  
+  
+    Calamares::JobThread
+    
+      
+      Done
+      
+    
+  
+  
+    Calamares::NamedJob
+    
+      
+      Example job (%1)
+      
+    
+  
+  
+    Calamares::ProcessJob
+    
+      
+      Run command '%1' in target system.
+      
+    
+    
+      
+       Run command '%1'.
+      
+    
+    
+      
+      Running command %1 %2
+      
+    
+  
+  
+    Calamares::PythonJob
+    
+      
+      Running %1 operation.
+      
+    
+    
+      
+      Bad working directory path
+      
+    
+    
+      
+      Working directory %1 for python job %2 is not readable.
+      
+    
+    
+      
+      Bad main script file
+      
+    
+    
+      
+      Main script file %1 for python job %2 is not readable.
+      
+    
+    
+      
+      Boost.Python error in job "%1".
+      
+    
+  
+  
+    Calamares::QmlViewStep
+    
+      
+      Loading ...
+      
+    
+    
+      
+      QML Step <i>%1</i>.
+      
+    
+    
+      
+      Loading failed.
+      
+    
+  
+  
+    Calamares::RequirementsChecker
+    
+      
+      Requirements checking for module <i>%1</i> is complete.
+      
+    
+    
+      
+      Waiting for %n module(s).
+      
+        
+      
+    
+    
+      
+      (%n second(s))
+      
+        
+      
+    
+    
+      
+      System-requirements checking is complete.
+      
+    
+  
+  
+    Calamares::ViewManager
+    
+      
+      Setup Failed
+      
+    
+    
+      
+      Installation Failed
+      
+    
+    
+      
+      Would you like to paste the install log to the web?
+      
+    
+    
+      
+      Error
+      
+    
+    
+      
+      
+      &Yes
+      
+    
+    
+      
+      
+      &No
+      
+    
+    
+      
+      &Close
+      
+    
+    
+      
+      Install Log Paste URL
+      
+    
+    
+      
+      The upload was unsuccessful. No web-paste was done.
+      
+    
+    
+      
+      Install log posted to
+
+%1
+
+Link copied to clipboard
+      
+    
+    
+      
+      Calamares Initialization Failed
+      
+    
+    
+      
+      %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
+      
+    
+    
+      
+      <br/>The following modules could not be loaded:
+      
+    
+    
+      
+      Continue with setup?
+      
+    
+    
+      
+      Continue with installation?
+      
+    
+    
+      
+      The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
+      
+    
+    
+      
+      The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
+      
+    
+    
+      
+      &Set up now
+      
+    
+    
+      
+      &Install now
+      
+    
+    
+      
+      Go &back
+      
+    
+    
+      
+      &Set up
+      
+    
+    
+      
+      &Install
+      
+    
+    
+      
+      Setup is complete. Close the setup program.
+      
+    
+    
+      
+      The installation is complete. Close the installer.
+      
+    
+    
+      
+      Cancel setup without changing the system.
+      
+    
+    
+      
+      Cancel installation without changing the system.
+      
+    
+    
+      
+      &Next
+      
+    
+    
+      
+      &Back
+      
+    
+    
+      
+      &Done
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      Cancel setup?
+      
+    
+    
+      
+      Cancel installation?
+      
+    
+    
+      
+      Do you really want to cancel the current setup process?
+The setup program will quit and all changes will be lost.
+      
+    
+    
+      
+      Do you really want to cancel the current install process?
+The installer will quit and all changes will be lost.
+      
+    
+  
+  
+    CalamaresPython::Helper
+    
+      
+      Unknown exception type
+      
+    
+    
+      
+      unparseable Python error
+      
+    
+    
+      
+      unparseable Python traceback
+      
+    
+    
+      
+      Unfetchable Python error.
+      
+    
+  
+  
+    CalamaresWindow
+    
+      
+      %1 Setup Program
+      
+    
+    
+      
+      %1 Installer
+      
+    
+  
+  
+    ChangeFilesystemLabelJob
+    
+      
+      Set filesystem label on %1.
+      
+    
+    
+      
+      Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+      
+    
+    
+      
+      The installer failed to update partition table on disk '%1'.
+      
+    
+  
+  
+    CheckerContainer
+    
+      
+      Gathering system information...
+      
+    
+  
+  
+    ChoicePage
+    
+      
+      Form
+      
+    
+    
+      
+      Select storage de&vice:
+      
+    
+    
+      
+      
+      
+      
+      Current:
+      
+    
+    
+      
+      After:
+      
+    
+    
+      
+      <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
+      
+    
+    
+      
+      Reuse %1 as home partition for %2.
+      
+    
+    
+      
+      <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
+      
+    
+    
+      
+      %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
+      
+    
+    
+      
+      Boot loader location:
+      
+    
+    
+      
+      <strong>Select a partition to install on</strong>
+      
+    
+    
+      
+      An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
+      
+    
+    
+      
+      The EFI system partition at %1 will be used for starting %2.
+      
+    
+    
+      
+      EFI system partition:
+      
+    
+    
+      
+      This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      
+      
+      
+      <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
+      
+    
+    
+      
+      
+      
+      
+      <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
+      
+    
+    
+      
+      
+      
+      
+      <strong>Replace a partition</strong><br/>Replaces a partition with %1.
+      
+    
+    
+      
+      This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
+      
+    
+    
+      
+      This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
+      
+    
+    
+      
+      This storage device has one of its partitions <strong>mounted</strong>.
+      
+    
+    
+      
+      This storage device is a part of an <strong>inactive RAID</strong> device.
+      
+    
+    
+      
+      No Swap
+      
+    
+    
+      
+      Reuse Swap
+      
+    
+    
+      
+      Swap (no Hibernate)
+      
+    
+    
+      
+      Swap (with Hibernate)
+      
+    
+    
+      
+      Swap to file
+      
+    
+  
+  
+    ClearMountsJob
+    
+      
+      Clear mounts for partitioning operations on %1
+      
+    
+    
+      
+      Clearing mounts for partitioning operations on %1.
+      
+    
+    
+      
+      Cleared all mounts for %1
+      
+    
+  
+  
+    ClearTempMountsJob
+    
+      
+      Clear all temporary mounts.
+      
+    
+    
+      
+      Clearing all temporary mounts.
+      
+    
+    
+      
+      Cannot get list of temporary mounts.
+      
+    
+    
+      
+      Cleared all temporary mounts.
+      
+    
+  
+  
+    CommandList
+    
+      
+      
+      Could not run command.
+      
+    
+    
+      
+      The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.
+      
+    
+    
+      
+      The command needs to know the user's name, but no username is defined.
+      
+    
+  
+  
+    Config
+    
+      
+      Set keyboard model to %1.<br/>
+      
+    
+    
+      
+      Set keyboard layout to %1/%2.
+      
+    
+    
+      
+      Set timezone to %1/%2.
+      
+    
+    
+      
+      The system language will be set to %1.
+      
+    
+    
+      
+      The numbers and dates locale will be set to %1.
+      
+    
+    
+      
+      Network Installation. (Disabled: Incorrect configuration)
+      
+    
+    
+      
+      Network Installation. (Disabled: Received invalid groups data)
+      
+    
+    
+      
+      Network Installation. (Disabled: Internal error)
+      
+    
+    
+      
+      Network Installation. (Disabled: No package list)
+      
+    
+    
+      
+      Package selection
+      
+    
+    
+      
+      Network Installation. (Disabled: Unable to fetch package lists, check your network connection)
+      
+    
+    
+      
+      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
+      
+    
+    
+      
+      This program will ask you some questions and set up %2 on your computer.
+      
+    
+    
+      
+      <h1>Welcome to the Calamares setup program for %1</h1>
+      
+    
+    
+      
+      <h1>Welcome to %1 setup</h1>
+      
+    
+    
+      
+      <h1>Welcome to the Calamares installer for %1</h1>
+      
+    
+    
+      
+      <h1>Welcome to the %1 installer</h1>
+      
+    
+    
+      
+      Your username is too long.
+      
+    
+    
+      
+      '%1' is not allowed as username.
+      
+    
+    
+      
+      Your username must start with a lowercase letter or underscore.
+      
+    
+    
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      Your hostname is too short.
+      
+    
+    
+      
+      Your hostname is too long.
+      
+    
+    
+      
+      '%1' is not allowed as hostname.
+      
+    
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      Your passwords do not match!
+      
+    
+    
+      
+      OK!
+      
+    
+    
+      
+      Setup Failed
+      
+    
+    
+      
+      Installation Failed
+      
+    
+    
+      
+      The setup of %1 did not complete successfully.
+      
+    
+    
+      
+      The installation of %1 did not complete successfully.
+      
+    
+    
+      
+      Setup Complete
+      
+    
+    
+      
+      Installation Complete
+      
+    
+    
+      
+      The setup of %1 is complete.
+      
+    
+    
+      
+      The installation of %1 is complete.
+      
+    
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
+  
+  
+    ContextualProcessJob
+    
+      
+      Contextual Processes Job
+      
+    
+  
+  
+    CreatePartitionDialog
+    
+      
+      Create a Partition
+      
+    
+    
+      
+      Si&ze:
+      
+    
+    
+      
+       MiB
+      
+    
+    
+      
+      Partition &Type:
+      
+    
+    
+      
+      &Primary
+      
+    
+    
+      
+      E&xtended
+      
+    
+    
+      
+      Fi&le System:
+      
+    
+    
+      
+      LVM LV name
+      
+    
+    
+      
+      &Mount Point:
+      
+    
+    
+      
+      Flags:
+      
+    
+    
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
+      En&crypt
+      
+    
+    
+      
+      Logical
+      
+    
+    
+      
+      Primary
+      
+    
+    
+      
+      GPT
+      
+    
+    
+      
+      Mountpoint already in use. Please select another one.
+      
+    
+  
+  
+    CreatePartitionJob
+    
+      
+      Create new %1MiB partition on %3 (%2) with entries %4.
+      
+    
+    
+      
+      Create new %1MiB partition on %3 (%2).
+      
+    
+    
+      
+      Create new %2MiB partition on %4 (%3) with file system %1.
+      
+    
+    
+      
+      Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
+      
+    
+    
+      
+      Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
+      
+    
+    
+      
+      Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
+      
+    
+    
+      
+      
+      Creating new %1 partition on %2.
+      
+    
+    
+      
+      The installer failed to create partition on disk '%1'.
+      
+    
+  
+  
+    CreatePartitionTableDialog
+    
+      
+      Create Partition Table
+      
+    
+    
+      
+      Creating a new partition table will delete all existing data on the disk.
+      
+    
+    
+      
+      What kind of partition table do you want to create?
+      
+    
+    
+      
+      Master Boot Record (MBR)
+      
+    
+    
+      
+      GUID Partition Table (GPT)
+      
+    
+  
+  
+    CreatePartitionTableJob
+    
+      
+      Create new %1 partition table on %2.
+      
+    
+    
+      
+      Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3).
+      
+    
+    
+      
+      Creating new %1 partition table on %2.
+      
+    
+    
+      
+      The installer failed to create a partition table on %1.
+      
+    
+  
+  
+    CreateUserJob
+    
+      
+      Create user %1
+      
+    
+    
+      
+      Create user <strong>%1</strong>.
+      
+    
+    
+      
+      Preserving home directory
+      
+    
+    
+      
+      
+      Creating user %1
+      
+    
+    
+      
+      Configuring user %1
+      
+    
+    
+      
+      Setting file permissions
+      
+    
+  
+  
+    CreateVolumeGroupDialog
+    
+      
+      Create Volume Group
+      
+    
+  
+  
+    CreateVolumeGroupJob
+    
+      
+      Create new volume group named %1.
+      
+    
+    
+      
+      Create new volume group named <strong>%1</strong>.
+      
+    
+    
+      
+      Creating new volume group named %1.
+      
+    
+    
+      
+      The installer failed to create a volume group named '%1'.
+      
+    
+  
+  
+    DeactivateVolumeGroupJob
+    
+      
+      
+      Deactivate volume group named %1.
+      
+    
+    
+      
+      Deactivate volume group named <strong>%1</strong>.
+      
+    
+    
+      
+      The installer failed to deactivate a volume group named %1.
+      
+    
+  
+  
+    DeletePartitionJob
+    
+      
+      Delete partition %1.
+      
+    
+    
+      
+      Delete partition <strong>%1</strong>.
+      
+    
+    
+      
+      Deleting partition %1.
+      
+    
+    
+      
+      The installer failed to delete partition %1.
+      
+    
+  
+  
+    DeviceInfoWidget
+    
+      
+      This device has a <strong>%1</strong> partition table.
+      
+    
+    
+      
+      This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem.
+      
+    
+    
+      
+      This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page.
+      
+    
+    
+      
+      <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment.
+      
+    
+    
+      
+      <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions.
+      
+    
+    
+      
+      The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred.
+      
+    
+  
+  
+    DeviceModel
+    
+      
+      %1 - %2 (%3)
+      device[name] - size[number] (device-node[name])
+      
+    
+    
+      
+      %1 - (%2)
+      device[name] - (device-node[name])
+      
+    
+  
+  
+    DracutLuksCfgJob
+    
+      
+      Write LUKS configuration for Dracut to %1
+      
+    
+    
+      
+      Skip writing LUKS configuration for Dracut: "/" partition is not encrypted
+      
+    
+    
+      
+      Failed to open %1
+      
+    
+  
+  
+    DummyCppJob
+    
+      
+      Dummy C++ Job
+      
+    
+  
+  
+    EditExistingPartitionDialog
+    
+      
+      Edit Existing Partition
+      
+    
+    
+      
+      Content:
+      
+    
+    
+      
+      &Keep
+      
+    
+    
+      
+      Format
+      
+    
+    
+      
+      Warning: Formatting the partition will erase all existing data.
+      
+    
+    
+      
+      &Mount Point:
+      
+    
+    
+      
+      Si&ze:
+      
+    
+    
+      
+       MiB
+      
+    
+    
+      
+      Fi&le System:
+      
+    
+    
+      
+      Flags:
+      
+    
+    
+      
+      Label for the filesystem
+      
+    
+    
+      
+      FS Label:
+      
+    
+    
+      
+      Mountpoint already in use. Please select another one.
+      
+    
+  
+  
+    EncryptWidget
+    
+      
+      Form
+      
+    
+    
+      
+      En&crypt system
+      
+    
+    
+      
+      Passphrase
+      
+    
+    
+      
+      Confirm passphrase
+      
+    
+    
+      
+      
+      Please enter the same passphrase in both boxes.
+      
+    
+  
+  
+    FillGlobalStorageJob
+    
+      
+      Set partition information
+      
+    
+    
+      
+      Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
+      
+    
+    
+      
+      Install %1 on <strong>new</strong> %2 system partition.
+      
+    
+    
+      
+      Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
+      
+    
+    
+      
+      Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
+      
+    
+    
+      
+      Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
+      
+    
+    
+      
+      Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
+      
+    
+    
+      
+      Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
+      
+    
+    
+      
+      Install %2 on %3 system partition <strong>%1</strong>.
+      
+    
+    
+      
+      Install boot loader on <strong>%1</strong>.
+      
+    
+    
+      
+      Setting up mount points.
+      
+    
+  
+  
+    FinishedPage
+    
+      
+      Form
+      
+    
+    
+      
+      &Restart now
+      
+    
+    
+      
+      <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system.
+      
+    
+    
+      
+      <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html>
+      
+    
+    
+      
+      <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment.
+      
+    
+    
+      
+      <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html>
+      
+    
+    
+      
+      <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2.
+      
+    
+    
+      
+      <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2.
+      
+    
+  
+  
+    FinishedQmlViewStep
+    
+      
+      Finish
+      
+    
+  
+  
+    FinishedViewStep
+    
+      
+      Finish
+      
+    
+  
+  
+    FormatPartitionJob
+    
+      
+      Format partition %1 (file system: %2, size: %3 MiB) on %4.
+      
+    
+    
+      
+      Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.
+      
+    
+    
+      
+      Formatting partition %1 with file system %2.
+      
+    
+    
+      
+      The installer failed to format partition %1 on disk '%2'.
+      
+    
+  
+  
+    GeneralRequirements
+    
+      
+      has at least %1 GiB available drive space
+      
+    
+    
+      
+      There is not enough drive space. At least %1 GiB is required.
+      
+    
+    
+      
+      has at least %1 GiB working memory
+      
+    
+    
+      
+      The system does not have enough working memory. At least %1 GiB is required.
+      
+    
+    
+      
+      is plugged in to a power source
+      
+    
+    
+      
+      The system is not plugged in to a power source.
+      
+    
+    
+      
+      is connected to the Internet
+      
+    
+    
+      
+      The system is not connected to the Internet.
+      
+    
+    
+      
+      is running the installer as an administrator (root)
+      
+    
+    
+      
+      The setup program is not running with administrator rights.
+      
+    
+    
+      
+      The installer is not running with administrator rights.
+      
+    
+    
+      
+      has a screen large enough to show the whole installer
+      
+    
+    
+      
+      The screen is too small to display the setup program.
+      
+    
+    
+      
+      The screen is too small to display the installer.
+      
+    
+  
+  
+    HostInfoJob
+    
+      
+      Collecting information about your machine.
+      
+    
+  
+  
+    IDJob
+    
+      
+      
+      
+      
+      OEM Batch Identifier
+      
+    
+    
+      
+      Could not create directories <code>%1</code>.
+      
+    
+    
+      
+      Could not open file <code>%1</code>.
+      
+    
+    
+      
+      Could not write to file <code>%1</code>.
+      
+    
+  
+  
+    InitcpioJob
+    
+      
+      Creating initramfs with mkinitcpio.
+      
+    
+  
+  
+    InitramfsJob
+    
+      
+      Creating initramfs.
+      
+    
+  
+  
+    InteractiveTerminalPage
+    
+      
+      Konsole not installed
+      
+    
+    
+      
+      Please install KDE Konsole and try again!
+      
+    
+    
+      
+      Executing script: &nbsp;<code>%1</code>
+      
+    
+  
+  
+    InteractiveTerminalViewStep
+    
+      
+      Script
+      
+    
+  
+  
+    KeyboardQmlViewStep
+    
+      
+      Keyboard
+      
+    
+  
+  
+    KeyboardViewStep
+    
+      
+      Keyboard
+      
+    
+  
+  
+    LCLocaleDialog
+    
+      
+      System locale setting
+      
+    
+    
+      
+      The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>.
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &OK
+      
+    
+  
+  
+    LicensePage
+    
+      
+      Form
+      
+    
+    
+      
+      <h1>License Agreement</h1>
+      
+    
+    
+      
+      I accept the terms and conditions above.
+      
+    
+    
+      
+      Please review the End User License Agreements (EULAs).
+      
+    
+    
+      
+      This setup procedure will install proprietary software that is subject to licensing terms.
+      
+    
+    
+      
+      If you do not agree with the terms, the setup procedure cannot continue.
+      
+    
+    
+      
+      This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
+      
+    
+    
+      
+      If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
+      
+    
+  
+  
+    LicenseViewStep
+    
+      
+      License
+      
+    
+  
+  
+    LicenseWidget
+    
+      
+      URL: %1
+      
+    
+    
+      
+      <strong>%1 driver</strong><br/>by %2
+      %1 is an untranslatable product name, example: Creative Audigy driver
+      
+    
+    
+      
+      <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font>
+      %1 is usually a vendor name, example: Nvidia graphics driver
+      
+    
+    
+      
+      <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      <strong>%1 codec</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      <strong>%1 package</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      <strong>%1</strong><br/><font color="Grey">by %2</font>
+      
+    
+    
+      
+      File: %1
+      
+    
+    
+      
+      Hide license text
+      
+    
+    
+      
+      Show the license text
+      
+    
+    
+      
+      Open license agreement in browser.
+      
+    
+  
+  
+    LocalePage
+    
+      
+      Region:
+      
+    
+    
+      
+      Zone:
+      
+    
+    
+      
+      
+      &Change...
+      
+    
+  
+  
+    LocaleQmlViewStep
+    
+      
+      Location
+      
+    
+  
+  
+    LocaleTests
+    
+      
+      Quit
+      
+    
+  
+  
+    LocaleViewStep
+    
+      
+      Location
+      
+    
+  
+  
+    LuksBootKeyFileJob
+    
+      
+      Configuring LUKS key file.
+      
+    
+    
+      
+      
+      No partitions are defined.
+      
+    
+    
+      
+      
+      
+      Encrypted rootfs setup error
+      
+    
+    
+      
+      Root partition %1 is LUKS but no passphrase has been set.
+      
+    
+    
+      
+      Could not create LUKS key file for root partition %1.
+      
+    
+    
+      
+      Could not configure LUKS key file on partition %1.
+      
+    
+  
+  
+    MachineIdJob
+    
+      
+      Generate machine-id.
+      
+    
+    
+      
+      Configuration Error
+      
+    
+    
+      
+      No root mount point is set for MachineId.
+      
+    
+  
+  
+    Map
+    
+      
+      Timezone: %1
+      
+    
+    
+      
+      Please select your preferred location on the map so the installer can suggest the locale
+            and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging
+            to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.
+      
+    
+  
+  
+    NetInstallViewStep
+    
+      
+      Package selection
+      
+    
+    
+      
+      Office software
+      
+    
+    
+      
+      Office package
+      
+    
+    
+      
+      Browser software
+      
+    
+    
+      
+      Browser package
+      
+    
+    
+      
+      Web browser
+      
+    
+    
+      
+      Kernel
+      
+    
+    
+      
+      Services
+      
+    
+    
+      
+      Login
+      
+    
+    
+      
+      Desktop
+      
+    
+    
+      
+      Applications
+      
+    
+    
+      
+      Communication
+      
+    
+    
+      
+      Development
+      
+    
+    
+      
+      Office
+      
+    
+    
+      
+      Multimedia
+      
+    
+    
+      
+      Internet
+      
+    
+    
+      
+      Theming
+      
+    
+    
+      
+      Gaming
+      
+    
+    
+      
+      Utilities
+      
+    
+  
+  
+    NotesQmlViewStep
+    
+      
+      Notes
+      
+    
+  
+  
+    OEMPage
+    
+      
+      Ba&tch:
+      
+    
+    
+      
+      <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html>
+      
+    
+    
+      
+      <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html>
+      
+    
+  
+  
+    OEMViewStep
+    
+      
+      OEM Configuration
+      
+    
+    
+      
+      Set the OEM Batch Identifier to <code>%1</code>.
+      
+    
+  
+  
+    Offline
+    
+      
+      Select your preferred Region, or use the default settings.
+      
+    
+    
+      
+      
+      
+      Timezone: %1
+      
+    
+    
+      
+      Select your preferred Zone within your Region.
+      
+    
+    
+      
+      Zones
+      
+    
+    
+      
+      You can fine-tune Language and Locale settings below.
+      
+    
+  
+  
+    PWQ
+    
+      
+      Password is too short
+      
+    
+    
+      
+      Password is too long
+      
+    
+    
+      
+      Password is too weak
+      
+    
+    
+      
+      Memory allocation error when setting '%1'
+      
+    
+    
+      
+      Memory allocation error
+      
+    
+    
+      
+      The password is the same as the old one
+      
+    
+    
+      
+      The password is a palindrome
+      
+    
+    
+      
+      The password differs with case changes only
+      
+    
+    
+      
+      The password is too similar to the old one
+      
+    
+    
+      
+      The password contains the user name in some form
+      
+    
+    
+      
+      The password contains words from the real name of the user in some form
+      
+    
+    
+      
+      The password contains forbidden words in some form
+      
+    
+    
+      
+      The password contains too few digits
+      
+    
+    
+      
+      The password contains too few uppercase letters
+      
+    
+    
+      
+      The password contains fewer than %n lowercase letters
+      
+        
+      
+    
+    
+      
+      The password contains too few lowercase letters
+      
+    
+    
+      
+      The password contains too few non-alphanumeric characters
+      
+    
+    
+      
+      The password is too short
+      
+    
+    
+      
+      The password does not contain enough character classes
+      
+    
+    
+      
+      The password contains too many same characters consecutively
+      
+    
+    
+      
+      The password contains too many characters of the same class consecutively
+      
+    
+    
+      
+      The password contains fewer than %n digits
+      
+        
+      
+    
+    
+      
+      The password contains fewer than %n uppercase letters
+      
+        
+      
+    
+    
+      
+      The password contains fewer than %n non-alphanumeric characters
+      
+        
+      
+    
+    
+      
+      The password is shorter than %n characters
+      
+        
+      
+    
+    
+      
+      The password is a rotated version of the previous one
+      
+    
+    
+      
+      The password contains fewer than %n character classes
+      
+        
+      
+    
+    
+      
+      The password contains more than %n same characters consecutively
+      
+        
+      
+    
+    
+      
+      The password contains more than %n characters of the same class consecutively
+      
+        
+      
+    
+    
+      
+      The password contains monotonic sequence longer than %n characters
+      
+        
+      
+    
+    
+      
+      The password contains too long of a monotonic character sequence
+      
+    
+    
+      
+      No password supplied
+      
+    
+    
+      
+      Cannot obtain random numbers from the RNG device
+      
+    
+    
+      
+      Password generation failed - required entropy too low for settings
+      
+    
+    
+      
+      The password fails the dictionary check - %1
+      
+    
+    
+      
+      The password fails the dictionary check
+      
+    
+    
+      
+      Unknown setting - %1
+      
+    
+    
+      
+      Unknown setting
+      
+    
+    
+      
+      Bad integer value of setting - %1
+      
+    
+    
+      
+      Bad integer value
+      
+    
+    
+      
+      Setting %1 is not of integer type
+      
+    
+    
+      
+      Setting is not of integer type
+      
+    
+    
+      
+      Setting %1 is not of string type
+      
+    
+    
+      
+      Setting is not of string type
+      
+    
+    
+      
+      Opening the configuration file failed
+      
+    
+    
+      
+      The configuration file is malformed
+      
+    
+    
+      
+      Fatal failure
+      
+    
+    
+      
+      Unknown error
+      
+    
+    
+      
+      Password is empty
+      
+    
+  
+  
+    PackageChooserPage
+    
+      
+      Form
+      
+    
+    
+      
+      Product Name
+      
+    
+    
+      
+      TextLabel
+      
+    
+    
+      
+      Long Product Description
+      
+    
+    
+      
+      Package Selection
+      
+    
+    
+      
+      Please pick a product from the list. The selected product will be installed.
+      
+    
+  
+  
+    PackageChooserViewStep
+    
+      
+      Packages
+      
+    
+  
+  
+    PackageModel
+    
+      
+      Name
+      
+    
+    
+      
+      Description
+      
+    
+  
+  
+    Page_Keyboard
+    
+      
+      Form
+      
+    
+    
+      
+      Keyboard Model:
+      
+    
+    
+      
+      Type here to test your keyboard
+      
+    
+  
+  
+    Page_UserSetup
+    
+      
+      Form
+      
+    
+    
+      
+      What is your name?
+      
+    
+    
+      
+      Your Full Name
+      
+    
+    
+      
+      What name do you want to use to log in?
+      
+    
+    
+      
+      login
+      
+    
+    
+      
+      What is the name of this computer?
+      
+    
+    
+      
+      <small>This name will be used if you make the computer visible to others on a network.</small>
+      
+    
+    
+      
+      Computer Name
+      
+    
+    
+      
+      Choose a password to keep your account safe.
+      
+    
+    
+      
+      
+      <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small>
+      
+    
+    
+      
+      
+      Password
+      
+    
+    
+      
+      
+      Repeat Password
+      
+    
+    
+      
+      When this box is checked, password-strength checking is done and you will not be able to use a weak password.
+      
+    
+    
+      
+      Require strong passwords.
+      
+    
+    
+      
+      Log in automatically without asking for the password.
+      
+    
+    
+      
+      Use the same password for the administrator account.
+      
+    
+    
+      
+      Choose a password for the administrator account.
+      
+    
+    
+      
+      
+      <small>Enter the same password twice, so that it can be checked for typing errors.</small>
+      
+    
+  
+  
+    PartitionLabelsView
+    
+      
+      Root
+      
+    
+    
+      
+      Home
+      
+    
+    
+      
+      Boot
+      
+    
+    
+      
+      EFI system
+      
+    
+    
+      
+      Swap
+      
+    
+    
+      
+      New partition for %1
+      
+    
+    
+      
+      New partition
+      
+    
+    
+      
+      %1  %2
+      size[number] filesystem[name]
+      
+    
+  
+  
+    PartitionModel
+    
+      
+      
+      Free Space
+      
+    
+    
+      
+      
+      New partition
+      
+    
+    
+      
+      Name
+      
+    
+    
+      
+      File System
+      
+    
+    
+      
+      File System Label
+      
+    
+    
+      
+      Mount Point
+      
+    
+    
+      
+      Size
+      
+    
+  
+  
+    PartitionPage
+    
+      
+      Form
+      
+    
+    
+      
+      Storage de&vice:
+      
+    
+    
+      
+      &Revert All Changes
+      
+    
+    
+      
+      New Partition &Table
+      
+    
+    
+      
+      Cre&ate
+      
+    
+    
+      
+      &Edit
+      
+    
+    
+      
+      &Delete
+      
+    
+    
+      
+      New Volume Group
+      
+    
+    
+      
+      Resize Volume Group
+      
+    
+    
+      
+      Deactivate Volume Group
+      
+    
+    
+      
+      Remove Volume Group
+      
+    
+    
+      
+      I&nstall boot loader on:
+      
+    
+    
+      
+      Are you sure you want to create a new partition table on %1?
+      
+    
+    
+      
+      Can not create new partition
+      
+    
+    
+      
+      The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
+      
+    
+  
+  
+    PartitionViewStep
+    
+      
+      Gathering system information...
+      
+    
+    
+      
+      Partitions
+      
+    
+    
+      
+      Install %1 <strong>alongside</strong> another operating system.
+      
+    
+    
+      
+      <strong>Erase</strong> disk and install %1.
+      
+    
+    
+      
+      <strong>Replace</strong> a partition with %1.
+      
+    
+    
+      
+      <strong>Manual</strong> partitioning.
+      
+    
+    
+      
+      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+    
+    
+      
+      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+    
+    
+      
+      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+    
+    
+      
+      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+    
+    
+      
+      Disk <strong>%1</strong> (%2)
+      
+    
+    
+      
+      Current:
+      
+    
+    
+      
+      After:
+      
+    
+    
+      
+      No EFI system partition configured
+      
+    
+    
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+    
+    
+      
+      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+    
+    
+      
+      EFI system partition flag not set
+      
+    
+    
+      
+      Option to use GPT on BIOS
+      
+    
+    
+      
+      A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
+      
+    
+    
+      
+      Boot partition not encrypted
+      
+    
+    
+      
+      A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
+      
+    
+    
+      
+      has at least one disk device available.
+      
+    
+    
+      
+      There are no partitions to install on.
+      
+    
+  
+  
+    PlasmaLnfJob
+    
+      
+      Plasma Look-and-Feel Job
+      
+    
+    
+      
+      
+      Could not select KDE Plasma Look-and-Feel package
+      
+    
+  
+  
+    PlasmaLnfPage
+    
+      
+      Form
+      
+    
+    
+      
+      Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.
+      
+    
+    
+      
+      Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.
+      
+    
+  
+  
+    PlasmaLnfViewStep
+    
+      
+      Look-and-Feel
+      
+    
+  
+  
+    PreserveFiles
+    
+      
+      Saving files for later ...
+      
+    
+    
+      
+      No files configured to save for later.
+      
+    
+    
+      
+      Not all of the configured files could be preserved.
+      
+    
+  
+  
+    ProcessResult
+    
+      
+      
+There was no output from the command.
+      
+    
+    
+      
+      
+Output:
+
+      
+    
+    
+      
+      External command crashed.
+      
+    
+    
+      
+      Command <i>%1</i> crashed.
+      
+    
+    
+      
+      External command failed to start.
+      
+    
+    
+      
+      Command <i>%1</i> failed to start.
+      
+    
+    
+      
+      Internal error when starting command.
+      
+    
+    
+      
+      Bad parameters for process job call.
+      
+    
+    
+      
+      External command failed to finish.
+      
+    
+    
+      
+      Command <i>%1</i> failed to finish in %2 seconds.
+      
+    
+    
+      
+      External command finished with errors.
+      
+    
+    
+      
+      Command <i>%1</i> finished with exit code %2.
+      
+    
+  
+  
+    QObject
+    
+      
+      %1 (%2)
+      
+    
+    
+      
+      unknown
+      
+    
+    
+      
+      extended
+      
+    
+    
+      
+      unformatted
+      
+    
+    
+      
+      swap
+      
+    
+    
+      
+      
+      Default
+      
+    
+    
+      
+      
+      
+      
+      File not found
+      
+    
+    
+      
+      Path <pre>%1</pre> must be an absolute path.
+      
+    
+    
+      
+      Directory not found
+      
+    
+    
+      
+      
+      Could not create new random file <pre>%1</pre>.
+      
+    
+    
+      
+      No product
+      
+    
+    
+      
+      No description provided.
+      
+    
+    
+      
+      (no mount point)
+      
+    
+    
+      
+      Unpartitioned space or unknown partition table
+      
+    
+  
+  
+    Recommended
+    
+      
+      <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
+        Setup can continue, but some features might be disabled.</p>
+      
+    
+  
+  
+    RemoveUserJob
+    
+      
+      Remove live user from target system
+      
+    
+  
+  
+    RemoveVolumeGroupJob
+    
+      
+      
+      Remove Volume Group named %1.
+      
+    
+    
+      
+      Remove Volume Group named <strong>%1</strong>.
+      
+    
+    
+      
+      The installer failed to remove a volume group named '%1'.
+      
+    
+  
+  
+    ReplaceWidget
+    
+      
+      Form
+      
+    
+    
+      
+      Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition.
+      
+    
+    
+      
+      The selected item does not appear to be a valid partition.
+      
+    
+    
+      
+      %1 cannot be installed on empty space. Please select an existing partition.
+      
+    
+    
+      
+      %1 cannot be installed on an extended partition. Please select an existing primary or logical partition.
+      
+    
+    
+      
+      %1 cannot be installed on this partition.
+      
+    
+    
+      
+      Data partition (%1)
+      
+    
+    
+      
+      Unknown system partition (%1)
+      
+    
+    
+      
+      %1 system partition (%2)
+      
+    
+    
+      
+      <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.
+      
+    
+    
+      
+      <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
+      
+    
+    
+      
+      
+      
+      <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost.
+      
+    
+    
+      
+      The EFI system partition at %1 will be used for starting %2.
+      
+    
+    
+      
+      EFI system partition:
+      
+    
+  
+  
+    Requirements
+    
+      
+      <p>This computer does not satisfy the minimum requirements for installing %1.<br/>
+        Installation cannot continue.</p>
+      
+    
+    
+      
+      <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
+        Setup can continue, but some features might be disabled.</p>
+      
+    
+  
+  
+    ResizeFSJob
+    
+      
+      Resize Filesystem Job
+      
+    
+    
+      
+      Invalid configuration
+      
+    
+    
+      
+      The file-system resize job has an invalid configuration and will not run.
+      
+    
+    
+      
+      KPMCore not Available
+      
+    
+    
+      
+      Calamares cannot start KPMCore for the file-system resize job.
+      
+    
+    
+      
+      
+      
+      
+      
+      Resize Failed
+      
+    
+    
+      
+      The filesystem %1 could not be found in this system, and cannot be resized.
+      
+    
+    
+      
+      The device %1 could not be found in this system, and cannot be resized.
+      
+    
+    
+      
+      
+      The filesystem %1 cannot be resized.
+      
+    
+    
+      
+      
+      The device %1 cannot be resized.
+      
+    
+    
+      
+      The filesystem %1 must be resized, but cannot.
+      
+    
+    
+      
+      The device %1 must be resized, but cannot
+      
+    
+  
+  
+    ResizePartitionJob
+    
+      
+      Resize partition %1.
+      
+    
+    
+      
+      Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.
+      
+    
+    
+      
+      Resizing %2MiB partition %1 to %3MiB.
+      
+    
+    
+      
+      The installer failed to resize partition %1 on disk '%2'.
+      
+    
+  
+  
+    ResizeVolumeGroupDialog
+    
+      
+      Resize Volume Group
+      
+    
+  
+  
+    ResizeVolumeGroupJob
+    
+      
+      
+      Resize volume group named %1 from %2 to %3.
+      
+    
+    
+      
+      Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>.
+      
+    
+    
+      
+      The installer failed to resize a volume group named '%1'.
+      
+    
+  
+  
+    ResultsListDialog
+    
+      
+      For best results, please ensure that this computer:
+      
+    
+    
+      
+      System requirements
+      
+    
+  
+  
+    ResultsListWidget
+    
+      
+      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
+      
+    
+    
+      
+      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
+      
+    
+    
+      
+      This program will ask you some questions and set up %2 on your computer.
+      
+    
+  
+  
+    ScanningDialog
+    
+      
+      Scanning storage devices...
+      
+    
+    
+      
+      Partitioning
+      
+    
+  
+  
+    SetHostNameJob
+    
+      
+      Set hostname %1
+      
+    
+    
+      
+      Set hostname <strong>%1</strong>.
+      
+    
+    
+      
+      Setting hostname %1.
+      
+    
+    
+      
+      
+      Internal Error
+      
+    
+    
+      
+      
+      Cannot write hostname to target system
+      
+    
+  
+  
+    SetKeyboardLayoutJob
+    
+      
+      Set keyboard model to %1, layout to %2-%3
+      
+    
+    
+      
+      Failed to write keyboard configuration for the virtual console.
+      
+    
+    
+      
+      
+      
+      Failed to write to %1
+      
+    
+    
+      
+      Failed to write keyboard configuration for X11.
+      
+    
+    
+      
+      Failed to write keyboard configuration to existing /etc/default directory.
+      
+    
+  
+  
+    SetPartFlagsJob
+    
+      
+      Set flags on partition %1.
+      
+    
+    
+      
+      Set flags on %1MiB %2 partition.
+      
+    
+    
+      
+      Set flags on new partition.
+      
+    
+    
+      
+      Clear flags on partition <strong>%1</strong>.
+      
+    
+    
+      
+      Clear flags on %1MiB <strong>%2</strong> partition.
+      
+    
+    
+      
+      Clear flags on new partition.
+      
+    
+    
+      
+      Flag partition <strong>%1</strong> as <strong>%2</strong>.
+      
+    
+    
+      
+      Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.
+      
+    
+    
+      
+      Flag new partition as <strong>%1</strong>.
+      
+    
+    
+      
+      Clearing flags on partition <strong>%1</strong>.
+      
+    
+    
+      
+      Clearing flags on %1MiB <strong>%2</strong> partition.
+      
+    
+    
+      
+      Clearing flags on new partition.
+      
+    
+    
+      
+      Setting flags <strong>%2</strong> on partition <strong>%1</strong>.
+      
+    
+    
+      
+      Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.
+      
+    
+    
+      
+      Setting flags <strong>%1</strong> on new partition.
+      
+    
+    
+      
+      The installer failed to set flags on partition %1.
+      
+    
+  
+  
+    SetPasswordJob
+    
+      
+      Set password for user %1
+      
+    
+    
+      
+      Setting password for user %1.
+      
+    
+    
+      
+      Bad destination system path.
+      
+    
+    
+      
+      rootMountPoint is %1
+      
+    
+    
+      
+      Cannot disable root account.
+      
+    
+    
+      
+      passwd terminated with error code %1.
+      
+    
+    
+      
+      Cannot set password for user %1.
+      
+    
+    
+      
+      usermod terminated with error code %1.
+      
+    
+  
+  
+    SetTimezoneJob
+    
+      
+      Set timezone to %1/%2
+      
+    
+    
+      
+      Cannot access selected timezone path.
+      
+    
+    
+      
+      Bad path: %1
+      
+    
+    
+      
+      Cannot set timezone.
+      
+    
+    
+      
+      Link creation failed, target: %1; link name: %2
+      
+    
+    
+      
+      Cannot set timezone,
+      
+    
+    
+      
+      Cannot open /etc/timezone for writing
+      
+    
+  
+  
+    SetupGroupsJob
+    
+      
+      Preparing groups.
+      
+    
+    
+      
+      
+      Could not create groups in target system
+      
+    
+    
+      
+      These groups are missing in the target system: %1
+      
+    
+  
+  
+    SetupSudoJob
+    
+      
+      Configure <pre>sudo</pre> users.
+      
+    
+    
+      
+      Cannot chmod sudoers file.
+      
+    
+    
+      
+      Cannot create sudoers file for writing.
+      
+    
+  
+  
+    ShellProcessJob
+    
+      
+      Shell Processes Job
+      
+    
+  
+  
+    SlideCounter
+    
+      
+      %L1 / %L2
+      slide counter, %1 of %2 (numeric)
+      
+    
+  
+  
+    SummaryPage
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
+  
+  
+    SummaryViewStep
+    
+      
+      Summary
+      
+    
+  
+  
+    TrackingInstallJob
+    
+      
+      Installation feedback
+      
+    
+    
+      
+      Sending installation feedback.
+      
+    
+    
+      
+      Internal error in install-tracking.
+      
+    
+    
+      
+      HTTP request timed out.
+      
+    
+  
+  
+    TrackingKUserFeedbackJob
+    
+      
+      KDE user feedback
+      
+    
+    
+      
+      Configuring KDE user feedback.
+      
+    
+    
+      
+      
+      Error in KDE user feedback configuration.
+      
+    
+    
+      
+      Could not configure KDE user feedback correctly, script error %1.
+      
+    
+    
+      
+      Could not configure KDE user feedback correctly, Calamares error %1.
+      
+    
+  
+  
+    TrackingMachineUpdateManagerJob
+    
+      
+      Machine feedback
+      
+    
+    
+      
+      Configuring machine feedback.
+      
+    
+    
+      
+      
+      Error in machine feedback configuration.
+      
+    
+    
+      
+      Could not configure machine feedback correctly, script error %1.
+      
+    
+    
+      
+      Could not configure machine feedback correctly, Calamares error %1.
+      
+    
+  
+  
+    TrackingPage
+    
+      
+      Form
+      
+    
+    
+      
+      Placeholder
+      
+    
+    
+      
+      <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html>
+      
+    
+    
+      
+      <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html>
+      
+    
+    
+      
+      Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area.
+      
+    
+    
+      
+      By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes.
+      
+    
+    
+      
+      By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1.
+      
+    
+    
+      
+      By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1.
+      
+    
+  
+  
+    TrackingViewStep
+    
+      
+      Feedback
+      
+    
+  
+  
+    UsersPage
+    
+      
+      <small>If more than one person will use this computer, you can create multiple accounts after setup.</small>
+      
+    
+    
+      
+      <small>If more than one person will use this computer, you can create multiple accounts after installation.</small>
+      
+    
+  
+  
+    UsersQmlViewStep
+    
+      
+      Users
+      
+    
+  
+  
+    UsersViewStep
+    
+      
+      Users
+      
+    
+  
+  
+    VariantModel
+    
+      
+      Key
+      Column header for key/value
+      
+    
+    
+      
+      Value
+      Column header for key/value
+      
+    
+  
+  
+    VolumeGroupBaseDialog
+    
+      
+      Create Volume Group
+      
+    
+    
+      
+      List of Physical Volumes
+      
+    
+    
+      
+      Volume Group Name:
+      
+    
+    
+      
+      Volume Group Type:
+      
+    
+    
+      
+      Physical Extent Size:
+      
+    
+    
+      
+       MiB
+      
+    
+    
+      
+      Total Size:
+      
+    
+    
+      
+      Used Size:
+      
+    
+    
+      
+      Total Sectors:
+      
+    
+    
+      
+      Quantity of LVs:
+      
+    
+  
+  
+    WelcomePage
+    
+      
+      Form
+      
+    
+    
+      
+      
+      Select application and system language
+      
+    
+    
+      
+      &About
+      
+    
+    
+      
+      Open donations website
+      
+    
+    
+      
+      &Donate
+      
+    
+    
+      
+      Open help and support website
+      
+    
+    
+      
+      &Support
+      
+    
+    
+      
+      Open issues and bug-tracking website
+      
+    
+    
+      
+      &Known issues
+      
+    
+    
+      
+      Open release notes website
+      
+    
+    
+      
+      &Release notes
+      
+    
+    
+      
+      <h1>Welcome to the Calamares setup program for %1.</h1>
+      
+    
+    
+      
+      <h1>Welcome to %1 setup.</h1>
+      
+    
+    
+      
+      <h1>Welcome to the Calamares installer for %1.</h1>
+      
+    
+    
+      
+      <h1>Welcome to the %1 installer.</h1>
+      
+    
+    
+      
+      %1 support
+      
+    
+    
+      
+      About %1 setup
+      
+    
+    
+      
+      About %1 installer
+      
+    
+    
+      
+      <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software.
+      
+    
+  
+  
+    WelcomeQmlViewStep
+    
+      
+      Welcome
+      
+    
+  
+  
+    WelcomeViewStep
+    
+      
+      Welcome
+      
+    
+  
+  
+    about
+    
+      
+      <h1>%1</h1><br/>
+                        <strong>%2<br/>
+                        for %3</strong><br/><br/>
+                        Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>
+                        Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>
+                        Thanks to <a href='https://calamares.io/team/'>the Calamares team</a>
+                        and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares
+                        translators team</a>.<br/><br/>
+                        <a href='https://calamares.io/'>Calamares</a>
+                        development is sponsored by <br/>
+                        <a href='http://www.blue-systems.com/'>Blue Systems</a> -
+                        Liberating Software.
+      
+    
+    
+      
+      Back
+      
+    
+  
+  
+    calamares-sidebar
+    
+      
+      Show debug information
+      
+    
+  
+  
+    finishedq
+    
+      
+      Installation Completed
+      
+    
+    
+      
+      %1 has been installed on your computer.<br/>
+            You may now restart into your new system, or continue using the Live environment.
+      
+    
+    
+      
+      Close Installer
+      
+    
+    
+      
+      Restart System
+      
+    
+    
+      
+      <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
+            This log is copied to /var/log/installation.log of the target system.</p>
+      
+    
+  
+  
+    i18n
+    
+      
+      <h1>Languages</h1> </br>
+                    The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
+      
+    
+    
+      
+      <h1>Locales</h1> </br>
+                    The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
+      
+    
+    
+      
+      Back
+      
+    
+  
+  
+    keyboardq
+    
+      
+      Keyboard Model
+      
+    
+    
+      
+      Layouts
+      
+    
+    
+      
+      Keyboard Layout
+      
+    
+    
+      
+      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      
+    
+    
+      
+      Models
+      
+    
+    
+      
+      Variants
+      
+    
+    
+      
+      Keyboard Variant
+      
+    
+    
+      
+      Test your keyboard
+      
+    
+  
+  
+    localeq
+    
+      
+      Change
+      
+    
+  
+  
+    notesqml
+    
+      
+      <h3>%1</h3>
+            <p>These are example release notes.</p>
+      
+    
+  
+  
+    release_notes
+    
+      
+      <h3>%1</h3>
+            <p>This an example QML file, showing options in RichText with Flickable content.</p>
+
+            <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p>
+
+            <p><b>This is bold text</b></p>
+            <p><i>This is italic text</i></p>
+            <p><u>This is underlined text</u></p>
+            <p><center>This text will be center-aligned.</center></p>
+            <p><s>This is strikethrough</s></p>
+
+            <p>Code example:
+            <code>ls -l /home</code></p>
+
+            <p><b>Lists:</b></p>
+            <ul>
+                <li>Intel CPU systems</li>
+                <li>AMD CPU systems</li>
+            </ul>
+
+            <p>The vertical scrollbar is adjustable, current width set to 10.</p>
+      
+    
+    
+      
+      Back
+      
+    
+  
+  
+    usersq
+    
+      
+      Pick your user name and credentials to login and perform admin tasks
+      
+    
+    
+      
+      What is your name?
+      
+    
+    
+      
+      Your Full Name
+      
+    
+    
+      
+      What name do you want to use to log in?
+      
+    
+    
+      
+      Login Name
+      
+    
+    
+      
+      If more than one person will use this computer, you can create multiple accounts after installation.
+      
+    
+    
+      
+      Only lowercase letters, numbers, underscore and hyphen are allowed.
+      
+    
+    
+      
+      root is not allowed as username.
+      
+    
+    
+      
+      What is the name of this computer?
+      
+    
+    
+      
+      Computer Name
+      
+    
+    
+      
+      This name will be used if you make the computer visible to others on a network.
+      
+    
+    
+      
+      localhost is not allowed as hostname.
+      
+    
+    
+      
+      Choose a password to keep your account safe.
+      
+    
+    
+      
+      Password
+      
+    
+    
+      
+      Repeat Password
+      
+    
+    
+      
+      Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
+      
+    
+    
+      
+      Validate passwords quality
+      
+    
+    
+      
+      When this box is checked, password-strength checking is done and you will not be able to use a weak password.
+      
+    
+    
+      
+      Log in automatically without asking for the password
+      
+    
+    
+      
+      Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+      
+    
+    
+      
+      Reuse user password as root password
+      
+    
+    
+      
+      Use the same password for the administrator account.
+      
+    
+    
+      
+      Choose a root password to keep your account safe.
+      
+    
+    
+      
+      Root Password
+      
+    
+    
+      
+      Repeat Root Password
+      
+    
+    
+      
+      Enter the same password twice, so that it can be checked for typing errors.
+      
+    
+  
+  
+    welcomeq
+    
+      
+      <h3>Welcome to the %1 <quote>%2</quote> installer</h3>
+            <p>This program will ask you some questions and set up %1 on your computer.</p>
+      
+    
+    
+      
+      About
+      
+    
+    
+      
+      Support
+      
+    
+    
+      
+      Known issues
+      
+    
+    
+      
+      Release notes
+      
+    
+    
+      
+      Donate
+      
+    
+  
+

From e577cd4495525bc31a2374d810ba1e57ea6fab43 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Mon, 26 Jul 2021 20:56:52 +0200
Subject: [PATCH 326/492] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/az/LC_MESSAGES/python.po    |  18 +-
 lang/python/az_AZ/LC_MESSAGES/python.po |  18 +-
 lang/python/ko_KR/LC_MESSAGES/python.po | 382 ++++++++++++++++++++++++
 lang/python/sq/LC_MESSAGES/python.po    |   2 +
 lang/python/zh_CN/LC_MESSAGES/python.po |  18 +-
 lang/python/zh_HK/LC_MESSAGES/python.po | 382 ++++++++++++++++++++++++
 6 files changed, 803 insertions(+), 17 deletions(-)
 create mode 100644 lang/python/ko_KR/LC_MESSAGES/python.po
 create mode 100644 lang/python/zh_HK/LC_MESSAGES/python.po

diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index 8545f672e4..d47e30acd8 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# xxmn77 , 2020
+# Xəyyam Qocayev , 2021
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: xxmn77 , 2020\n"
+"Last-Translator: Xəyyam Qocayev , 2021\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -313,25 +313,31 @@ msgstr[1] "%(num)d paket silinir."
 #: src/modules/packages/main.py:588 src/modules/packages/main.py:600
 #: src/modules/packages/main.py:628
 msgid "Package Manager error"
-msgstr ""
+msgstr "Paket meneceri xətası"
 
 #: src/modules/packages/main.py:589
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
    {!s}
     əmri xəta"
+" kodu {!s} ilə cavab verdi."
 
 #: src/modules/packages/main.py:601
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. 
    {!s}
     əmri xəta kodu {!s} "
+"ilə cavab verdi."
 
 #: src/modules/packages/main.py:629
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
    {!s}
     "
+"əmri xəta kodu {!s} ilə cavab verdi."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
@@ -339,13 +345,15 @@ msgstr "Önyükləyici qurulur."
 
 #: src/modules/bootloader/main.py:502
 msgid "Bootloader installation error"
-msgstr ""
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
 
 #: src/modules/bootloader/main.py:503
 msgid ""
 "The bootloader could not be installed. The installation command "
 "
    {!s}
     returned error code {!s}."
 msgstr ""
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
+"{!s} ilə cavab verdi."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
@@ -386,6 +394,8 @@ msgstr "fstab yazılır."
 #: src/modules/fstab/main.py:389
 msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
+"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
+"göstərilməyib."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index 9ee8feda17..d1e805facb 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# xxmn77 , 2020
+# Xəyyam Qocayev , 2021
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: xxmn77 , 2020\n"
+"Last-Translator: Xəyyam Qocayev , 2021\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -313,25 +313,31 @@ msgstr[1] "%(num)d paket silinir."
 #: src/modules/packages/main.py:588 src/modules/packages/main.py:600
 #: src/modules/packages/main.py:628
 msgid "Package Manager error"
-msgstr ""
+msgstr "Paket meneceri xətası"
 
 #: src/modules/packages/main.py:589
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
    {!s}
     əmri xəta"
+" kodu {!s} ilə cavab verdi."
 
 #: src/modules/packages/main.py:601
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. 
    {!s}
     əmri xəta kodu {!s} "
+"ilə cavab verdi."
 
 #: src/modules/packages/main.py:629
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
    {!s}
     "
+"əmri xəta kodu {!s} ilə cavab verdi."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
@@ -339,13 +345,15 @@ msgstr "Önyükləyici qurulur."
 
 #: src/modules/bootloader/main.py:502
 msgid "Bootloader installation error"
-msgstr ""
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
 
 #: src/modules/bootloader/main.py:503
 msgid ""
 "The bootloader could not be installed. The installation command "
 "
    {!s}
     returned error code {!s}."
 msgstr ""
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
+"{!s} ilə cavab verdi."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
@@ -386,6 +394,8 @@ msgstr "fstab yazılır."
 #: src/modules/fstab/main.py:389
 msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
+"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
+"göstərilməyib."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
diff --git a/lang/python/ko_KR/LC_MESSAGES/python.po b/lang/python/ko_KR/LC_MESSAGES/python.po
new file mode 100644
index 0000000000..75302ae602
--- /dev/null
+++ b/lang/python/ko_KR/LC_MESSAGES/python.po
@@ -0,0 +1,382 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"PO-Revision-Date: 2017-08-09 10:34+0000\n"
+"Language-Team: Korean (Korea) (https://www.transifex.com/calamares/teams/20061/ko_KR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""
diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po
index a920c1e01d..e34ef08b7e 100644
--- a/lang/python/sq/LC_MESSAGES/python.po
+++ b/lang/python/sq/LC_MESSAGES/python.po
@@ -337,6 +337,8 @@ msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
+"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
+"
    {!s}
     u përgjigj me kod gabimi {!s}."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index 1e8e85009f..36ba26f767 100644
--- a/lang/python/zh_CN/LC_MESSAGES/python.po
+++ b/lang/python/zh_CN/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@
 # plantman , 2017
 # Feng Chao , 2020
 # Bobby Rong , 2020
-# 玉堂白鹤 , 2020
+# 玉堂白鹤 , 2021
 # 
 #, fuzzy
 msgid ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: 玉堂白鹤 , 2020\n"
+"Last-Translator: 玉堂白鹤 , 2021\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -300,25 +300,25 @@ msgstr[0] "移除%(num)d软件包。"
 #: src/modules/packages/main.py:588 src/modules/packages/main.py:600
 #: src/modules/packages/main.py:628
 msgid "Package Manager error"
-msgstr ""
+msgstr "软件包管理器错误"
 
 #: src/modules/packages/main.py:589
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
-msgstr ""
+msgstr "软件包管理器无法准备更新。命令
    {!s}
    返回错误代码{!s}。"
 
 #: src/modules/packages/main.py:601
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
-msgstr ""
+msgstr "软件包管理器无法更新系统。命令
    {!s}
    返回错误代码{!s}。"
 
 #: src/modules/packages/main.py:629
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
-msgstr ""
+msgstr "软件包管理器无法对已安装的系统进行更改。命令
    {!s}
    返回错误代码{!s}。"
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
@@ -326,13 +326,13 @@ msgstr "安装启动加载器。"
 
 #: src/modules/bootloader/main.py:502
 msgid "Bootloader installation error"
-msgstr ""
+msgstr "启动加载器安装出错"
 
 #: src/modules/bootloader/main.py:503
 msgid ""
 "The bootloader could not be installed. The installation command "
 "
    {!s}
     returned error code {!s}."
-msgstr ""
+msgstr "无法安装启动加载器。安装命令
    {!s}
    返回错误代码 {!s}。"
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
@@ -372,7 +372,7 @@ msgstr "正在写入 fstab。"
 
 #: src/modules/fstab/main.py:389
 msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+msgstr "无 
    {!s}
     配置可供 
    {!s}
     使用。"
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
diff --git a/lang/python/zh_HK/LC_MESSAGES/python.po b/lang/python/zh_HK/LC_MESSAGES/python.po
new file mode 100644
index 0000000000..d911132ca0
--- /dev/null
+++ b/lang/python/zh_HK/LC_MESSAGES/python.po
@@ -0,0 +1,382 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"PO-Revision-Date: 2017-08-09 10:34+0000\n"
+"Language-Team: Chinese (Hong Kong) (https://www.transifex.com/calamares/teams/20061/zh_HK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_HK\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
+#: src/modules/packages/main.py:628
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:589
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:601
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:629
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:502
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:503
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr ""

From fc2286117d2b2e9bd543960a8f557bbd7eaa35ed Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 21:31:57 +0200
Subject: [PATCH 327/492] [packages] Move package-list-logic into PM base class

---
 src/modules/packages/main.py | 112 +++++++++++++++++++++++++----------
 1 file changed, 81 insertions(+), 31 deletions(-)

diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py
index 6982468df9..7d383b5529 100644
--- a/src/modules/packages/main.py
+++ b/src/modules/packages/main.py
@@ -151,6 +151,82 @@ def remove_package(self, packagedata):
             self.remove([packagedata["package"]])
             self.run(packagedata["post-script"])
 
+    def operation_install(self, package_list, from_local=False):
+        """
+        Installs the list of packages named in @p package_list .
+        These can be strings -- plain package names -- or
+        structures (with a pre- and post-install step).
+
+        This operation is called for "critical" packages,
+        which are expected to succeed, or fail, all together.
+        However, if there are packages with pre- or post-scripts,
+        then packages are installed one-by-one instead.
+
+        NOTE: package managers may reimplement this method
+        NOTE: exceptions are expected to leave this method, to indicate
+              failure of the installation.
+        """
+        if all([isinstance(x, str) for x in package_list]):
+            self.install(package_list, from_local=from_local)
+        else:
+            for package in package_list:
+                self.install_package(package, from_local=from_local)
+
+    def operation_try_install(self, package_list):
+        """
+        Installs the list of packages named in @p package_list .
+        These can be strings -- plain package names -- or
+        structures (with a pre- and post-install step).
+
+        This operation is called for "non-critical" packages,
+        which can succeed or fail without affecting the overall installation.
+        Packages are installed one-by-one to support package managers
+        that do not have a "install as much as you can" mode.
+
+        NOTE: package managers may reimplement this method
+        NOTE: no package-installation exceptions should be raised
+        """
+        # we make a separate package manager call for each package so a
+        # single failing package won't stop all of them
+        for package in package_list:
+            try:
+                self.install_package(package)
+            except subprocess.CalledProcessError:
+                libcalamares.utils.warning("Could not install package %s" % package)
+
+    def operation_remove(self, package_list):
+        """
+        Removes the list of packages named in @p package_list .
+        These can be strings -- plain package names -- or
+        structures (with a pre- and post-install step).
+
+        This operation is called for "critical" packages, which are
+        expected to succeed or fail all together.
+        However, if there are packages with pre- or post-scripts,
+        then packages are removed one-by-one instead.
+
+        NOTE: package managers may reimplement this method
+        NOTE: exceptions should be raised to indicate failure
+        """
+        if all([isinstance(x, str) for x in package_list]):
+            self.remove(package_list)
+        else:
+            for package in package_list:
+                self.remove_package(package)
+
+    def operation_try_remove(self, package_list):
+        """
+        Same relation as try_install has to install, except it removes
+        packages instead. Packages are removed one-by-one.
+
+        NOTE: package managers may reimplement this method
+        NOTE: no package-installation exceptions should be raised
+        """
+        for package in package_list:
+            try:
+                self.remove_package(package)
+            except subprocess.CalledProcessError:
+                libcalamares.utils.warning("Could not remove package %s" % package)
 
 ### PACKAGE MANAGER IMPLEMENTATIONS
 #
@@ -503,45 +579,19 @@ def run_operations(pkgman, entry):
         group_packages = len(package_list)
         if key == "install":
             _change_mode(INSTALL)
-            if all([isinstance(x, str) for x in package_list]):
-                pkgman.install(package_list)
-            else:
-                for package in package_list:
-                    pkgman.install_package(package)
+            pkgman.operation_install(package_list)
         elif key == "try_install":
             _change_mode(INSTALL)
-            # we make a separate package manager call for each package so a
-            # single failing package won't stop all of them
-            for package in package_list:
-                try:
-                    pkgman.install_package(package)
-                except subprocess.CalledProcessError:
-                    warn_text = "Could not install package "
-                    warn_text += str(package)
-                    libcalamares.utils.warning(warn_text)
+            pkgman.operation_try_install(package_list)
         elif key == "remove":
             _change_mode(REMOVE)
-            if all([isinstance(x, str) for x in package_list]):
-                pkgman.remove(package_list)
-            else:
-                for package in package_list:
-                    pkgman.remove_package(package)
+            pkgman.operation_remove(package_list)
         elif key == "try_remove":
             _change_mode(REMOVE)
-            for package in package_list:
-                try:
-                    pkgman.remove_package(package)
-                except subprocess.CalledProcessError:
-                    warn_text = "Could not remove package "
-                    warn_text += str(package)
-                    libcalamares.utils.warning(warn_text)
+            pkgman.operation_try_remove(package_list)
         elif key == "localInstall":
             _change_mode(INSTALL)
-            if all([isinstance(x, str) for x in package_list]):
-                pkgman.install(package_list, from_local=True)
-            else:
-                for package in package_list:
-                    pkgman.install_package(package, from_local=True)
+            pkgman.operation_install(package_list, from_local=True)
         elif key == "source":
             libcalamares.utils.debug("Package-list from {!s}".format(entry[key]))
         else:

From 3596b48c7a69b5275076269dd5749b8632c38ffb Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 27 Jul 2021 16:01:32 +0200
Subject: [PATCH 328/492] [libcalamares] Factor out common string in Python
 logging

- enforce consistent [PYTHON JOB]
- use CDebug() constructor, because the convenience macro's
  introduce the function name -- that's the C++ function, so
  it isn't useful for logging.
---
 src/libcalamares/PythonJobApi.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 41fb82151c..d61cfc223b 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -136,16 +136,18 @@ check_target_env_output( const bp::list& args, const std::string& stdin, int tim
     return ec.second.toStdString();
 }
 
+static const char output_prefix[] = "[PYTHON JOB]:";
+
 void
 debug( const std::string& s )
 {
-    Logger::CDebug( Logger::LOGDEBUG ) << "[PYTHON JOB]: " << QString::fromStdString( s );
+    Logger::CDebug( Logger::LOGDEBUG ) << output_prefix << QString::fromStdString( s );
 }
 
 void
 warning( const std::string& s )
 {
-    cWarning() << "[PYTHON JOB]: " << QString::fromStdString( s );
+    Logger::CDebug( Logger::LOGWARNING )  << output_prefix << QString::fromStdString( s );
 }
 
 PythonJobInterface::PythonJobInterface( Calamares::PythonJob* parent )
@@ -168,7 +170,6 @@ PythonJobInterface::setprogress( qreal progress )
     }
 }
 
-
 std::string
 obscure( const std::string& string )
 {

From d6825c4986aaf7f95c698d642098425a49079546 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 28 Jul 2021 13:20:35 +0200
Subject: [PATCH 329/492] [libcalamares] Fix linking with renamed targets

---
 src/libcalamares/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 2f542450b9..d4755bde4f 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -315,10 +315,10 @@ calamares_add_test(
 # This is not an actual test, it's a test / demo application
 # for experimenting with GeoIP.
 add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} )
-target_link_libraries( test_geoip calamares Qt5::Network yamlcpp::yamlcpp )
+target_link_libraries( test_geoip Calamares::calamares Qt5::Network yamlcpp::yamlcpp )
 calamares_automoc( test_geoip )
 
 if ( Qt5DBus_FOUND )
     add_executable( test_automount partition/calautomount.cpp )
-    target_link_libraries( test_automount calamares Qt5::DBus )
+    target_link_libraries( test_automount Calamares::calamares Qt5::DBus )
 endif()

From bf9f1c95bc603cf4e9d74a6346bbea271f01e7ba Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 11:28:11 +0200
Subject: [PATCH 330/492] [libcalamares] Rename classes describing Translations

- the name 'Label' was a relic of the class being UI-centered
---
 src/libcalamares/locale/Label.cpp      | 10 +++----
 src/libcalamares/locale/Label.h        | 10 +++----
 src/libcalamares/locale/LabelModel.cpp | 36 +++++++++++++-------------
 src/libcalamares/locale/LabelModel.h   | 14 +++++-----
 src/modules/locale/Config.cpp          |  4 +--
 src/modules/welcome/Config.cpp         |  2 +-
 src/modules/welcome/Config.h           |  6 ++---
 src/modules/welcome/WelcomePage.cpp    |  2 +-
 src/modules/welcome/WelcomePage.h      |  2 +-
 9 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/libcalamares/locale/Label.cpp b/src/libcalamares/locale/Label.cpp
index e2cfbc70ad..f79d0d3e5b 100644
--- a/src/libcalamares/locale/Label.cpp
+++ b/src/libcalamares/locale/Label.cpp
@@ -46,14 +46,14 @@ namespace CalamaresUtils
 namespace Locale
 {
 
-Label::Label( QObject* parent )
-    : Label( QString(), LabelFormat::IfNeededWithCountry, parent )
+Translation::Translation( QObject* parent )
+    : Translation( QString(), LabelFormat::IfNeededWithCountry, parent )
 {
 }
 
-Label::Label( const QString& locale, LabelFormat format, QObject* parent )
+Translation::Translation( const QString& locale, LabelFormat format, QObject* parent )
     : QObject( parent )
-    , m_locale( Label::getLocale( locale ) )
+    , m_locale( getLocale( locale ) )
     , m_localeId( locale.isEmpty() ? m_locale.name() : locale )
 {
     auto special = specialCase( locale );
@@ -80,7 +80,7 @@ Label::Label( const QString& locale, LabelFormat format, QObject* parent )
 }
 
 QLocale
-Label::getLocale( const QString& localeName )
+Translation::getLocale( const QString& localeName )
 {
     if ( localeName.isEmpty() )
     {
diff --git a/src/libcalamares/locale/Label.h b/src/libcalamares/locale/Label.h
index b0f17930a9..04ad4f5e8f 100644
--- a/src/libcalamares/locale/Label.h
+++ b/src/libcalamares/locale/Label.h
@@ -34,7 +34,7 @@ namespace Locale
  * - `ca@valencia` is the Catalan dialect spoken in Valencia.
  *   There is no Qt code for it.
  */
-class Label : public QObject
+class Translation : public QObject
 {
     Q_OBJECT
 
@@ -47,7 +47,7 @@ class Label : public QObject
     };
 
     /** @brief Empty locale. This uses the system-default locale. */
-    Label( QObject* parent = nullptr );
+    Translation( QObject* parent = nullptr );
 
     /** @brief Construct from a locale name.
      *
@@ -55,7 +55,7 @@ class Label : public QObject
      * The @p format determines whether the country name is always present
      * in the label (human-readable form) or only if needed for disambiguation.
      */
-    Label( const QString& localeName,
+    Translation( const QString& localeName,
            LabelFormat format = LabelFormat::IfNeededWithCountry,
            QObject* parent = nullptr );
 
@@ -64,7 +64,7 @@ class Label : public QObject
      *
      * Locales are sorted by their id, which means the ISO 2-letter code + country.
      */
-    bool operator<( const Label& other ) const { return m_localeId < other.m_localeId; }
+    bool operator<( const Translation& other ) const { return m_localeId < other.m_localeId; }
 
     /** @brief Is this locale English?
      *
@@ -96,7 +96,7 @@ class Label : public QObject
      */
     static QLocale getLocale( const QString& localeName );
 
-protected:
+private:
     QLocale m_locale;
     QString m_localeId;  // the locale identifier, e.g. "en_GB"
     QString m_label;  // the native name of the locale
diff --git a/src/libcalamares/locale/LabelModel.cpp b/src/libcalamares/locale/LabelModel.cpp
index 9a9be99058..93d0aab3e1 100644
--- a/src/libcalamares/locale/LabelModel.cpp
+++ b/src/libcalamares/locale/LabelModel.cpp
@@ -20,7 +20,7 @@ namespace CalamaresUtils
 namespace Locale
 {
 
-LabelModel::LabelModel( const QStringList& locales, QObject* parent )
+TranslationsModel::TranslationsModel( const QStringList& locales, QObject* parent )
     : QAbstractListModel( parent )
     , m_localeIds( locales )
 {
@@ -29,20 +29,20 @@ LabelModel::LabelModel( const QStringList& locales, QObject* parent )
 
     for ( const auto& l : locales )
     {
-        m_locales.push_back( new Label( l, Label::LabelFormat::IfNeededWithCountry, this ) );
+        m_locales.push_back( new Translation( l, Translation::LabelFormat::IfNeededWithCountry, this ) );
     }
 }
 
-LabelModel::~LabelModel() {}
+TranslationsModel::~TranslationsModel() {}
 
 int
-LabelModel::rowCount( const QModelIndex& ) const
+TranslationsModel::rowCount( const QModelIndex& ) const
 {
     return m_locales.count();
 }
 
 QVariant
-LabelModel::data( const QModelIndex& index, int role ) const
+TranslationsModel::data( const QModelIndex& index, int role ) const
 {
     if ( ( role != LabelRole ) && ( role != EnglishLabelRole ) )
     {
@@ -67,13 +67,13 @@ LabelModel::data( const QModelIndex& index, int role ) const
 }
 
 QHash< int, QByteArray >
-LabelModel::roleNames() const
+TranslationsModel::roleNames() const
 {
     return { { LabelRole, "label" }, { EnglishLabelRole, "englishLabel" } };
 }
 
-const Label&
-LabelModel::locale( int row ) const
+const Translation&
+TranslationsModel::locale( int row ) const
 {
     if ( ( row < 0 ) || ( row >= m_locales.count() ) )
     {
@@ -88,7 +88,7 @@ LabelModel::locale( int row ) const
 }
 
 int
-LabelModel::find( std::function< bool( const Label& ) > predicate ) const
+TranslationsModel::find( std::function< bool( const Translation& ) > predicate ) const
 {
     for ( int row = 0; row < m_locales.count(); ++row )
     {
@@ -101,19 +101,19 @@ LabelModel::find( std::function< bool( const Label& ) > predicate ) const
 }
 
 int
-LabelModel::find( std::function< bool( const QLocale& ) > predicate ) const
+TranslationsModel::find( std::function< bool( const QLocale& ) > predicate ) const
 {
-    return find( [&]( const Label& l ) { return predicate( l.locale() ); } );
+    return find( [&]( const Translation& l ) { return predicate( l.locale() ); } );
 }
 
 int
-LabelModel::find( const QLocale& locale ) const
+TranslationsModel::find( const QLocale& locale ) const
 {
-    return find( [&]( const Label& l ) { return locale == l.locale(); } );
+    return find( [&]( const Translation& l ) { return locale == l.locale(); } );
 }
 
 int
-LabelModel::find( const QString& countryCode ) const
+TranslationsModel::find( const QString& countryCode ) const
 {
     if ( countryCode.length() != 2 )
     {
@@ -121,18 +121,18 @@ LabelModel::find( const QString& countryCode ) const
     }
 
     auto c_l = countryData( countryCode );
-    int r = find( [&]( const Label& l ) { return ( l.language() == c_l.second ) && ( l.country() == c_l.first ); } );
+    int r = find( [&]( const Translation& l ) { return ( l.language() == c_l.second ) && ( l.country() == c_l.first ); } );
     if ( r >= 0 )
     {
         return r;
     }
-    return find( [&]( const Label& l ) { return l.language() == c_l.second; } );
+    return find( [&]( const Translation& l ) { return l.language() == c_l.second; } );
 }
 
-LabelModel*
+TranslationsModel*
 availableTranslations()
 {
-    static LabelModel* model = new LabelModel( QStringLiteral( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' ) );
+    static TranslationsModel* model = new TranslationsModel( QStringLiteral( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' ) );
     return model;
 }
 
diff --git a/src/libcalamares/locale/LabelModel.h b/src/libcalamares/locale/LabelModel.h
index 7e6f2daccf..1d12295b39 100644
--- a/src/libcalamares/locale/LabelModel.h
+++ b/src/libcalamares/locale/LabelModel.h
@@ -24,7 +24,7 @@ namespace CalamaresUtils
 namespace Locale
 {
 
-class DLLEXPORT LabelModel : public QAbstractListModel
+class DLLEXPORT TranslationsModel : public QAbstractListModel
 {
     Q_OBJECT
 
@@ -35,8 +35,8 @@ class DLLEXPORT LabelModel : public QAbstractListModel
         EnglishLabelRole = Qt::UserRole + 1
     };
 
-    LabelModel( const QStringList& locales, QObject* parent = nullptr );
-    ~LabelModel() override;
+    TranslationsModel( const QStringList& locales, QObject* parent = nullptr );
+    ~TranslationsModel() override;
 
     int rowCount( const QModelIndex& parent ) const override;
 
@@ -48,7 +48,7 @@ class DLLEXPORT LabelModel : public QAbstractListModel
      * This is the backing data for the model; if @p row is out-of-range,
      * returns a reference to en_US.
      */
-    const Label& locale( int row ) const;
+    const Translation& locale( int row ) const;
 
     /// @brief Returns all of the locale Ids (e.g. en_US) put into this model.
     const QStringList& localeIds() const { return m_localeIds; }
@@ -58,14 +58,14 @@ class DLLEXPORT LabelModel : public QAbstractListModel
      * Returns the row number of the first match, or -1 if there isn't one.
      */
     int find( std::function< bool( const QLocale& ) > predicate ) const;
-    int find( std::function< bool( const Label& ) > predicate ) const;
+    int find( std::function< bool( const Translation& ) > predicate ) const;
     /// @brief Looks for an item using the same locale, -1 if there isn't one
     int find( const QLocale& ) const;
     /// @brief Looks for an item that best matches the 2-letter country code
     int find( const QString& countryCode ) const;
 
 private:
-    QVector< Label* > m_locales;
+    QVector< Translation* > m_locales;
     QStringList m_localeIds;
 };
 
@@ -79,7 +79,7 @@ class DLLEXPORT LabelModel : public QAbstractListModel
  *
  * NOTE: While the model is not typed const, it should be. Do not modify.
  */
-DLLEXPORT LabelModel* availableTranslations();
+DLLEXPORT TranslationsModel* availableTranslations();
 }  // namespace Locale
 }  // namespace CalamaresUtils
 #endif
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index 854d65eef9..7000112583 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -368,9 +368,9 @@ Config::currentTimezoneName() const
 static inline QString
 localeLabel( const QString& s )
 {
-    using CalamaresUtils::Locale::Label;
+    using CalamaresUtils::Locale::Translation;
 
-    Label lang( s, Label::LabelFormat::AlwaysWithCountry );
+    Translation lang( s, Translation::LabelFormat::AlwaysWithCountry );
     return lang.label();
 }
 
diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index bc489d1866..756cb0e5a6 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -84,7 +84,7 @@ Config::retranslate()
     emit warningMessageChanged( m_warningMessage );
 }
 
-CalamaresUtils::Locale::LabelModel*
+CalamaresUtils::Locale::TranslationsModel*
 Config::languagesModel() const
 {
     return m_languages;
diff --git a/src/modules/welcome/Config.h b/src/modules/welcome/Config.h
index a3f1276a6d..2597ccb5ab 100644
--- a/src/modules/welcome/Config.h
+++ b/src/modules/welcome/Config.h
@@ -27,7 +27,7 @@ class Config : public QObject
      * This is a list-model, with names and descriptions for the translations
      * available to Calamares.
      */
-    Q_PROPERTY( CalamaresUtils::Locale::LabelModel* languagesModel READ languagesModel CONSTANT FINAL )
+    Q_PROPERTY( CalamaresUtils::Locale::TranslationsModel* languagesModel READ languagesModel CONSTANT FINAL )
     /** @brief The requirements (from modules) and their checked-status
      *
      * The model grows rows over time as each module is checked and its
@@ -92,7 +92,7 @@ class Config : public QObject
     QString warningMessage() const;
 
 public slots:
-    CalamaresUtils::Locale::LabelModel* languagesModel() const;
+    CalamaresUtils::Locale::TranslationsModel* languagesModel() const;
     void retranslate();
 
     ///@brief The **global** requirements model, from ModuleManager
@@ -116,7 +116,7 @@ public slots:
 private:
     void initLanguages();
 
-    CalamaresUtils::Locale::LabelModel* m_languages = nullptr;
+    CalamaresUtils::Locale::TranslationsModel* m_languages = nullptr;
     std::unique_ptr< QSortFilterProxyModel > m_filtermodel;
 
     QString m_languageIcon;
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 376fe1ea62..b56b6754a3 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -275,5 +275,5 @@ LocaleTwoColumnDelegate::paint( QPainter* painter, const QStyleOptionViewItem& o
         Qt::AlignRight | Qt::AlignVCenter,
         option.palette,
         false,
-        index.data( CalamaresUtils::Locale::LabelModel::EnglishLabelRole ).toString() );
+        index.data( CalamaresUtils::Locale::TranslationsModel::EnglishLabelRole ).toString() );
 }
diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h
index cbbc7f5103..ceeb5160b5 100644
--- a/src/modules/welcome/WelcomePage.h
+++ b/src/modules/welcome/WelcomePage.h
@@ -64,7 +64,7 @@ public slots:
 
     Ui::WelcomePage* ui;
     CheckerContainer* m_checkingWidget;
-    CalamaresUtils::Locale::LabelModel* m_languages;
+    CalamaresUtils::Locale::TranslationsModel* m_languages;
 
     Config* m_conf;
 };

From bc9d8fb13a2a9f703ac4517eb0c10f9ea4612fd9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 11:38:15 +0200
Subject: [PATCH 331/492] [libcalamares] Rename files Label -> Translation

---
 src/libcalamares/CMakeLists.txt                           | 4 ++--
 src/libcalamares/locale/Tests.cpp                         | 2 +-
 src/libcalamares/locale/TranslatableConfiguration.cpp     | 3 ++-
 src/libcalamares/locale/{Label.cpp => Translation.cpp}    | 2 +-
 src/libcalamares/locale/{Label.h => Translation.h}        | 8 ++++----
 .../locale/{LabelModel.cpp => TranslationsModel.cpp}      | 8 +++++---
 .../locale/{LabelModel.h => TranslationsModel.h}          | 6 +++---
 src/modules/locale/Config.cpp                             | 2 +-
 src/modules/welcome/Config.h                              | 2 +-
 src/modules/welcome/WelcomePage.cpp                       | 1 -
 src/modules/welcome/WelcomePage.h                         | 2 +-
 src/modules/welcomeq/WelcomeQmlViewStep.cpp               | 2 +-
 12 files changed, 22 insertions(+), 20 deletions(-)
 rename src/libcalamares/locale/{Label.cpp => Translation.cpp} (99%)
 rename src/libcalamares/locale/{Label.h => Translation.h} (95%)
 rename src/libcalamares/locale/{LabelModel.cpp => TranslationsModel.cpp} (90%)
 rename src/libcalamares/locale/{LabelModel.h => TranslationsModel.h} (96%)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index d4755bde4f..645a26d257 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -40,12 +40,12 @@ set( libSources
 
     # Locale-data service
     locale/Global.cpp
-    locale/Label.cpp
-    locale/LabelModel.cpp
     locale/Lookup.cpp
     locale/TimeZone.cpp
     locale/TranslatableConfiguration.cpp
     locale/TranslatableString.cpp
+    locale/Translation.cpp
+    locale/TranslationsModel.cpp
 
     # Modules
     modulesystem/Config.cpp
diff --git a/src/libcalamares/locale/Tests.cpp b/src/libcalamares/locale/Tests.cpp
index 05e8f610c1..f234c15964 100644
--- a/src/libcalamares/locale/Tests.cpp
+++ b/src/libcalamares/locale/Tests.cpp
@@ -9,9 +9,9 @@
  */
 
 #include "locale/Global.h"
-#include "locale/LabelModel.h"
 #include "locale/TimeZone.h"
 #include "locale/TranslatableConfiguration.h"
+#include "locale/TranslationsModel.h"
 
 #include "CalamaresVersion.h"
 #include "GlobalStorage.h"
diff --git a/src/libcalamares/locale/TranslatableConfiguration.cpp b/src/libcalamares/locale/TranslatableConfiguration.cpp
index c10307aee8..3a95722d18 100644
--- a/src/libcalamares/locale/TranslatableConfiguration.cpp
+++ b/src/libcalamares/locale/TranslatableConfiguration.cpp
@@ -10,7 +10,7 @@
 
 #include "TranslatableConfiguration.h"
 
-#include "LabelModel.h"
+#include "TranslationsModel.h"
 
 #include "utils/Logger.h"
 #include "utils/Variant.h"
@@ -69,6 +69,7 @@ TranslatedString::get() const
 QString
 TranslatedString::get( const QLocale& locale ) const
 {
+    // TODO: keep track of special cases like sr@latin and ca@valencia
     QString localeName = locale.name();
     // Special case, sr@latin doesn't have the @latin reflected in the name
     if ( locale.language() == QLocale::Language::Serbian && locale.script() == QLocale::Script::LatinScript )
diff --git a/src/libcalamares/locale/Label.cpp b/src/libcalamares/locale/Translation.cpp
similarity index 99%
rename from src/libcalamares/locale/Label.cpp
rename to src/libcalamares/locale/Translation.cpp
index f79d0d3e5b..0a2e594be0 100644
--- a/src/libcalamares/locale/Label.cpp
+++ b/src/libcalamares/locale/Translation.cpp
@@ -9,7 +9,7 @@
  *
  */
 
-#include "Label.h"
+#include "Translation.h"
 
 #include 
 
diff --git a/src/libcalamares/locale/Label.h b/src/libcalamares/locale/Translation.h
similarity index 95%
rename from src/libcalamares/locale/Label.h
rename to src/libcalamares/locale/Translation.h
index 04ad4f5e8f..a4402ebaac 100644
--- a/src/libcalamares/locale/Label.h
+++ b/src/libcalamares/locale/Translation.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef LOCALE_LABEL_H
-#define LOCALE_LABEL_H
+#ifndef LOCALE_TRANSLATION_H
+#define LOCALE_TRANSLATION_H
 
 #include 
 #include 
@@ -56,8 +56,8 @@ class Translation : public QObject
      * in the label (human-readable form) or only if needed for disambiguation.
      */
     Translation( const QString& localeName,
-           LabelFormat format = LabelFormat::IfNeededWithCountry,
-           QObject* parent = nullptr );
+                 LabelFormat format = LabelFormat::IfNeededWithCountry,
+                 QObject* parent = nullptr );
 
 
     /** @brief Define a sorting order.
diff --git a/src/libcalamares/locale/LabelModel.cpp b/src/libcalamares/locale/TranslationsModel.cpp
similarity index 90%
rename from src/libcalamares/locale/LabelModel.cpp
rename to src/libcalamares/locale/TranslationsModel.cpp
index 93d0aab3e1..af1bd18011 100644
--- a/src/libcalamares/locale/LabelModel.cpp
+++ b/src/libcalamares/locale/TranslationsModel.cpp
@@ -9,7 +9,7 @@
  *
  */
 
-#include "LabelModel.h"
+#include "TranslationsModel.h"
 
 #include "Lookup.h"
 
@@ -121,7 +121,8 @@ TranslationsModel::find( const QString& countryCode ) const
     }
 
     auto c_l = countryData( countryCode );
-    int r = find( [&]( const Translation& l ) { return ( l.language() == c_l.second ) && ( l.country() == c_l.first ); } );
+    int r = find(
+        [&]( const Translation& l ) { return ( l.language() == c_l.second ) && ( l.country() == c_l.first ); } );
     if ( r >= 0 )
     {
         return r;
@@ -132,7 +133,8 @@ TranslationsModel::find( const QString& countryCode ) const
 TranslationsModel*
 availableTranslations()
 {
-    static TranslationsModel* model = new TranslationsModel( QStringLiteral( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' ) );
+    static TranslationsModel* model
+        = new TranslationsModel( QStringLiteral( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' ) );
     return model;
 }
 
diff --git a/src/libcalamares/locale/LabelModel.h b/src/libcalamares/locale/TranslationsModel.h
similarity index 96%
rename from src/libcalamares/locale/LabelModel.h
rename to src/libcalamares/locale/TranslationsModel.h
index 1d12295b39..b87c000270 100644
--- a/src/libcalamares/locale/LabelModel.h
+++ b/src/libcalamares/locale/TranslationsModel.h
@@ -9,11 +9,11 @@
  *
  */
 
-#ifndef LOCALE_LABELMODEL_H
-#define LOCALE_LABELMODEL_H
+#ifndef LOCALE_TRANSLATIONSMODEL_H
+#define LOCALE_TRANSLATIONSMODEL_H
 
 #include "DllMacro.h"
-#include "Label.h"
+#include "Translation.h"
 
 #include 
 #include 
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index 7000112583..9627fcfc3f 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -15,7 +15,7 @@
 #include "JobQueue.h"
 #include "Settings.h"
 #include "locale/Global.h"
-#include "locale/Label.h"
+#include "locale/Translation.h"
 #include "modulesystem/ModuleManager.h"
 #include "network/Manager.h"
 #include "utils/Logger.h"
diff --git a/src/modules/welcome/Config.h b/src/modules/welcome/Config.h
index 2597ccb5ab..ad509a9838 100644
--- a/src/modules/welcome/Config.h
+++ b/src/modules/welcome/Config.h
@@ -10,7 +10,7 @@
 #ifndef WELCOME_CONFIG_H
 #define WELCOME_CONFIG_H
 
-#include "locale/LabelModel.h"
+#include "locale/TranslationsModel.h"
 #include "modulesystem/RequirementsModel.h"
 
 #include 
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index b56b6754a3..a82d873e9d 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -20,7 +20,6 @@
 #include "Settings.h"
 #include "ViewManager.h"
 
-#include "locale/LabelModel.h"
 #include "modulesystem/ModuleManager.h"
 #include "modulesystem/RequirementsModel.h"
 #include "utils/CalamaresUtilsGui.h"
diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h
index ceeb5160b5..dba1f6a28e 100644
--- a/src/modules/welcome/WelcomePage.h
+++ b/src/modules/welcome/WelcomePage.h
@@ -11,7 +11,7 @@
 #ifndef WELCOMEPAGE_H
 #define WELCOMEPAGE_H
 
-#include "locale/LabelModel.h"
+#include "locale/TranslationsModel.h"
 
 #include 
 #include 
diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.cpp b/src/modules/welcomeq/WelcomeQmlViewStep.cpp
index af32f2992b..0d1d8cb3c2 100644
--- a/src/modules/welcomeq/WelcomeQmlViewStep.cpp
+++ b/src/modules/welcomeq/WelcomeQmlViewStep.cpp
@@ -12,7 +12,7 @@
 
 #include "checker/GeneralRequirements.h"
 
-#include "locale/LabelModel.h"
+#include "locale/TranslationsModel.h"
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"

From 559c53b09c353d816fd9265e4c59a5def2d9872c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 26 Jul 2021 13:14:30 +0200
Subject: [PATCH 332/492] [libcalamares]: stronger type for translation name

QString -> Id for translations in the external API, to avoid
accidentally converting a QLocale name (e.g. ca_ES) into a
Calamares translation name. This preserves special-cases
like ca@valencia and sr@latin.
---
 src/calamares/CalamaresApplication.cpp       |  2 +-
 src/libcalamares/locale/Translation.h        |  7 ++-
 src/libcalamares/utils/Retranslator.cpp      | 54 +++++++-------------
 src/libcalamares/utils/Retranslator.h        | 17 +++---
 src/modules/keyboard/KeyboardLayoutModel.cpp |  2 +-
 src/modules/welcome/Config.cpp               | 16 +++---
 6 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index 08a5606e13..6c3eed6d1c 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -78,7 +78,7 @@ CalamaresApplication::init()
     initQmlPath();
     initBranding();
 
-    CalamaresUtils::installTranslator( QLocale::system(), QString() );
+    CalamaresUtils::installTranslator();
 
     setQuitOnLastWindowClosed( false );
     setWindowIcon( QIcon( Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductIcon ) ) );
diff --git a/src/libcalamares/locale/Translation.h b/src/libcalamares/locale/Translation.h
index a4402ebaac..db5be3c7c0 100644
--- a/src/libcalamares/locale/Translation.h
+++ b/src/libcalamares/locale/Translation.h
@@ -46,6 +46,11 @@ class Translation : public QObject
         IfNeededWithCountry
     };
 
+    struct Id
+    {
+        QString name;
+    };
+
     /** @brief Empty locale. This uses the system-default locale. */
     Translation( QObject* parent = nullptr );
 
@@ -82,7 +87,7 @@ class Translation : public QObject
     QLocale locale() const { return m_locale; }
 
     QString name() const { return m_locale.name(); }
-    QString id() const { return m_localeId; }
+    Id id() const { return { m_localeId }; }
 
     /// @brief Convenience accessor to the language part of the locale
     QLocale::Language language() const { return m_locale.language(); }
diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index 2e71fc0115..2c1d2edb3e 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -28,29 +28,8 @@ static bool s_allowLocalTranslations = false;
  */
 struct TranslationLoader
 {
-    static QString mungeLocaleName( const QLocale& locale )
-    {
-        QString localeName = locale.name();
-        localeName.replace( "-", "_" );
-
-        if ( localeName == "C" )
-        {
-            localeName = "en";
-        }
-
-        // Special case of sr@latin
-        //
-        // See top-level CMakeLists.txt about special cases for translation loading.
-        if ( locale.language() == QLocale::Language::Serbian && locale.script() == QLocale::Script::LatinScript )
-        {
-            localeName = QStringLiteral( "sr@latin" );
-        }
-        return localeName;
-    }
-
-    TranslationLoader( const QLocale& locale )
-        : m_locale( locale )
-        , m_localeName( mungeLocaleName( locale ) )
+    TranslationLoader( const QString& locale )
+        : m_localeName( locale )
     {
     }
 
@@ -58,14 +37,13 @@ struct TranslationLoader
     /// @brief Loads @p translator with the specific translations of this type
     virtual bool tryLoad( QTranslator* translator ) = 0;
 
-    const QLocale& m_locale;
     QString m_localeName;
 };
 
 /// @brief Loads translations for branding
 struct BrandingLoader : public TranslationLoader
 {
-    BrandingLoader( const QLocale& locale, const QString& prefix )
+    BrandingLoader( const QString& locale, const QString& prefix )
         : TranslationLoader( locale )
         , m_prefix( prefix )
     {
@@ -106,7 +84,7 @@ BrandingLoader::tryLoad( QTranslator* translator )
     {
         QString filenameBase( m_prefix );
         filenameBase.remove( 0, m_prefix.lastIndexOf( QDir::separator() ) + 1 );
-        if ( translator->load( m_locale, filenameBase, "_", brandingTranslationsDir.absolutePath() ) )
+        if ( translator->load( m_localeName, filenameBase, "_", brandingTranslationsDir.absolutePath() ) )
         {
             cDebug() << Logger::SubEntry << "Branding using locale:" << m_localeName;
             return true;
@@ -189,26 +167,32 @@ static QTranslator* s_tztranslator = nullptr;
 static QString s_translatorLocaleName;
 
 void
-installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix )
+installTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& brandingTranslationsPrefix )
 {
-    loadSingletonTranslator( BrandingLoader( locale, brandingTranslationsPrefix ), s_brandingTranslator );
-    loadSingletonTranslator( TZLoader( locale ), s_tztranslator );
-    loadSingletonTranslator( CalamaresLoader( locale ), s_translator );
+    s_translatorLocaleName = locale.name;
 
-    s_translatorLocaleName = CalamaresLoader::mungeLocaleName( locale );
+    loadSingletonTranslator( BrandingLoader( locale.name, brandingTranslationsPrefix ), s_brandingTranslator );
+    loadSingletonTranslator( TZLoader( locale.name ), s_tztranslator );
+    loadSingletonTranslator( CalamaresLoader( locale.name ), s_translator );
 }
 
+void
+installTranslator()
+{
+    // Just wrap it up like an Id
+    installTranslator( { QLocale::system().name() }, QString() );
+}
 
-QString
+CalamaresUtils::Locale::Translation::Id
 translatorLocaleName()
 {
-    return s_translatorLocaleName;
+    return { s_translatorLocaleName };
 }
 
 bool
-loadTranslator( const QLocale& locale, const QString& prefix, QTranslator* translator )
+loadTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& prefix, QTranslator* translator )
 {
-    return ::tryLoad( translator, prefix, locale.name() );
+    return ::tryLoad( translator, prefix, locale.name );
 }
 
 Retranslator::Retranslator( QObject* parent )
diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h
index 9d8617cbd1..efe12ef8ac 100644
--- a/src/libcalamares/utils/Retranslator.h
+++ b/src/libcalamares/utils/Retranslator.h
@@ -12,8 +12,8 @@
 #define UTILS_RETRANSLATOR_H
 
 #include "DllMacro.h"
+#include "locale/Translation.h"
 
-#include 
 #include 
 #include 
 
@@ -25,12 +25,15 @@ class QTranslator;
 
 namespace CalamaresUtils
 {
-/**
- * @brief installTranslator changes the application language.
- * @param locale the new locale.
+/** @brief changes the application language.
+ * @param locale the new locale (names as defined by Calamares).
  * @param brandingTranslationsPrefix the branding path prefix, from Calamares::Branding.
  */
-DLLEXPORT void installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix );
+DLLEXPORT void installTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& brandingTranslationsPrefix );
+
+/** @brief Initializes the translations with the current system settings
+ */
+DLLEXPORT void installTranslator();
 
 /** @brief The name of the (locale of the) most recently installed translator
  *
@@ -38,7 +41,7 @@ DLLEXPORT void installTranslator( const QLocale& locale, const QString& branding
  * QLocale passed in, because Calamares will munge some names and
  * may remap translations.
  */
-DLLEXPORT QString translatorLocaleName();
+DLLEXPORT CalamaresUtils::Locale::Translation::Id translatorLocaleName();
 
 /** @brief Loads  translations into the given @p translator
  *
@@ -53,7 +56,7 @@ DLLEXPORT QString translatorLocaleName();
  *
  * @returns @c true on success
  */
-DLLEXPORT bool loadTranslator( const QLocale& locale, const QString& prefix, QTranslator* translator );
+DLLEXPORT bool loadTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& prefix, QTranslator* translator );
 
 /** @brief Set @p allow to true to load translations from current dir.
  *
diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 34a1dec885..3b9ba19fe6 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -27,7 +27,7 @@ retranslateKeyboardModels()
     {
         s_kbtranslator = new QTranslator;
     }
-    (void)CalamaresUtils::loadTranslator( QLocale(), QStringLiteral( "kb_" ), s_kbtranslator );
+    (void)CalamaresUtils::loadTranslator( CalamaresUtils::translatorLocaleName(), QStringLiteral( "kb_" ), s_kbtranslator );
 }
 
 
diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index 756cb0e5a6..4d9fcad2bf 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -150,10 +150,10 @@ Config::initLanguages()
 
     if ( matchedLocaleIndex >= 0 )
     {
-        QString name = m_languages->locale( matchedLocaleIndex ).name();
-        cDebug() << Logger::SubEntry << "Matched with index" << matchedLocaleIndex << name;
+        auto languageId = m_languages->locale( matchedLocaleIndex ).id();
+        cDebug() << Logger::SubEntry << "Matched with index" << matchedLocaleIndex << languageId.name;
 
-        CalamaresUtils::installTranslator( name, Calamares::Branding::instance()->translationsDirectory() );
+        CalamaresUtils::installTranslator( languageId, Calamares::Branding::instance()->translationsDirectory() );
         setLocaleIndex( matchedLocaleIndex );
     }
     else
@@ -188,16 +188,16 @@ Config::setLocaleIndex( int index )
 
     m_localeIndex = index;
 
-    const auto& selectedLocale = m_languages->locale( m_localeIndex ).locale();
-    cDebug() << "Index" << index << "Selected locale" << selectedLocale;
+    const auto& selectedTranslation = m_languages->locale( m_localeIndex );
+    cDebug() << "Index" << index << "Selected locale" << selectedTranslation.id().name;
 
-    QLocale::setDefault( selectedLocale );
-    CalamaresUtils::installTranslator( selectedLocale, Calamares::Branding::instance()->translationsDirectory() );
+    QLocale::setDefault( selectedTranslation.locale() );
+    CalamaresUtils::installTranslator( selectedTranslation.id(), Calamares::Branding::instance()->translationsDirectory() );
     if ( Calamares::JobQueue::instance() && Calamares::JobQueue::instance()->globalStorage() )
     {
         CalamaresUtils::Locale::insertGS( *Calamares::JobQueue::instance()->globalStorage(),
                                           QStringLiteral( "LANG" ),
-                                          CalamaresUtils::translatorLocaleName() );
+                                          CalamaresUtils::translatorLocaleName().name );
     }
     emit localeIndexChanged( m_localeIndex );
 }

From 1297845e319b4c92d4cd5bcca50a494060503cc5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 31 Jul 2021 00:39:37 +0200
Subject: [PATCH 333/492] i18n: update language lists

I'm specifically putting zh_HK in the 'ok' list so it is selectable,
because that's what we need to be able to improve it most quickly,
---
 CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c2b6e02cb..84aba3fe83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,14 +132,14 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 # NOTE: update these lines by running `txstats.py`, or for full automation
 #       `txstats.py -e`. See also
 #
-# Total 77 languages
-set( _tx_complete ca lt pt_PT sq uk zh_TW )
-set( _tx_good as az az_AZ be ca@valencia cs_CZ da de fi_FI fr fur
-    he hi hr it_IT ja ko ml nl pt_BR ru sk sv tg tr_TR vi zh_CN )
+# Total 79 languages
+set( _tx_complete az az_AZ ca fi_FI he hi hr ja lt sq sv uk zh_TW )
+set( _tx_good as be ca@valencia cs_CZ da de fr fur it_IT ko ml nl
+    pt_BR pt_PT ru sk tg tr_TR vi zh_CN )
 set( _tx_ok ar ast bg bn el en_GB es es_MX es_PR et eu fa gl hu id
-    is mr nb pl ro sl sr sr@latin th )
-set( _tx_incomplete eo es_PE fr_CH gu id_ID ie kk kn lo lv mk ne
-    ne_NP ru_RU si te ur uz zh )
+    is mr nb pl ro sl sr sr@latin th zh_HK )
+set( _tx_incomplete eo es_PE fr_CH gu id_ID ie kk kn ko_KR lo lv mk
+    ne ne_NP ru_RU si te ur uz zh )
 
 ### Required versions
 #

From 07a9e3dd46c311941918321bb87178391d826d8b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sat, 31 Jul 2021 00:41:27 +0200
Subject: [PATCH 334/492] CHANGES: release date

---
 CHANGES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index cd10c82df4..b1af852b68 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.41 (unreleased) #
+# 3.2.41 (2021-07-31) #
 
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma

From 12a361556bc15e24e373b181b18b0ffb2f11ba4b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 1 Aug 2021 21:26:06 +0200
Subject: [PATCH 335/492] Changes: post-release housekeeping

---
 CHANGES        | 12 ++++++++++++
 CMakeLists.txt |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index b1af852b68..94068efc06 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.42 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - No external contributors yet
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - No module changes yet
+
+
 # 3.2.41 (2021-07-31) #
 
 This release contains contributions from (alphabetically by first name):
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84aba3fe83..44a88074f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,11 +41,11 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.41
+    VERSION 3.2.42
     LANGUAGES C CXX
 )
 
-set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From b8583a1e59943a4269a38df6f7e033aedebd0a8a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 1 Aug 2021 22:07:51 +0200
Subject: [PATCH 336/492] [libcalamares] Expand the number of URLs to check for
 connectivity

- introduce a list of URLs instead of just one
- ping each of them, in turn, until one responds
---
 src/libcalamares/network/Manager.cpp | 40 ++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index 79db1a587e..e5277d74ef 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -27,7 +27,7 @@ namespace Network
 void
 RequestOptions::applyToRequest( QNetworkRequest* request ) const
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+#if QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 )
     constexpr const auto RedirectPolicyAttribute = QNetworkRequest::FollowRedirectsAttribute;
 #else
     constexpr const auto RedirectPolicyAttribute = QNetworkRequest::RedirectPolicyAttribute;
@@ -60,8 +60,9 @@ public slots:
     void cleanupNam();
 
 public:
-    QUrl m_hasInternetUrl;
-    bool m_hasInternet;
+    QVector< QUrl > m_hasInternetUrls;
+    bool m_hasInternet = false;
+    int m_lastCheckedUrlIndex = -1;
 
     Private();
 
@@ -155,8 +156,33 @@ Manager::hasInternet()
 bool
 Manager::checkHasInternet()
 {
+    if ( d->m_hasInternetUrls.empty() )
+    {
+        return false;
+    }
+    if ( d->m_lastCheckedUrlIndex < 0 )
+    {
+        d->m_lastCheckedUrlIndex = 0;
+    }
+    int attempts = 0;
+    do
+    {
+        // Start by pinging the same one as last time
+        d->m_hasInternet = synchronousPing( d->m_hasInternetUrls.at( d->m_lastCheckedUrlIndex ) );
+        // if it's not responding, **then** move on to the next one,
+        // and wrap around if needed
+        if ( !d->m_hasInternet )
+        {
+            if ( ++( d->m_lastCheckedUrlIndex ) >= d->m_hasInternetUrls.size() )
+            {
+                d->m_lastCheckedUrlIndex = 0;
+            }
+        }
+        // keep track of how often we've tried, because there's no point in
+        // going around more than once.
+        attempts++;
+    } while ( !d->m_hasInternet && ( attempts < d->m_hasInternetUrls.size() ) );
 
-    d->m_hasInternet = synchronousPing( d->m_hasInternetUrl );
 
 // For earlier Qt versions (< 5.15.0), set the accessibility flag to
 // NotAccessible if synchronous ping has failed, so that any module
@@ -177,7 +203,11 @@ Manager::checkHasInternet()
 void
 Manager::setCheckHasInternetUrl( const QUrl& url )
 {
-    d->m_hasInternetUrl = url;
+    if ( d->m_hasInternetUrls.empty() )
+    {
+        d->m_lastCheckedUrlIndex = -1;
+    }
+    d->m_hasInternetUrls.append( url );
 }
 
 /** @brief Does a request asynchronously, returns the (pending) reply

From 81fe8b148834d236c78404e2e91539be4d689a70 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 1 Aug 2021 22:37:13 +0200
Subject: [PATCH 337/492] [libcalamares] Expand API for setting URLs to check

---
 src/libcalamares/network/Manager.cpp | 19 +++++++++++++++----
 src/libcalamares/network/Manager.h   |  7 +++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index e5277d74ef..62ab60e604 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -203,10 +203,21 @@ Manager::checkHasInternet()
 void
 Manager::setCheckHasInternetUrl( const QUrl& url )
 {
-    if ( d->m_hasInternetUrls.empty() )
-    {
-        d->m_lastCheckedUrlIndex = -1;
-    }
+    d->m_lastCheckedUrlIndex = -1;
+    d->m_hasInternetUrls.clear();
+    d->m_hasInternetUrls.append( url );
+}
+
+void
+Manager::setCheckHasInternetUrl( const QVector< QUrl >& urls )
+{
+    d->m_lastCheckedUrlIndex = -1;
+    d->m_hasInternetUrls = urls;
+}
+
+void
+Manager::addCheckHasInternetUrl( const QUrl& url )
+{
     d->m_hasInternetUrls.append( url );
 }
 
diff --git a/src/libcalamares/network/Manager.h b/src/libcalamares/network/Manager.h
index a038dceae1..8bc3dded7c 100644
--- a/src/libcalamares/network/Manager.h
+++ b/src/libcalamares/network/Manager.h
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -122,6 +123,12 @@ class DLLEXPORT Manager : public QObject
     /// @brief Set the URL which is used for the general "is there internet" check.
     void setCheckHasInternetUrl( const QUrl& url );
 
+    /// @brief Adds an (extra) URL to check
+    void addCheckHasInternetUrl( const QUrl& url );
+
+    /// @brief Set a collection of URLs used for the general "is there internet" check.
+    void setCheckHasInternetUrl( const QVector< QUrl >& urls );
+
     /** @brief Do a network request asynchronously.
      *
      * Returns a pointer to the reply-from-the-request.

From 2f3062f4c298873700998f9304e0c2045f690e45 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 1 Aug 2021 23:49:33 +0200
Subject: [PATCH 338/492] [libcalamares] Fix typo in comment

---
 src/libcalamares/utils/Variant.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libcalamares/utils/Variant.h b/src/libcalamares/utils/Variant.h
index ab9e73f90a..d0d893dc3e 100644
--- a/src/libcalamares/utils/Variant.h
+++ b/src/libcalamares/utils/Variant.h
@@ -34,7 +34,7 @@ DLLEXPORT QString getString( const QVariantMap& map, const QString& key, const Q
 
 /** @brief Get a string list from a mapping with a given key; returns @p d if no value.
  *
- * This is slightly more lenient that getString(), and a single-string value will
+ * This is slightly more lenient than getString(), and a single-string value will
  * be returned as a 1-item list.
  */
 DLLEXPORT QStringList getStringList( const QVariantMap& map, const QString& key, const QStringList& d = QStringList() );

From 1452b747402928edf4ddd84431429ade859ebe82 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 1 Aug 2021 23:52:27 +0200
Subject: [PATCH 339/492] [welcome] Load potentially a list of URLs to check

---
 .../welcome/checker/GeneralRequirements.cpp   | 76 +++++++++++++------
 src/modules/welcome/welcome.conf              | 15 ++++
 2 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp
index 07c3529465..2528cbd9f4 100644
--- a/src/modules/welcome/checker/GeneralRequirements.cpp
+++ b/src/modules/welcome/checker/GeneralRequirements.cpp
@@ -215,6 +215,57 @@ GeneralRequirements::checkRequirements()
     return checkEntries;
 }
 
+/** @brief Loads the check-internel URLs
+ *
+ * There may be zero or one or more URLs specified; returns
+ * @c true if the configuration is incomplete or damaged in some way.
+ */
+static bool
+getCheckInternetUrls( const QVariantMap& configurationMap )
+{
+    const QString exampleUrl = QStringLiteral( "http://example.com" );
+
+    bool incomplete = false;
+    QStringList checkInternetSetting = CalamaresUtils::getStringList( configurationMap, "internetCheckUrl" );
+    if ( !checkInternetSetting.isEmpty() )
+    {
+        QVector< QUrl > urls;
+        for ( const auto& urlString : qAsConst( checkInternetSetting ) )
+        {
+            QUrl url( urlString.trimmed() );
+            if ( url.isValid() )
+            {
+                urls.append( url );
+            }
+            else
+            {
+                cWarning() << "GeneralRequirements entry 'internetCheckUrl' in welcome.conf contains invalid"
+                           << urlString;
+            }
+        }
+
+        if ( urls.empty() )
+        {
+            cWarning() << "GeneralRequirements entry 'internetCheckUrl' contains no valid URLs,"
+                       << "reverting to default (http://example.com).";
+            CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) );
+            incomplete = true;
+        }
+        else
+        {
+            CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( urls );
+        }
+    }
+    else
+    {
+        cWarning() << "GeneralRequirements entry 'internetCheckUrl' is undefined in welcome.conf,"
+                      "reverting to default (http://example.com).";
+        CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) );
+        incomplete = true;
+    }
+    return incomplete;
+}
+
 
 void
 GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
@@ -302,30 +353,7 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
         incompleteConfiguration = true;
     }
 
-    QUrl checkInternetUrl;
-    QString checkInternetSetting = CalamaresUtils::getString( configurationMap, "internetCheckUrl" );
-    if ( !checkInternetSetting.isEmpty() )
-    {
-        checkInternetUrl = QUrl( checkInternetSetting.trimmed() );
-        if ( !checkInternetUrl.isValid() )
-        {
-            cWarning() << "GeneralRequirements entry 'internetCheckUrl' is invalid in welcome.conf"
-                       << checkInternetSetting << "reverting to default (http://example.com).";
-            checkInternetUrl = QUrl( "http://example.com" );
-            incompleteConfiguration = true;
-        }
-    }
-    else
-    {
-        cWarning() << "GeneralRequirements entry 'internetCheckUrl' is undefined in welcome.conf,"
-                      "reverting to default (http://example.com).";
-        checkInternetUrl = "http://example.com";
-        incompleteConfiguration = true;
-    }
-    if ( checkInternetUrl.isValid() )
-    {
-        CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( checkInternetUrl );
-    }
+    incompleteConfiguration |= getCheckInternetUrls( configurationMap );
 
     if ( incompleteConfiguration )
     {
diff --git a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf
index b3da8d366d..6e11817bf0 100644
--- a/src/modules/welcome/welcome.conf
+++ b/src/modules/welcome/welcome.conf
@@ -43,6 +43,21 @@ requirements:
     #
     # The URL is only used if "internet" is in the *check* list below.
     internetCheckUrl:   http://example.com
+    #
+    # This may be a single URL, or a list or URLs, in which case the
+    # URLs will be checked one-by-one; if any of them returns data,
+    # internet is assumed to be OK. This can be used to check via
+    # a number of places, where some domains may be down or blocked.
+    #
+    # To use a list of URLs, just use YAML list syntax (e.g.
+    #
+    # internetCheckUrl:
+    #     - http://www.kde.org
+    #     - http://www.freebsd.org
+    #
+    # or short-form
+    #
+    # internetCheckUrl: [ http://www.kde.org, http://www.freebsd.org ]
 
     # List conditions to check. Each listed condition will be
     # probed in some way, and yields true or false according to

From 670d8089bc0a0ee8fd79a60441bb98df050b0f80 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 5 Aug 2021 14:16:28 +0200
Subject: [PATCH 340/492] Changes: pre-release housekeeping

---
 CHANGES        | 12 +++---------
 CMakeLists.txt |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 94068efc06..91e71395fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,16 +7,10 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.42 (unreleased) #
+# 3.2.41.1 (2021-08-05) #
 
-This release contains contributions from (alphabetically by first name):
- - No external contributors yet
-
-## Core ##
- - No core changes yet
-
-## Modules ##
- - No module changes yet
+This is a hotfix release for a crash in the *partition* module, reported on
+KDE neon. #1746
 
 
 # 3.2.41 (2021-07-31) #
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44a88074f5..9b6e46828e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,11 +41,11 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.42
+    VERSION 3.2.41.1
     LANGUAGES C CXX
 )
 
-set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From 2820316d16aba7a7f58708f193d8da3ace46f029 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 5 Aug 2021 14:23:11 +0200
Subject: [PATCH 341/492] Partition: don't set text if button doesn't exist

---
 src/modules/partition/gui/ChoicePage.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 11f1504c10..ebff428def 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -140,8 +140,11 @@ ChoicePage::retranslate()
     m_previewBeforeLabel->setText( tr( "Current:" ) );
     m_previewAfterLabel->setText( tr( "After:" ) );
 
-    m_somethingElseButton->setText( tr( "Manual partitioning
    "
-                                        "You can create or resize partitions yourself." ) );
+    if ( m_somethingElseButton )
+    {
+        m_somethingElseButton->setText( tr( "Manual partitioning
    "
+                                            "You can create or resize partitions yourself." ) );
+    }
     updateSwapChoicesTr( m_eraseSwapChoiceComboBox );
 }
 

From c5fa6383d731c6339a76debbb75a5ee4476fc100 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 5 Aug 2021 14:25:20 +0200
Subject: [PATCH 342/492] [welcome] Remove annoying debug message

---
 src/modules/welcome/Config.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index bc489d1866..48e92e6287 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -38,8 +38,6 @@ Config::Config( QObject* parent )
 void
 Config::retranslate()
 {
-    cWarning() << "Retranslated to" << QLocale().name();
-
     m_genericWelcomeMessage = genericWelcomeMessage().arg( Calamares::Branding::instance()->versionedName() );
     emit genericWelcomeMessageChanged( m_genericWelcomeMessage );
 

From 390acd41b2972df918f73ea1dc81e7dec5eadbe9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 4 Aug 2021 01:42:00 +0200
Subject: [PATCH 343/492] [partition] Factor out manual partitioning
 translation

- needs to be called when the button is created, too
---
 src/modules/partition/gui/ChoicePage.cpp | 18 +++++++++++++-----
 src/modules/partition/gui/ChoicePage.h   |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index ebff428def..d6a9a52500 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -140,12 +140,8 @@ ChoicePage::retranslate()
     m_previewBeforeLabel->setText( tr( "Current:" ) );
     m_previewAfterLabel->setText( tr( "After:" ) );
 
-    if ( m_somethingElseButton )
-    {
-        m_somethingElseButton->setText( tr( "Manual partitioning
    "
-                                            "You can create or resize partitions yourself." ) );
-    }
     updateSwapChoicesTr( m_eraseSwapChoiceComboBox );
+    updateChoiceButtonsTr();
 }
 
 
@@ -342,6 +338,8 @@ ChoicePage::setupChoices()
                  this,
                  &ChoicePage::onEraseSwapChoiceChanged );
     }
+
+    updateChoiceButtonsTr();
 }
 
 
@@ -1664,6 +1662,16 @@ ChoicePage::updateSwapChoicesTr( QComboBox* box )
     }
 }
 
+void
+ChoicePage::updateChoiceButtonsTr()
+{
+    if ( m_somethingElseButton )
+    {
+        m_somethingElseButton->setText( tr( "Manual partitioning
    "
+                                            "You can create or resize partitions yourself." ) );
+    }
+}
+
 int
 ChoicePage::lastSelectedDeviceIndex()
 {
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index c340bfe4a0..ce1c95326b 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -125,6 +125,7 @@ private slots:
 
     // Translations support
     void updateSwapChoicesTr( QComboBox* box );
+    void updateChoiceButtonsTr();
 
     Config* m_config;
     bool m_nextEnabled;

From 0be4c38a87efe50acd8b64ca4df2946c0adbcf34 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 4 Aug 2021 01:45:22 +0200
Subject: [PATCH 344/492] [partition] Remove useless parameter

- previously, updateSwapChoicesTr() wanted to be a static free function,
  but it needs QObject::tr() ; drop the unnecessary parameter (since it
  is a member function).
---
 src/modules/partition/gui/ChoicePage.cpp | 24 ++++++++++++------------
 src/modules/partition/gui/ChoicePage.h   |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index d6a9a52500..83de4e3389 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -140,7 +140,7 @@ ChoicePage::retranslate()
     m_previewBeforeLabel->setText( tr( "Current:" ) );
     m_previewAfterLabel->setText( tr( "After:" ) );
 
-    updateSwapChoicesTr( m_eraseSwapChoiceComboBox );
+    updateSwapChoicesTr();
     updateChoiceButtonsTr();
 }
 
@@ -1617,47 +1617,47 @@ ChoicePage::updateNextEnabled()
 }
 
 void
-ChoicePage::updateSwapChoicesTr( QComboBox* box )
+ChoicePage::updateSwapChoicesTr()
 {
-    if ( !box )
+    if ( !m_eraseSwapChoiceComboBox )
     {
         return;
     }
 
     static_assert( SwapChoice::NoSwap == 0, "Enum values out-of-sync" );
-    for ( int index = 0; index < box->count(); ++index )
+    for ( int index = 0; index < m_eraseSwapChoiceComboBox->count(); ++index )
     {
         bool ok = false;
         int value = 0;
 
-        switch ( value = box->itemData( index ).toInt( &ok ) )
+        switch ( value = m_eraseSwapChoiceComboBox->itemData( index ).toInt( &ok ) )
         {
         // case 0:
         case SwapChoice::NoSwap:
             // toInt() returns 0 on failure, so check for ok
             if ( ok )  // It was explicitly set to 0
             {
-                box->setItemText( index, tr( "No Swap" ) );
+                m_eraseSwapChoiceComboBox->setItemText( index, tr( "No Swap" ) );
             }
             else
             {
-                cWarning() << "Box item" << index << box->itemText( index ) << "has non-integer role.";
+                cWarning() << "Box item" << index << m_eraseSwapChoiceComboBox->itemText( index ) << "has non-integer role.";
             }
             break;
         case SwapChoice::ReuseSwap:
-            box->setItemText( index, tr( "Reuse Swap" ) );
+            m_eraseSwapChoiceComboBox->setItemText( index, tr( "Reuse Swap" ) );
             break;
         case SwapChoice::SmallSwap:
-            box->setItemText( index, tr( "Swap (no Hibernate)" ) );
+            m_eraseSwapChoiceComboBox->setItemText( index, tr( "Swap (no Hibernate)" ) );
             break;
         case SwapChoice::FullSwap:
-            box->setItemText( index, tr( "Swap (with Hibernate)" ) );
+            m_eraseSwapChoiceComboBox->setItemText( index, tr( "Swap (with Hibernate)" ) );
             break;
         case SwapChoice::SwapFile:
-            box->setItemText( index, tr( "Swap to file" ) );
+            m_eraseSwapChoiceComboBox->setItemText( index, tr( "Swap to file" ) );
             break;
         default:
-            cWarning() << "Box item" << index << box->itemText( index ) << "has role" << value;
+            cWarning() << "Box item" << index << m_eraseSwapChoiceComboBox->itemText( index ) << "has role" << value;
         }
     }
 }
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index ce1c95326b..3892b4a232 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -124,7 +124,7 @@ private slots:
     void setupEfiSystemPartitionSelector();
 
     // Translations support
-    void updateSwapChoicesTr( QComboBox* box );
+    void updateSwapChoicesTr();
     void updateChoiceButtonsTr();
 
     Config* m_config;

From a1690ac2d6537562b2648975425af5eac81b8200 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 4 Aug 2021 01:47:55 +0200
Subject: [PATCH 345/492] [partition] Set up swap-choice texts correctly

---
 src/modules/partition/gui/ChoicePage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 83de4e3389..5f3832fa0f 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -339,6 +339,7 @@ ChoicePage::setupChoices()
                  &ChoicePage::onEraseSwapChoiceChanged );
     }
 
+    updateSwapChoicesTr();
     updateChoiceButtonsTr();
 }
 

From b7a3f58df44d20d133ea3ddafec9bf7a08647e89 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 5 Aug 2021 14:51:31 +0200
Subject: [PATCH 346/492] [partition] Update waiting widget only if it (still)
 exists

---
 src/modules/partition/PartitionViewStep.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 015aab2ce4..d3d45bc8a8 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -51,7 +51,7 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
 
     m_waitingWidget = new WaitingWidget( QString() );
     m_widget->addWidget( m_waitingWidget );
-    CALAMARES_RETRANSLATE( m_waitingWidget->setText( tr( "Gathering system information..." ) ); );
+    CALAMARES_RETRANSLATE( if (m_waitingWidget) {  m_waitingWidget->setText( tr( "Gathering system information..." ) ); } );
 
     m_core = new PartitionCoreModule( this );  // Unusable before init is complete!
     // We're not done loading, but we need the configuration map first.

From 8a2f60a03a57123d668183d22d5b98a4841b212e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 5 Aug 2021 15:29:23 +0200
Subject: [PATCH 347/492] Changes: post-release housekeeping

---
 CHANGES        | 12 ++++++++++++
 CMakeLists.txt |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 91e71395fc..96282452d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.42 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - No external contributors yet
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - No module changes yet
+
+
 # 3.2.41.1 (2021-08-05) #
 
 This is a hotfix release for a crash in the *partition* module, reported on
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b6e46828e..44a88074f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,11 +41,11 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.41.1
+    VERSION 3.2.42
     LANGUAGES C CXX
 )
 
-set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From e294221a2d6628bfac997d88affa99c287b3b5ed Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 31 Aug 2021 13:08:54 +0200
Subject: [PATCH 348/492] [partition] Rename test executables

- all partition tests are now named partitiontest
---
 src/modules/partition/tests/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index 8edef484c3..c8c6f7fd43 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
 )
 
 calamares_add_test(
-    partitionjobtests
+    partitionjobtest
     SOURCES
         PartitionJobTests.cpp
         ${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp
@@ -31,7 +31,7 @@ calamares_add_test(
 )
 
 calamares_add_test(
-    clearmountsjobtests
+    partitionclearmountsjobtest
     SOURCES
         ${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp
         ClearMountsJobTests.cpp
@@ -42,7 +42,7 @@ calamares_add_test(
 
 
 calamares_add_test(
-    createlayoutstests
+    partitioncreatelayoutstest
     SOURCES
         ${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp
         ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
@@ -59,7 +59,7 @@ calamares_add_test(
 )
 
 calamares_add_test(
-    automounttests
+    partitionautomounttest
     SOURCES
         ${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp
         AutoMountTests.cpp

From 22ba21f9375aa33acff3fe83ffd845ff74443605 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 31 Aug 2021 13:16:45 +0200
Subject: [PATCH 349/492] [partition] Stub of a test of scandevice

---
 src/modules/partition/tests/CMakeLists.txt   | 11 ++--
 src/modules/partition/tests/DevicesTests.cpp | 56 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 src/modules/partition/tests/DevicesTests.cpp

diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index c8c6f7fd43..6c7abc183d 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -52,9 +52,6 @@ calamares_add_test(
         CreateLayoutsTests.cpp
     LIBRARIES
         kpmcore
-        calamares
-        calamaresui
-        Qt5::Gui
     DEFINITIONS ${_partition_defs}
 )
 
@@ -63,6 +60,10 @@ calamares_add_test(
     SOURCES
         ${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp
         AutoMountTests.cpp
-    LIBRARIES
-        calamares
+)
+
+calamares_add_test(
+    partitiondevicestest
+    SOURCES
+        DevicesTests.cpp
 )
diff --git a/src/modules/partition/tests/DevicesTests.cpp b/src/modules/partition/tests/DevicesTests.cpp
new file mode 100644
index 0000000000..82311b288c
--- /dev/null
+++ b/src/modules/partition/tests/DevicesTests.cpp
@@ -0,0 +1,56 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   SPDX-FileCopyrightText: 2021 Adriaan de Groot 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "core/DeviceList.h"
+
+#include "utils/Logger.h"
+
+#include 
+#include 
+
+class DevicesTests : public QObject
+{
+    Q_OBJECT
+
+public:
+    DevicesTests();
+
+private Q_SLOTS:
+    void testKPMScanDevices();
+    void testPartUtilScanDevices();
+};
+
+DevicesTests::DevicesTests() {}
+
+void
+DevicesTests::testKPMScanDevices()
+{
+    Logger::setupLogLevel( Logger::LOGVERBOSE );
+
+#if defined( WITH_KPMCORE4API )
+    cDebug() << "Getting devices via KPMCore";
+    CoreBackend* backend = CoreBackendManager::self()->backend();
+    DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
+    cDebug() << Logger::SubEntry << "Done getting devices.";
+#else
+    cWarning() << "Test skipped; use KPMCore4";
+#endif
+}
+
+void
+DevicesTests::testPartUtilScanDevices()
+{
+    Logger::setupLogLevel( Logger::LOGVERBOSE );
+
+    cDebug() << "Getting devices via PartUtils";
+    auto l = PartUtils::getDevices();
+    cDebug() << Logger::SubEntry << "Done getting devices.";
+
+    QVERIFY( l.count() > 0 );
+}

From 854eb845d2d2c8226019cfde1968994d29cc7d20 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 5 Aug 2021 15:49:29 +0200
Subject: [PATCH 350/492] [partition] Fix build of layoutstest

This test needs UI because the devicemodel uses GUI parts.
---
 src/modules/partition/tests/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index 6c7abc183d..bb0b59af46 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -52,6 +52,7 @@ calamares_add_test(
         CreateLayoutsTests.cpp
     LIBRARIES
         kpmcore
+        Calamares::calamaresui
     DEFINITIONS ${_partition_defs}
 )
 

From 74a3a2da78ec59996fa313b894c40f5fec2d07ea Mon Sep 17 00:00:00 2001
From: Artem Grinev 
Date: Thu, 12 Aug 2021 02:13:16 +0400
Subject: [PATCH 351/492] [partition] Fix Delete button for extended

Extended partition can't be removed when contains children. This commit
adds missing check.
---
 src/modules/partition/gui/PartitionPage.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index f5a3b0f433..3e2bb4bd1f 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -139,6 +139,11 @@ PartitionPage::updateButtons()
         bool isFree = CalamaresUtils::Partition::isPartitionFreeSpace( partition );
         bool isExtended = partition->roles().has( PartitionRole::Extended );
 
+        bool hasChildren = isExtended
+            && ( partition->children().length() > 1
+                 || ( partition->children().length() == 1
+                      && !CalamaresUtils::Partition::isPartitionFreeSpace( partition->children().at( 0 ) ) ) );
+
         bool isInVG = m_core->isInVG( partition );
 
         create = isFree;
@@ -151,7 +156,7 @@ PartitionPage::updateButtons()
         // order.
         // TODO: See if LVM PVs can be edited in Calamares
         edit = !isFree && !isExtended;
-        del = !isFree && !isInVG;
+        del = !isFree && !isInVG && !hasChildren;
     }
 
     if ( m_ui->deviceComboBox->currentIndex() >= 0 )

From 8913317a44e0a81a9a208ae71b52268005ec7a9a Mon Sep 17 00:00:00 2001
From: demmm 
Date: Mon, 16 Aug 2021 14:06:13 +0200
Subject: [PATCH 352/492] [networkcfg] add setting the correct target user in
 copied file see https://github.com/calamares/calamares/issues/1753

---
 src/modules/networkcfg/main.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index 40d1530317..cc6c394fe8 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -7,6 +7,7 @@
 #   SPDX-FileCopyrightText: 2014 Teo Mrnjavac 
 #   SPDX-FileCopyrightText: 2017 Alf Gaida 
 #   SPDX-FileCopyrightText: 2019 Adriaan de Groot 
+#   SPDX-FileCopyrightText: 2021 Anke boersma 
 #   SPDX-License-Identifier: GPL-3.0-or-later
 #
 #   Calamares is Free Software: see the License-Identifier above.
@@ -14,6 +15,7 @@
 
 import os
 import shutil
+import getpass
 
 import libcalamares
 
@@ -33,6 +35,8 @@ def run():
     Setup network configuration
     """
     root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
+    user = libcalamares.globalstorage.value("username")
+    live_user = getpass.getuser()
 
     if root_mount_point is None:
         libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point))
@@ -60,6 +64,16 @@ def run():
 
             try:
                 shutil.copy(source_network, target_network, follow_symlinks=False)
+                if live_user in open(target_network).read():
+                    text = []
+                    with open(target_network, "r") as network_conf:
+                        text = network_conf.readlines()
+                        with open(target_network, "w") as network_conf:
+                            for line in text:
+                                if 'permissions=user:{}:;'.format(live_user) in line:
+                                    line = 'permissions=user:{}:;\n'.format(user)
+                                network_conf.write(line)
+                    network_conf.close()
             except FileNotFoundError:
                 libcalamares.utils.debug(
                     "Can't copy network configuration files in "

From 805fed559c904e6074095276d93f25f215ca3d55 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Mon, 16 Aug 2021 20:17:07 +0200
Subject: [PATCH 353/492] [networkcfg] use os.getlogin() cala running as root
 returns root for live_user otherwise

---
 src/modules/networkcfg/main.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index cc6c394fe8..35bf67d63e 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -15,7 +15,6 @@
 
 import os
 import shutil
-import getpass
 
 import libcalamares
 
@@ -36,7 +35,7 @@ def run():
     """
     root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
     user = libcalamares.globalstorage.value("username")
-    live_user = getpass.getuser()
+    live_user = os.getlogin()
 
     if root_mount_point is None:
         libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point))

From b9f22a75260031a2e60eda28d6575b23908fc801 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 23 Aug 2021 17:37:08 +0200
Subject: [PATCH 354/492] Changes: mention the networkcfg improvement

---
 CHANGES | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 96282452d8..4b8fcfd554 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,13 +10,15 @@ website will have to do for older versions.
 # 3.2.42 (unreleased) #
 
 This release contains contributions from (alphabetically by first name):
- - No external contributors yet
+ - Anke Boersma
 
 ## Core ##
  - No core changes yet
 
 ## Modules ##
- - No module changes yet
+ - *networkcfg* now translates the "live user" on an ISO to the regular
+   user on the installed system, so that network configuration changes
+   made in the live system are automatically used after installation.
 
 
 # 3.2.41.1 (2021-08-05) #

From c79fc2e6d91af9b39a500f3a8749182776887a43 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 24 Aug 2021 10:00:42 +0200
Subject: [PATCH 355/492] [libcalamares] Add urls only if valid, add tests to
 check that

---
 src/libcalamares/network/Manager.cpp | 14 ++++++-
 src/libcalamares/network/Tests.cpp   | 55 ++++++++++++++++++++++++++++
 src/libcalamares/network/Tests.h     |  3 ++
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index 62ab60e604..0e651f45ca 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -20,6 +20,8 @@
 #include 
 #include 
 
+#include 
+
 namespace CalamaresUtils
 {
 namespace Network
@@ -205,7 +207,10 @@ Manager::setCheckHasInternetUrl( const QUrl& url )
 {
     d->m_lastCheckedUrlIndex = -1;
     d->m_hasInternetUrls.clear();
-    d->m_hasInternetUrls.append( url );
+    if ( url.isValid() )
+    {
+        d->m_hasInternetUrls.append( url );
+    }
 }
 
 void
@@ -213,12 +218,17 @@ Manager::setCheckHasInternetUrl( const QVector< QUrl >& urls )
 {
     d->m_lastCheckedUrlIndex = -1;
     d->m_hasInternetUrls = urls;
+    std::remove_if(
+        d->m_hasInternetUrls.begin(), d->m_hasInternetUrls.end(), []( const QUrl& u ) { return u.isValid(); } );
 }
 
 void
 Manager::addCheckHasInternetUrl( const QUrl& url )
 {
-    d->m_hasInternetUrls.append( url );
+    if ( url.isValid() )
+    {
+        d->m_hasInternetUrls.append( url );
+    }
 }
 
 /** @brief Does a request asynchronously, returns the (pending) reply
diff --git a/src/libcalamares/network/Tests.cpp b/src/libcalamares/network/Tests.cpp
index d42a741156..d44f03781b 100644
--- a/src/libcalamares/network/Tests.cpp
+++ b/src/libcalamares/network/Tests.cpp
@@ -60,3 +60,58 @@ NetworkTests::testPing()
         QVERIFY( canPing_www_kde_org );
     }
 }
+
+void
+NetworkTests::testCheckUrl()
+{
+    using namespace CalamaresUtils::Network;
+    Logger::setupLogLevel( Logger::LOGVERBOSE );
+    auto& nam = Manager::instance();
+
+    {
+        QUrl u( "http://example.com" );
+        QVERIFY( u.isValid() );
+        nam.setCheckHasInternetUrl( u );
+        QVERIFY( nam.checkHasInternet() );
+    }
+    {
+        QUrl u( "http://nonexistent.example.com" );
+        QVERIFY( u.isValid() );
+        nam.setCheckHasInternetUrl( u );
+        QVERIFY( !nam.checkHasInternet() );
+    }
+    {
+        QUrl u;
+        QVERIFY( !u.isValid() );
+        nam.setCheckHasInternetUrl( u );
+        QVERIFY( !nam.checkHasInternet() );
+    }
+}
+
+void
+NetworkTests::testCheckMultiUrl()
+{
+    using namespace CalamaresUtils::Network;
+    Logger::setupLogLevel( Logger::LOGVERBOSE );
+    auto& nam = Manager::instance();
+
+    {
+        QUrl u0( "http://example.com" );
+        QUrl u1( "https://kde.org" );
+        QVERIFY( u0.isValid() );
+        QVERIFY( u1.isValid() );
+        nam.setCheckHasInternetUrl( { u0, u1 } );
+        QVERIFY( nam.checkHasInternet() );
+    }
+    {
+        QUrl u0( "http://nonexistent.example.com" );
+        QUrl u1( "http://bogus.example.com" );
+        QVERIFY( u0.isValid() );
+        QVERIFY( u1.isValid() );
+        nam.setCheckHasInternetUrl( { u0, u1 } );
+        QVERIFY( !nam.checkHasInternet() );
+        QVERIFY( !nam.checkHasInternet() );
+        nam.addCheckHasInternetUrl( QUrl( "http://example.com" ) );
+        QVERIFY( nam.checkHasInternet() );
+    }
+}
diff --git a/src/libcalamares/network/Tests.h b/src/libcalamares/network/Tests.h
index 6000e227ac..d72da574af 100644
--- a/src/libcalamares/network/Tests.h
+++ b/src/libcalamares/network/Tests.h
@@ -24,6 +24,9 @@ private Q_SLOTS:
 
     void testInstance();
     void testPing();
+
+    void testCheckUrl();
+    void testCheckMultiUrl();
 };
 
 #endif

From f1a47a9f0a16e7ba9a9e5b2e09a7906876b5e8f8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 24 Aug 2021 10:24:11 +0200
Subject: [PATCH 356/492] [welcome] Add (stub) test for the Config object

This crashes because there's no translations object yet,
but that is an internal issue.
---
 src/modules/welcome/CMakeLists.txt            | 10 +++
 src/modules/welcome/Tests.cpp                 | 61 +++++++++++++++++++
 .../welcome/tests/1a-checkinternet.conf       |  3 +
 3 files changed, 74 insertions(+)
 create mode 100644 src/modules/welcome/Tests.cpp
 create mode 100644 src/modules/welcome/tests/1a-checkinternet.conf

diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt
index 9240626527..4895d4b80e 100644
--- a/src/modules/welcome/CMakeLists.txt
+++ b/src/modules/welcome/CMakeLists.txt
@@ -42,3 +42,13 @@ calamares_add_plugin( welcome
         Qt5::Network
     SHARED_LIB
 )
+
+calamares_add_test(
+    welcometest
+    SOURCES
+        Config.cpp
+        Tests.cpp
+    LIBRARIES
+        Qt5::Widgets
+        Calamares::calamaresui
+)
diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp
new file mode 100644
index 0000000000..366de416fe
--- /dev/null
+++ b/src/modules/welcome/Tests.cpp
@@ -0,0 +1,61 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   SPDX-FileCopyrightText: 2021 Adriaan de Groot 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "Config.h"
+
+#include "utils/Logger.h"
+#include "utils/Yaml.h"
+
+#include 
+
+class WelcomeTests : public QObject
+{
+    Q_OBJECT
+public:
+    WelcomeTests();
+    ~WelcomeTests() override {}
+
+private Q_SLOTS:
+    void initTestCase();
+
+    void testOneUrl();
+};
+
+WelcomeTests::WelcomeTests() {}
+
+void
+WelcomeTests::initTestCase()
+{
+    Logger::setupLogLevel( Logger::LOGDEBUG );
+    cDebug() << "Welcome test started.";
+}
+
+void
+WelcomeTests::testOneUrl()
+{
+    Config c;
+
+    // BUILD_AS_TEST is the source-directory path
+    QString filename = QStringLiteral( "1a-checkinternet.conf" );
+    QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) );
+    QVERIFY( fi.exists() );
+
+    bool ok = false;
+    const auto map = CalamaresUtils::loadYaml( fi, &ok );
+    QVERIFY( ok );
+    QVERIFY( map.count() > 0 );
+    QVERIFY( map.contains( "requirements" ) );
+}
+
+
+QTEST_GUILESS_MAIN( WelcomeTests )
+
+#include "utils/moc-warnings.h"
+
+#include "Tests.moc"
diff --git a/src/modules/welcome/tests/1a-checkinternet.conf b/src/modules/welcome/tests/1a-checkinternet.conf
new file mode 100644
index 0000000000..d2140f2010
--- /dev/null
+++ b/src/modules/welcome/tests/1a-checkinternet.conf
@@ -0,0 +1,3 @@
+---
+requirements:
+    internetCheckUrl:   http://example.com

From 38c65e80f3c61860fa7ba0b102d6012dd4ccc40a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 24 Aug 2021 11:57:37 +0200
Subject: [PATCH 357/492] [libcalamaresui] Warn when asking for nonexistent
 Branding instance

---
 src/libcalamaresui/Branding.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index b9445ba833..5894c723d6 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -49,6 +49,10 @@ Branding* Branding::s_instance = nullptr;
 Branding*
 Branding::instance()
 {
+    if ( !s_instance )
+    {
+        cWarning() << "No Branding instance created yet.";
+    }
     return s_instance;
 }
 

From e9a98f35ad1b61e0d60f3c28f110fe482f99d102 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 24 Aug 2021 11:58:24 +0200
Subject: [PATCH 358/492] [welcome] Avoid crash when no Branding available

- don't install translators twice -- do it in setLocaleIndex only
- avoid crash if the branding instance is nullptr
---
 src/modules/welcome/Config.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index bc489d1866..52cd4c88d7 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -152,8 +152,6 @@ Config::initLanguages()
     {
         QString name = m_languages->locale( matchedLocaleIndex ).name();
         cDebug() << Logger::SubEntry << "Matched with index" << matchedLocaleIndex << name;
-
-        CalamaresUtils::installTranslator( name, Calamares::Branding::instance()->translationsDirectory() );
         setLocaleIndex( matchedLocaleIndex );
     }
     else
@@ -192,7 +190,8 @@ Config::setLocaleIndex( int index )
     cDebug() << "Index" << index << "Selected locale" << selectedLocale;
 
     QLocale::setDefault( selectedLocale );
-    CalamaresUtils::installTranslator( selectedLocale, Calamares::Branding::instance()->translationsDirectory() );
+    const auto* branding = Calamares::Branding::instance();
+    CalamaresUtils::installTranslator( selectedLocale, branding ? branding->translationsDirectory() : QString() );
     if ( Calamares::JobQueue::instance() && Calamares::JobQueue::instance()->globalStorage() )
     {
         CalamaresUtils::Locale::insertGS( *Calamares::JobQueue::instance()->globalStorage(),

From 14c26d01afb881f0114ab85e8532cf1c8fadb070 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 24 Aug 2021 12:30:44 +0200
Subject: [PATCH 359/492] [libcalamares] Warnings for nullptr Settings

---
 src/libcalamares/Settings.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp
index 9453075b61..2620b8563f 100644
--- a/src/libcalamares/Settings.cpp
+++ b/src/libcalamares/Settings.cpp
@@ -104,6 +104,10 @@ Settings* Settings::s_instance = nullptr;
 Settings*
 Settings::instance()
 {
+    if ( !s_instance )
+    {
+        cWarning() << "Getting nullptr Settings instance.";
+    }
     return s_instance;
 }
 
@@ -238,6 +242,9 @@ Settings::Settings( bool debugMode )
     , m_disableCancel( false )
     , m_disableCancelDuringExec( false )
 {
+    cWarning() << "Using bogus Calamares settings in"
+               << ( debugMode ? QStringLiteral( "debug" ) : QStringLiteral( "regular" ) ) << "mode";
+    s_instance = this;
 }
 
 Settings::Settings( const QString& settingsFilePath, bool debugMode )

From 1e05e7996b778a6d9c7c4a5192008606ad2ea0ef Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 24 Aug 2021 12:32:48 +0200
Subject: [PATCH 360/492] [libcalamares] Avoid cError + SubEntry

The combination of Error and SubEntry loses the indentation.
---
 src/libcalamares/utils/CalamaresUtilsSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
index 29f743743e..df578a8622 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
@@ -102,7 +102,7 @@ System::instance()
     if ( !s_instance )
     {
         cError() << "No Calamares system-object has been created.";
-        cError() << Logger::SubEntry << "using a bogus instance instead.";
+        cDebug() << Logger::SubEntry << "using a bogus instance instead.";
         return new System( true, nullptr );
     }
     return s_instance;

From e0ee2d9514bba73bf384b6794cfc4f4b5a0dd000 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 24 Aug 2021 12:50:03 +0200
Subject: [PATCH 361/492] [welcome] Handle nullptrs nicely in Config

- Branding, Settings, and ModuleManager may all be nullptr,
  in which case the corresponding code shouldn't call methods
  of those instances -- this is demonstrated by just creating
  a Config object
---
 src/modules/welcome/Config.cpp | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index 52cd4c88d7..9894751536 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -40,14 +40,16 @@ Config::retranslate()
 {
     cWarning() << "Retranslated to" << QLocale().name();
 
-    m_genericWelcomeMessage = genericWelcomeMessage().arg( Calamares::Branding::instance()->versionedName() );
+    const auto* branding = Calamares::Branding::instance();
+    const auto* settings = Calamares::Settings::instance();
+    m_genericWelcomeMessage = genericWelcomeMessage().arg( branding ? branding->versionedName() : QString() );
     emit genericWelcomeMessageChanged( m_genericWelcomeMessage );
 
     const auto* r = requirementsModel();
-    if ( !r->satisfiedRequirements() )
+    if ( r && !r->satisfiedRequirements() )
     {
         QString message;
-        const bool setup = Calamares::Settings::instance()->isSetupMode();
+        const bool setup = settings ? settings->isSetupMode() : false;
 
         if ( !r->satisfiedMandatory() )
         {
@@ -72,13 +74,13 @@ Config::retranslate()
                                   "might be disabled." );
         }
 
-        m_warningMessage = message.arg( Calamares::Branding::instance()->shortVersionedName() );
+        m_warningMessage = message.arg( branding ? branding->shortVersionedName() : QString() );
     }
     else
     {
         m_warningMessage = tr( "This program will ask you some questions and "
                                "set up %2 on your computer." )
-                               .arg( Calamares::Branding::instance()->productName() );
+                               .arg( branding ? branding->productName() : QString() );
     }
 
     emit warningMessageChanged( m_warningMessage );
@@ -93,7 +95,8 @@ Config::languagesModel() const
 Calamares::RequirementsModel*
 Config::requirementsModel() const
 {
-    return Calamares::ModuleManager::instance()->requirementsModel();
+    auto* manager = Calamares::ModuleManager::instance();
+    return manager ? manager->requirementsModel() : nullptr;
 }
 
 QAbstractItemModel*
@@ -241,17 +244,19 @@ Config::genericWelcomeMessage() const
 {
     QString message;
 
-    if ( Calamares::Settings::instance()->isSetupMode() )
+    const auto* settings = Calamares::Settings::instance();
+    const auto* branding = Calamares::Branding::instance();
+    const bool welcomeStyle = branding ? branding->welcomeStyleCalamares() : true;
+
+    if ( settings ? settings->isSetupMode() : false )
     {
-        message = Calamares::Branding::instance()->welcomeStyleCalamares()
-            ? tr( "
    Welcome to the Calamares setup program for %1
    " )
-            : tr( "
    Welcome to %1 setup
    " );
+        message = welcomeStyle ? tr( "
    Welcome to the Calamares setup program for %1
    " )
+                               : tr( "
    Welcome to %1 setup
    " );
     }
     else
     {
-        message = Calamares::Branding::instance()->welcomeStyleCalamares()
-            ? tr( "
    Welcome to the Calamares installer for %1
    " )
-            : tr( "
    Welcome to the %1 installer
    " );
+        message = welcomeStyle ? tr( "
    Welcome to the Calamares installer for %1
    " )
+                               : tr( "
    Welcome to the %1 installer
    " );
     }
 
     return message;

From d5e6e1075d9cdf5f32e9b7e746f31117d8986ba7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 24 Aug 2021 13:37:02 +0200
Subject: [PATCH 362/492] [welcome] Expand stub tests to check that crashes are
 gone

---
 src/modules/welcome/Tests.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp
index 366de416fe..eed7dae87e 100644
--- a/src/modules/welcome/Tests.cpp
+++ b/src/modules/welcome/Tests.cpp
@@ -9,6 +9,9 @@
 
 #include "Config.h"
 
+#include "Branding.h"
+#include "Settings.h"
+#include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 
@@ -34,6 +37,17 @@ WelcomeTests::initTestCase()
 {
     Logger::setupLogLevel( Logger::LOGDEBUG );
     cDebug() << "Welcome test started.";
+
+    // Ensure we have a system object, expect it to be a "bogus" one
+    CalamaresUtils::System* system = CalamaresUtils::System::instance();
+    QVERIFY( system );
+    cDebug() << Logger::SubEntry << "System @" << Logger::Pointer( system );
+
+    const auto* settings = Calamares::Settings::instance();
+    if ( !settings )
+    {
+        (void)new Calamares::Settings( true );
+    }
 }
 
 void

From 7bfb769288a96cd3093e9952b3ce0e353212d7a2 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Thu, 26 Aug 2021 12:05:38 +0200
Subject: [PATCH 363/492] [localeq] redo i18n.qml set colors as vars, mostly
 kirigami colors, to make it work for boths dark & light themes highlights now
 full width and on hover currentindex still at -1, not implemented in
 cofig.cpp/h, possible to use js, or is
 https://github.com/calamares/calamares/blob/calamares/src/modules/locale/LCLocaleDialog.cpp#L43
 accessible to QML?

---
 src/modules/localeq/i18n.qml | 107 ++++++++++++++++++++++-------------
 1 file changed, 69 insertions(+), 38 deletions(-)

diff --git a/src/modules/localeq/i18n.qml b/src/modules/localeq/i18n.qml
index 63cad8bf53..3ceae2ab80 100644
--- a/src/modules/localeq/i18n.qml
+++ b/src/modules/localeq/i18n.qml
@@ -1,6 +1,6 @@
 /* === This file is part of Calamares -  ===
  *
- *   SPDX-FileCopyrightText: 2020 Anke Boersma 
+ *   SPDX-FileCopyrightText: 2020 - 2021 Anke Boersma 
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is Free Software: see the License-Identifier above.
@@ -16,19 +16,23 @@ import QtQuick.Layouts 1.3
 import org.kde.kirigami 2.7 as Kirigami
 
 Item {
+    readonly property color backgroundColor: Kirigami.Theme.backgroundColor //"#F5F5F5"
+    readonly property color headerBackgroundColor: Kirigami.Theme.alternateBackgroundColor //"#d3d3d3"
+    readonly property color backgroundLighterColor: "#ffffff"
+    readonly property color highlightColor: Kirigami.Theme.highlightColor //"#3498DB"
+    readonly property color textColor: Kirigami.Theme.textColor
+    readonly property color highlightedTextColor: Kirigami.Theme.highlightedTextColor
+
     width: parent.width
     height: parent.height
     focus: true
-    MouseArea {
-        anchors.fill: parent
-    }
 
     Rectangle {
         id: textArea
         x: 28
         y: 14
         anchors.fill: parent
-        Kirigami.Theme.backgroundColor: Kirigami.Theme.backgroundColor
+        color: backgroundColor
 
         Column {
             id: languages
@@ -38,7 +42,7 @@ Item {
             Rectangle {
                 width: 250
                 height: 140
-                color: "#d3d3d3"
+                color: headerBackgroundColor
                 Text {
                     anchors.top: parent.top
                     width: 240
@@ -57,30 +61,43 @@ Item {
                     id: scroll1
                     anchors.fill: parent
                     contentHeight: 800
-                    clip: true
+                    ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
 
                     ListView {
                         id: list1
                         focus: true
+                        clip: true
+                        width: parent.width
 
                         model: config.supportedLocales
 
-                        currentIndex: -1
-                        highlight: Rectangle {
-                            color: Kirigami.Theme.highlightColor
-                        }
-                        delegate: Text {
-                            text: modelData
-
-                            MouseArea {
-                                hoverEnabled: true
-                                anchors.fill: parent
-                                cursorShape: Qt.PointingHandCursor
-                                onEntered: {
-                                    color: "#0000ff"
+                        currentIndex: -1 //model.currentLanguageCodeIndex
+                        delegate: ItemDelegate {
+
+                            hoverEnabled: true
+                            width: parent.width
+                            implicitHeight: 18
+                            highlighted: ListView.isCurrentItem
+                            Label {
+                                Layout.fillHeight: true
+                                Layout.fillWidth: true
+                                width: parent.width
+                                height: 18
+                                color: highlighted ? highlightedTextColor : textColor
+                                text: modelData
+                                background: Rectangle {
+
+                                    color: highlighted || hovered ? highlightColor : backgroundLighterColor
+                                    opacity: highlighted || hovered ? 0.5 : 0.9
                                 }
-                                onClicked: {
-                                    list1.currentIndex = index
+
+                                MouseArea {
+                                    hoverEnabled: true
+                                    anchors.fill: parent
+                                    cursorShape: Qt.PointingHandCursor
+                                    onClicked: {
+                                        list1.currentIndex = index
+                                    }
                                 }
                             }
                         }
@@ -98,7 +115,7 @@ Item {
             Rectangle {
                 width: 250
                 height: 140
-                color: "#d3d3d3"
+                color: headerBackgroundColor
                 Text {
                     anchors.top: parent.top
                     width: 240
@@ -117,28 +134,42 @@ Item {
                     id: scroll2
                     anchors.fill: parent
                     contentHeight: 800
-                    clip: true
+                    ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
 
                     ListView {
                         id: list2
-                        width: 180; height: 200
                         focus: true
+                        clip: true
 
                         model: config.supportedLocales
 
-                        currentIndex: -1
-                        highlight: Rectangle {
-                            color: Kirigami.Theme.highlightColor
-                        }
-                        delegate: Text {
-                            text: modelData
-
-                            MouseArea {
-                                hoverEnabled: true
-                                anchors.fill: parent
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: {
-                                    list2.currentIndex = index
+                        currentIndex: -1 //model.currentLCCodeIndex
+                        delegate: ItemDelegate {
+
+                            hoverEnabled: true
+                            width: parent.width
+                            implicitHeight: 18
+                            highlighted: ListView.isCurrentItem
+                            Label {
+                                Layout.fillHeight: true
+                                Layout.fillWidth: true
+                                width: parent.width
+                                height: 18
+                                color: highlighted ? highlightedTextColor : textColor
+                                text: modelData
+                                background: Rectangle {
+
+                                    color: highlighted || hovered ? highlightColor : backgroundLighterColor
+                                    opacity: highlighted || hovered ? 0.5 : 0.9
+                                }
+
+                                MouseArea {
+                                    hoverEnabled: true
+                                    anchors.fill: parent
+                                    cursorShape: Qt.PointingHandCursor
+                                    onClicked: {
+                                        list2.currentIndex = index
+                                    }
                                 }
                             }
                         }

From 653359d815ce4113ff384848e3c0dd5b430bb1e7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 26 Aug 2021 12:57:40 +0200
Subject: [PATCH 364/492] [libcalamares] Fix up multiple URLs for checkinternet

- was filtering out the wrong URLs
- was not actually removing the invalid URLs
- extend API to make it possible to count / confirm the settings
- extend tests to demonstrate that API and the issues
---
 src/libcalamares/network/Manager.cpp | 14 ++++++++++++--
 src/libcalamares/network/Manager.h   |  4 ++++
 src/libcalamares/network/Tests.cpp   | 20 ++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index 0e651f45ca..5125f592e9 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -218,8 +218,12 @@ Manager::setCheckHasInternetUrl( const QVector< QUrl >& urls )
 {
     d->m_lastCheckedUrlIndex = -1;
     d->m_hasInternetUrls = urls;
-    std::remove_if(
-        d->m_hasInternetUrls.begin(), d->m_hasInternetUrls.end(), []( const QUrl& u ) { return u.isValid(); } );
+    auto it = std::remove_if(
+        d->m_hasInternetUrls.begin(), d->m_hasInternetUrls.end(), []( const QUrl& u ) { return !u.isValid(); } );
+    if ( it != d->m_hasInternetUrls.end() )
+    {
+        d->m_hasInternetUrls.erase( it );
+    }
 }
 
 void
@@ -231,6 +235,12 @@ Manager::addCheckHasInternetUrl( const QUrl& url )
     }
 }
 
+QVector< QUrl >
+Manager::getCheckInternetUrls() const
+{
+    return d->m_hasInternetUrls;
+}
+
 /** @brief Does a request asynchronously, returns the (pending) reply
  *
  * The extra options for the request are taken from @p options,
diff --git a/src/libcalamares/network/Manager.h b/src/libcalamares/network/Manager.h
index 8bc3dded7c..6a906c8838 100644
--- a/src/libcalamares/network/Manager.h
+++ b/src/libcalamares/network/Manager.h
@@ -90,6 +90,7 @@ class DLLEXPORT Manager : public QObject
 {
     Q_OBJECT
     Q_PROPERTY( bool hasInternet READ hasInternet NOTIFY hasInternetChanged FINAL )
+    Q_PROPERTY( QVector< QUrl > checkInternetUrls READ getCheckInternetUrls WRITE setCheckHasInternetUrl )
 
     Manager();
 
@@ -129,6 +130,9 @@ class DLLEXPORT Manager : public QObject
     /// @brief Set a collection of URLs used for the general "is there internet" check.
     void setCheckHasInternetUrl( const QVector< QUrl >& urls );
 
+    /// @brief What URLs are used to check for internet connectivity?
+    QVector< QUrl > getCheckInternetUrls() const;
+
     /** @brief Do a network request asynchronously.
      *
      * Returns a pointer to the reply-from-the-request.
diff --git a/src/libcalamares/network/Tests.cpp b/src/libcalamares/network/Tests.cpp
index d44f03781b..a5bc52497e 100644
--- a/src/libcalamares/network/Tests.cpp
+++ b/src/libcalamares/network/Tests.cpp
@@ -30,6 +30,7 @@ NetworkTests::testInstance()
 {
     auto& nam = CalamaresUtils::Network::Manager::instance();
     QVERIFY( !nam.hasInternet() );
+    QCOMPARE( nam.getCheckInternetUrls().count(), 0 );
 }
 
 void
@@ -73,18 +74,21 @@ NetworkTests::testCheckUrl()
         QVERIFY( u.isValid() );
         nam.setCheckHasInternetUrl( u );
         QVERIFY( nam.checkHasInternet() );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 1 );  // Valid URL
     }
     {
         QUrl u( "http://nonexistent.example.com" );
         QVERIFY( u.isValid() );
         nam.setCheckHasInternetUrl( u );
         QVERIFY( !nam.checkHasInternet() );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 1 );  // Valid URL even if it doesn't resolve
     }
     {
         QUrl u;
         QVERIFY( !u.isValid() );
         nam.setCheckHasInternetUrl( u );
         QVERIFY( !nam.checkHasInternet() );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 0 );  // Invalid URL tried
     }
 }
 
@@ -102,6 +106,7 @@ NetworkTests::testCheckMultiUrl()
         QVERIFY( u1.isValid() );
         nam.setCheckHasInternetUrl( { u0, u1 } );
         QVERIFY( nam.checkHasInternet() );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 2 );
     }
     {
         QUrl u0( "http://nonexistent.example.com" );
@@ -111,7 +116,22 @@ NetworkTests::testCheckMultiUrl()
         nam.setCheckHasInternetUrl( { u0, u1 } );
         QVERIFY( !nam.checkHasInternet() );
         QVERIFY( !nam.checkHasInternet() );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 2 );  // Both are valid URLs
         nam.addCheckHasInternetUrl( QUrl( "http://example.com" ) );
         QVERIFY( nam.checkHasInternet() );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 3 );
+    }
+    {
+        QUrl u0( "http://nonexistent.example.com" );
+        QUrl u1;
+        QVERIFY( u0.isValid() );
+        QVERIFY( !u1.isValid() );
+        nam.setCheckHasInternetUrl( { u0, u1 } );
+        QVERIFY( !nam.checkHasInternet() );
+        QVERIFY( !nam.checkHasInternet() );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 1 );  // Only valid URL added
+        nam.addCheckHasInternetUrl( QUrl( "http://example.com" ) );
+        QVERIFY( nam.checkHasInternet() );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 2 );
     }
 }

From 05388814476f6e48bb70bcb82aeef6da7cb46ab7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 26 Aug 2021 14:32:57 +0200
Subject: [PATCH 365/492] [libcalamares] Handle multiple invalid URLs at once

- expand tests with example where more than one URL is invalid
- fix the call to the wrong overload of QVector::erase()
---
 src/libcalamares/network/Manager.cpp |  2 +-
 src/libcalamares/network/Tests.cpp   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index 5125f592e9..cceff477e0 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -222,7 +222,7 @@ Manager::setCheckHasInternetUrl( const QVector< QUrl >& urls )
         d->m_hasInternetUrls.begin(), d->m_hasInternetUrls.end(), []( const QUrl& u ) { return !u.isValid(); } );
     if ( it != d->m_hasInternetUrls.end() )
     {
-        d->m_hasInternetUrls.erase( it );
+        d->m_hasInternetUrls.erase( it, d->m_hasInternetUrls.end() );
     }
 }
 
diff --git a/src/libcalamares/network/Tests.cpp b/src/libcalamares/network/Tests.cpp
index a5bc52497e..e5bd34c23e 100644
--- a/src/libcalamares/network/Tests.cpp
+++ b/src/libcalamares/network/Tests.cpp
@@ -134,4 +134,14 @@ NetworkTests::testCheckMultiUrl()
         QVERIFY( nam.checkHasInternet() );
         QCOMPARE( nam.getCheckInternetUrls().count(), 2 );
     }
+    {
+        QUrl u0( "http://nonexistent.example.com" );
+        QUrl u1;
+        QVERIFY( u0.isValid() );
+        QVERIFY( !u1.isValid() );
+        nam.setCheckHasInternetUrl( { u1, u1, u1, u1 } );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 0 );
+        nam.setCheckHasInternetUrl( { u1, u1, u0, u1 } );
+        QCOMPARE( nam.getCheckInternetUrls().count(), 1 );
+    }
 }

From 67d2b5568d54a8cb2bcc42efb96a761987214561 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 26 Aug 2021 14:40:52 +0200
Subject: [PATCH 366/492] [welcome] Fix test, check that the internet check
 URLs are loaded

---
 src/modules/welcome/Tests.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp
index eed7dae87e..cc2b7b8736 100644
--- a/src/modules/welcome/Tests.cpp
+++ b/src/modules/welcome/Tests.cpp
@@ -11,6 +11,7 @@
 
 #include "Branding.h"
 #include "Settings.h"
+#include "network/Manager.h"
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
@@ -57,7 +58,7 @@ WelcomeTests::testOneUrl()
 
     // BUILD_AS_TEST is the source-directory path
     QString filename = QStringLiteral( "1a-checkinternet.conf" );
-    QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) );
+    QFile fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) );
     QVERIFY( fi.exists() );
 
     bool ok = false;
@@ -65,6 +66,9 @@ WelcomeTests::testOneUrl()
     QVERIFY( ok );
     QVERIFY( map.count() > 0 );
     QVERIFY( map.contains( "requirements" ) );
+
+    c.setConfigurationMap( map );
+    QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 1 );
 }
 
 

From ad76a2cbe870ca9d67f050654e6add3dbfbe2fd5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 26 Aug 2021 16:39:55 +0200
Subject: [PATCH 367/492] [welcome] [welcomeq] Move requirements to Config

The Config object can hold all of the configuration information,
including also the requirements-checking parts. Move requirements-
checking configuration there, so it is shared and consistent
across welcome and welcomeq, regardless.

This repairs the test that expects the Config object to handle
**all** of the configuration, too.
---
 src/modules/welcome/CMakeLists.txt          | 25 +++++++++++----------
 src/modules/welcome/Config.cpp              | 12 ++++++++++
 src/modules/welcome/Config.h                |  6 +++++
 src/modules/welcome/WelcomeViewStep.cpp     | 15 +------------
 src/modules/welcome/WelcomeViewStep.h       |  1 -
 src/modules/welcomeq/WelcomeQmlViewStep.cpp | 18 +--------------
 src/modules/welcomeq/WelcomeQmlViewStep.h   |  3 ---
 7 files changed, 33 insertions(+), 47 deletions(-)

diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt
index 4895d4b80e..01a89703a6 100644
--- a/src/modules/welcome/CMakeLists.txt
+++ b/src/modules/welcome/CMakeLists.txt
@@ -8,26 +8,22 @@ find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
 find_package( LIBPARTED )
 if ( LIBPARTED_FOUND )
     set( PARTMAN_SRC checker/partman_devices.c )
-    set( CHECKER_LINK_LIBRARIES ${LIBPARTED_LIBRARY} )
+    set( PARTMAN_LIB ${LIBPARTED_LIBRARY} )
 else()
     set( PARTMAN_SRC )
-    set( CHECKER_LINK_LIBRARIES )
+    set( PARTMAN_LIB )
     add_definitions( -DWITHOUT_LIBPARTED )
 endif()
 
-set( CHECKER_SOURCES
-    checker/CheckerContainer.cpp
-    checker/GeneralRequirements.cpp
-    checker/ResultWidget.cpp
-    checker/ResultsListWidget.cpp
-    ${PARTMAN_SRC}
-)
-
 calamares_add_plugin( welcome
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
-        ${CHECKER_SOURCES}
+        checker/CheckerContainer.cpp
+        checker/GeneralRequirements.cpp
+        checker/ResultWidget.cpp
+        checker/ResultsListWidget.cpp
+        ${PARTMAN_SRC}
         WelcomeViewStep.cpp
         Config.cpp
         Config.h
@@ -37,7 +33,7 @@ calamares_add_plugin( welcome
     RESOURCES
         welcome.qrc
     LINK_PRIVATE_LIBRARIES
-        ${CHECKER_LINK_LIBRARIES}
+        ${PARTMAN_LIB}
         Qt5::DBus
         Qt5::Network
     SHARED_LIB
@@ -46,9 +42,14 @@ calamares_add_plugin( welcome
 calamares_add_test(
     welcometest
     SOURCES
+        checker/GeneralRequirements.cpp
+        ${PARTMAN_SRC}
         Config.cpp
         Tests.cpp
     LIBRARIES
+        ${PARTMAN_LIB}
+        Qt5::DBus
+        Qt5::Network
         Qt5::Widgets
         Calamares::calamaresui
 )
diff --git a/src/modules/welcome/Config.cpp b/src/modules/welcome/Config.cpp
index 9894751536..c6b960d9d6 100644
--- a/src/modules/welcome/Config.cpp
+++ b/src/modules/welcome/Config.cpp
@@ -27,6 +27,7 @@ Config::Config( QObject* parent )
     : QObject( parent )
     , m_languages( CalamaresUtils::Locale::availableTranslations() )
     , m_filtermodel( std::make_unique< QSortFilterProxyModel >() )
+    , m_requirementsChecker( std::make_unique< GeneralRequirements >( this ) )
 {
     initLanguages();
 
@@ -399,4 +400,15 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
 
     ::setLanguageIcon( this, configurationMap );
     ::setGeoIP( this, configurationMap );
+
+    if ( configurationMap.contains( "requirements" )
+         && configurationMap.value( "requirements" ).type() == QVariant::Map )
+    {
+        m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() );
+    }
+    else
+    {
+        cWarning() << "no valid requirements map found in welcome "
+                      "module configuration.";
+    }
 }
diff --git a/src/modules/welcome/Config.h b/src/modules/welcome/Config.h
index a3f1276a6d..6cce75f226 100644
--- a/src/modules/welcome/Config.h
+++ b/src/modules/welcome/Config.h
@@ -10,6 +10,8 @@
 #ifndef WELCOME_CONFIG_H
 #define WELCOME_CONFIG_H
 
+#include "checker/GeneralRequirements.h"
+
 #include "locale/LabelModel.h"
 #include "modulesystem/RequirementsModel.h"
 
@@ -100,6 +102,9 @@ public slots:
 
     QAbstractItemModel* unsatisfiedRequirements() const;
 
+    /// @brief Check the general requirements
+    Calamares::RequirementsList checkRequirements() const { return m_requirementsChecker->checkRequirements(); }
+
 signals:
     void countryCodeChanged( QString countryCode );
     void localeIndexChanged( int localeIndex );
@@ -118,6 +123,7 @@ public slots:
 
     CalamaresUtils::Locale::LabelModel* m_languages = nullptr;
     std::unique_ptr< QSortFilterProxyModel > m_filtermodel;
+    std::unique_ptr< GeneralRequirements > m_requirementsChecker;
 
     QString m_languageIcon;
     QString m_countryCode;
diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp
index 2a0d57bc45..df42271fc2 100644
--- a/src/modules/welcome/WelcomeViewStep.cpp
+++ b/src/modules/welcome/WelcomeViewStep.cpp
@@ -12,7 +12,6 @@
 
 #include "Config.h"
 #include "WelcomePage.h"
-#include "checker/GeneralRequirements.h"
 
 #include "Branding.h"
 #include "modulesystem/ModuleManager.h"
@@ -25,7 +24,6 @@ WelcomeViewStep::WelcomeViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_conf( new Config( this ) )
     , m_widget( new WelcomePage( m_conf ) )
-    , m_requirementsChecker( new GeneralRequirements( this ) )
 {
     connect( Calamares::ModuleManager::instance(),
              &Calamares::ModuleManager::requirementsComplete,
@@ -96,17 +94,6 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
     m_conf->setConfigurationMap( configurationMap );
 
-    if ( configurationMap.contains( "requirements" )
-         && configurationMap.value( "requirements" ).type() == QVariant::Map )
-    {
-        m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() );
-    }
-    else
-    {
-        cWarning() << "no valid requirements map found in welcome "
-                      "module configuration.";
-    }
-
     //here init the qml or qwidgets needed bits
     m_widget->init();
 }
@@ -114,5 +101,5 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 Calamares::RequirementsList
 WelcomeViewStep::checkRequirements()
 {
-    return m_requirementsChecker->checkRequirements();
+    return m_conf->checkRequirements();
 }
diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h
index 57632f7ac9..dfc6f1169b 100644
--- a/src/modules/welcome/WelcomeViewStep.h
+++ b/src/modules/welcome/WelcomeViewStep.h
@@ -66,7 +66,6 @@ class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep
 private:
     Config* m_conf;
     WelcomePage* m_widget;
-    GeneralRequirements* m_requirementsChecker;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( WelcomeViewStepFactory )
diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.cpp b/src/modules/welcomeq/WelcomeQmlViewStep.cpp
index af32f2992b..914ea4f3a0 100644
--- a/src/modules/welcomeq/WelcomeQmlViewStep.cpp
+++ b/src/modules/welcomeq/WelcomeQmlViewStep.cpp
@@ -26,7 +26,6 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( WelcomeQmlViewStepFactory, registerPlugin<
 WelcomeQmlViewStep::WelcomeQmlViewStep( QObject* parent )
     : Calamares::QmlViewStep( parent )
     , m_config( new Config( this ) )
-    , m_requirementsChecker( new GeneralRequirements( this ) )
 {
     connect( Calamares::ModuleManager::instance(),
              &Calamares::ModuleManager::requirementsComplete,
@@ -58,7 +57,6 @@ WelcomeQmlViewStep::isBackEnabled() const
 bool
 WelcomeQmlViewStep::isAtBeginning() const
 {
-    // TODO: adjust to "pages" in the QML
     return true;
 }
 
@@ -66,7 +64,6 @@ WelcomeQmlViewStep::isAtBeginning() const
 bool
 WelcomeQmlViewStep::isAtEnd() const
 {
-    // TODO: adjust to "pages" in the QML
     return true;
 }
 
@@ -81,26 +78,13 @@ void
 WelcomeQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
     m_config->setConfigurationMap( configurationMap );
-
-    if ( configurationMap.contains( "requirements" )
-         && configurationMap.value( "requirements" ).type() == QVariant::Map )
-    {
-        m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() );
-    }
-    else
-    {
-        cWarning() << "no valid requirements map found in welcomeq "
-                      "module configuration.";
-    }
-
     Calamares::QmlViewStep::setConfigurationMap( configurationMap );  // call parent implementation last
-    setContextProperty( "Welcome", m_config );
 }
 
 Calamares::RequirementsList
 WelcomeQmlViewStep::checkRequirements()
 {
-    return m_requirementsChecker->checkRequirements();
+    return m_config->checkRequirements();
 }
 
 QObject*
diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.h b/src/modules/welcomeq/WelcomeQmlViewStep.h
index 4c68ea2aed..1ed90ce055 100644
--- a/src/modules/welcomeq/WelcomeQmlViewStep.h
+++ b/src/modules/welcomeq/WelcomeQmlViewStep.h
@@ -29,9 +29,7 @@ class Handler;
 }
 }  // namespace CalamaresUtils
 
-class GeneralRequirements;
 
-// TODO: Needs a generic Calamares::QmlViewStep as base class
 // TODO: refactor and move what makes sense to base class
 class PLUGINDLLEXPORT WelcomeQmlViewStep : public Calamares::QmlViewStep
 {
@@ -65,7 +63,6 @@ class PLUGINDLLEXPORT WelcomeQmlViewStep : public Calamares::QmlViewStep
 
 private:
     Config* m_config;
-    GeneralRequirements* m_requirementsChecker;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( WelcomeQmlViewStepFactory )

From f376b42c31e4befd9d87c55ac80130bfd165f492 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 26 Aug 2021 16:58:46 +0200
Subject: [PATCH 368/492] [welcome] Add a handful of tests for different URL
 configs

---
 src/modules/welcome/Tests.cpp                 | 37 +++++++++++++++++++
 .../welcome/tests/1b-checkinternet.conf       |  3 ++
 .../welcome/tests/1c-checkinternet.conf       |  4 ++
 .../welcome/tests/1d-checkinternet.conf       |  4 ++
 .../welcome/tests/1e-checkinternet.conf       |  4 ++
 .../welcome/tests/1f-checkinternet.conf       |  6 +++
 .../welcome/tests/1g-checkinternet.conf       |  3 ++
 .../welcome/tests/1h-checkinternet.conf       |  8 ++++
 8 files changed, 69 insertions(+)
 create mode 100644 src/modules/welcome/tests/1b-checkinternet.conf
 create mode 100644 src/modules/welcome/tests/1c-checkinternet.conf
 create mode 100644 src/modules/welcome/tests/1d-checkinternet.conf
 create mode 100644 src/modules/welcome/tests/1e-checkinternet.conf
 create mode 100644 src/modules/welcome/tests/1f-checkinternet.conf
 create mode 100644 src/modules/welcome/tests/1g-checkinternet.conf
 create mode 100644 src/modules/welcome/tests/1h-checkinternet.conf

diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp
index cc2b7b8736..0445433e9e 100644
--- a/src/modules/welcome/Tests.cpp
+++ b/src/modules/welcome/Tests.cpp
@@ -29,6 +29,8 @@ private Q_SLOTS:
     void initTestCase();
 
     void testOneUrl();
+    void testUrls_data();
+    void testUrls();
 };
 
 WelcomeTests::WelcomeTests() {}
@@ -71,6 +73,41 @@ WelcomeTests::testOneUrl()
     QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 1 );
 }
 
+void
+WelcomeTests::testUrls_data()
+{
+    QTest::addColumn< QString >( "filename" );
+    QTest::addColumn< int >( "result" );
+
+    QTest::newRow( "one  " ) << QString( "1a-checkinternet.conf" ) << 1;
+    QTest::newRow( "none " ) << QString( "1b-checkinternet.conf" ) << 0;
+    QTest::newRow( "blank" ) << QString( "1c-checkinternet.conf" ) << 0;
+    QTest::newRow( "bogus" ) << QString( "1d-checkinternet.conf" ) << 0;
+    QTest::newRow( "[]   " ) << QString( "1e-checkinternet.conf" ) << 0;
+    QTest::newRow( "-3   " ) << QString( "1f-checkinternet.conf" ) << 3;
+    QTest::newRow( "[3]  " ) << QString( "1g-checkinternet.conf" ) << 3;
+    QTest::newRow( "some " ) << QString( "1h-checkinternet.conf" ) << 3;
+}
+
+void
+WelcomeTests::testUrls()
+{
+    QFETCH( QString, filename );
+    QFETCH( int, result );
+
+    Config c;
+
+    // BUILD_AS_TEST is the source-directory path
+    QFile fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) );
+    QVERIFY( fi.exists() );
+
+    bool ok = false;
+    const auto map = CalamaresUtils::loadYaml( fi, &ok );
+    QVERIFY( ok );
+
+    c.setConfigurationMap( map );
+    QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), result );
+}
 
 QTEST_GUILESS_MAIN( WelcomeTests )
 
diff --git a/src/modules/welcome/tests/1b-checkinternet.conf b/src/modules/welcome/tests/1b-checkinternet.conf
new file mode 100644
index 0000000000..a1e6569859
--- /dev/null
+++ b/src/modules/welcome/tests/1b-checkinternet.conf
@@ -0,0 +1,3 @@
+# Nothing at all
+---
+bogus:   1
diff --git a/src/modules/welcome/tests/1c-checkinternet.conf b/src/modules/welcome/tests/1c-checkinternet.conf
new file mode 100644
index 0000000000..845e253c0a
--- /dev/null
+++ b/src/modules/welcome/tests/1c-checkinternet.conf
@@ -0,0 +1,4 @@
+# Set to blank
+---
+requirements:
+    internetCheckUrl:   ""
diff --git a/src/modules/welcome/tests/1d-checkinternet.conf b/src/modules/welcome/tests/1d-checkinternet.conf
new file mode 100644
index 0000000000..9a44d7c935
--- /dev/null
+++ b/src/modules/welcome/tests/1d-checkinternet.conf
@@ -0,0 +1,4 @@
+# Set to something broken
+---
+requirements:
+    internetCheckUrl:   false
diff --git a/src/modules/welcome/tests/1e-checkinternet.conf b/src/modules/welcome/tests/1e-checkinternet.conf
new file mode 100644
index 0000000000..579414a79f
--- /dev/null
+++ b/src/modules/welcome/tests/1e-checkinternet.conf
@@ -0,0 +1,4 @@
+# Empty list
+---
+requirements:
+    internetCheckUrl:   []
diff --git a/src/modules/welcome/tests/1f-checkinternet.conf b/src/modules/welcome/tests/1f-checkinternet.conf
new file mode 100644
index 0000000000..6607603810
--- /dev/null
+++ b/src/modules/welcome/tests/1f-checkinternet.conf
@@ -0,0 +1,6 @@
+---
+requirements:
+    internetCheckUrl:   
+        - http://example.com
+        - http://bogus.example.com
+        - http://nonexistent.example.com
diff --git a/src/modules/welcome/tests/1g-checkinternet.conf b/src/modules/welcome/tests/1g-checkinternet.conf
new file mode 100644
index 0000000000..dd3ddae0cf
--- /dev/null
+++ b/src/modules/welcome/tests/1g-checkinternet.conf
@@ -0,0 +1,3 @@
+---
+requirements:
+    internetCheckUrl: [ http://example.com, http://bogus.example.com, http://nonexistent.example.com ]
diff --git a/src/modules/welcome/tests/1h-checkinternet.conf b/src/modules/welcome/tests/1h-checkinternet.conf
new file mode 100644
index 0000000000..928360c209
--- /dev/null
+++ b/src/modules/welcome/tests/1h-checkinternet.conf
@@ -0,0 +1,8 @@
+# "0" is a valid URL (?) but "" is not
+---
+requirements:
+    internetCheckUrl:   
+        - http://example.com
+        - 0
+        - ""
+        - http://nonexistent.example.com

From 4e8d67052fea2e75d1273fbdaad6258d55d93f8a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 26 Aug 2021 17:23:14 +0200
Subject: [PATCH 369/492] Changes: describe partition changes

---
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index a57b48956f..f56ec0fc41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ website will have to do for older versions.
 
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma
+ - Artem Grinev
 
 ## Core ##
  - No core changes yet
@@ -19,6 +20,8 @@ This release contains contributions from (alphabetically by first name):
  - *networkcfg* now translates the "live user" on an ISO to the regular
    user on the installed system, so that network configuration changes
    made in the live system are automatically used after installation.
+ - *partition* no longer allows you to delete an extended partition with
+   children (which led to crashes). Thanks Artem!
  - *welcome* can now check multiple URLs to determine if internet connectivity
    is available. It is still recommended to check the distro home-page or
    some special "ping" page of the distro, although that has some privacy

From 46ca4d93e76abd8ee8b5518b291dc170ca1d3063 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 26 Aug 2021 17:30:55 +0200
Subject: [PATCH 370/492] [partition] Improve constness, naming

---
 src/modules/partition/gui/PartitionPage.cpp | 34 ++++++++++++---------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index e4aa93c72b..aa05c3a266 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -125,8 +125,8 @@ PartitionPage::~PartitionPage() {}
 void
 PartitionPage::updateButtons()
 {
-    bool create = false, createTable = false, edit = false, del = false, currentDeviceIsVG = false,
-         isDeactivable = false;
+    bool allow_create = false, allow_create_table = false, allow_edit = false, allow_delete = false;
+    bool currentDeviceIsVG = false, isDeactivable = false;
     bool isRemovable = false, isVGdeactivated = false;
 
     QModelIndex index = m_ui->partitionTreeView->currentIndex();
@@ -136,17 +136,21 @@ PartitionPage::updateButtons()
         Q_ASSERT( model );
         Partition* partition = model->partitionForIndex( index );
         Q_ASSERT( partition );
-        bool isFree = CalamaresUtils::Partition::isPartitionFreeSpace( partition );
-        bool isExtended = partition->roles().has( PartitionRole::Extended );
-
-        bool hasChildren = isExtended
+        const bool isFree = CalamaresUtils::Partition::isPartitionFreeSpace( partition );
+        const bool isExtended = partition->roles().has( PartitionRole::Extended );
+
+        // An extended partition can have a "free space" child; that one does
+        // not count as a real child. If there are more children, at least one
+        // is a real one and we should not allow the extended partition to be
+        // deleted.
+        const bool hasChildren = isExtended
             && ( partition->children().length() > 1
                  || ( partition->children().length() == 1
                       && !CalamaresUtils::Partition::isPartitionFreeSpace( partition->children().at( 0 ) ) ) );
 
-        bool isInVG = m_core->isInVG( partition );
+        const bool isInVG = m_core->isInVG( partition );
 
-        create = isFree;
+        allow_create = isFree;
 
         // Keep it simple for now: do not support editing extended partitions as
         // it does not work with our current edit implementation which is
@@ -155,8 +159,8 @@ PartitionPage::updateButtons()
         // inside them, so an edit must be applied without altering the job
         // order.
         // TODO: See if LVM PVs can be edited in Calamares
-        edit = !isFree && !isExtended;
-        del = !isFree && !isInVG && !hasChildren;
+        allow_edit = !isFree && !isExtended;
+        allow_delete = !isFree && !isInVG && !hasChildren;
     }
 
     if ( m_ui->deviceComboBox->currentIndex() >= 0 )
@@ -173,7 +177,7 @@ PartitionPage::updateButtons()
         }
         else if ( device->type() != Device::Type::LVM_Device )
         {
-            createTable = true;
+            allow_create_table = true;
 
 #ifdef WITH_KPMCORE4API
             if ( device->type() == Device::Type::SoftwareRAID_Device
@@ -202,10 +206,10 @@ PartitionPage::updateButtons()
         }
     }
 
-    m_ui->createButton->setEnabled( create );
-    m_ui->editButton->setEnabled( edit );
-    m_ui->deleteButton->setEnabled( del );
-    m_ui->newPartitionTableButton->setEnabled( createTable );
+    m_ui->createButton->setEnabled( allow_create );
+    m_ui->editButton->setEnabled( allow_edit );
+    m_ui->deleteButton->setEnabled( allow_delete );
+    m_ui->newPartitionTableButton->setEnabled( allow_create_table );
     m_ui->resizeVolumeGroupButton->setEnabled( currentDeviceIsVG && !isVGdeactivated );
     m_ui->deactivateVolumeGroupButton->setEnabled( currentDeviceIsVG && isDeactivable && !isVGdeactivated );
     m_ui->removeVolumeGroupButton->setEnabled( currentDeviceIsVG && isRemovable );

From 52a82ea1e683139e5b71365899253ebd7ebf52b6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Thu, 26 Aug 2021 17:39:06 +0200
Subject: [PATCH 371/492] [partition] Improve warning message in log

---
 src/modules/partition/core/PartUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 4beac0db8a..8fe13f505c 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -461,7 +461,7 @@ isEfiFilesystemSuitable(const Partition* candidate)
             {
                 return true;
             }
-            cWarning() << "FAT32 filesystem is too small (" << size << "bytes)";
+            cWarning() << "FAT32 filesystem for EFI is too small (" << size << "bytes)";
             return false;
 #ifdef WITH_KPMCORE4API
         case FileSystem::Type::Fat12:

From 7d0877080655171755039b2dcd17c1cfcfcc55eb Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 27 Aug 2021 17:26:50 +0200
Subject: [PATCH 372/492] [partition] Apply code style

---
 .../partition/core/PartitionLayout.cpp        | 98 ++++++++++---------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 233f5117a3..8ae904e92e 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -138,61 +138,63 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi
 }
 
 void
-PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
+PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
 {
     using FileSystem = FileSystem::Type;
     switch ( defaultFsType )
     {
-        case FileSystem::Unknown:
-        case FileSystem::Unformatted:
-        case FileSystem::Extended:
-        case FileSystem::LinuxSwap:
-        case FileSystem::Luks:
-        case FileSystem::Ocfs2:
-        case FileSystem::Lvm2_PV:
-        case FileSystem::Udf:
-        case FileSystem::Iso9660:
+    case FileSystem::Unknown:
+    case FileSystem::Unformatted:
+    case FileSystem::Extended:
+    case FileSystem::LinuxSwap:
+    case FileSystem::Luks:
+    case FileSystem::Ocfs2:
+    case FileSystem::Lvm2_PV:
+    case FileSystem::Udf:
+    case FileSystem::Iso9660:
 #ifdef WITH_KPMCORE4API
-        case FileSystem::Luks2:
-        case FileSystem::LinuxRaidMember:
-        case FileSystem::BitLocker:
+    case FileSystem::Luks2:
+    case FileSystem::LinuxRaidMember:
+    case FileSystem::BitLocker:
 #endif
-            // bad bad
-            cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead.";
-            defaultFsType = FileSystem::Ext4;
-            break;
-        case FileSystem::Ext2:
-        case FileSystem::Ext3:
-        case FileSystem::Ext4:
-        case FileSystem::Fat32:
-        case FileSystem::Ntfs:
-        case FileSystem::Reiser4:
-        case FileSystem::ReiserFS:
-        case FileSystem::Xfs:
-        case FileSystem::Jfs:
-        case FileSystem::Btrfs:
-        case FileSystem::Exfat:
-        case FileSystem::F2fs:
-            // ok
-            break;
-        case FileSystem::Fat16:
-        case FileSystem::Hfs:
-        case FileSystem::HfsPlus:
-        case FileSystem::Ufs:
-        case FileSystem::Hpfs:
-        case FileSystem::Zfs:
-        case FileSystem::Nilfs2:
+        // bad bad
+        cWarning() << "The selected default FS" << defaultFsType << "is not suitable."
+                   << "Using ext4 instead.";
+        defaultFsType = FileSystem::Ext4;
+        break;
+    case FileSystem::Ext2:
+    case FileSystem::Ext3:
+    case FileSystem::Ext4:
+    case FileSystem::Fat32:
+    case FileSystem::Ntfs:
+    case FileSystem::Reiser4:
+    case FileSystem::ReiserFS:
+    case FileSystem::Xfs:
+    case FileSystem::Jfs:
+    case FileSystem::Btrfs:
+    case FileSystem::Exfat:
+    case FileSystem::F2fs:
+        // ok
+        break;
+    case FileSystem::Fat16:
+    case FileSystem::Hfs:
+    case FileSystem::HfsPlus:
+    case FileSystem::Ufs:
+    case FileSystem::Hpfs:
+    case FileSystem::Zfs:
+    case FileSystem::Nilfs2:
 #ifdef WITH_KPMCORE4API
-        case FileSystem::Fat12:
-        case FileSystem::Apfs:
-        case FileSystem::Minix:
+    case FileSystem::Fat12:
+    case FileSystem::Apfs:
+    case FileSystem::Minix:
 #endif
-            // weird
-            cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
-            break;
-        default:
-            cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares." << "Using ext4 instead.";
-            defaultFsType = FileSystem::Ext4;
+        // weird
+        cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
+        break;
+    default:
+        cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares."
+                   << "Using ext4 instead.";
+        defaultFsType = FileSystem::Ext4;
     }
 
     m_defaultFsType = defaultFsType;
@@ -278,7 +280,7 @@ PartitionLayout::createPartitions( Device* dev,
         }
     }
 
-    auto correctFS = [d=m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
+    auto correctFS = [d = m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
 
     // Create the partitions.
     currentSector = firstSector;

From 6324fa3eb9ab1b5eab8b7eb5007368551c86bd4a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 27 Aug 2021 17:27:26 +0200
Subject: [PATCH 373/492] [partition] Disentangle questions of suitability of
 ESP

- split into size, type, flags so the warning message can
  be tailored to what is wrong.
---
 src/modules/partition/core/PartUtils.cpp | 56 ++++++++++++++++--------
 src/modules/partition/core/PartUtils.h   | 19 +++++++-
 2 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 8fe13f505c..54f971f4e6 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -447,31 +447,40 @@ isEfiSystem()
 }
 
 bool
-isEfiFilesystemSuitable(const Partition* candidate)
+isEfiFilesystemSuitableType( const Partition* candidate )
 {
     auto type = candidate->fileSystem().type();
-    auto size = candidate->capacity();  // bytes
-
-    using CalamaresUtils::Units::operator""_MiB;
 
-    switch( type )
+    switch ( type )
     {
-        case FileSystem::Type::Fat32:
-            if ( size >= 300_MiB )
-            {
-                return true;
-            }
-            cWarning() << "FAT32 filesystem for EFI is too small (" << size << "bytes)";
-            return false;
+    case FileSystem::Type::Fat32:
+        return true;
 #ifdef WITH_KPMCORE4API
-        case FileSystem::Type::Fat12:
+    case FileSystem::Type::Fat12:
 #endif
-        case FileSystem::Type::Fat16:
-            cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
-            return false;
-        default:
-            cWarning() << "EFI boot partition must be FAT32";
-            return false;
+    case FileSystem::Type::Fat16:
+        cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
+        return false;
+    default:
+        cWarning() << "EFI boot partition must be FAT32";
+        return false;
+    }
+}
+
+bool
+isEfiFilesystemSuitableSize( const Partition* candidate )
+{
+    auto size = candidate->capacity();  // bytes
+
+    using CalamaresUtils::Units::operator""_MiB;
+    if ( size >= 300_MiB )
+    {
+        return true;
+    }
+    else
+    {
+        cWarning() << "Filesystem for EFI is too small (" << size << "bytes)";
+        return false;
     }
 }
 
@@ -508,6 +517,15 @@ isEfiBootable( const Partition* candidate )
 #endif
 }
 
+// TODO: this is configurable via the config file **already**
+size_t
+efiFilesystemMinimumSize()
+{
+    using CalamaresUtils::Units::operator""_MiB;
+    return 300_MiB;
+}
+
+
 QString
 canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType )
 {
diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h
index 6bf2239212..dd4efc8678 100644
--- a/src/modules/partition/core/PartUtils.h
+++ b/src/modules/partition/core/PartUtils.h
@@ -84,9 +84,24 @@ bool isEfiSystem();
 
 /**
  * @brief Is the @p partition suitable as an EFI boot partition?
- * Checks for filesystem type (FAT32) and size (300MiB at least).
+ * Checks for filesystem type (FAT32).
  */
-bool isEfiFilesystemSuitable( const Partition* candidate );
+bool isEfiFilesystemSuitableType( const Partition* candidate );
+
+/**
+ * @brief Is the @p partition suitable as an EFI boot partition?
+ * Checks for filesystem size (300MiB, see efiFilesystemMinimumSize).
+ */
+bool isEfiFilesystemSuitableSize( const Partition* candidate );
+
+/** @brief Returns the minimum size of an EFI boot partition.
+ *
+ * This is determined as 300MiB, based on the FAT32 standard
+ * and EFI documentation (and not a little discussion in Calamares
+ * issues about what works, what is effective, and what is mandated
+ * by the standard and how all of those are different).
+ */
+size_t efiFilesystemMinimumSize();
 
 /**
  * @brief Is the given @p partition bootable in EFI? Depending on

From da49becac341adf3ae5a46818d2f9d41ca457da4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 27 Aug 2021 17:28:07 +0200
Subject: [PATCH 374/492] [partition] Tailor warning message about ESP

- tell the user all the things that are wrong with the
  (proposed) ESP; a missing one gets all the suggestions.
---
 src/modules/partition/PartitionViewStep.cpp | 74 +++++++++++++--------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index d3d45bc8a8..29e6524d96 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -434,50 +434,66 @@ PartitionViewStep::onLeave()
         {
             const QString espMountPoint
                 = Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
-            const QString espFlagName = PartitionTable::flagName(
 #ifdef WITH_KPMCORE4API
-                PartitionTable::Flag::Boot
+            const auto espFlag = PartitionTable::Flag::Boot;
 #else
-                PartitionTable::FlagEsp
+            const auto espFlag = PartitionTable::FlagEsp;
 #endif
-                                                        );
             Partition* esp = m_core->findPartitionByMountPoint( espMountPoint );
 
             QString message;
             QString description;
-            if ( !esp || ( esp && !PartUtils::isEfiFilesystemSuitable( esp ) ) )
+
+            Logger::Once o;
+
+            const bool okType = esp && PartUtils::isEfiFilesystemSuitableType( esp );
+            const bool okSize = esp && PartUtils::isEfiFilesystemSuitableSize( esp );
+            const bool okFlag = esp && PartUtils::isEfiBootable( esp );
+
+            if ( !esp )
             {
                 message = tr( "No EFI system partition configured" );
-                description = tr( "An EFI system partition is necessary to start %1."
-                                  "

    "
-                                  "To configure an EFI system partition, go back and "
-                                  "select or create a FAT32 filesystem with the "
-                                  "%3 flag enabled and mount point "
-                                  "%2.

    "
-                                  "You can continue without setting up an EFI system "
-                                  "partition but your system may fail to start." )
-                                  .arg( branding->shortProductName() )
-                                  .arg( espMountPoint, espFlagName );
             }
-            else if ( esp && !PartUtils::isEfiBootable( esp ) )
+            else if ( !(okType && okSize && okFlag ) )
             {
-                message = tr( "EFI system partition flag not set" );
-                description = tr( "An EFI system partition is necessary to start %1."
-                                  "

    "
-                                  "A partition was configured with mount point "
-                                  "%2 but its %3 "
-                                  "flag is not set.
    "
-                                  "To set the flag, go back and edit the partition."
-                                  "

    "
-                                  "You can continue without setting the flag but your "
-                                  "system may fail to start." )
-                                  .arg( branding->shortProductName() )
-                                  .arg( espMountPoint, espFlagName );
+                message = tr( "EFI system partition configured incorrectly" );
             }
 
+            if ( !esp || !(okType&&okSize &&okFlag)) {
+            description = tr( "An EFI system partition is necessary to start %1."
+                                "

    "
+                                "To configure an EFI system partition, go back and "
+                                "select or create a suitable filesystem.").arg( branding->shortProductName() );
+            }
+            if (!esp) {
+                cDebug() << o << "No ESP mounted";
+                description.append(' ');
+                description.append(tr("The filesystem must be mounted on %1.").arg(espMountPoint));
+            }
+            if (!okType) {
+                cDebug() << o << "ESP wrong type";
+                description.append(' ');
+                description.append(tr("The filesystem must have type FAT32."));
+            }
+            if (!okSize) {
+                cDebug() << o << "ESP too small";
+                description.append(' ');
+                description.append(tr("The filesystem must be at least %1 MiB in size.").arg( PartUtils::efiFilesystemMinimumSize() ));
+            }
+            if (!okFlag)
+            {
+                cDebug() << o << "ESP missing flag";
+                description.append(' ');
+                description.append(tr("The filesystem must have flag %1 set.").arg(PartitionTable::flagName( espFlag )));
+            }
+            if (!description.isEmpty()) {
+                description.append( "

    " );
+                description.append( tr(
+                                  "You can continue without setting up an EFI system "
+                                  "partition but your system may fail to start." ));
+            }
             if ( !message.isEmpty() )
             {
-                cWarning() << message;
                 QMessageBox::warning( m_manualPartitionPage, message, description );
             }
         }

From 4bf3afac482450967e01aa2a82995aefada4528e Mon Sep 17 00:00:00 2001
From: waneon 
Date: Fri, 27 Aug 2021 19:18:09 -0400
Subject: [PATCH 375/492] [partition] Fix invalid variable name

---
 src/modules/partition/gui/PartitionPage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index aa05c3a266..d22f6f01db 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -183,8 +183,8 @@ PartitionPage::updateButtons()
             if ( device->type() == Device::Type::SoftwareRAID_Device
                  && static_cast< SoftwareRAID* >( device )->status() == SoftwareRAID::Status::Inactive )
             {
-                createTable = false;
-                create = false;
+                allow_create_table = false;
+                allow_create = false;
             }
 #endif
         }

From 6831fac76be30b155d96a3e0d4c94093eb0c6e1f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 30 Aug 2021 22:34:57 +0200
Subject: [PATCH 376/492] Changes: document newly-merged

---
 CHANGES | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index f56ec0fc41..61e3e338fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ website will have to do for older versions.
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma
  - Artem Grinev
+ - Waneon Kim (new contributor, welcome!)
 
 ## Core ##
  - No core changes yet
@@ -19,14 +20,16 @@ This release contains contributions from (alphabetically by first name):
 ## Modules ##
  - *networkcfg* now translates the "live user" on an ISO to the regular
    user on the installed system, so that network configuration changes
-   made in the live system are automatically used after installation.
+   made in the live system are automatically used after installation. #1755
  - *partition* no longer allows you to delete an extended partition with
-   children (which led to crashes). Thanks Artem!
+   children (which led to crashes). Thanks Artem! #1749
+ - *partition* complains in more detail about the state of the UEFI
+   boot partition (under manual partitioning schemes). #1761
  - *welcome* can now check multiple URLs to determine if internet connectivity
    is available. It is still recommended to check the distro home-page or
    some special "ping" page of the distro, although that has some privacy
    implications; using example.com or google.com may work as well. Listing
-   multiple URLs will ping each of them in turn until one succeeds.
+   multiple URLs will ping each of them in turn until one succeeds. #1669
 
 
 # 3.2.41.1 (2021-08-05) #

From 0899eefde7c70dd9434875f0988aa092debf4ff3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 31 Aug 2021 11:33:05 +0200
Subject: [PATCH 377/492] [packagechooserq] Fix build on Debian, openSUSE with
 AppStream

---
 src/modules/packagechooserq/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/packagechooserq/CMakeLists.txt b/src/modules/packagechooserq/CMakeLists.txt
index 0d98c7d1e5..51a17e215d 100644
--- a/src/modules/packagechooserq/CMakeLists.txt
+++ b/src/modules/packagechooserq/CMakeLists.txt
@@ -28,7 +28,7 @@ if ( WITH_APPDATA )
     if ( Qt5Xml_FOUND )
         add_definitions( -DHAVE_APPDATA )
         list( APPEND _extra_libraries Qt5::Xml )
-        list( APPEND _extra_src ItemAppData.cpp )
+        list( APPEND _extra_src ${_packagechooser}/ItemAppData.cpp )
     endif()
 endif()
 
@@ -48,7 +48,7 @@ if ( WITH_APPSTREAM )
     if ( AppStreamQt_FOUND )
         add_definitions( -DHAVE_APPSTREAM )
         list( APPEND _extra_libraries AppStreamQt )
-        list( APPEND _extra_src ItemAppStream.cpp )
+        list( APPEND _extra_src ${_packagechooser}/ItemAppStream.cpp )
     endif()
 endif()
 
@@ -59,7 +59,7 @@ calamares_add_plugin( packagechooserq
         PackageChooserQmlViewStep.cpp
         ${_packagechooser}/Config.cpp
         ${_packagechooser}/PackageModel.cpp
-        ${_packagechooser}/ItemAppData.cpp
+        ${_extra_src}
     RESOURCES
         packagechooserq.qrc
     LINK_PRIVATE_LIBRARIES

From 3519697d0e72c03307ca3056f47c6d70a6d5987d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 31 Aug 2021 12:54:51 +0200
Subject: [PATCH 378/492] [libcalamares] Slightly more memory-safe

Use unique_ptr to ensure Private is always deleted.

SEE #1758
---
 src/libcalamares/partition/Mount.cpp | 7 ++-----
 src/libcalamares/partition/Mount.h   | 6 ++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp
index 0fd204df4d..89e17a885b 100644
--- a/src/libcalamares/partition/Mount.cpp
+++ b/src/libcalamares/partition/Mount.cpp
@@ -92,7 +92,7 @@ struct TemporaryMount::Private
 
 
 TemporaryMount::TemporaryMount( const QString& devicePath, const QString& filesystemName, const QString& options )
-    : m_d( new Private )
+    : m_d( std::make_unique() )
 {
     m_d->m_devicePath = devicePath;
     m_d->m_mountDir.setAutoRemove( false );
@@ -100,8 +100,7 @@ TemporaryMount::TemporaryMount( const QString& devicePath, const QString& filesy
     if ( r )
     {
         cWarning() << "Mount of" << devicePath << "on" << m_d->m_mountDir.path() << "failed, code" << r;
-        delete m_d;
-        m_d = nullptr;
+        m_d.reset();
     }
 }
 
@@ -115,8 +114,6 @@ TemporaryMount::~TemporaryMount()
             cWarning() << "UnMount of temporary" << m_d->m_devicePath << "on" << m_d->m_mountDir.path()
                        << "failed, code" << r;
         }
-        delete m_d;
-        m_d = nullptr;
     }
 }
 
diff --git a/src/libcalamares/partition/Mount.h b/src/libcalamares/partition/Mount.h
index 6a2ef9f8b2..d088b108fc 100644
--- a/src/libcalamares/partition/Mount.h
+++ b/src/libcalamares/partition/Mount.h
@@ -17,6 +17,8 @@
 #include 
 #include 
 
+#include 
+
 namespace CalamaresUtils
 {
 namespace Partition
@@ -58,12 +60,12 @@ class DLLEXPORT TemporaryMount
     TemporaryMount& operator=( const TemporaryMount& ) = delete;
     ~TemporaryMount();
 
-    bool isValid() const { return m_d; }
+    bool isValid() const { return bool( m_d ); }
     QString path() const;
 
 private:
     struct Private;
-    Private* m_d = nullptr;
+    std::unique_ptr< Private > m_d;
 };
 
 }  // namespace Partition

From ede19c8a6179a4e8cd049317663844cfa586b10b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 31 Aug 2021 13:45:15 +0200
Subject: [PATCH 379/492] [partition] Fix build of devices test

---
 src/modules/partition/tests/CMakeLists.txt   |  5 ++++-
 src/modules/partition/tests/DevicesTests.cpp | 22 +++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index bb0b59af46..2839270fbb 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -44,12 +44,12 @@ calamares_add_test(
 calamares_add_test(
     partitioncreatelayoutstest
     SOURCES
+        CreateLayoutsTests.cpp
         ${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp
         ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
         ${PartitionModule_SOURCE_DIR}/core/PartitionLayout.cpp
         ${PartitionModule_SOURCE_DIR}/core/PartUtils.cpp
         ${PartitionModule_SOURCE_DIR}/core/DeviceModel.cpp
-        CreateLayoutsTests.cpp
     LIBRARIES
         kpmcore
         Calamares::calamaresui
@@ -67,4 +67,7 @@ calamares_add_test(
     partitiondevicestest
     SOURCES
         DevicesTests.cpp
+        ${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp
+    LIBRARIES
+        kpmcore
 )
diff --git a/src/modules/partition/tests/DevicesTests.cpp b/src/modules/partition/tests/DevicesTests.cpp
index 82311b288c..02b1dc62e0 100644
--- a/src/modules/partition/tests/DevicesTests.cpp
+++ b/src/modules/partition/tests/DevicesTests.cpp
@@ -11,6 +11,9 @@
 
 #include "utils/Logger.h"
 
+#include 
+#include 
+
 #include 
 #include 
 
@@ -33,14 +36,13 @@ DevicesTests::testKPMScanDevices()
 {
     Logger::setupLogLevel( Logger::LOGVERBOSE );
 
-#if defined( WITH_KPMCORE4API )
     cDebug() << "Getting devices via KPMCore";
     CoreBackend* backend = CoreBackendManager::self()->backend();
-    DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
+    QVERIFY( backend );
+    auto devices = backend->scanDevices(); // Whatever the default is /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
     cDebug() << Logger::SubEntry << "Done getting devices.";
-#else
-    cWarning() << "Test skipped; use KPMCore4";
-#endif
+
+    QVERIFY( devices.count() > 0 );
 }
 
 void
@@ -49,8 +51,14 @@ DevicesTests::testPartUtilScanDevices()
     Logger::setupLogLevel( Logger::LOGVERBOSE );
 
     cDebug() << "Getting devices via PartUtils";
-    auto l = PartUtils::getDevices();
+    auto devices = PartUtils::getDevices();
     cDebug() << Logger::SubEntry << "Done getting devices.";
 
-    QVERIFY( l.count() > 0 );
+    QVERIFY( devices.count() > 0 );
 }
+
+QTEST_GUILESS_MAIN( DevicesTests )
+
+#include "utils/moc-warnings.h"
+
+#include "DevicesTests.moc"

From 3d0709c779be330ae3259dff9a80c431b944f3c2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 31 Aug 2021 13:46:25 +0200
Subject: [PATCH 380/492] [partition] Avoid crash when there is no KPM backend

---
 src/modules/partition/core/DeviceList.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp
index 6b770a9821..c7de12e887 100644
--- a/src/modules/partition/core/DeviceList.cpp
+++ b/src/modules/partition/core/DeviceList.cpp
@@ -112,6 +112,11 @@ QList< Device* >
 getDevices( DeviceType which )
 {
     CoreBackend* backend = CoreBackendManager::self()->backend();
+    if ( !backend )
+    {
+        cWarning() << "No KPM backend found.";
+        return {};
+    }
 #if defined( WITH_KPMCORE4API )
     DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
 #else

From 1554c3a07cbf3779589d923778e0811e56bef1f2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 31 Aug 2021 13:54:23 +0200
Subject: [PATCH 381/492] [partition] Create KPM backend at start of test

---
 src/modules/partition/tests/DevicesTests.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/tests/DevicesTests.cpp b/src/modules/partition/tests/DevicesTests.cpp
index 02b1dc62e0..6d42e71e43 100644
--- a/src/modules/partition/tests/DevicesTests.cpp
+++ b/src/modules/partition/tests/DevicesTests.cpp
@@ -9,6 +9,7 @@
 
 #include "core/DeviceList.h"
 
+#include "partition/KPMManager.h"
 #include "utils/Logger.h"
 
 #include 
@@ -17,6 +18,8 @@
 #include 
 #include 
 
+#include 
+
 class DevicesTests : public QObject
 {
     Q_OBJECT
@@ -27,9 +30,13 @@ class DevicesTests : public QObject
 private Q_SLOTS:
     void testKPMScanDevices();
     void testPartUtilScanDevices();
+
+private:
+    std::unique_ptr< CalamaresUtils::Partition::KPMManager > m_d;
 };
 
-DevicesTests::DevicesTests() {}
+DevicesTests::DevicesTests() : m_d( std::make_unique< CalamaresUtils::Partition::KPMManager >() )
+{}
 
 void
 DevicesTests::testKPMScanDevices()
@@ -39,7 +46,12 @@ DevicesTests::testKPMScanDevices()
     cDebug() << "Getting devices via KPMCore";
     CoreBackend* backend = CoreBackendManager::self()->backend();
     QVERIFY( backend );
-    auto devices = backend->scanDevices(); // Whatever the default is /* not includeReadOnly, not includeLoopback */ ScanFlag( 0 ) );
+#if defined( WITH_KPMCORE4API )
+    auto flags = ScanFlag( ~0 );
+#else
+    auto flags = true;
+#endif
+    auto devices = backend->scanDevices( flags ); // These flags try to get "all"
     cDebug() << Logger::SubEntry << "Done getting devices.";
 
     QVERIFY( devices.count() > 0 );

From 09491e4cbb70b78ad1462d729d4fe816dcf9b9bd Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 31 Aug 2021 13:58:23 +0200
Subject: [PATCH 382/492] [partition] expect failures when kpm can't read the
 disk

---
 src/modules/partition/tests/DevicesTests.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/modules/partition/tests/DevicesTests.cpp b/src/modules/partition/tests/DevicesTests.cpp
index 6d42e71e43..6513e955b4 100644
--- a/src/modules/partition/tests/DevicesTests.cpp
+++ b/src/modules/partition/tests/DevicesTests.cpp
@@ -20,6 +20,8 @@
 
 #include 
 
+#include 
+
 class DevicesTests : public QObject
 {
     Q_OBJECT
@@ -33,9 +35,12 @@ private Q_SLOTS:
 
 private:
     std::unique_ptr< CalamaresUtils::Partition::KPMManager > m_d;
+    bool m_isRoot = false;
 };
 
-DevicesTests::DevicesTests() : m_d( std::make_unique< CalamaresUtils::Partition::KPMManager >() )
+DevicesTests::DevicesTests()
+    : m_d( std::make_unique< CalamaresUtils::Partition::KPMManager >() )
+    , m_isRoot( geteuid() == 0 )
 {}
 
 void
@@ -54,6 +59,10 @@ DevicesTests::testKPMScanDevices()
     auto devices = backend->scanDevices( flags ); // These flags try to get "all"
     cDebug() << Logger::SubEntry << "Done getting devices.";
 
+    if ( !m_isRoot )
+    {
+        QEXPECT_FAIL( "", "Test invalid when not root", Continue );
+    }
     QVERIFY( devices.count() > 0 );
 }
 
@@ -66,6 +75,10 @@ DevicesTests::testPartUtilScanDevices()
     auto devices = PartUtils::getDevices();
     cDebug() << Logger::SubEntry << "Done getting devices.";
 
+    if ( !m_isRoot )
+    {
+        QEXPECT_FAIL( "", "Test invalid when not root", Continue );
+    }
     QVERIFY( devices.count() > 0 );
 }
 

From 2f88ba0d3f2d1df4a35df67d5557d2c0f1ea2062 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 31 Aug 2021 14:03:04 +0200
Subject: [PATCH 383/492] [partition] Coding style

---
 src/modules/partition/tests/DevicesTests.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/tests/DevicesTests.cpp b/src/modules/partition/tests/DevicesTests.cpp
index 6513e955b4..c63d7476d8 100644
--- a/src/modules/partition/tests/DevicesTests.cpp
+++ b/src/modules/partition/tests/DevicesTests.cpp
@@ -41,7 +41,8 @@ private Q_SLOTS:
 DevicesTests::DevicesTests()
     : m_d( std::make_unique< CalamaresUtils::Partition::KPMManager >() )
     , m_isRoot( geteuid() == 0 )
-{}
+{
+}
 
 void
 DevicesTests::testKPMScanDevices()
@@ -56,7 +57,7 @@ DevicesTests::testKPMScanDevices()
 #else
     auto flags = true;
 #endif
-    auto devices = backend->scanDevices( flags ); // These flags try to get "all"
+    auto devices = backend->scanDevices( flags );  // These flags try to get "all"
     cDebug() << Logger::SubEntry << "Done getting devices.";
 
     if ( !m_isRoot )

From 57f2a4c9eb85bdb70e6ef2cb127af182afd929f7 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Tue, 31 Aug 2021 22:38:48 +0200
Subject: [PATCH 384/492] update CHANGES with what was done for QML modules

---
 CHANGES | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES b/CHANGES
index 61e3e338fc..76d430a97e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,9 @@ This release contains contributions from (alphabetically by first name):
  - No core changes yet
 
 ## Modules ##
+ - The *localeq* module had the i18n.qml rewritten to make it easier
+   to customize. A bug in the layout has been fixed, and the overall
+   look has been updated.
  - *networkcfg* now translates the "live user" on an ISO to the regular
    user on the installed system, so that network configuration changes
    made in the live system are automatically used after installation. #1755
@@ -30,6 +33,12 @@ This release contains contributions from (alphabetically by first name):
    some special "ping" page of the distro, although that has some privacy
    implications; using example.com or google.com may work as well. Listing
    multiple URLs will ping each of them in turn until one succeeds. #1669
+ - The work to make a QML version available for all view modules is almost
+   completed. Two new QML modules have been added *packagechooserq* and *summaryq*.
+   Summaryq brings the option to present the summary page in a customizable
+   way, with a bit more of a contemporary look. Packagechooserq adds the option
+   to preselect an item and displays all options in one overview.
+
 
 
 # 3.2.41.1 (2021-08-05) #

From 35156574b82edff5c4c76e2228c018861dec25f4 Mon Sep 17 00:00:00 2001
From: dr460nf1r3 
Date: Fri, 3 Sep 2021 20:49:08 +0200
Subject: [PATCH 385/492] Dont set fsck check for BTRFS in fstab

---
 src/modules/fstab/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
index 61f6b0e9f3..5312e7f5bc 100644
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@@ -244,9 +244,9 @@ def generate_fstab_line_info(self, partition):
             if extra:
                 options += "," + extra
 
-        if mount_point == "/":
+        if mount_point == "/" and filesystem != "btrfs":
             check = 1
-        elif mount_point and mount_point != "swap":
+        elif mount_point and mount_point != "swap" and filesystem != "btrfs":
             check = 2
         else:
             check = 0

From 1a1009a2a9e866bc596ba7d701549fa58b1df1e7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 3 Sep 2021 17:07:32 +0200
Subject: [PATCH 386/492] [summaryq] add SPDX-tags

---
 src/modules/summaryq/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/summaryq/CMakeLists.txt b/src/modules/summaryq/CMakeLists.txt
index cdf520b24e..8aac1bc2f0 100644
--- a/src/modules/summaryq/CMakeLists.txt
+++ b/src/modules/summaryq/CMakeLists.txt
@@ -1,3 +1,8 @@
+# === This file is part of Calamares -  ===
+#
+#   SPDX-FileCopyrightText: 2021 Anke Boersma 
+#   SPDX-License-Identifier: BSD-2-Clause
+#
 if( NOT WITH_QML )
     calamares_skip_module( "summaryq (QML is not supported in this build)" )
     return()

From 47c504df5daed636664ec1828b4b6dd0051627a4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 3 Sep 2021 17:07:49 +0200
Subject: [PATCH 387/492] [welcome] add SPDX-tags to test-data

---
 src/modules/welcome/tests/1a-checkinternet.conf | 2 ++
 src/modules/welcome/tests/1b-checkinternet.conf | 3 +++
 src/modules/welcome/tests/1c-checkinternet.conf | 3 +++
 src/modules/welcome/tests/1d-checkinternet.conf | 3 +++
 src/modules/welcome/tests/1e-checkinternet.conf | 3 +++
 src/modules/welcome/tests/1f-checkinternet.conf | 6 +++++-
 src/modules/welcome/tests/1g-checkinternet.conf | 4 ++++
 src/modules/welcome/tests/1h-checkinternet.conf | 5 ++++-
 8 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/modules/welcome/tests/1a-checkinternet.conf b/src/modules/welcome/tests/1a-checkinternet.conf
index d2140f2010..d10a97d2a9 100644
--- a/src/modules/welcome/tests/1a-checkinternet.conf
+++ b/src/modules/welcome/tests/1a-checkinternet.conf
@@ -1,3 +1,5 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
 ---
 requirements:
     internetCheckUrl:   http://example.com
diff --git a/src/modules/welcome/tests/1b-checkinternet.conf b/src/modules/welcome/tests/1b-checkinternet.conf
index a1e6569859..7cb9b4206c 100644
--- a/src/modules/welcome/tests/1b-checkinternet.conf
+++ b/src/modules/welcome/tests/1b-checkinternet.conf
@@ -1,3 +1,6 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
 # Nothing at all
 ---
 bogus:   1
diff --git a/src/modules/welcome/tests/1c-checkinternet.conf b/src/modules/welcome/tests/1c-checkinternet.conf
index 845e253c0a..6dbfb8f37c 100644
--- a/src/modules/welcome/tests/1c-checkinternet.conf
+++ b/src/modules/welcome/tests/1c-checkinternet.conf
@@ -1,3 +1,6 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
 # Set to blank
 ---
 requirements:
diff --git a/src/modules/welcome/tests/1d-checkinternet.conf b/src/modules/welcome/tests/1d-checkinternet.conf
index 9a44d7c935..0f5896ce1f 100644
--- a/src/modules/welcome/tests/1d-checkinternet.conf
+++ b/src/modules/welcome/tests/1d-checkinternet.conf
@@ -1,3 +1,6 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
 # Set to something broken
 ---
 requirements:
diff --git a/src/modules/welcome/tests/1e-checkinternet.conf b/src/modules/welcome/tests/1e-checkinternet.conf
index 579414a79f..98ff62695a 100644
--- a/src/modules/welcome/tests/1e-checkinternet.conf
+++ b/src/modules/welcome/tests/1e-checkinternet.conf
@@ -1,3 +1,6 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
 # Empty list
 ---
 requirements:
diff --git a/src/modules/welcome/tests/1f-checkinternet.conf b/src/modules/welcome/tests/1f-checkinternet.conf
index 6607603810..158025c628 100644
--- a/src/modules/welcome/tests/1f-checkinternet.conf
+++ b/src/modules/welcome/tests/1f-checkinternet.conf
@@ -1,6 +1,10 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
+# Multiple, all valid
 ---
 requirements:
-    internetCheckUrl:   
+    internetCheckUrl:
         - http://example.com
         - http://bogus.example.com
         - http://nonexistent.example.com
diff --git a/src/modules/welcome/tests/1g-checkinternet.conf b/src/modules/welcome/tests/1g-checkinternet.conf
index dd3ddae0cf..1f4477f9f3 100644
--- a/src/modules/welcome/tests/1g-checkinternet.conf
+++ b/src/modules/welcome/tests/1g-checkinternet.conf
@@ -1,3 +1,7 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
+# Multiple, all valid, in short-list form
 ---
 requirements:
     internetCheckUrl: [ http://example.com, http://bogus.example.com, http://nonexistent.example.com ]
diff --git a/src/modules/welcome/tests/1h-checkinternet.conf b/src/modules/welcome/tests/1h-checkinternet.conf
index 928360c209..4984cf12b6 100644
--- a/src/modules/welcome/tests/1h-checkinternet.conf
+++ b/src/modules/welcome/tests/1h-checkinternet.conf
@@ -1,7 +1,10 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
 # "0" is a valid URL (?) but "" is not
 ---
 requirements:
-    internetCheckUrl:   
+    internetCheckUrl:
         - http://example.com
         - 0
         - ""

From c367731c42f5fd1cdeb9206c0010ff7ad98bf3c4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 3 Sep 2021 17:29:21 +0200
Subject: [PATCH 388/492] [packagechooser] Rename internals

- pkgc -> packageChoice and similar for methods, variables
- document that this is the convenience value for one-selection
  QML modules, not a full model
- use std::optional to keep track of which one is being used.
---
 src/modules/packagechooser/Config.cpp | 23 +++++++++++++++--------
 src/modules/packagechooser/Config.h   | 26 ++++++++++++++++++++------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp
index f66f168245..2c798ea037 100644
--- a/src/modules/packagechooser/Config.cpp
+++ b/src/modules/packagechooser/Config.cpp
@@ -100,10 +100,10 @@ Config::updateGlobalStorage( const QStringList& selected ) const
 {
     if ( m_method == PackageChooserMethod::Legacy )
     {
-        //QString value = selected.join( ',' );
-        QString value = ( m_pkgc );
+        QString value = selected.join( ',' );
+        // QString value = ( m_pkgc );
         Calamares::JobQueue::instance()->globalStorage()->insert( m_id, value );
-        cDebug() << m_id<< "selected" << value;
+        cDebug() << m_id << "selected" << value;
     }
     else if ( m_method == PackageChooserMethod::Packages )
     {
@@ -119,16 +119,23 @@ Config::updateGlobalStorage( const QStringList& selected ) const
 }
 
 void
-Config::setPkgc( const QString& pkgc )
+Config::setPackageChoice( const QString& packageChoice )
 {
-    m_pkgc = pkgc;
-    emit pkgcChanged( m_pkgc );
+    if ( packageChoice.isEmpty() )
+    {
+        m_packageChoice.reset();
+    }
+    else
+    {
+        m_packageChoice = packageChoice;
+    }
+    emit packageChoiceChanged( m_packageChoice.value_or( QString() ) );
 }
 
 QString
 Config::prettyStatus() const
 {
-    return tr( "Install option: %1" ).arg( m_pkgc );
+    return tr( "Install option: %1" ).arg( m_packageChoice.value_or( tr( "None" ) ) );
 }
 
 static void
@@ -197,7 +204,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
                                              PackageChooserMode::Required );
     m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ),
                                                  PackageChooserMethod::Legacy );
-    m_pkgc = CalamaresUtils::getString( configurationMap, "pkgc" );
+    setPackageChoice( CalamaresUtils::getString( configurationMap, "pkgc" ) );
 
     if ( m_method == PackageChooserMethod::Legacy )
     {
diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h
index b343a8cb2b..75ff0d0c64 100644
--- a/src/modules/packagechooser/Config.h
+++ b/src/modules/packagechooser/Config.h
@@ -17,6 +17,7 @@
 #include "modulesystem/InstanceKey.h"
 
 #include 
+#include 
 
 enum class PackageChooserMode
 {
@@ -40,7 +41,16 @@ class Config : public Calamares::ModuleSystem::Config
 {
     Q_OBJECT
 
-    Q_PROPERTY( QString pkgc READ pkgc WRITE setPkgc NOTIFY pkgcChanged )
+    /** @brief This is the single-select package-choice
+     *
+     * For (QML) modules that support only a single selection and
+     * just want to do things in a straightforward pick-this-one
+     * way, the packageChoice property is a (the) way to go.
+     *
+     * Writing to this property means that any other form of package-
+     * choice or selection is ignored.
+     */
+    Q_PROPERTY( QString packageChoice READ packageChoice WRITE setPackageChoice NOTIFY packageChoiceChanged )
     Q_PROPERTY( QString prettyStatus READ prettyStatus NOTIFY prettyStatusChanged FINAL )
 
 public:
@@ -78,13 +88,13 @@ class Config : public Calamares::ModuleSystem::Config
     /// As updateGlobalStorage() with an empty selection list
     void fillGSSecondaryConfiguration() const { updateGlobalStorage( QStringList() ); }
 
-    QString pkgc() const { return m_pkgc; }
-    void setPkgc( const QString& pkgc );
+    QString packageChoice() const { return m_packageChoice.value_or( QString() ); }
+    void setPackageChoice( const QString& packageChoice );
 
     QString prettyStatus() const;
 
 signals:
-    void pkgcChanged( QString pkgc );
+    void packageChoiceChanged( QString packageChoice );
     void prettyStatusChanged();
 
 private:
@@ -99,8 +109,12 @@ class Config : public Calamares::ModuleSystem::Config
     QString m_id;
     /// Value to use for id if none is set in the config file
     Calamares::ModuleSystem::InstanceKey m_defaultId;
-    /// QML selection
-    QString m_pkgc;
+    /** @brief QML selection (for single-selection approaches)
+     *
+     * If there is no value, then there has been no selection.
+     * Reading the property will return an empty QString.
+     */
+    std::optional< QString > m_packageChoice;
 };
 
 

From 8b703ba6a33c5bbf21909e348d28f54adbcaa53d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 3 Sep 2021 21:12:11 +0200
Subject: [PATCH 389/492] [packagechooserq] More docs for the config file

---
 src/modules/packagechooserq/packagechooserq.conf | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/packagechooserq/packagechooserq.conf b/src/modules/packagechooserq/packagechooserq.conf
index fc45e4fa9a..ecf9ed1a6d 100644
--- a/src/modules/packagechooserq/packagechooserq.conf
+++ b/src/modules/packagechooserq/packagechooserq.conf
@@ -6,9 +6,7 @@
 # Software selection mode, to set whether the software packages
 # can be chosen singly, or multiply.
 #
-# Possible modes are "optional", "required" (for zero-or-one or exactly-one)
-# or "optionalmultiple", "requiredmultiple" (for zero-or-more
-# or one-or-more).
+# The example QML module does not use a model, and ignores this value.
 mode: required
 
 # Software installation method:
@@ -40,7 +38,11 @@ mode: required
 # modules, either *contextualprocess* or *packages* or some custom
 # module, in the `exec` section to do the actual work.
 method: legacy
-# The *id* key is used only in "legacy" mode
+
+# The *id* key is used only in "legacy" mode and changes the GlobalStorage
+# key used to store the package choices. It is not recommended to use
+# this, since the module instance key does the same job.
+#
 # id: ""
 
 # The *pkgc* is used for setting the default selection in the QML view

From 8a49fde0163c6660784d2ea11da817e721a8f36b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 3 Sep 2021 21:15:57 +0200
Subject: [PATCH 390/492] [packagechooserq] Apply renaming also to
 distro-visible code

- The distro-visible key is renamed *pkgc* to *packageChoice*
- Read *packageChoice* only if there are no items to use
---
 src/modules/packagechooser/Config.cpp         | 27 ++++++++++---------
 .../packagechooserq/packagechooserq.conf      | 10 +++++--
 .../packagechooserq/packagechooserq.qml       |  8 +++---
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp
index 2c798ea037..11288bde6a 100644
--- a/src/modules/packagechooser/Config.cpp
+++ b/src/modules/packagechooser/Config.cpp
@@ -204,7 +204,6 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
                                              PackageChooserMode::Required );
     m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ),
                                                  PackageChooserMethod::Legacy );
-    setPackageChoice( CalamaresUtils::getString( configurationMap, "pkgc" ) );
 
     if ( m_method == PackageChooserMethod::Legacy )
     {
@@ -233,21 +232,25 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     if ( configurationMap.contains( "items" ) )
     {
         fillModel( m_model, configurationMap.value( "items" ).toList() );
-    }
 
-    QString default_item_id = CalamaresUtils::getString( configurationMap, "default" );
-    if ( !default_item_id.isEmpty() )
-    {
-        for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n )
+        QString default_item_id = CalamaresUtils::getString( configurationMap, "default" );
+        if ( !default_item_id.isEmpty() )
         {
-            QModelIndex item_idx = m_model->index( item_n, 0 );
-            QVariant item_id = m_model->data( item_idx, PackageListModel::IdRole );
-
-            if ( item_id.toString() == default_item_id )
+            for ( int item_n = 0; item_n < m_model->packageCount(); ++item_n )
             {
-                m_defaultModelIndex = item_idx;
-                break;
+                QModelIndex item_idx = m_model->index( item_n, 0 );
+                QVariant item_id = m_model->data( item_idx, PackageListModel::IdRole );
+
+                if ( item_id.toString() == default_item_id )
+                {
+                    m_defaultModelIndex = item_idx;
+                    break;
+                }
             }
         }
     }
+    else
+    {
+        setPackageChoice( CalamaresUtils::getString( configurationMap, "packageChoice" ) );
+    }
 }
diff --git a/src/modules/packagechooserq/packagechooserq.conf b/src/modules/packagechooserq/packagechooserq.conf
index ecf9ed1a6d..8fd3a08f65 100644
--- a/src/modules/packagechooserq/packagechooserq.conf
+++ b/src/modules/packagechooserq/packagechooserq.conf
@@ -45,6 +45,12 @@ method: legacy
 #
 # id: ""
 
-# The *pkgc* is used for setting the default selection in the QML view
-pkgc: libreoffice
+# The *packageChoice* value is used for setting the default selection
+# in the QML view; this should match one of the keys used in the QML
+# module for package names.
+#
+# (e.g. the sample QML uses "no_office_suite", "minimal_install" and
+# "libreoffice" as possible choices).
+#
+packageChoice: libreoffice
 
diff --git a/src/modules/packagechooserq/packagechooserq.qml b/src/modules/packagechooserq/packagechooserq.qml
index cf7454fe9d..98f7b80381 100644
--- a/src/modules/packagechooserq/packagechooserq.qml
+++ b/src/modules/packagechooserq/packagechooserq.qml
@@ -84,8 +84,8 @@ Item {
                             print("L not used")
                         }
                         else {
-                            config.pkgc = "libreoffice"
-                            print( config.pkgc )
+                            config.packageChoice = "libreoffice"
+                            print( config.packageChoice )
                         }
                     }
                 }
@@ -152,7 +152,7 @@ Item {
                         }
                         else {
                             print("No Office Suite")
-                            config.pkgc = "no_office_suite"
+                            config.packageChoice = "no_office_suite"
                         }
                     }
                 }
@@ -220,7 +220,7 @@ Item {
                         }
                         else {
                             print("minimal")
-                            config.pkgc = "minimal_install"
+                            config.packageChoice = "minimal_install"
                         }
                     }
                 }

From 33e7e8da58a24bea4ca2916c79e0454e7dfd272d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 3 Sep 2021 22:41:13 +0200
Subject: [PATCH 391/492] [packagechooser] Massage API

- use updateGlobalStorage() for both single-selection and
  model-based approaches, although the model-based one
  needs extra parameters.
- complain about inconsistent settings and API calls (e.g.
  setting a model and single-selection at the same time)
---
 src/modules/packagechooser/Config.cpp         | 39 ++++++++++++++++++-
 src/modules/packagechooser/Config.h           |  9 ++++-
 .../PackageChooserQmlViewStep.cpp             |  2 +-
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp
index 11288bde6a..0001d9fc66 100644
--- a/src/modules/packagechooser/Config.cpp
+++ b/src/modules/packagechooser/Config.cpp
@@ -98,10 +98,13 @@ Config::introductionPackage() const
 void
 Config::updateGlobalStorage( const QStringList& selected ) const
 {
+    if ( m_packageChoice.has_value() )
+    {
+        cWarning() << "Inconsistent package choices -- both model and single-selection QML";
+    }
     if ( m_method == PackageChooserMethod::Legacy )
     {
         QString value = selected.join( ',' );
-        // QString value = ( m_pkgc );
         Calamares::JobQueue::instance()->globalStorage()->insert( m_id, value );
         cDebug() << m_id << "selected" << value;
     }
@@ -118,6 +121,36 @@ Config::updateGlobalStorage( const QStringList& selected ) const
     }
 }
 
+void
+Config::updateGlobalStorage() const
+{
+    if ( m_model->packageCount() > 0 )
+    {
+        cWarning() << "Inconsistent package choices -- both model and single-selection QML";
+    }
+    if ( m_method == PackageChooserMethod::Legacy )
+    {
+        auto* gs = Calamares::JobQueue::instance()->globalStorage();
+        if ( m_packageChoice.has_value() )
+        {
+            gs->insert( m_id, m_packageChoice.value() );
+        }
+        else
+        {
+            gs->remove( m_id );
+        }
+    }
+    else if ( m_method == PackageChooserMethod::Packages )
+    {
+        cWarning() << "Unsupported single-selection packagechooser method 'Packages'";
+    }
+    else
+    {
+        cWarning() << "Unknown packagechooser method" << smash( m_method );
+    }
+}
+
+
 void
 Config::setPackageChoice( const QString& packageChoice )
 {
@@ -252,5 +285,9 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     else
     {
         setPackageChoice( CalamaresUtils::getString( configurationMap, "packageChoice" ) );
+        if ( m_method != PackageChooserMethod::Legacy )
+        {
+            cWarning() << "Single-selection QML module must use 'Legacy' method.";
+        }
     }
 }
diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h
index 75ff0d0c64..85b8de83f3 100644
--- a/src/modules/packagechooser/Config.h
+++ b/src/modules/packagechooser/Config.h
@@ -85,8 +85,13 @@ class Config : public Calamares::ModuleSystem::Config
      * (and only) the packages in @p selected as selected.
      */
     void updateGlobalStorage( const QStringList& selected ) const;
-    /// As updateGlobalStorage() with an empty selection list
-    void fillGSSecondaryConfiguration() const { updateGlobalStorage( QStringList() ); }
+    /** @brief Write selection to global storage
+     *
+     * Updates the GS keys for this packagechooser, marking **only**
+     * the package choice as selected. This assumes that the single-
+     * selection QML code is in use.
+     */
+    void updateGlobalStorage() const;
 
     QString packageChoice() const { return m_packageChoice.value_or( QString() ); }
     void setPackageChoice( const QString& packageChoice );
diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
index 109260ca92..543c9771d1 100644
--- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
+++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
@@ -74,7 +74,7 @@ PackageChooserQmlViewStep::jobs() const
 void
 PackageChooserQmlViewStep::onLeave()
 {
-    m_config->fillGSSecondaryConfiguration();
+    m_config->updateGlobalStorage();
 }
 
 void

From 6def41fab4270498ea8df5e98fc48b950572189b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 3 Sep 2021 22:57:17 +0200
Subject: [PATCH 392/492] [packagechooserq] Remove debug-output in QML

---
 .../packagechooserq/packagechooserq.qml       | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/modules/packagechooserq/packagechooserq.qml b/src/modules/packagechooserq/packagechooserq.qml
index 98f7b80381..7d1613582b 100644
--- a/src/modules/packagechooserq/packagechooserq.qml
+++ b/src/modules/packagechooserq/packagechooserq.qml
@@ -80,12 +80,8 @@ Item {
                     }
 
                     onCheckedChanged: {
-                        if ( ! checked ) {
-                            print("L not used")
-                        }
-                        else {
+                        if ( checked ) {
                             config.packageChoice = "libreoffice"
-                            print( config.packageChoice )
                         }
                     }
                 }
@@ -146,12 +142,7 @@ Item {
                     }
 
                     onCheckedChanged: {
-                        if ( ! checked ) {
-                            print("not used")
-                            //console.log("removed")
-                        }
-                        else {
-                            print("No Office Suite")
+                        if ( checked ) {
                             config.packageChoice = "no_office_suite"
                         }
                     }
@@ -215,11 +206,7 @@ Item {
                     }
 
                     onCheckedChanged: {
-                        if ( ! checked ) {
-                            print("M not used")
-                        }
-                        else {
-                            print("minimal")
+                        if ( checked ) {
                             config.packageChoice = "minimal_install"
                         }
                     }

From e311d7a89346ad61ee10a2da48cb1a7a76559725 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 3 Sep 2021 23:59:11 +0200
Subject: [PATCH 393/492] [packagechooser] Remove 'id' configuration setting

- Setting 'id' (which changes the Global Storage key that
  gets used) is a kludge when the existing module-instance
  name can be used instead -- and **was** already used, as
  a fallback when 'id' is not set. There's no point in having
  two places to set a particular name.
- Rip out the docs for 'id' as well.
- Add documentation on the difference between single-selection
  (the QML implementation) and model-selection (what the Widgets
  version does).
---
 src/modules/packagechooser/Config.cpp         | 35 ++++++-------------
 src/modules/packagechooser/Config.h           |  2 --
 .../packagechooser/packagechooser.conf        | 12 +++----
 .../packagechooserq/packagechooserq.conf      | 31 ++++++++--------
 4 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp
index 0001d9fc66..5c0db5d91f 100644
--- a/src/modules/packagechooser/Config.cpp
+++ b/src/modules/packagechooser/Config.cpp
@@ -95,6 +95,12 @@ Config::introductionPackage() const
     return *defaultIntroduction;
 }
 
+static inline QString
+make_gs_key( const Calamares::ModuleSystem::InstanceKey& key )
+{
+    return QStringLiteral( "packagechooser_" ) + key.id();
+}
+
 void
 Config::updateGlobalStorage( const QStringList& selected ) const
 {
@@ -105,8 +111,8 @@ Config::updateGlobalStorage( const QStringList& selected ) const
     if ( m_method == PackageChooserMethod::Legacy )
     {
         QString value = selected.join( ',' );
-        Calamares::JobQueue::instance()->globalStorage()->insert( m_id, value );
-        cDebug() << m_id << "selected" << value;
+        Calamares::JobQueue::instance()->globalStorage()->insert( make_gs_key( m_defaultId ), value );
+        cDebug() << m_defaultId << "selected" << value;
     }
     else if ( m_method == PackageChooserMethod::Packages )
     {
@@ -133,11 +139,11 @@ Config::updateGlobalStorage() const
         auto* gs = Calamares::JobQueue::instance()->globalStorage();
         if ( m_packageChoice.has_value() )
         {
-            gs->insert( m_id, m_packageChoice.value() );
+            gs->insert( make_gs_key( m_defaultId ), m_packageChoice.value() );
         }
         else
         {
-            gs->remove( m_id );
+            gs->remove( make_gs_key( m_defaultId ) );
         }
     }
     else if ( m_method == PackageChooserMethod::Packages )
@@ -240,26 +246,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
 
     if ( m_method == PackageChooserMethod::Legacy )
     {
-        const QString configId = CalamaresUtils::getString( configurationMap, "id" );
-        const QString base = QStringLiteral( "packagechooser_" );
-        if ( configId.isEmpty() )
-        {
-            if ( m_defaultId.id().isEmpty() )
-            {
-                // We got nothing to work with
-                m_id = base;
-            }
-            else
-            {
-                m_id = base + m_defaultId.id();
-            }
-            cDebug() << "Using default ID" << m_id << "from" << m_defaultId.toString();
-        }
-        else
-        {
-            m_id = base + configId;
-            cDebug() << "Using configured ID" << m_id;
-        }
+        cDebug() << "Using module ID" << m_defaultId;
     }
 
     if ( configurationMap.contains( "items" ) )
diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h
index 85b8de83f3..32f1e8b572 100644
--- a/src/modules/packagechooser/Config.h
+++ b/src/modules/packagechooser/Config.h
@@ -110,8 +110,6 @@ class Config : public Calamares::ModuleSystem::Config
     PackageChooserMode m_mode = PackageChooserMode::Optional;
     /// How this module stores to GS
     PackageChooserMethod m_method = PackageChooserMethod::Legacy;
-    /// Id (used to identify settings from this module in GS)
-    QString m_id;
     /// Value to use for id if none is set in the config file
     Calamares::ModuleSystem::InstanceKey m_defaultId;
     /** @brief QML selection (for single-selection approaches)
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index 2bde1369ce..231826cd3a 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -15,11 +15,10 @@ mode: required
 #
 # - "legacy" or "custom" or "contextualprocess"
 #   When set to "legacy", writes a GlobalStorage value for the choice that
-#   has been made. The key is *packagechooser_*. Normally, the module's
+#   has been made. The key is *packagechooser_*. The module's
 #   instance name is used; see the *instances* section of `settings.conf`.
 #   If there is just one packagechooser module, and no special instance is set,
-#   resulting GS key is probably *packagechooser@packagechooser*.
-#   You can set *id* to change that, but it is not recommended.
+#   resulting GS key is probably *packagechooser_packagechooser*.
 #
 #   The GS value is a comma-separated list of the IDs of the selected
 #   packages, or an empty string if none is selected.
@@ -33,15 +32,12 @@ mode: required
 #   consumption by the *packages* module (which should appear later
 #   in the `exec` section. These package settings will then be handed
 #   off to whatever package manager is configured there.
-#   The *id* key is not used.
 #
 # There is no need to put this module in the `exec` section. There
 # are no jobs that this module provides. You should put **other**
 # modules, either *contextualprocess* or *packages* or some custom
 # module, in the `exec` section to do the actual work.
 method: legacy
-# The *id* key is used only in "legacy" mode
-# id: ""
 
 
 # Human-visible strings in this module. These are all optional.
@@ -51,13 +47,13 @@ method: legacy
 # Each key can have a [locale] added to it, which is used as
 # the translated string for that locale. For the strings
 # associated with the "no-selection" item, see *items*, below
-# with the explicit id "".
+# with the explicit item-*id* "".
 #
 labels:
     step: "Packages"
     step[nl]: "Pakketten"
 
-# (Optional) 'id' of pre-selected list-view item.
+# (Optional) item-*id* of pre-selected list-view item.
 # Pre-selects one of the items below.
 # default: kde
 
diff --git a/src/modules/packagechooserq/packagechooserq.conf b/src/modules/packagechooserq/packagechooserq.conf
index 8fd3a08f65..803c6f6706 100644
--- a/src/modules/packagechooserq/packagechooserq.conf
+++ b/src/modules/packagechooserq/packagechooserq.conf
@@ -1,23 +1,26 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
 #
-# Configuration for the low-density software chooser
----
-# Software selection mode, to set whether the software packages
-# can be chosen singly, or multiply.
+# Configuration for the low-density software chooser, QML implementation
+#
+# The example QML implementation uses single-selection, rather than
+# a model for the available packages. That makes it simpler: the
+# QML itself codes the available options, descriptions and images
+# -- after all, this is **low density** selection, so a custom UI
+# can make sense for the few choices that need to be made.
+#
 #
-# The example QML module does not use a model, and ignores this value.
-mode: required
 
+---
 # Software installation method:
 #
 # - "legacy" or "custom" or "contextualprocess"
 #   When set to "legacy", writes a GlobalStorage value for the choice that
-#   has been made. The key is *packagechooser_*. Normally, the module's
+#   has been made. The key is *packagechooser_*. The module's
 #   instance name is used; see the *instances* section of `settings.conf`.
-#   If there is just one packagechooser module, and no special instance is set,
-#   resulting GS key is probably *packagechooser@packagechooser*.
-#   You can set *id* to change that, but it is not recommended.
+#   If there is just one packagechooserq module, and no special instance is set,
+#   resulting GS key is probably *packagechooser_packagechooserq*.
+#   (Do note that the prefix of the GS key remains "packagechooser_")
 #
 #   The GS value is a comma-separated list of the IDs of the selected
 #   packages, or an empty string if none is selected.
@@ -31,19 +34,13 @@ mode: required
 #   consumption by the *packages* module (which should appear later
 #   in the `exec` section. These package settings will then be handed
 #   off to whatever package manager is configured there.
-#   The *id* key is not used.
 #
 # There is no need to put this module in the `exec` section. There
 # are no jobs that this module provides. You should put **other**
 # modules, either *contextualprocess* or *packages* or some custom
 # module, in the `exec` section to do the actual work.
-method: legacy
-
-# The *id* key is used only in "legacy" mode and changes the GlobalStorage
-# key used to store the package choices. It is not recommended to use
-# this, since the module instance key does the same job.
 #
-# id: ""
+method: legacy
 
 # The *packageChoice* value is used for setting the default selection
 # in the QML view; this should match one of the keys used in the QML

From 5a6e033e822d7c0e7ae5c59b222ec3337c2ed471 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 5 Sep 2021 13:34:38 +0200
Subject: [PATCH 394/492] [bootloader] Flags for root-on-BTRFS

This is directly derived from Anke Boersma's KaOS code in module
*bootldr*, which adds the same kernel parameter via a slightly
different route.
---
 src/modules/bootloader/main.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 7192df75cb..68cbddd0ea 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -133,6 +133,12 @@ def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, ker
                                   "root=/dev/mapper/"
                                   + partition["luksMapperName"]]
 
+    # systemd-boot with a BTRFS root filesystem needs to be told
+    # about the root subvolume.
+    for partition in partitions:
+        if partition["mountPoint"] == "/" and partition["fs"] == "btrfs":
+            kernel_params.append("rootflags=subvol=@")
+
     if cryptdevice_params:
         kernel_params.extend(cryptdevice_params)
     else:

From ea32c12938fdee71e5ac77a153e119bc71de128e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 6 Sep 2021 11:26:59 +0200
Subject: [PATCH 395/492] Changes: credits for recent work

---
 CHANGES | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 76d430a97e..9826cb4d1f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,12 +12,15 @@ website will have to do for older versions.
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma
  - Artem Grinev
+ - Nico 'dr460nf1r3' (new contributor, welcome!)
  - Waneon Kim (new contributor, welcome!)
 
 ## Core ##
  - No core changes yet
 
 ## Modules ##
+ - BTRFS partitions are no longer listed as "check in phase 2" in
+   the *fstab* module. (Thanks Nico)
  - The *localeq* module had the i18n.qml rewritten to make it easier
    to customize. A bug in the layout has been fixed, and the overall
    look has been updated.
@@ -25,7 +28,7 @@ This release contains contributions from (alphabetically by first name):
    user on the installed system, so that network configuration changes
    made in the live system are automatically used after installation. #1755
  - *partition* no longer allows you to delete an extended partition with
-   children (which led to crashes). Thanks Artem! #1749
+   children (which led to crashes). #1749 (Thanks Artem)
  - *partition* complains in more detail about the state of the UEFI
    boot partition (under manual partitioning schemes). #1761
  - *welcome* can now check multiple URLs to determine if internet connectivity
@@ -38,6 +41,7 @@ This release contains contributions from (alphabetically by first name):
    Summaryq brings the option to present the summary page in a customizable
    way, with a bit more of a contemporary look. Packagechooserq adds the option
    to preselect an item and displays all options in one overview.
+   (Thanks Anke)
 
 
 

From 07572d36c0b27607d80581abf7452a8a4a88e876 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Sun, 5 Sep 2021 14:18:52 +0200
Subject: [PATCH 396/492] Changes: pre-release housekeeping

---
 CHANGES        | 2 +-
 CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9826cb4d1f..0571afd2f7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.42 (unreleased) #
+# 3.2.42 (2021-09-06) #
 
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44a88074f5..efc2f0cff9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ project( CALAMARES
     LANGUAGES C CXX
 )
 
-set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From 9c435e0173a6d1397bd1675e0bed89b663a9c373 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Sun, 5 Sep 2021 14:20:30 +0200
Subject: [PATCH 397/492] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_de.ts    | 27 ++++++------
 lang/calamares_ko.ts    |  2 +-
 lang/calamares_lt.ts    | 10 ++---
 lang/calamares_ml.ts    | 38 ++++++++--------
 lang/calamares_pt_BR.ts | 30 ++++++-------
 lang/calamares_ru.ts    | 56 +++++++++++------------
 lang/calamares_si.ts    | 98 ++++++++++++++++++++---------------------
 lang/calamares_th.ts    | 36 +++++++--------
 lang/calamares_zh_CN.ts | 16 +++----
 lang/calamares_zh_HK.ts |  6 +--
 10 files changed, 160 insertions(+), 159 deletions(-)

diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index cb48adb161..e682848c5c 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -510,12 +510,13 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     
       
       Set filesystem label on %1.
-      
+      Setze Dateisytem-Label für %1.
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      Setze Dateisytem-Label <strong>%1</strong> für Partition <strong>%2</strong>.
+
     
     
       
@@ -896,7 +897,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     
       
       OK!
-      
+      OK!
     
     
       
@@ -1012,12 +1013,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     
       
       Label for the filesystem
-      
+      Label für das Dateisystem
     
     
       
       FS Label:
-      
+      FS Label:
     
     
       
@@ -1376,12 +1377,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     
       
       Label for the filesystem
-      
+      Label für das Dateisystem
     
     
       
       FS Label:
-      
+      FS Label:
     
     
       
@@ -1889,7 +1890,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     
       
       Quit
-      
+      Beenden
     
       
   
@@ -2113,7 +2114,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     
       
       Select your preferred Region, or use the default settings.
-      
+      Wählen Sie Ihre bevorzugte Region oder nutzen Sie die Standardeinstellungen.
     
     
       
@@ -2653,7 +2654,7 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     
       
       File System Label
-      
+      Dateisystem-Label
     
     
       
@@ -4263,7 +4264,7 @@ Ausgabe:
     
       
       root is not allowed as username.
-      
+      root ist als Benutzername nicht erlaubt.
     
     
       
@@ -4283,7 +4284,7 @@ Ausgabe:
     
       
       localhost is not allowed as hostname.
-      
+      localhost ist als Computername nicht erlaubt.
     
     
       
@@ -4323,7 +4324,7 @@ Ausgabe:
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      Es sind nur Buchstaben, Zahlen, Unterstrich und Bindestrich erlaubt, minimal zwei Zeichen.
     
     
       
diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts
index e8fa92dd60..695ccfc42c 100644
--- a/lang/calamares_ko.ts
+++ b/lang/calamares_ko.ts
@@ -4312,7 +4312,7 @@ Output:
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      문자, 숫자, 밑줄 및 하이픈만 허용되며, 최소 2자 이상이어야 합니다.
     
     
       
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index fc2dc392d1..88b7ecc974 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -232,7 +232,7 @@
     
       
       Boost.Python error in job "%1".
-      Boost.Python klaida užduotyje "%1".
+      Boost.Python klaida užduotyje „%1“.
     
   
   
@@ -1225,7 +1225,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
     
       
       The installer failed to deactivate a volume group named %1.
-      Diegimo programai nepavyko pasyvinti tomų grupės, pavadinimu "%1".
+      Diegimo programai nepavyko pasyvinti tomų grupės, pavadinimu „%1“.
     
   
   
@@ -1309,7 +1309,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
     
       
       Skip writing LUKS configuration for Dracut: "/" partition is not encrypted
-      Praleisti LUKS konfigūracijos, kuri yra skirta Dracut, įrašymą: "/" skaidinys nėra užšifruotas
+      Praleisti LUKS konfigūracijos, kuri yra skirta Dracut, įrašymą: „/“ skaidinys nėra užšifruotas
     
     
       
@@ -2162,7 +2162,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
     
       
       Memory allocation error when setting '%1'
-      Atminties paskirstymo klaida, nustatant "%1"
+      Atminties paskirstymo klaida, nustatant „%1“
     
     
       
@@ -3123,7 +3123,7 @@ Išvestis:
     
       
       The installer failed to remove a volume group named '%1'.
-      Diegimo programai nepavyko pašalinti tomų grupės, pavadinimu "%1".
+      Diegimo programai nepavyko pašalinti tomų grupės, pavadinimu „%1“.
     
   
   
diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts
index 452c86b3bd..f2f7a0885a 100644
--- a/lang/calamares_ml.ts
+++ b/lang/calamares_ml.ts
@@ -6,7 +6,7 @@
     
       
       Manage auto-mount settings
-      
+      ഓട്ടോ-മൗണ്ട് ക്രമീകരണങ്ങൾ സജ്ജീകരിക്കുക
     
   
   
@@ -4024,7 +4024,7 @@ Output:
     
       
       Back
-      
+      പുറകോട്ട്
     
   
   
@@ -4082,7 +4082,7 @@ Output:
     
       
       Back
-      
+      പുറകോട്ട്
     
   
   
@@ -4175,7 +4175,7 @@ Output:
     
       
       Back
-      
+      പുറകോട്ട്
     
   
   
@@ -4203,7 +4203,7 @@ Output:
     
       
       Login Name
-      
+      പ്രവേശന നാമം
     
     
       
@@ -4238,7 +4238,7 @@ Output:
     
       
       localhost is not allowed as hostname.
-      
+      localhost അനുവദനീയമായ ഒരു ഹോസ്റ്റ്‌നെയിം അല്ല.
     
     
       
@@ -4263,7 +4263,7 @@ Output:
     
       
       Validate passwords quality
-      
+      രഹസ്യവാക്കിന്റെ ഗുണനിലവാരം ഉറപ്പുവരുത്തുക
     
     
       
@@ -4273,17 +4273,17 @@ Output:
     
       
       Log in automatically without asking for the password
-      
+      രഹസ്യവാക്ക് ചോദിക്കാതെ സ്വയം പ്രവേശിക്കുക
     
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      അക്ഷരങ്ങൾ, അക്കങ്ങൾ, ഹൈഫൻ, അണ്ടർസ്കോർ എന്നിവ മാത്രമേ അനുവദിക്കപ്പെട്ടിട്ടുള്ളൂ, കുറഞ്ഞത് രണ്ടെണ്ണമെങ്കിലും.
     
     
       
       Reuse user password as root password
-      
+      ഉപയോക്തൃ രഹസ്യവാക്ക് റൂട്ട് രഹസ്യവാക്കായി പുനരുപയോഗിക്കുക
     
     
       
@@ -4293,22 +4293,22 @@ Output:
     
       
       Choose a root password to keep your account safe.
-      
+      താങ്കളുടെ അക്കൗണ്ട് സുരക്ഷിതമാക്കാൻ ഒരു റൂട്ട് രഹസ്യവാക്ക് തിരഞ്ഞെടുക്കുക.
     
     
       
       Root Password
-      
+      റൂട്ട് രഹസ്യവാക്ക്
     
     
       
       Repeat Root Password
-      
+      റൂട്ട് രഹസ്യവാക്ക് വീണ്ടും
     
     
       
       Enter the same password twice, so that it can be checked for typing errors.
-      
+      ടൈപ്പിങ്ങ് പിഴവുകളില്ല എന്നുറപ്പിക്കുന്നതിനായി ഒരേ രഹസ്യവാക്ക് രണ്ട് തവണ നൽകുക.
     
   
   
@@ -4322,27 +4322,27 @@ Output:
     
       
       About
-      
+      വിവരം
     
     
       
       Support
-      
+      സഹായം
     
     
       
       Known issues
-      
+      അറിയാവുന്ന പ്രശ്നങ്ങൾ
     
     
       
       Release notes
-      
+      പ്രകാശനക്കുറിപ്പുകൾ
     
     
       
       Donate
-      
+      സംഭാവന
     
   
 
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index 039b689ae9..4bf0ac14da 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -24,7 +24,7 @@
     
       
       This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.
-      Este sistema foi iniciado utilizando o <strong>BIOS</strong> como ambiente de inicialização.<br><br>Para configurar a inicialização em um ambiente BIOS, este instalador deve instalar um gerenciador de boot, como o <strong>GRUB</strong>, no começo de uma partição ou no <strong>Master Boot Record</strong>, perto do começo da tabela de partições (recomendado). Esse processo é automático, a não ser que você escolha o particionamento manual, onde você deverá configurá-lo manualmente.
+      Este sistema foi iniciado utilizando o <strong>BIOS</strong> como ambiente de inicialização.<br><br>Para configurar a inicialização em um ambiente BIOS, este instalador deve instalar um gerenciador de inicialização, como o <strong>GRUB</strong>, no começo de uma partição ou no <strong>Master Boot Record</strong>, perto do começo da tabela de partições (recomendado). Esse processo é automático, a não ser que você escolha o particionamento manual, onde você deverá configurá-lo manualmente.
     
   
   
@@ -510,12 +510,12 @@ O instalador será fechado e todas as alterações serão perdidas.
       
       Set filesystem label on %1.
-      
+      Definir etiqueta do sistema de arquivos em %1.
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      Definir etiqueta do sistema de arquivos <strong>%1</strong> para partição <strong>%2</strong>.
     
     
       
@@ -896,7 +896,7 @@ O instalador será fechado e todas as alterações serão perdidas.
       
       OK!
-      
+      OK!
     
     
       
@@ -1012,12 +1012,12 @@ O instalador será fechado e todas as alterações serão perdidas.
       
       Label for the filesystem
-      
+      Etiqueta para o sistema de arquivos
     
     
       
       FS Label:
-      
+      Etiqueta do FS:
     
     
       
@@ -1376,12 +1376,12 @@ O instalador será fechado e todas as alterações serão perdidas.
       
       Label for the filesystem
-      
+      Etiqueta para o sistema de arquivos
     
     
       
       FS Label:
-      
+      Etiqueta do FS:
     
     
       
@@ -1889,7 +1889,7 @@ O instalador será fechado e todas as alterações serão perdidas.
       
       Quit
-      
+      Sair
     
   
   
@@ -2113,7 +2113,7 @@ O instalador será fechado e todas as alterações serão perdidas.
       
       Select your preferred Region, or use the default settings.
-      
+      Selecione sua região preferida ou use as configurações predefinidas.
     
     
       
@@ -2653,7 +2653,7 @@ O instalador será fechado e todas as alterações serão perdidas.
       
       File System Label
-      
+      Etiqueta do Sistema de Arquivos
     
     
       
@@ -2844,7 +2844,7 @@ O instalador será fechado e todas as alterações serão perdidas.
       
       Boot partition not encrypted
-      Partição de boot não criptografada
+      Partição de inicialização não criptografada
     
     
       
@@ -4263,7 +4263,7 @@ Saída:
     
       
       root is not allowed as username.
-      
+      root não é permitido como um nome de usuário.
     
     
       
@@ -4283,7 +4283,7 @@ Saída:
     
       
       localhost is not allowed as hostname.
-      
+      localhost não é permitido como hostname.
     
     
       
@@ -4323,7 +4323,7 @@ Saída:
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      São permitidos apenas letras, números, sublinhado e hífen, com no mínimo dois caracteres.
     
     
       
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index 113a679d50..a1d34b9bbb 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -277,7 +277,7 @@
         (% секунда)
         (% секунд)
         (% секунд)
-        (% секунд)
+        (%n секунд)
       
     
     
@@ -1011,12 +1011,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      Метка файловой системы
     
     
       
       FS Label:
-      
+      Метка ФС:
     
     
       
@@ -1054,7 +1054,7 @@ The installer will quit and all changes will be lost.
     
       
       Create new %1MiB partition on %3 (%2).
-      
+      Создать новый раздел %1МиБ на %3 (%2).
     
     
       
@@ -1069,7 +1069,7 @@ The installer will quit and all changes will be lost.
     
       
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
-      
+      Создать новый раздел <strong>%1МиБ</strong> на <strong>%3</strong> (%2).
     
     
       
@@ -1375,12 +1375,12 @@ The installer will quit and all changes will be lost.
     
       
       Label for the filesystem
-      
+      Метка файловой системы
     
     
       
       FS Label:
-      
+      Метка ФС:
     
     
       
@@ -1442,7 +1442,7 @@ The installer will quit and all changes will be lost.
     
       
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
-      
+      Настроить <strong>новый</strong> %2 раздел с точкой монтирования <strong>%1</strong> %3.
     
     
       
@@ -1457,7 +1457,7 @@ The installer will quit and all changes will be lost.
     
       
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
-      
+      Настроить %3 раздел <strong>%1</strong> с точкой монтирования <strong>%2</strong>%4.
     
     
       
@@ -2525,7 +2525,7 @@ The installer will quit and all changes will be lost.
     
       
       login
-      
+      Вход
     
     
       
@@ -2668,7 +2668,7 @@ The installer will quit and all changes will be lost.
     
       
       File System Label
-      
+      Метка файловой системы
     
     
       
@@ -3053,7 +3053,7 @@ Output:
     
       
       Directory not found
-      
+      Папка  не найдена
     
     
       
@@ -3088,7 +3088,7 @@ Output:
       
       <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
         Setup can continue, but some features might be disabled.</p>
-      
+      <p>Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны.</p>
     
   
   
@@ -3206,7 +3206,7 @@ Output:
       
       <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/>
         Setup can continue, but some features might be disabled.</p>
-      
+      <p>Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны.</p>
     
   
   
@@ -3657,7 +3657,7 @@ Output:
       
       %L1 / %L2
       slide counter, %1 of %2 (numeric)
-      
+      %L1 / %L2
     
   
   
@@ -3714,13 +3714,13 @@ Output:
     
       
       Configuring KDE user feedback.
-      
+      Настройка обратной связи KDE
     
     
       
       
       Error in KDE user feedback configuration.
-      
+      Ошибка в настройке обратной связи KDE
     
     
       
@@ -3936,7 +3936,7 @@ Output:
     
       
       &Donate
-      
+      Пожертвовать
     
     
       
@@ -4062,7 +4062,7 @@ Output:
     
       
       Installation Completed
-      
+      Установка завершена 
     
     
       
@@ -4073,7 +4073,7 @@ Output:
     
       
       Close Installer
-      
+      Закрыть установщик
     
     
       
@@ -4117,7 +4117,7 @@ Output:
     
       
       Layouts
-      
+      Раскладки
     
     
       
@@ -4127,7 +4127,7 @@ Output:
     
       
       Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      
+      Выберете предпочитаемую модель клавиатуры, чтобы выбрать раскладку и вариант, или используйте модель по умолчанию в зависимости от обнаруженного оборудования.
     
     
       
@@ -4231,7 +4231,7 @@ Output:
     
       
       If more than one person will use this computer, you can create multiple accounts after installation.
-      
+      Если этот компьютер используется несколькими людьми, Вы сможете создать соответствующие учетные записи сразу после установки.
     
     
       
@@ -4241,7 +4241,7 @@ Output:
     
       
       root is not allowed as username.
-      
+      root не допускается в качестве имени пользователя.
     
     
       
@@ -4261,7 +4261,7 @@ Output:
     
       
       localhost is not allowed as hostname.
-      
+      localhost не допускается в качестве имени пользователя.
     
     
       
@@ -4296,7 +4296,7 @@ Output:
     
       
       Log in automatically without asking for the password
-      
+      Входить автоматически, не спрашивая пароль
     
     
       
@@ -4326,12 +4326,12 @@ Output:
     
       
       Repeat Root Password
-      
+      Повторите пароль от root
     
     
       
       Enter the same password twice, so that it can be checked for typing errors.
-      
+      Введите пароль повторно, чтобы не допустить ошибок при вводе
     
   
   
diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts
index 0b46d08582..7783b17b10 100644
--- a/lang/calamares_si.ts
+++ b/lang/calamares_si.ts
@@ -73,7 +73,7 @@
     
       
       GlobalStorage
-      
+      ගෝලීය ආචයනය
     
     
       
@@ -88,7 +88,7 @@
     
       
       Type:
-      
+      වර්ගය:
     
     
       
@@ -99,7 +99,7 @@
     
       
       Interface:
-      
+      අතුරුමුහුණත:
     
     
       
@@ -240,7 +240,7 @@
     
       
       Loading ...
-      
+      පූරණය වෙමින්...
     
     
       
@@ -308,18 +308,18 @@
       
       
       &Yes
-      
+      ඔව් (Y)
     
     
       
       
       &No
-      
+      නැහැ (N)
     
     
       
       &Close
-      
+      වසන්න (C)
     
     
       
@@ -388,7 +388,7 @@ Link copied to clipboard
     
       
       Go &back
-      
+      ආපසු යන්න
     
     
       
@@ -428,7 +428,7 @@ Link copied to clipboard
     
       
       &Back
-      
+      ආපසු (B)
     
     
       
@@ -448,7 +448,7 @@ Link copied to clipboard
     
       
       Cancel installation?
-      
+      ස්ථාපනය අවලංගු කරනවාද?
     
     
       
@@ -543,7 +543,7 @@ The installer will quit and all changes will be lost.
       
       
       Current:
-      
+      වත්මන්:
     
     
       
@@ -845,7 +845,7 @@ The installer will quit and all changes will be lost.
     
       
       Your username is too long.
-      
+      පරිශීලක නාමය දිග වැඩිය.
     
     
       
@@ -890,7 +890,7 @@ The installer will quit and all changes will be lost.
     
       
       OK!
-      
+      හරි!
     
     
       
@@ -961,7 +961,7 @@ The installer will quit and all changes will be lost.
     
       
       Si&ze:
-      
+      ප්‍රමාණය:
     
     
       
@@ -986,7 +986,7 @@ The installer will quit and all changes will be lost.
     
       
       Fi&le System:
-      
+      ගොනු පද්ධතිය:
     
     
       
@@ -1139,12 +1139,12 @@ The installer will quit and all changes will be lost.
     
       
       Create user %1
-      
+      %1 පරිශීලක සාදන්න
     
     
       
       Create user <strong>%1</strong>.
-      
+      <strong>%1</strong> පරිශීලක සාදන්න.
     
     
       
@@ -1155,12 +1155,12 @@ The installer will quit and all changes will be lost.
       
       
       Creating user %1
-      
+      %1 පරිශීලක සෑදෙමින්
     
     
       
       Configuring user %1
-      
+      %1 පරිශීලක වින්‍යාසගත වෙමින්
     
     
       
@@ -1280,13 +1280,13 @@ The installer will quit and all changes will be lost.
       
       %1 - %2 (%3)
       device[name] - size[number] (device-node[name])
-      
+      %1 - %2 (%3)
     
     
       
       %1 - (%2)
       device[name] - (device-node[name])
-      
+      %1 - (%2)
     
   
   
@@ -1350,7 +1350,7 @@ The installer will quit and all changes will be lost.
     
       
       Si&ze:
-      
+      ප්‍රමාණය:
     
     
       
@@ -1360,7 +1360,7 @@ The installer will quit and all changes will be lost.
     
       
       Fi&le System:
-      
+      ගොනු පද්ධතිය:
     
     
       
@@ -1706,7 +1706,7 @@ The installer will quit and all changes will be lost.
     
       
       Keyboard
-      
+      යතුරුපුවරුව
     
   
   
@@ -1714,7 +1714,7 @@ The installer will quit and all changes will be lost.
     
       
       Keyboard
-      
+      යතුරුපුවරුව
     
   
   
@@ -1788,7 +1788,7 @@ The installer will quit and all changes will be lost.
     
       
       License
-      
+      බලපත්‍රය
     
   
   
@@ -1796,7 +1796,7 @@ The installer will quit and all changes will be lost.
     
       
       URL: %1
-      
+      ඒ.ස.නි.: %1
     
     
       
@@ -1833,7 +1833,7 @@ The installer will quit and all changes will be lost.
     
       
       File: %1
-      
+      ගොනුව: %1
     
     
       
@@ -1867,7 +1867,7 @@ The installer will quit and all changes will be lost.
       
       
       &Change...
-      
+      වෙනස් කරන්න...
     
   
   
@@ -1875,7 +1875,7 @@ The installer will quit and all changes will be lost.
     
       
       Location
-      
+      ස්ථානය
     
   
   
@@ -1883,7 +1883,7 @@ The installer will quit and all changes will be lost.
     
       
       Quit
-      
+      ඉවත් වන්න
     
   
   
@@ -1891,7 +1891,7 @@ The installer will quit and all changes will be lost.
     
       
       Location
-      
+      ස්ථානය
     
   
   
@@ -1973,27 +1973,27 @@ The installer will quit and all changes will be lost.
     
       
       Office software
-      
+      කාර්යාලීය මෘදුකාංගය
     
     
       
       Office package
-      
+      කාර්යාලීය ඇසුරුම
     
     
       
       Browser software
-      
+      අතිරික්සු මෘදුකාංගය
     
     
       
       Browser package
-      
+      අතිරික්සු ඇසුරුම
     
     
       
       Web browser
-      
+      වියමන අතිරික්සුව
     
     
       
@@ -2003,7 +2003,7 @@ The installer will quit and all changes will be lost.
     
       
       Services
-      
+      සේවා
     
     
       
@@ -2018,32 +2018,32 @@ The installer will quit and all changes will be lost.
     
       
       Applications
-      
+      යෙදුම්
     
     
       
       Communication
-      
+      සන්නිවේදනය
     
     
       
       Development
-      
+      සංවර්ධනය
     
     
       
       Office
-      
+      කාර්යාලීය
     
     
       
       Multimedia
-      
+      බහුමාධ්‍ය
     
     
       
       Internet
-      
+      අන්තර්ජාලය
     
     
       
@@ -2066,7 +2066,7 @@ The installer will quit and all changes will be lost.
     
       
       Notes
-      
+      සටහන්
     
   
   
@@ -2135,12 +2135,12 @@ The installer will quit and all changes will be lost.
     
       
       Password is too short
-      
+      මුරපදය ඉතා කෙටිය
     
     
       
       Password is too long
-      
+      මුරපදය ඉතා දිගය
     
     
       
@@ -2223,7 +2223,7 @@ The installer will quit and all changes will be lost.
     
       
       The password is too short
-      
+      මුරපදය ඉතා කෙටිය
     
     
       
@@ -2796,7 +2796,7 @@ The installer will quit and all changes will be lost.
     
       
       Current:
-      
+      වත්මන්:
     
     
       
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index 27e9612932..4525b3415a 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -285,7 +285,7 @@
     
       
       Setup Failed
-      
+      การตั้งค่าล้มเหลว
     
     
       
@@ -306,18 +306,18 @@
       
       
       &Yes
-      
+      &ใช่
     
     
       
       
       &No
-      
+      &ไม่
     
     
       
       &Close
-      
+      ปิ&ด
     
     
       
@@ -376,7 +376,7 @@ Link copied to clipboard
     
       
       &Set up now
-      &ตั้งค่าตอนนี้
+      ตั้&งค่าตอนนี้
     
     
       
@@ -391,12 +391,12 @@ Link copied to clipboard
     
       
       &Set up
-      &ตั้งค่า
+      ตั้&งค่า
     
     
       
       &Install
-      &ติดตั้ง
+      ติ&ดตั้ง
     
     
       
@@ -534,7 +534,7 @@ The installer will quit and all changes will be lost.
     
       
       Select storage de&vice:
-      
+      เลือกอุปก&รณ์จัดเก็บ:
     
     
       
@@ -562,7 +562,7 @@ The installer will quit and all changes will be lost.
     
       
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
-      
+      <strong>เลือกพาร์ทิชันที่จะลดขนาด แล้วลากแถบด้านล่างเพื่อปรับขนาด</strong>
     
     
       
@@ -597,7 +597,7 @@ The installer will quit and all changes will be lost.
     
       
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
-      ดูเหมือนว่าอุปกรณ์จัดเก็บนี้ไม่มีระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บของคุณ
+      ดูเหมือนว่าอุปกรณ์จัดเก็บข้อมูลนี้ไม่มีระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ
     
     
       
@@ -605,7 +605,7 @@ The installer will quit and all changes will be lost.
       
       
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
-      
+      <strong>ล้างดิสก์</strong><br/>การกระทำนี้จะ<font color="red">ลบ</font>ข้อมูลทั้งหมดที่อยู่บนอุปกรณ์จัดเก็บข้อมูลที่เลือก
     
     
       
@@ -626,17 +626,17 @@ The installer will quit and all changes will be lost.
     
       
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
-      อุปกรณ์จัดเก็บนี้มีระบบปฏิบัติการ %1 อยู่ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บของคุณ
+      อุปกรณ์จัดเก็บข้อมูลนี้มีระบบปฏิบัติการ %1 อยู่ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ
     
     
       
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
-      อุปกรณ์จัดเก็บนี้มีระบบปฏิบัติการอยู่แล้ว คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บของคุณ
+      อุปกรณ์จัดเก็บข้อมูลนี้มีระบบปฏิบัติการอยู่แล้ว คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ
     
     
       
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
-      อุปกรณ์จัดเก็บนี้มีหลายระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บของคุณ
+      อุปกรณ์จัดเก็บข้อมูลนี้มีหลายระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ
     
     
       
@@ -819,7 +819,7 @@ The installer will quit and all changes will be lost.
     
       
       This program will ask you some questions and set up %2 on your computer.
-      โปรแกรมนี้จะถามตำถามต่าง ๆ เพื่อติดตั้ง %2 ลงในคอมพิวเตอร์ของคุณ
+      โปรแกรมนี้จะถามคำถามต่าง ๆ เพื่อติดตั้ง %2 ลงในคอมพิวเตอร์ของคุณ
     
     
       
@@ -894,7 +894,7 @@ The installer will quit and all changes will be lost.
     
       
       Setup Failed
-      
+      การตั้งค่าล้มเหลว
     
     
       
@@ -3329,7 +3329,7 @@ Output:
     
       
       This program will ask you some questions and set up %2 on your computer.
-      โปรแกรมนี้จะถามคุณบางอย่าง เพื่อติดตั้ง %2 ไว้ในคอมพิวเตอร์ของคุณ
+      โปรแกรมนี้จะถามคำถามต่าง ๆ เพื่อติดตั้ง %2 ลงในคอมพิวเตอร์ของคุณ
     
   
   
@@ -3889,7 +3889,7 @@ Output:
     
       
       &About
-      &A เกี่ยวกับ
+      &เกี่ยวกับ
     
     
       
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index a986159827..a2a9757eb4 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -105,7 +105,7 @@
     
       
       Crashes Calamares, so that Dr. Konqui can look at it.
-      
+      使 Calamares 崩溃，以便 Konqui 医生可以查看它。
     
     
       
@@ -130,7 +130,7 @@
     
       
       Displays the tree of widget names in the log (for stylesheet debugging).
-      
+      在日志中显示小部件名称树（用于样式表调试）。
     
     
       
@@ -514,7 +514,7 @@ The installer will quit and all changes will be lost.
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      设置文件系统标签 <strong>%1</strong> 至分区 <strong>%2</strong>。
     
     
       
@@ -1056,7 +1056,7 @@ The installer will quit and all changes will be lost.
     
       
       Create new %1MiB partition on %3 (%2).
-      
+      在 %3 (%2) 上建立新的 %1MiB 分区。
     
     
       
@@ -1071,7 +1071,7 @@ The installer will quit and all changes will be lost.
     
       
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
-      
+      在<strong>%3</strong>(%2)上创建新的<strong>%1MiB</strong>分区
     
     
       
@@ -1445,12 +1445,12 @@ The installer will quit and all changes will be lost.
     
       
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
-      
+      设置 <strong>新的</strong> 含挂载点 <strong>%1</strong>%3 的 %2 分区。
     
     
       
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
-      
+      在具有功能<em>%4</em>的 %3 系统分区<strong>%1</strong>上安装 %2。
     
     
       
@@ -4319,7 +4319,7 @@ Output:
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      只允许字母、数组、下划线"_" 和 连字符"-"，最少两个字符。
     
     
       
diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts
index 6c592a6d3e..db1ecd4d9c 100644
--- a/lang/calamares_zh_HK.ts
+++ b/lang/calamares_zh_HK.ts
@@ -6,7 +6,7 @@
     
       
       Manage auto-mount settings
-      
+      管理自動掛載設定
     
   
   
@@ -14,12 +14,12 @@
     
       
       The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode.
-      
+      這個系統的<strong>開機環境</strong>。<br><br>較舊的 x86 系統只支援 <strong>BIOS</strong>。<br>現時的系統則通常使用 <strong>EFI</strong>，但若使用相容模式 (CSM)，也可能顯示為 BIOS。
     
     
       
       This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.
-      
+      這個系統以 <strong>EFI</strong> 開機。<br><br>要從 EFI 環境開機，本安裝程式必須安裝開機載入器程式，像是 <strong>GRUB</strong> 或 <strong>systemd-boot</strong> 在 <strong>EFI 系統分割區</strong>。這是自動的，除非選擇手動分割；在這種情況，您必須自行選取或建立它。
     
     
       

From 37bdfb9faa69115ddb8964037cc3e241b0171eb2 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Sun, 5 Sep 2021 14:20:31 +0200
Subject: [PATCH 398/492] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/az/LC_MESSAGES/python.po    |  4 ++--
 lang/python/az_AZ/LC_MESSAGES/python.po |  4 ++--
 lang/python/cs_CZ/LC_MESSAGES/python.po |  2 +-
 lang/python/de/LC_MESSAGES/python.po    | 18 ++++++++++++++----
 lang/python/es/LC_MESSAGES/python.po    |  2 +-
 lang/python/ko/LC_MESSAGES/python.po    |  1 +
 lang/python/lt/LC_MESSAGES/python.po    |  2 +-
 lang/python/pt_BR/LC_MESSAGES/python.po | 20 +++++++++++++++-----
 lang/python/si/LC_MESSAGES/python.po    | 20 ++++++++++++--------
 9 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index d47e30acd8..f3f3693a42 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Xəyyam Qocayev , 2021
+# xxmn77 , 2021
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Xəyyam Qocayev , 2021\n"
+"Last-Translator: xxmn77 , 2021\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index d1e805facb..ba5c1f5d2a 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# Xəyyam Qocayev , 2021
+# xxmn77 , 2021
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Xəyyam Qocayev , 2021\n"
+"Last-Translator: xxmn77 , 2021\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index 50002805df..9ac7c6b82d 100644
--- a/lang/python/cs_CZ/LC_MESSAGES/python.po
+++ b/lang/python/cs_CZ/LC_MESSAGES/python.po
@@ -5,7 +5,7 @@
 # 
 # Translators:
 # pavelrz, 2017
-# LiberteCzech , 2020
+# LiberteCzech , 2020
 # Pavel Borecki , 2020
 # 
 #, fuzzy
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index 555d4636ff..b1e0beed9a 100644
--- a/lang/python/de/LC_MESSAGES/python.po
+++ b/lang/python/de/LC_MESSAGES/python.po
@@ -5,8 +5,8 @@
 # 
 # Translators:
 # Adriaan de Groot , 2020
-# Gustav Gyges, 2020
 # Andreas Eitel , 2020
+# Gustav Gyges, 2021
 # 
 #, fuzzy
 msgid ""
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Andreas Eitel , 2020\n"
+"Last-Translator: Gustav Gyges, 2021\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -319,25 +319,31 @@ msgstr[1] "Entferne %(num)d Pakete."
 #: src/modules/packages/main.py:588 src/modules/packages/main.py:600
 #: src/modules/packages/main.py:628
 msgid "Package Manager error"
-msgstr ""
+msgstr "Fehler im Paketmanager"
 
 #: src/modules/packages/main.py:589
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
+"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
+"
    {!s}
     erzeugte Fehlercode {!s}."
 
 #: src/modules/packages/main.py:601
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
+"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
+"
    {!s}
     erzeugte Fehlercode {!s}."
 
 #: src/modules/packages/main.py:629
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
+"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
+"
    {!s}
     erzeugte Fehlercode {!s}."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
@@ -345,13 +351,15 @@ msgstr "Installiere Bootloader."
 
 #: src/modules/bootloader/main.py:502
 msgid "Bootloader installation error"
-msgstr ""
+msgstr "Fehler beim Installieren des Bootloaders"
 
 #: src/modules/bootloader/main.py:503
 msgid ""
 "The bootloader could not be installed. The installation command "
 "
    {!s}
     returned error code {!s}."
 msgstr ""
+"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
+"
    {!s}
     erzeugte Fehlercode {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
@@ -392,6 +400,8 @@ msgstr "Schreibe fstab."
 #: src/modules/fstab/main.py:389
 msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
+"Keine 
    {!s}
     Konfiguration gegeben die 
    {!s}
     benutzen "
+"könnte."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index 960e280c49..f1fe11a615 100644
--- a/lang/python/es/LC_MESSAGES/python.po
+++ b/lang/python/es/LC_MESSAGES/python.po
@@ -7,7 +7,7 @@
 # strel, 2017
 # Francisco Sánchez López de Lerma , 2018
 # Guido Grasso , 2018
-# Adolfo Jayme Barrientos, 2019
+# Adolfo Jayme-Barrientos, 2019
 # Miguel Mayol , 2020
 # Pier Jose Gotta Perez , 2020
 # 
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index e6f1f1c8ba..6d3f2b5f53 100644
--- a/lang/python/ko/LC_MESSAGES/python.po
+++ b/lang/python/ko/LC_MESSAGES/python.po
@@ -320,6 +320,7 @@ msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
+"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po
index 6ceb39a273..d1c10622e1 100644
--- a/lang/python/lt/LC_MESSAGES/python.po
+++ b/lang/python/lt/LC_MESSAGES/python.po
@@ -137,7 +137,7 @@ msgstr "Bloga unsquash konfigūracija"
 
 #: src/modules/unpackfs/main.py:455
 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta \"{}\" ({})"
+msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta „{}“ ({})"
 
 #: src/modules/unpackfs/main.py:459
 msgid "The source filesystem \"{}\" does not exist"
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index 8a9f235b4b..3ceeeb09a5 100644
--- a/lang/python/pt_BR/LC_MESSAGES/python.po
+++ b/lang/python/pt_BR/LC_MESSAGES/python.po
@@ -5,7 +5,7 @@
 # 
 # Translators:
 # André Marcelo Alvarenga , 2020
-# Guilherme Marçal Silva, 2020
+# Guilherme Marçal Silva, 2021
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Guilherme Marçal Silva, 2020\n"
+"Last-Translator: Guilherme Marçal Silva, 2021\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -317,39 +317,47 @@ msgstr[1] "Removendo %(num)d pacotes."
 #: src/modules/packages/main.py:588 src/modules/packages/main.py:600
 #: src/modules/packages/main.py:628
 msgid "Package Manager error"
-msgstr ""
+msgstr "Erro do Gerenciador de Pacotes"
 
 #: src/modules/packages/main.py:589
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
+"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
+"
    {!s}
     retornou o código de erro {!s}."
 
 #: src/modules/packages/main.py:601
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
+"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
+"
    {!s}
     retornou o código de erro {!s}."
 
 #: src/modules/packages/main.py:629
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
+"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
+"comando 
    {!s}
     retornou o código de erro {!s}."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
-msgstr "Instalar bootloader."
+msgstr "Instalar carregador de inicialização."
 
 #: src/modules/bootloader/main.py:502
 msgid "Bootloader installation error"
-msgstr ""
+msgstr "Erro de instalação do carregador de inicialização"
 
 #: src/modules/bootloader/main.py:503
 msgid ""
 "The bootloader could not be installed. The installation command "
 "
    {!s}
     returned error code {!s}."
 msgstr ""
+"O carregador de inicialização não pôde ser instalado. O comando de "
+"instalação 
    {!s}
     retornou o código de erro {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
@@ -390,6 +398,8 @@ msgstr "Escrevendo fstab."
 #: src/modules/fstab/main.py:389
 msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
+"Nenhuma configuração 
    {!s}
     é dada para que 
    {!s}
     possa "
+"utilizar."
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po
index dc92f2203d..bfe7ba3234 100644
--- a/lang/python/si/LC_MESSAGES/python.po
+++ b/lang/python/si/LC_MESSAGES/python.po
@@ -3,6 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# Hela Basa, 2021
+# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -10,6 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-14 12:55+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
+"Last-Translator: Hela Basa, 2021\n"
 "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -216,7 +220,7 @@ msgstr ""
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
-msgstr ""
+msgstr "දත්ත ස්ථාපනය වෙමින්."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
@@ -268,7 +272,7 @@ msgstr ""
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
 msgid "Install packages."
-msgstr ""
+msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
 
 #: src/modules/packages/main.py:57
 #, python-format
@@ -279,15 +283,15 @@ msgstr ""
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
 
 #: src/modules/packages/main.py:65
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
 
 #: src/modules/packages/main.py:588 src/modules/packages/main.py:600
 #: src/modules/packages/main.py:628
@@ -328,7 +332,7 @@ msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
-msgstr ""
+msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
@@ -381,4 +385,4 @@ msgstr ""
 
 #: src/modules/networkcfg/main.py:28
 msgid "Saving network configuration."
-msgstr ""
+msgstr "ජාල වින්‍යාසය සුරැකෙමින්."

From a1fce99a05a37eb87e207ae0b26d8f7b1317b4c0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 6 Sep 2021 11:39:01 +0200
Subject: [PATCH 399/492] i18n: update language lists

Keep zh_HK in 'ok' even if technically it doesn't qualify.
---
 CMakeLists.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efc2f0cff9..f60301ee56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,13 +133,14 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 #       `txstats.py -e`. See also
 #
 # Total 79 languages
-set( _tx_complete az az_AZ ca fi_FI he hi hr ja lt sq sv uk zh_TW )
-set( _tx_good as be ca@valencia cs_CZ da de fr fur it_IT ko ml nl
-    pt_BR pt_PT ru sk tg tr_TR vi zh_CN )
+set( _tx_complete az az_AZ ca de fi_FI he hi hr ja ko lt pt_BR sq
+    sv uk zh_TW )
+set( _tx_good as be ca@valencia cs_CZ da fr fur it_IT ml nl pt_PT
+    ru sk tg tr_TR vi zh_CN )
 set( _tx_ok ar ast bg bn el en_GB es es_MX es_PR et eu fa gl hu id
-    is mr nb pl ro sl sr sr@latin th zh_HK )
+    is mr nb pl ro si sl sr sr@latin th zh_HK )
 set( _tx_incomplete eo es_PE fr_CH gu id_ID ie kk kn ko_KR lo lv mk
-    ne ne_NP ru_RU si te ur uz zh )
+    ne ne_NP ru_RU te ur uz zh )
 
 ### Required versions
 #

From 4948f634edfef3c7484033a563e0aae4d7dbd998 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 6 Sep 2021 12:06:11 +0200
Subject: [PATCH 400/492] [keyboard] Code tidy

- complain just once (globally) if ckbcomp is not found, rather than
  at every update to the layout.
- tighten up QStringList constructor.
---
 .../keyboard/keyboardwidget/keyboardpreview.cpp    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
index 572965de53..0bb1add876 100644
--- a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
+++ b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
@@ -124,10 +124,7 @@ KeyBoardPreview::loadCodes()
         return false;
     }
 
-    QStringList param;
-    param << "-model"
-          << "pc106"
-          << "-layout" << layout << "-compact";
+    QStringList param { "-model", "pc106", "-layout", layout, "-compact" };
     if ( !variant.isEmpty() )
     {
         param << "-variant" << variant;
@@ -140,13 +137,18 @@ KeyBoardPreview::loadCodes()
     process.start( "ckbcomp", param );
     if ( !process.waitForStarted() )
     {
-        cWarning() << "ckbcomp not found , keyboard preview disabled";
+        static bool need_warning = true;
+        if ( need_warning )
+        {
+            cWarning() << "ckbcomp not found , keyboard preview disabled";
+            need_warning = false;
+        }
         return false;
     }
 
     if ( !process.waitForFinished() )
     {
-        cWarning() << "ckbcomp failed, keyboard preview disabled";
+        cWarning() << "ckbcomp failed, keyboard preview skipped for" << layout << variant;
         return false;
     }
 

From 6017420dded3c35bbc9cf34c311c2fd2b29f31c7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 6 Sep 2021 12:35:24 +0200
Subject: [PATCH 401/492] [welcome] Fix up and expand tests

- improve logging
- fix failing tests -- the observed and expected behavior is
  to fill in a fallback check-URL, not change to an empty list,
- **except** if there's no requirements key in the config
  at all; this is a bit weird, but let's make the tests
  document existing behavior so we can notice if it changes.
---
 src/modules/welcome/Tests.cpp                 | 57 ++++++++++++++++++-
 .../welcome/checker/GeneralRequirements.cpp   | 11 ++--
 2 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp
index 0445433e9e..1e1d07c4be 100644
--- a/src/modules/welcome/Tests.cpp
+++ b/src/modules/welcome/Tests.cpp
@@ -31,6 +31,8 @@ private Q_SLOTS:
     void testOneUrl();
     void testUrls_data();
     void testUrls();
+
+    void testBadConfigDoesNotResetUrls();
 };
 
 WelcomeTests::WelcomeTests() {}
@@ -81,9 +83,9 @@ WelcomeTests::testUrls_data()
 
     QTest::newRow( "one  " ) << QString( "1a-checkinternet.conf" ) << 1;
     QTest::newRow( "none " ) << QString( "1b-checkinternet.conf" ) << 0;
-    QTest::newRow( "blank" ) << QString( "1c-checkinternet.conf" ) << 0;
-    QTest::newRow( "bogus" ) << QString( "1d-checkinternet.conf" ) << 0;
-    QTest::newRow( "[]   " ) << QString( "1e-checkinternet.conf" ) << 0;
+    QTest::newRow( "blank" ) << QString( "1c-checkinternet.conf" ) << 1;
+    QTest::newRow( "bogus" ) << QString( "1d-checkinternet.conf" ) << 1;
+    QTest::newRow( "[]   " ) << QString( "1e-checkinternet.conf" ) << 1;
     QTest::newRow( "-3   " ) << QString( "1f-checkinternet.conf" ) << 3;
     QTest::newRow( "[3]  " ) << QString( "1g-checkinternet.conf" ) << 3;
     QTest::newRow( "some " ) << QString( "1h-checkinternet.conf" ) << 3;
@@ -105,10 +107,59 @@ WelcomeTests::testUrls()
     const auto map = CalamaresUtils::loadYaml( fi, &ok );
     QVERIFY( ok );
 
+    CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} );
+    QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 0 );
     c.setConfigurationMap( map );
     QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), result );
 }
 
+void
+WelcomeTests::testBadConfigDoesNotResetUrls()
+{
+    auto& nam = CalamaresUtils::Network::Manager::instance();
+    CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} );
+    QCOMPARE( nam.getCheckInternetUrls().count(), 0 );
+    nam.setCheckHasInternetUrl( QVector< QUrl > { QUrl( "http://example.com" ), QUrl( "https://www.kde.org" ) } );
+    QCOMPARE( nam.getCheckInternetUrls().count(), 2 );
+
+    Config c;
+
+    // This is slightly surprising: if there is **no** requirements
+    // configuration, the list of check-URLs is left unchanged.
+    {
+        const QString filename = QStringLiteral( "1b-checkinternet.conf" );  // "none"
+
+        // BUILD_AS_TEST is the source-directory path
+        QFile fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) );
+        QVERIFY( fi.exists() );
+
+        bool ok = false;
+        const auto map = CalamaresUtils::loadYaml( fi, &ok );
+        QVERIFY( ok );
+
+        c.setConfigurationMap( map );
+    }
+    QCOMPARE( nam.getCheckInternetUrls().count(), 2 );
+
+    // But if the config contains a requirements entry, even if broken,
+    // the list is changed (to the default).
+    {
+        const QString filename = QStringLiteral( "1d-checkinternet.conf" );  // "bogus"
+
+        // BUILD_AS_TEST is the source-directory path
+        QFile fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) );
+        QVERIFY( fi.exists() );
+
+        bool ok = false;
+        const auto map = CalamaresUtils::loadYaml( fi, &ok );
+        QVERIFY( ok );
+
+        c.setConfigurationMap( map );
+    }
+    QCOMPARE( nam.getCheckInternetUrls().count(), 1 );
+}
+
+
 QTEST_GUILESS_MAIN( WelcomeTests )
 
 #include "utils/moc-warnings.h"
diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp
index 2528cbd9f4..ca7219ca46 100644
--- a/src/modules/welcome/checker/GeneralRequirements.cpp
+++ b/src/modules/welcome/checker/GeneralRequirements.cpp
@@ -215,7 +215,7 @@ GeneralRequirements::checkRequirements()
     return checkEntries;
 }
 
-/** @brief Loads the check-internel URLs
+/** @brief Loads the check-internet URLs
  *
  * There may be zero or one or more URLs specified; returns
  * @c true if the configuration is incomplete or damaged in some way.
@@ -246,8 +246,8 @@ getCheckInternetUrls( const QVariantMap& configurationMap )
 
         if ( urls.empty() )
         {
-            cWarning() << "GeneralRequirements entry 'internetCheckUrl' contains no valid URLs,"
-                       << "reverting to default (http://example.com).";
+            cWarning() << "GeneralRequirements entry 'internetCheckUrl' contains no valid URLs, "
+                       << "reverting to default (" << exampleUrl << ").";
             CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) );
             incomplete = true;
         }
@@ -258,8 +258,9 @@ getCheckInternetUrls( const QVariantMap& configurationMap )
     }
     else
     {
-        cWarning() << "GeneralRequirements entry 'internetCheckUrl' is undefined in welcome.conf,"
-                      "reverting to default (http://example.com).";
+        cWarning() << "GeneralRequirements entry 'internetCheckUrl' is undefined in welcome.conf, "
+                      "reverting to default ("
+                   << exampleUrl << ").";
         CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) );
         incomplete = true;
     }

From 563c1492178c30bbcb3cc1f09bfb2f19fdcc98a5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 6 Sep 2021 11:56:50 +0200
Subject: [PATCH 402/492] i18n: update english sources, too

---
 lang/calamares_en.ts | 400 +++++++++++++++++----------------
 lang/python.pot      | 513 ++++++++++++++++++++-----------------------
 2 files changed, 443 insertions(+), 470 deletions(-)

diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 5ff148eccd..53882fbb06 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -495,12 +495,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Setup Program
     
     
-      
+      
       %1 Installer
       %1 Installer
     
@@ -539,149 +539,149 @@ The installer will quit and all changes will be lost.
       Form
         
     
-      
+      
       Select storage de&vice:
       Select storage de&vice:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Current:
     
     
-      
+      
       After:
       After:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reuse %1 as home partition for %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
     
     
-      
+      
       Boot loader location:
       Boot loader location:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Select a partition to install on</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       The EFI system partition at %1 will be used for starting %2.
     
     
-      
+      
       EFI system partition:
       EFI system partition:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       This storage device has one of its partitions <strong>mounted</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       This storage device is a part of an <strong>inactive RAID</strong> device.
     
     
-      
+      
       No Swap
       No Swap
     
     
-      
+      
       Reuse Swap
       Reuse Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (no Hibernate)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (with Hibernate)
     
     
-      
+      
       Swap to file
       Swap to file
     
@@ -749,12 +749,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Set keyboard model to %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Set keyboard layout to %1/%2.
     
@@ -804,47 +804,47 @@ The installer will quit and all changes will be lost.
       Network Installation. (Disabled: Unable to fetch package lists, check your network connection)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       This program will ask you some questions and set up %2 on your computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Welcome to the Calamares setup program for %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Welcome to %1 setup</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Welcome to the Calamares installer for %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Welcome to the %1 installer</h1>
     
@@ -939,15 +939,40 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
     
     
-      
+      
       Package Selection
       Package Selection
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Please pick a product from the list. The selected product will be installed.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Summary
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      This is an overview of what will happen once you start the setup procedure.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      This is an overview of what will happen once you start the install procedure.
+    
   
   
     ContextualProcessJob
@@ -2446,6 +2471,14 @@ The installer will quit and all changes will be lost.
       Please pick a product from the list. The selected product will be installed.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Packages
+    
+  
   
     PackageChooserViewStep
     
@@ -2729,17 +2762,17 @@ The installer will quit and all changes will be lost.
       I&nstall boot loader on:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Are you sure you want to create a new partition table on %1?
     
     
-      
+      
       Can not create new partition
       Can not create new partition
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
     
@@ -2757,107 +2790,82 @@ The installer will quit and all changes will be lost.
       Partitions
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Install %1 <strong>alongside</strong> another operating system.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Erase</strong> disk and install %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Replace</strong> a partition with %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Manual</strong> partitioning.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      Current:
+      Current:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      After:
+      After:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      No EFI system partition configured
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disk <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Current:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      After:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Option to use GPT on BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
     
     
-      
+      
       Boot partition not encrypted
       Boot partition not encrypted
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
     
     
-      
+      
       has at least one disk device available.
       has at least one disk device available.
     
     
-      
+      
       There are no partitions to install on.
       There are no partitions to install on.
     
@@ -2992,7 +3000,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3318,44 +3326,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       For best results, please ensure that this computer:
     
     
-      
+      
       System requirements
       System requirements
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      This program will ask you some questions and set up %2 on your computer.
-    
-  
   
     ScanningDialog
     
@@ -3647,27 +3627,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      This is an overview of what will happen once you start the setup procedure.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      This is an overview of what will happen once you start the install procedure.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Summary
-    
-  
   
     TrackingInstallJob
     
@@ -3999,7 +3958,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Welcome
     
@@ -4007,7 +3966,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Welcome
     
@@ -4090,21 +4049,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
     
     
-      
+      
       Back
       Back
     
@@ -4170,6 +4129,45 @@ Output:
             <p>These are example release notes.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4226,132 +4224,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Pick your user name and credentials to login and perform admin tasks
     
     
-      
+      
       What is your name?
       What is your name?
     
     
-      
+      
       Your Full Name
       Your Full Name
     
     
-      
+      
       What name do you want to use to log in?
       What name do you want to use to log in?
     
     
-      
+      
       Login Name
       Login Name
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       If more than one person will use this computer, you can create multiple accounts after installation.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Only lowercase letters, numbers, underscore and hyphen are allowed.
     
     
-      
+      
       root is not allowed as username.
       root is not allowed as username.
     
     
-      
+      
       What is the name of this computer?
       What is the name of this computer?
     
     
-      
+      
       Computer Name
       Computer Name
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       This name will be used if you make the computer visible to others on a network.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost is not allowed as hostname.
     
     
-      
+      
       Choose a password to keep your account safe.
       Choose a password to keep your account safe.
     
     
-      
+      
       Password
       Password
     
     
-      
+      
       Repeat Password
       Repeat Password
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
     
     
-      
+      
       Validate passwords quality
       Validate passwords quality
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
     
     
-      
+      
       Log in automatically without asking for the password
       Log in automatically without asking for the password
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
     
     
-      
+      
       Reuse user password as root password
       Reuse user password as root password
     
     
-      
+      
       Use the same password for the administrator account.
       Use the same password for the administrator account.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Choose a root password to keep your account safe.
     
     
-      
+      
       Root Password
       Root Password
     
     
-      
+      
       Repeat Root Password
       Repeat Root Password
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Enter the same password twice, so that it can be checked for typing errors.
     
diff --git a/lang/python.pot b/lang/python.pot
index a3d128ca74..6bd8bfd927 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -2,406 +2,381 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Mounting partitions."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Configuration Error"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No partitions are defined for 
    {!s}
     to use."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure systemd services"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Cannot modify service"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Cannot enable systemd service {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Cannot enable systemd target {name!s}."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Cannot disable systemd target {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Cannot mask systemd unit {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount file systems."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Filling up filesystems."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync failed with error code {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Unpacking image {}/{}, file {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Starting to unpack {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Failed to unpack image \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No mount point for root partition"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Bad mount point for root partition"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Bad unsquash configuration"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "The source filesystem \"{}\" does not exist"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command 
    {!s} returned error code {!s}."
 msgstr ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "The destination \"{}\" in the target system is not a directory"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
-msgstr "Cannot write KDM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
-msgstr "KDM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
-msgstr "Cannot write LXDM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
-msgstr "Cannot write LightDM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
-msgstr "Cannot configure LightDM"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
-msgstr "No LightDM greeter installed."
+msgstr ""
 
 #: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
-msgstr "Cannot write SLIM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
-msgstr "No display managers selected for the displaymanager module."
+msgstr ""
 
 #: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
-msgstr "Display manager configuration was incomplete"
+msgstr ""
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr ""
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91 src/modules/networkcfg/main.py:43
+#: src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
 
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
-msgstr "Configuring mkinitcpio."
+msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
-msgstr "Configuring encrypted swap."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
-msgstr "Installing data."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
-msgstr "Configure OpenRC services"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:57
 msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:59
 msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:61
 msgid ""
 "Unknown service-action {arg!s} for service {name!s} in run-"
 "level {level!s}."
 msgstr ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
 
 #: src/modules/services-openrc/main.py:101
 msgid "Target runlevel does not exist"
-msgstr "Target runlevel does not exist"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:102
 msgid ""
 "The path for runlevel {level!s} is {path!s}, which does not "
 "exist."
 msgstr ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
 
 #: src/modules/services-openrc/main.py:110
 msgid "Target service does not exist"
-msgstr "Target service does not exist"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:111
 msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+"The path for service {name!s} is {path!s}, which does not exist."
 msgstr ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure Plymouth theme"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Install packages."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Package Manager error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Install bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Bootloader installation error"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}."
 msgstr ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Setting hardware clock."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuring locales."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Saving network configuration."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""

From b237c73a04e01f845e318242ee72dad662fdb809 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 6 Sep 2021 12:49:49 +0200
Subject: [PATCH 403/492] [shellprocess] Fix test

The test was loading the config file (for testing) either from the
build directory or possibly the source directory; if the config
in the build-dir was edited (for other testing purposes) then
the test would fail. Load only the source-dir version of the file.
---
 src/modules/shellprocess/Tests.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/modules/shellprocess/Tests.cpp b/src/modules/shellprocess/Tests.cpp
index 77368db481..c1489c1abd 100644
--- a/src/modules/shellprocess/Tests.cpp
+++ b/src/modules/shellprocess/Tests.cpp
@@ -42,16 +42,11 @@ ShellProcessTests::testProcessListSampleConfig()
 {
     YAML::Node doc;
 
-    QStringList dirs { "src/modules/shellprocess", "." };
-    for ( const auto& dir : dirs )
-    {
-        QString filename = dir + "/shellprocess.conf";
-        if ( QFileInfo::exists( filename ) )
-        {
-            doc = YAML::LoadFile( filename.toStdString() );
-            break;
-        }
-    }
+    QString filename = QStringLiteral( "shellprocess.conf" );
+    QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) );
+
+    QVERIFY( fi.exists() );
+    doc = YAML::LoadFile( fi.fileName().toStdString() );
 
     CommandList cl( CalamaresUtils::yamlMapToVariant( doc ).value( "script" ) );
     QVERIFY( !cl.isEmpty() );

From 44e66c1318221a8eb398dba1a6d7f9ff6903a918 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 6 Sep 2021 13:16:23 +0200
Subject: [PATCH 404/492] [keyboard] Fix mapping for India + English

- India (when in English) should use the English variant, not Hindi
- While here, fix up minor items in code:
  - Typo in comment
  - Asturian doesn't need a special case (which didn't match, anyway)
  - Don't debug-log a country-name that might be entirely wrong
    (the layout is English, variant "in" but "in" interpreted as
    a country is Indonesia, and the actually-desired name is eng_in
    which isn't a QLocale name at all -- just like the Hausa and Igbo
    special cases)
---
 src/modules/keyboard/Config.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index b77282a18c..7140bd7905 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -467,12 +467,12 @@ Config::guessLocaleKeyboardLayout()
         { "ar_TN", arabic },
         { "ar_YE", arabic },
         { "ca_ES", "cat_ES" }, /* Catalan */
-        { "as_ES", "ast_ES" }, /* Asturian */
         { "en_CA", "us" }, /* Canadian English */
         { "el_CY", "gr" }, /* Greek in Cyprus */
-        { "el_GR", "gr" }, /* Greek in Greeze */
+        { "el_GR", "gr" }, /* Greek in Greece */
         { "ig_NG", "igbo_NG" }, /* Igbo in Nigeria */
-        { "ha_NG", "hausa_NG" } /* Hausa */
+        { "ha_NG", "hausa_NG" }, /* Hausa */
+        { "en_IN", "eng_in" }, /* India, English with Rupee */
     } );
 
     // Try to preselect a layout, depending on language and locale
@@ -508,14 +508,7 @@ Config::guessLocaleKeyboardLayout()
     }
     if ( !lang.isEmpty() )
     {
-        const auto langParts = lang.split( '_', SplitSkipEmptyParts );
-
-        // Note that this his string is not fit for display purposes!
-        // It doesn't come from QLocale::nativeCountryName.
-        QString country = QLocale::countryToString( QLocale( lang ).country() );
-        cDebug() << Logger::SubEntry << "extracted country" << country << "::" << langParts;
-
-        guessLayout( langParts, m_keyboardLayoutsModel, m_keyboardVariantsModel );
+        guessLayout( lang.split( '_', SplitSkipEmptyParts ), m_keyboardLayoutsModel, m_keyboardVariantsModel );
     }
 }
 

From 0aa2603a23b96c3b819ac7d803bdcc43c0349587 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 6 Sep 2021 14:44:48 +0200
Subject: [PATCH 405/492] [libcalamares] Fix network-connectivity check on old
 Qt

With old Qt, Calamares could only run one check on a thread,
because the NAM would be switched to NotAccessible --
subsequent checks would fail because the NAM is already
hard-set to NotAccessible, so it could never be turned back
on by Calamares code.

Reset the accessible flag for the NAM while checking if
the internet is there.
---
 src/libcalamares/network/Manager.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index cceff477e0..6cb270ecd2 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -162,6 +162,15 @@ Manager::checkHasInternet()
     {
         return false;
     }
+    // It's possible that access was switched off (see below, if the check
+    // fails) so we want to turn it back on first. Otherwise all the
+    // checks will fail **anyway**, defeating the point of the checks.
+#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
+    if ( !d->m_hasInternet )
+    {
+        d->nam()->setNetworkAccessible( QNetworkAccessManager::Accessible );
+    }
+#endif
     if ( d->m_lastCheckedUrlIndex < 0 )
     {
         d->m_lastCheckedUrlIndex = 0;
@@ -189,8 +198,7 @@ Manager::checkHasInternet()
 // For earlier Qt versions (< 5.15.0), set the accessibility flag to
 // NotAccessible if synchronous ping has failed, so that any module
 // using Qt's networkAccessible method to determine whether or not
-// internet connection is actually avaialable won't get confused over
-// virtualization technologies.
+// internet connection is actually available won't get confused.
 #if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
     if ( !d->m_hasInternet )
     {
@@ -261,6 +269,7 @@ asynchronousRun( QNetworkAccessManager* nam, const QUrl& url, const RequestOptio
     // Bail out early if the request is bad
     if ( reply->error() )
     {
+        cWarning() << "Early reply error" << reply->error() << reply->errorString();
         reply->deleteLater();
         return nullptr;
     }

From ada9a998043e8301e55415e9269b6a32f27efc13 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 6 Sep 2021 15:16:40 +0200
Subject: [PATCH 406/492] Changes: post-release housekeeping

---
 CHANGES        | 12 ++++++++++++
 CMakeLists.txt |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 83aa256d3c..e0a44f40f0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.43 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - No external contributors yet
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - No module changes yet
+
+
 # 3.2.42 (2021-09-06) #
 
 This release contains contributions from (alphabetically by first name):
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f60301ee56..27fcda865a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,11 +41,11 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.42
+    VERSION 3.2.43
     LANGUAGES C CXX
 )
 
-set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From 79cc616de267466ac13e3ce7fac46be4224fd8c8 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Mon, 6 Sep 2021 19:25:16 +0200
Subject: [PATCH 407/492] [keyboardq] add interactive keyboard preview rewrite
 of keyboardq.qml, reduce stackview to 2, use a combobox for keyboard models
 list colors set to configurable .xml files used for keyboard layouts, about a
 dozen added now builds, runs, actions record as intended, GS filled correctly

---
 src/modules/keyboardq/data/Key.qml            | 179 ++++++
 src/modules/keyboardq/data/Keyboard.qml       | 222 ++++++++
 src/modules/keyboardq/data/afgani.xml         |  65 +++
 src/modules/keyboardq/data/ar.xml             |  65 +++
 src/modules/keyboardq/data/backspace.svg      |   7 +
 .../keyboardq/data/backspace.svg.license      |   2 +
 .../keyboardq/data/button_bkg_center.png      | Bin 0 -> 4289 bytes
 .../data/button_bkg_center.png.license        |   2 +
 .../keyboardq/data/button_bkg_left.png        | Bin 0 -> 5549 bytes
 .../data/button_bkg_left.png.license          |   2 +
 .../keyboardq/data/button_bkg_right.png       | Bin 0 -> 5955 bytes
 .../data/button_bkg_right.png.license         |   2 +
 src/modules/keyboardq/data/de.xml             |  66 +++
 src/modules/keyboardq/data/empty.xml          |  64 +++
 src/modules/keyboardq/data/en.xml             |  64 +++
 src/modules/keyboardq/data/enter.svg          |  43 ++
 src/modules/keyboardq/data/enter.svg.license  |   2 +
 src/modules/keyboardq/data/es.xml             |  64 +++
 src/modules/keyboardq/data/fr.xml             |  66 +++
 src/modules/keyboardq/data/generic.xml        |  64 +++
 src/modules/keyboardq/data/generic_qz.xml     |  66 +++
 src/modules/keyboardq/data/pt.xml             |  64 +++
 src/modules/keyboardq/data/ru.xml             |  64 +++
 src/modules/keyboardq/data/scan.xml           |  64 +++
 src/modules/keyboardq/data/shift.license      |   2 +
 src/modules/keyboardq/data/shift.svg          |   7 +
 src/modules/keyboardq/keyboardq.qml           | 510 +++++++-----------
 27 files changed, 1453 insertions(+), 303 deletions(-)
 create mode 100644 src/modules/keyboardq/data/Key.qml
 create mode 100644 src/modules/keyboardq/data/Keyboard.qml
 create mode 100644 src/modules/keyboardq/data/afgani.xml
 create mode 100644 src/modules/keyboardq/data/ar.xml
 create mode 100755 src/modules/keyboardq/data/backspace.svg
 create mode 100644 src/modules/keyboardq/data/backspace.svg.license
 create mode 100755 src/modules/keyboardq/data/button_bkg_center.png
 create mode 100644 src/modules/keyboardq/data/button_bkg_center.png.license
 create mode 100755 src/modules/keyboardq/data/button_bkg_left.png
 create mode 100644 src/modules/keyboardq/data/button_bkg_left.png.license
 create mode 100755 src/modules/keyboardq/data/button_bkg_right.png
 create mode 100644 src/modules/keyboardq/data/button_bkg_right.png.license
 create mode 100644 src/modules/keyboardq/data/de.xml
 create mode 100644 src/modules/keyboardq/data/empty.xml
 create mode 100644 src/modules/keyboardq/data/en.xml
 create mode 100755 src/modules/keyboardq/data/enter.svg
 create mode 100644 src/modules/keyboardq/data/enter.svg.license
 create mode 100644 src/modules/keyboardq/data/es.xml
 create mode 100644 src/modules/keyboardq/data/fr.xml
 create mode 100644 src/modules/keyboardq/data/generic.xml
 create mode 100644 src/modules/keyboardq/data/generic_qz.xml
 create mode 100644 src/modules/keyboardq/data/pt.xml
 create mode 100644 src/modules/keyboardq/data/ru.xml
 create mode 100644 src/modules/keyboardq/data/scan.xml
 create mode 100644 src/modules/keyboardq/data/shift.license
 create mode 100755 src/modules/keyboardq/data/shift.svg

diff --git a/src/modules/keyboardq/data/Key.qml b/src/modules/keyboardq/data/Key.qml
new file mode 100644
index 0000000000..e85b44f08f
--- /dev/null
+++ b/src/modules/keyboardq/data/Key.qml
@@ -0,0 +1,179 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   Copyright 2021, Anke Boersma 
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+import QtQuick 2.15
+
+Item {
+    id: key
+
+    property string mainLabel: "A"
+    property var secondaryLabels: [];
+
+    property var iconSource;
+
+    property var keyImageLeft: ""
+    property var keyImageRight: ""
+    property var keyImageCenter: ""
+
+    property color keyColor: "#404040"
+    property color keyPressedColor: "grey"
+    property int keyBounds: 2
+    property var keyPressedColorOpacity: 1
+
+    property var mainFontFamily: "Roboto"
+    property color mainFontColor: "white"
+    property int mainFontSize: 18
+
+    property var secondaryFontFamily: "Roboto"
+    property color secondaryFontColor: "white"
+    property int secondaryFontSize: 10
+
+    property bool secondaryLabelVisible: true
+
+    property bool isChekable;
+    property bool isChecked;
+
+    property bool upperCase;
+
+    signal clicked()
+    signal alternatesClicked(string symbol)
+
+    Item {
+        anchors.fill: parent
+        anchors.margins: key.keyBounds
+        visible: key.keyImageLeft != "" || key.keyImageCenter != "" || key.keyImageRight != "" ? 1 : 0
+        Image {
+            id: backgroundImage_left
+            anchors.left: parent.left
+            height: parent.height
+            fillMode: Image.PreserveAspectFit
+            source: key.keyImageLeft
+        }
+        Image {
+            id: backgroundImage_right
+            anchors.right: parent.right
+            height: parent.height
+            fillMode: Image.PreserveAspectFit
+            source: key.keyImageRight
+        }
+        Image {
+            id: backgroundImage_center
+            anchors.fill: parent
+            anchors.leftMargin: backgroundImage_left.width - 1
+            anchors.rightMargin: backgroundImage_right.width - 1
+            height: parent.height
+            fillMode: Image.Stretch
+            source: key.keyImageCenter
+        }
+    }
+
+    Rectangle {
+        id: backgroundItem
+        anchors.fill: parent
+        anchors.margins: key.keyBounds
+        color: key.isChecked || mouseArea.pressed ? key.keyPressedColor : key.keyColor;
+        opacity: key.keyPressedColorOpacity
+    }
+
+    Column
+    {
+        anchors.centerIn: backgroundItem
+
+        Text {
+            id: secondaryLabelsItem
+            smooth: true
+            anchors.right: parent.right
+            visible: true //secondaryLabelVisible
+            text: secondaryLabels.length > 0 ? secondaryLabels : ""
+            color: secondaryFontColor
+
+            font.pixelSize: secondaryFontSize
+            font.weight: Font.Light
+            font.family: secondaryFontFamily
+            font.capitalization: upperCase ? Font.AllUppercase :
+                                                     Font.MixedCase
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            Image {
+                id: icon
+                smooth: true
+                anchors.verticalCenter: parent.verticalCenter
+                source: iconSource
+                //sourceSize.width: key.width * 0.6
+                sourceSize.height: key.height * 0.4
+            }
+
+            Text {
+                id: mainLabelItem
+                smooth: true
+                anchors.verticalCenter: parent.verticalCenter
+                text: mainLabel
+                color: mainFontColor
+                visible: iconSource ? false : true
+
+                font.pixelSize: mainFontSize
+                font.weight: Font.Light
+                font.family: mainFontFamily
+                font.capitalization: upperCase ? Font.AllUppercase :
+                                                         Font.MixedCase
+            }
+        }
+    }
+
+    Row {
+        id: alternatesRow
+        property int selectedIndex: -1
+        visible: false
+        anchors.bottom: backgroundItem.top
+        anchors.left: backgroundItem.left
+
+        Repeater {
+            model: secondaryLabels.length
+
+            Rectangle {
+                property bool isSelected: alternatesRow.selectedIndex == index
+                color: isSelected ? mainLabelItem.color : key.keyPressedColor
+                height: backgroundItem.height
+                width: backgroundItem.width
+
+                Text {
+                    anchors.centerIn: parent
+                    text: secondaryLabels[ index ]
+                    font: mainLabelItem.font
+                    color: isSelected ? key.keyPressedColor : mainLabelItem.color
+                }
+            }
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onPressAndHold: alternatesRow.visible = true
+        onClicked: {
+            if (key.isChekable) key.isChecked = !key.isChecked
+            key.clicked()
+        }
+
+        onReleased: {
+            alternatesRow.visible = false
+            if (alternatesRow.selectedIndex > -1)
+                key.alternatesClicked(secondaryLabels[alternatesRow.selectedIndex])
+        }
+
+        onMouseXChanged: {
+            alternatesRow.selectedIndex =
+            (mouseY < 0 && mouseX > 0 && mouseY < alternatesRow.width) ?
+                        Math.floor(mouseX / backgroundItem.width) :
+                        -1;
+        }
+    }
+}
diff --git a/src/modules/keyboardq/data/Keyboard.qml b/src/modules/keyboardq/data/Keyboard.qml
new file mode 100644
index 0000000000..a804ca9f4f
--- /dev/null
+++ b/src/modules/keyboardq/data/Keyboard.qml
@@ -0,0 +1,222 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   Copyright 2021, Anke Boersma 
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+import QtQuick 2.15
+import QtQuick.XmlListModel 2.10
+
+Item {
+    id: keyboard
+
+    width: 1024
+    height: 640
+
+    property int rows: 4;
+    property int columns: 10;
+
+    property string source: "generic.xml"
+    property var target;
+
+    property color backgroundColor: "black"
+
+    property var keyImageLeft: ""
+    property var keyImageRight: ""
+    property var keyImageCenter: ""
+
+    property color keyColor: "#404040"
+    property color keyPressedColor: "grey"
+    property int keyBounds: 2
+    property var keyPressedColorOpacity: 1
+
+    property var mainFontFamily: "Roboto"
+    property color mainFontColor: "white"
+    property int mainFontSize: 59
+
+    property var secondaryFontFamily: "Roboto"
+    property color secondaryFontColor: "white"
+    property int secondaryFontSize: 30
+
+    property bool secondaryLabelsVisible: false
+    property bool doSwitchSource: true
+
+    property bool allUpperCase: false
+
+    signal keyClicked(string key)
+    signal switchSource(string source)
+    signal enterClicked()
+
+    Rectangle {
+        id: root
+        anchors.fill: parent
+        color: backgroundColor
+
+        property int keyWidth: keyboard.width / columns;
+        property int keyHeight: keyboard.height / rows;
+
+        property int xmlIndex: 1
+
+        Text {
+            id: proxyMainTextItem
+            color: keyboard.mainFontColor
+            font.pixelSize: keyboard.mainFontSize
+            font.weight: Font.Light
+            font.family: keyboard.mainFontFamily
+            font.capitalization: keyboard.allUpperCase ? Font.AllUppercase :
+                                                     Font.MixedCase
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Text {
+            id: proxySecondaryTextItem
+            color: keyboard.secondaryFontColor
+            font.pixelSize: keyboard.secondaryFontSize
+            font.weight: Font.Light
+            font.family: keyboard.secondaryFontFamily
+            font.capitalization: keyboard.allUpperCase ? Font.AllUppercase :
+                                                     Font.MixedCase
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Column {
+            id: column
+            anchors.centerIn: parent
+
+            Repeater {
+                id: rowRepeater
+
+                model: XmlListModel {
+                    id: keyboardModel
+                    source: keyboard.source
+                    query: "/Keyboard/Row"
+
+                    Behavior on source {
+                        NumberAnimation {
+                            easing.type: Easing.InOutSine
+                            duration: 100
+                        }
+                    }
+                }
+
+                Row {
+                    id: keyRow
+                    property int rowIndex: index
+                    anchors.horizontalCenter: if(parent) parent.horizontalCenter
+
+                    Repeater {
+                        id: keyRepeater
+
+                        model: XmlListModel {
+                            source: keyboard.source
+                            query: "/Keyboard/Row[" + (rowIndex + 1) + "]/Key"
+
+                            XmlRole { name: "labels"; query: "@labels/string()" }
+                            XmlRole { name: "ratio"; query: "@ratio/number()" }
+                            XmlRole { name: "icon"; query: "@icon/string()" }
+                            XmlRole { name: "checkable"; query: "@checkable/string()" }
+                        }
+
+                        Key {
+                            id: key
+                            width: root.keyWidth * ratio
+                            height: root.keyHeight
+                            iconSource: icon
+                            mainFontFamily: proxyMainTextItem.font
+                            mainFontColor: proxyMainTextItem.color
+                            secondaryFontFamily: proxySecondaryTextItem.font
+                            secondaryFontColor: proxySecondaryTextItem.color
+                            secondaryLabelVisible: keyboard.secondaryLabelsVisible
+                            keyColor: keyboard.keyColor
+                            keyImageLeft: keyboard.keyImageLeft
+                            keyImageRight: keyboard.keyImageRight
+                            keyImageCenter: keyboard.keyImageCenter
+                            keyPressedColor: keyboard.keyPressedColor
+                            keyPressedColorOpacity: keyboard.keyPressedColorOpacity
+                            keyBounds: keyboard.keyBounds
+                            isChekable: checkable
+                            isChecked: isChekable &&
+                                       command &&
+                                       command === "shift" &&
+                                       keyboard.allUpperCase
+                            upperCase: keyboard.allUpperCase
+
+                            property var command
+                            property var params: labels
+
+                            onParamsChanged: {
+                                var labelSplit;
+
+                                if(params[0] === '|')
+                                {
+                                    mainLabel = '|'
+                                    labelSplit = params
+                                }
+                                else
+                                {
+                                    labelSplit = params.split(/[|]+/)
+
+                                    if (labelSplit[0] === '!')
+                                        mainLabel = '!';
+                                    else
+                                        mainLabel = params.split(/[!|]+/)[0].toString();
+                                }
+
+                                if (labelSplit[1]) secondaryLabels = labelSplit[1];
+
+                                if (labelSplit[0] === '!')
+                                    command = params.split(/[!|]+/)[1];
+                                else
+                                    command = params.split(/[!]+/)[1];
+                            }
+
+                            onClicked: {
+                                if (command)
+                                {
+                                    var commandList = command.split(":");
+
+                                    switch(commandList[0])
+                                    {
+                                        case "source":
+                                            keyboard.switchSource(commandList[1])
+                                            if(doSwitchSource) keyboard.source = commandList[1]
+                                            return;
+                                        case "shift":
+                                            keyboard.allUpperCase = !keyboard.allUpperCase
+                                            return;
+                                        case "backspace":
+                                            keyboard.keyClicked('\b');
+                                            target.text = target.text.substring(0,target.text.length-1)
+                                            return;
+                                        case "enter":
+                                            keyboard.enterClicked()
+                                            return;
+                                        case "tab":
+                                            keyboard.keyClicked('\t');
+                                            target.text = target.text + "   "
+                                            return;
+                                        default: return;
+                                    }
+                                }
+                                if (mainLabel.length === 1)
+                                    root.emitKeyClicked(mainLabel);
+                            }
+                            onAlternatesClicked: root.emitKeyClicked(symbol);
+                        }
+                    }
+                }
+            }
+        }
+
+        function emitKeyClicked(text) {
+            var emitText = keyboard.allUpperCase ? text.toUpperCase() : text;
+            keyClicked( emitText );
+            target.text = target.text + emitText
+        }
+    }
+}
+
diff --git a/src/modules/keyboardq/data/afgani.xml b/src/modules/keyboardq/data/afgani.xml
new file mode 100644
index 0000000000..356e393f77
--- /dev/null
+++ b/src/modules/keyboardq/data/afgani.xml
@@ -0,0 +1,65 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/ar.xml b/src/modules/keyboardq/data/ar.xml
new file mode 100644
index 0000000000..07bd9b0879
--- /dev/null
+++ b/src/modules/keyboardq/data/ar.xml
@@ -0,0 +1,65 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/backspace.svg b/src/modules/keyboardq/data/backspace.svg
new file mode 100755
index 0000000000..4d29e246cd
--- /dev/null
+++ b/src/modules/keyboardq/data/backspace.svg
@@ -0,0 +1,7 @@
+
+
+
+
+ Svg Vector Icons : http://www.onlinewebfonts.com/icon 
+
+
diff --git a/src/modules/keyboardq/data/backspace.svg.license b/src/modules/keyboardq/data/backspace.svg.license
new file mode 100644
index 0000000000..36158c6040
--- /dev/null
+++ b/src/modules/keyboardq/data/backspace.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2019 https://www.onlinewebfonts.com/fonts
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/src/modules/keyboardq/data/button_bkg_center.png b/src/modules/keyboardq/data/button_bkg_center.png
new file mode 100755
index 0000000000000000000000000000000000000000..d17e1698e0b6a10ecdf25905f34ff88760536a95
GIT binary patch
literal 4289
zcmeHLeLRzU8=tdqj=Yq2hIQoKFfsDF$e1tNQKmqRES;_9nPaVF>7WH
zPgY8FNOC%*jR=pD*GNi*wVvNLq^Ccg^Uw3&bAP`3?Y@8aZ`bd-zSsA~2q3EBKN~@b_?qF#psV0~f1eUA$Z%km|hE{0K=1
z1PbxR6EJJmtXaEut)il$l9H0Lva*VbimIxrnwpxry1IsjhNdQfCJYAC($dn_*4EJh
z(1C+v9ekY->wW}>?vJ{FSOZw2P$(N402^Cd+l{t18^O2{
zV56O#oxQ!CgM+=Jql1%^qmz@9vonA*8jaqx31E|pi;Jr(fa~VXo88<1+%Oo7yE}lp
zhld9i>yE{O5$oyciNj%WI56V8a5(QRTkv=s9>2v4kN5Tl@bdBT_Qm70sI02{0Y9k1V29lI0*$gGpPr0tAPI
zYz++w4h3TUEjXcP7~HjilC;{iM9sZCZxkRT9pv
zC@JadpDcM=GPQp&FkFFGagOGc~eZIc!HQa_NB
z`({y`)3=HiaO3jxdwX~NvoC4l+CTdX98%}ssa>-8tD~Z!p`m!RNw}2
zdsmYE+=bEcXT;K6XN;G#t@go%$#7i!POWD;2RK@z*>jt`9cj&Sw)^^NV{Uo&DKkY>
zrm@GBn&(EGnbQ@fW$hN9-4cVxqu@E_Ua3O`TgYlcOgr@(!P+fJ+vuz;(2D--26@EstL}|lL@E~
z@9GtIMsjt^p~Ce9rlln9FCj_i0G@`hW#Pc14ZNXaRFpS74TA(MQJ`i8vkmSC$WK4l8
zq5tPFCCLiYt@#Ed)!rRdsa9&aGk?SlJ@&iBpN)U>e!i=P+df;B+g|03l|Hkcc}$7l
zp8Tn=lP|Gme$UkNXIXmfgk6yky_kPcBnSoPXSyP-Z-bBP_GIXcK)VKO3KWtnNwWjiVt-SS37SU
zpxW3movNJj9j#{wGx(W{qvTy3l!e{R_ZI%5(I{nD4%@wGbiaAZ!jg5D9!I%A>}!n9N$#*h5=Dj{3ytU^@KzLGguMRL$yjDbLsMw3*5D|#mWVlJ1Rs(e9@rLgupbFfPk
zF47_LUWIpvnvoI1v-u__hPEtznewgGCa~_~L~dgd*JFXIN$Q+K+_hn9%Q4;t%PNY=
zSY}t0tN=ag=uzO0IF^9Ld}fz5744v`UsowF73HutzU%PbyaoJwp~`pWrjgMfL7aj
z?ug|hjJjNfDiG~Tm#?H}pkA7GgUpK7eXR`wseyS#T8awmVoIwr(#`|!#7^dakwWH@
zF0*w-j%3mtyGEBn%B<}i%mYdWddQ%WE|INd8QX6o&;LEzw!wjX0$Yh~jT
zP-<{%f|rwsGoj2tSRfi95A2?}&)tov{gh?*0$WksX%7XVMxtpE!ul1*CtiS|gNd@H
zp5bierHB_JVvI`}RMusv@c1Ih5w(E=`vFBa*vlqX2t?OUNKu89FejotqG_RASp?|?
zxke6AJzt9bk1UAXm6_Pbd<5+jSG^4NYBSsk>8H&rXhwe@Qf&ZRQTHIMBz+LzqId~n
zxe8@3O0))vwV&KBkEpg^*_A|l2!Fwg{;FzJc=*L@dNVzWLbqqorFduJxQ2`R5fZtg
zCjhNg98KqE+!=5B!t}~25~@7)qgs2<*pjfk@)`O!x()6y(ns7$V+7c9vW>sKIcQe*eS2xyKT$lyrvBDmHp
zb5K#9(seELsE-mMv1WGsT3B5kv3**BHLfmj2~>ejL~xNT=Ris5M68)JYcpw!!Yd@N
z0P1kO_Elpp#mtU%iL_e&6&85x;hgVLqY4v1s1<_>>~k6dBsG69k78!YvSdg~+2o=Y
z8r|8$I^87R11PMcD47Cd4Qq89Ff^p=)`C8n1noVE>YcWY?m+Q#g5S!fC-4x>1BX$q
zjdc+nNY*6D0ZuA>>2j&S6{l;gmwEY=qQ5JyEV0o4&0bEDTu*Y&EPASR%az-DM*S^U
z_No2y*u%Nq@XY-#h09gL#^HLww+x(9vv6}Qw~cOX-kALS^XFev^|YBtP|hbL711zv#dW(_%e2Akjk>A$Ll
zAIz7&03Q)#jU72?@AQDLUV3ovtU5gXRrSo8u}4|O=gwdX*gxecm!)1t6r90OFW16K
zJ%ja(Pw=pL&P7xEStg14fdc{88KyP#1Z~T?+=<#|GW9fkWNY!k+m$I3*EGqj#2Au3
zlR_NDF(%0py_v$5sJOT(9E-WSn`KJ5MDFN?GHtKMr!=>4DBMw*z)a@do_kyk!Bpr4
z;xCmcv8siv^`R0W^+m}o^#}ja{bwyFB8tpP8dj{!F(tJoG_Y5L*W{u5tOuHVW4ce8
z2iMlifEVyXyC!x7)2<)V4|+Rbqf%l1GRIcneNF#<$*TEw`|@L>R|?a7GF8k;PRvwR
zP3)f+Q_AMZy>rCA@H|BB$r+1Mhtj;O3B|L;gcq-K$t}O2Ut9DJw5E6eo-iVi-kH=K
Vre~}J{&s*sJTcyGOjpX`e*=nhff)b*

literal 0
HcmV?d00001

diff --git a/src/modules/keyboardq/data/button_bkg_center.png.license b/src/modules/keyboardq/data/button_bkg_center.png.license
new file mode 100644
index 0000000000..d36c167bbd
--- /dev/null
+++ b/src/modules/keyboardq/data/button_bkg_center.png.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2019 MarcoPellin 
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/src/modules/keyboardq/data/button_bkg_left.png b/src/modules/keyboardq/data/button_bkg_left.png
new file mode 100755
index 0000000000000000000000000000000000000000..0a674af6c1a014846efe6cb3531deb7d75b5eb4d
GIT binary patch
literal 5549
zcmYjVc|4SB*tTZNAf&8C$}(vblBFymOOr5qQ+P*N##V_I!Z1@r(kUh(TFzK!YQ|ce
zFf=;qXu%AoLrIn~?U|O5`kr^D^L^hRelw4Eo_o3O>$;!ke$V=2y;PNTm8GPlRK0g>
z4*;LOQc}{oic7$^y@I->;6wUofR~%pt;hO&u#k&(-RUYN#Vl0$ftLqsrNcY+9+i?p
z^&o%J4-VBF1pi!_>;WYQ9*Rmnj!%k|I*cbICR-&&Ca9Czct~gSc*}V6Pl9tx3+>Oo4=$d?i>K!{ais;NLKDF-
zH;uc%)wE2V
zPvTeaEh+PjijKN?h0i~jDhk+`PO!MrcEb9u{gx|!*f2(TJHK+!s^;@utMWZFNmsYc
zI0zQs2hTjN*!g(${qccq`=Zx7b>R=H&joT_1&-WGni@U%{{GM~?DCnJOO~51U-Av?
zjxqQq@A&s;hgCH*tNuz}75${5FJ=0i!&SjNVYqgGHMaKbeoalyQ`blbSD^T&0tId*
z{a36Uebhg!ywW$yYS;4^LV?zV|4c#<2GR&I^wTJ@Sn}xRg!I=-S$8_{>BFM3X6o*y
zwx*(g!mfB%#ml8&4K{QK^vGN4Msm77bP2egqQ9D>7FnqmJ=$VSyfrAsXl>0EhNn2Z
z9kHFlO}@vQ=9A0H?hTM$dqH`OAT*roPqn-FF6k2YJ$?Py^yN1<=#F3&)Vn>Q#kX1Z9-z9sHQ2>iu@z0c5J8uTY^kW|6qsb9X|`hL9JH1A~c?1ZGN3
zdr?jj;uvi8#>gpg&WQ4a2LvXe_igtK5RUh)Eu^pT{r%h=v;8{HKfKvS_E+Jxpr_G-TtyCEG~CA2Gfb!BU-={*w*y#wG02;iXyh;wKaoI5#u
zMnn^)3ts5%Mm=Ohc}y*2uN*KU4qq;*`MQns)6n-Mu5F!8?B=Z17h~Pc`)~eCH1$5FU^Xiy^1U>}mSicWV7k{n0g-HdaF7rlt}PZez3baV@wM~6N9OOt;N@dmmtuPsN#
zwq~EcRusJPS20#&I_jvuRd>KSsw6erM20$rvUfh?wyk69;Gw89NJPEhu_DM^cijqC
z{=4ep{=(+9&W>r+f@TFzC}iSCeKFeVpEUn8*ru*Y>qlpEaikt@6VW!FVSZl>cY!WC
zKjrUKFTs>9ZqFOki792o=6^VV(06Bl_xFjL*~jM~h<*_%Vwh$M5`kR&(7lgV{e!yd3U{
z=IU8tC#Q-goqg^JS-nH;u)q(^sOim3-T?
z-(v5?4AVxNMp(&ncQuOH%LZ5^g-g|y84jbJnVHq;3tw<^wbd2MYiY+1(L#4p;(6Cp
zelS>bPrfMmHeXA&e&V);rW1b3I;W_BSfkF}W|J@*At|ewSTke}?=!X5b-53}$no$?
zDVazU{XB+Y>$qkV^OfwNQ{J_(R6aF%JB}Sdc8_EZ>}<%-|4h_YD|wfZXf;(GS7g3$DnE6(&#?Iz|5VNH>?uZs+~Db}w{UIOG>eQT
z{K=QrlWdJlOM+Ewe7|0|c{cP{F0nxa<>8V+)HW*l;u%@3Qo6f6Kebpf$9T;iDN94l
zab@L43WNXbhi*y*vLWBSH2bb(ogwpC_q%~l@f_(uvb%N!L8Pu%QpQ|>9OP|7KQQNR
zXrQ#aLj0H!vV(cmJxTDpgq>#H*A;V=;bzZ0Xt*uvZsZE1N1b7(jrH>myGaK-!QG`L
z_M;@~*_wSgv;4zm+1DMQN6yd@qLScs-@B^}D~fTszufCRM2=I*_*}XD5vLq#t9_#D
zc_L!BkHZcLi+`apDP2}kfqmh$0F~N(gC^xZGbjPH>8_wmXj0~p#B~b8Q@YBB@k+Wr
zpQ^YHv~g45gr5lMJo2yyt58~VeV-4i{v^Yd0hVOIGu~%1GF?etivwm<06kIcpXr>lNCuwU!olqX^rhz&Qon%NtaTg=TR
zCN}E_gIIO4Rf;(lT_N7g2$_1)6k@0*fChDmSb%6q(ehMi;o_jkGPIA`)*&ir^3<1>
z%OFe^0H=Oyus$3TVkqZ}knfWKrmqZ+hdm$%?fUZbR!Aj^d-9b0;zAquIyp;2MjHeQuYux_s9f$TKq(O`39!&U2xVypLjMYilVhxJk)y3S
z^5zXX!ui*a&$%Ez5BpIkTK%&uZ9L8(6ftnolEkqonaeJgFj1pOhIXQ>scHWioKC^v
z8aG;;m_zwrik5NhyV{`P2B@FJK|}>|y`QH_GXl9@SIl*zm2^!{Pm92Tq?vcvOwDpD
zBg2dGpIqV@Rw1Dn?e2jG%WR~%thRAho`T;KR6e6umCJ5>cYrO`5~PGArUim`o~X^n
zDfnriaCxABDwe+j@ni|kQru=A_+-R|l!bM!>2Z=#)-M
znLJadEjyB=?z_z&3kpCsUe#$xGiEsPW?A#(b!1#h@?Eh^QI=~N8__xlUp0!{Xim@u
z-kq+xhys;=dfLXVP#By9_Ie$3q21R1pfB!e8zpHglo&Q~*%ItGaQg)W>nzpm{{_Fq
zFh{Z~kIyakidzDXl|r7re2MXz%Q-1GL-pahrS+&15d1YQgn#m4n&Z)qHTw|U`L1y|
z+7Y4<9&6)Rpcot;sJU6U5-wL;1sIl;!4DK^MVClSdjPzkO1jp*YiJc{+Se7==>elv
z(K*2Bc)Sdal+rG%Eeom8m&W}IJ43C99>@pFBd{+E_JdRPfp;VnutLKr3`7(td1yEZ
z+DWR-kZ4(+k?0}M{S9^s@Ne8DhN+NsmIP-kz&WEU_1PI&u9}!%pljQz
zR?S~)1`@!4*8GVf*JP*-Db~MPm|Fxvmd6{=3Q$OAeweYRq$gH}mLF+${JjHh4!#!y
zF0(zln;{esvR*L~qs0NX4Cr#=0&EN(gzHcg(8as2%Rn-`nx$M1J%f@8pJ9pc0P&s!
z1^w4&=2*OclR?y{8T09QxuOD~YHW)>aJ*Te7vZH#27m|Bkl0h~1G1H-o#rfX{@x2p
zfFu#D4M<>dE^<{_+3};$&TPWEoj4?Y7TJxqv**t7UC>7&0s>HW%_?BGRn#rvyLy}r
z(BnqT+dug_zT)nq4vM5ssqoPRoknZopymBoUB5DSH{|Fezn+U&*>x|iYzu8I>mg%~
zXbu?a16VZ5deON7be%ew<6(l(4|s?Jr!l~^jtmNWY+y*-T(O|hCIRhYSV7w)%@35d
ztS43%03nuc3UleppNnaT{iZEsMyZSd9&06KesBTtM>6$;0^uz{O)1avfcsw6GZ2%A
z`)xP`klZ}Mu?`3qInv}I5M&i=4i=Lw513_<77(+)yZmYBcBd8XS$4{^hpYwwSgk$~
z(BgRz1sRk*S6g8uRlVLyA7Q@^g0`aNLRuuiXNQ%VAPf~(0@qoUe2FQ>fA0)mjvRLm
zkXisu0dY_l@%`5=G$L`~hwI28OQN1CY5>fIYS|GoyUkod@DsPZJDZ8h-my$=6oCihhw4VQxf4yCpR<
zZ&9H_!+Yl;5DhX!Sg6>c(U%JYv|MZTx!<~0^egDuAtvh1frQ5XfWfw!hmbXq5Y9Ja
z6cq*pn*xkH&rX4#%&}5q6nwzdI4Bc7=Lz#Hw#1^RZfbEz!d^W!4dlLUI&uf>StdS^
z?3qPs?#OvR*_-s;CBqf;uhQ;-trs8lq+S5!^ea1D29`y!2SRrlj%FPFFV0Cm2
zMLFW$_h}PkRxsRpunA9O6RFuiqwMS{H*gBKs0J^EpDWiBFmIvp;NMsEEW+0pEj{At
zLRHoe($sveE*THZMp`8EfT~Q(Tgf=Jm^JodrDR_l9Qyzk-wEfkfraycD#*kn{rrgJ
zxq1ojqvV?f?6_QP5x4XU94(pK^16;WNyY)WDuYL09KNd4ZX))P6v=GDCG9~>%T4i`
z5fiR=kF7_3>~9tN;Fu}+rh~5y1t&Nd^Yq$*vWhJ8sq~BOy5L)!nx#6v)|uu)rhZ|_
zXi#`P%G)8{(_?c(hRZ4J0nLg{(T|hE-WUc~h0zxJzJH!^a7lwM^bE+nWanQ>gCdoD
zkKccExjKzlDwn_fQS+TUPfs#Yv1*nVwl1Ih_HmM*Kh|U6z3s#6>5w$Yl%R1qY2*3)
zQ}a+Pfnc4^MAeyN@Cod5LhimohkT+n?2OIqHh%R7l|U|Yvr$@0%bdNbJm2Uz?{;98
z-a5Wx+s7Tp*;UMOZA!+);;ZpE_~naChqS^a#a!e?tSaNoCI)zy(K>
zdx-YBqd$7qqn8pjPo`Glxwn%q^!PxXTHNVghmJcV0}cH{Lmu~aZA%y(3F&_wnK|~U
zYAj_|zL&CG{z>Jw7e^P9pshT{1UY3;^zw0k8Gn6g*#2__$AQttXa~$*THW0zy*GZS
zC8tydrjDfU(i|+A2`TFOH&w^=j$(JQ{Kum&FfTI)yTI7Cm+!S?Fh6e#z3TCkC#Db1
z8~Cba3_)`_-EHj|3gP~5_@A!7zuJ*Zuvqjws$gS5i{nndJvR1f(8*78Pe0pcpef*p
zXr8aN>*l)==5SKVhVeFy`RPP;ufn;~k%xE##yFw>^<+gk#nfi8ZoMz>BTa}|yimRM
z3vpnb`EF5={nwp*s~jOgFcaKxx5IgQU(b$c4dLwW_Z2F`>n{E&+Y*s}Vy3rXKK!Xs
z$C$~AVvi${o0lv=;f+6IOx0Q@LYc7$S--$}94Mje{<
zr>Q)s%`sz8=@i`Ji4v)^WazZ@Qk<}6vr7HSI4as|gtR=o00
zVBAJti8VgQdY{Hz=fUC3jQI35n9zADHuD=+Wp`dIDgBwKLfBD^wLI4I+*r=MUbV`*
z{@um*N`9KdSGNv&owI0W+0dUl`Mo!3o#*a&Zz|*xe>S`|bPJ-ZR(;vG4ZHvfxasFR
z==e6|jABY0DSbSo@h9y3jGa08g`Uh#slGPB`WmR`M>y#f_dT<*g{FFnH#n2q{5$DR&66d*6$=G*(4aPZMZtO)C}
z3mfp)=5HRo%M52RoAjye)5CO}?|UinTR)#emE`L0rJfbzD`N`l?d0Qhnla54+~gC)
zn-AfkX!Kk9Q=d15wD5hU^?a=8eylWaR&X$IS(crF;gJ1C_06w34ienQQUv=bU+(
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/src/modules/keyboardq/data/button_bkg_right.png b/src/modules/keyboardq/data/button_bkg_right.png
new file mode 100755
index 0000000000000000000000000000000000000000..ce7c4ad7146a5fe93dffe60cd90024de6b2ff6d7
GIT binary patch
literal 5955
zcmYjVdpy(a``@t1xx$*`o;=AhlvZ-gQ$tE2=EG8(<&cReltT`4sE9m8;*lcKj6O@|
z(7_Oj%9B_QNs)RSO7u*T?00{*p6~1Thu7@0`*U5_eO>SO`?~Mztm|G!1zB}j6bhxV
z%W0=O_}q;`q19Jl!GGRUEP3#OKJM=L2detH<^=d66=?5bk3w;><(6m|@LlGZllO5H
zO0gCBLwAH#90m{7PLQAz`@;fGMAIVtQO9UULQj~4`k(l1vx%9>#;xX|#dH)3SF>xU
zy~oLepN4mZX&%w)n8hZclAJbq2W}cDdd4ZTiOM^xcTX#@=-q}dt0Ad1Qd{ejs0U@7
zj%`2296JD|I2=n+{tdehoAyCi^;yqX&^vQ0hV_XRqxtcR=V<=~>*GbAtJT#fl-|TI
zp6EYLpb&f#IJWScy3+v<0^{3aLZA5@x@${QNNc5;DqOXWv-peKq2W3YF&M2k`8AH&
zY25@n?T26AKl!q|`|1lv{)qfP`}q6VGf+2s2mj`VZ53Q~&EhL+jR77VSqj-0%b0)v
zX|xL9OkdR7E5EPUlK7X^@qm-duN&U=+wY4<{Km4c6YQXvFyFv
z`sO4_>9p#tBXRq=3BuC@8e#W2Yac8xPL+K>o)`b+ZSyo?dU|Q;%V3XtS_kgC?og`2
zXF}S)j41{`Q}ATV3t1?>G&QEEJ@G9EbI|vIX7!t<8E(B$y(g?H%=_lh9~Yq;uoErE
zj<@Cbv2-PZ_Eld9|K>rYkriJ}T`$89I#f50=H>)3nbJg@fw4REUWt{FXcaVN8P?G_
z)YYZ<>GvIrWrE(t*A7W)eEXrh;#D`Wy`*cLhnhp=&u=1Mu6};Q4px+KkX_5&$nQdb
zu#9-`6t%_QXVV*E0_}l+)fD?mYfJ+VN*{Q6GhJytMeTU4DW$jw_Y`^BPrTAKe0M=T
z&}D~T-BOw$^$1Uj-zD81bEx5jL1D4l>WhOjK0}4c3W{3p&q?ksoU69
zwW*xlS=qFNI*Z->y++pTDone5LR{WbX`3}WV$=|BME_1aV?uv$g^XYM^R=bx*~ss3
zi%u#@JwpX&pnq9?r&q%%yz;BrJ;ER4V?Du8`lo?=|NnOERbWmS
znyibkd3xb=Sa@5lB4a9<^YFm-yH!&O*f!nC7CzA;VkeS^RAOg(1c(V_B%eDrZDF_d
zBe!}4>abz|-s(lYSikcb@#m~ZGGoE?c_y75%2U+*8-asD#k2lKi>UK~^G$c67E>#`mQt{$^_WI@}TC9??qHv+4~d0jBTOdzGs8q1VG(aK>@vz2cwF_p6>-
z8y)AFENSzNERS`}HU#(q6{3U4&XZ&_dfyJ75quz{hg2I{^jaZR5`>|$ba)S(FIZuHDm1CyD%N_;Ea
z0#);$q+JTe2JEF*^2ZwG&U{MJJxgN0{@3fk5PCN*!)UcKdo%A(o(_T0t*tnBioM+Y
z=kT4A)hl*7Q+FNpK4rH4=5Loci;`gJgrq(K>?26&;Gl~%taw0(^s`sQoW^JGQmcw|h{YLT;koA8_n}G@|zxwF9CQu4EKg#fmN5mEkO6
zN?p?WggEXKco8$^!u+#M;#y{H4)xjRzV6{tqUL)q?$l;Jt#E}1J|a&gKJ14)7Q86c
z)s%0Z~hjy061`U=oGh3U1IPf(K=x%a9%^UEX~uEGtz0
zR%^);Z}9OUMF^z=yl1pWj7!(&EM(8XSz2E~+>A`pf_n1L
zODV2ksRJ#Sr~~q#mqobUUSjR+xzN1zS%Q2z(R_?9kjABwPF-Tnp
zZ^Z}bC$q@XA7T)J?>|5^S~#YupFl2Zve)1n8Pg}W%36u<@_YOAs5=@|QDn@vS8D2H
znkT0GML}{-O9_fROxZrZAGj}-r5EkNvQzr7c!O(keZaidMzc5dH&gngGF7si*EURY
z7NzC0G#nCqR5I46K1d*k%>CTl%}!JW0fG8nKn_&XUtlugJ2u@E)g^!~hU}kY_C6
zJ_3Ena&AsJ*EV{{T-D6>$TeJs$XJ15r5zlEUv`uP=>#)viMMiTL+=D7CREAu5Naa;LX`JL+Ab^4r1I@lgm@iFsU|_dw-RcE;
z2omHhbkm&e!7G8qII&WLH(nGSq>U#b#M3ZZES%2BCpI0eWrd-ER3+!UzMe&f6`Db8Q2QgDXcF
zl^m6Vbjg>g0^qEuswG%5(~pCHFJ+|2&g8mL(;~T8aTU(B`C;}W5XC411p0B@(N?kZ
zA(~=qhB#ok9U-%g?}9QY`#Lfu
zNcJ2HeqPiC07X9ArwVC-^45y&5EaO>R5#K8dLB0X`)iAKOR!go_UYKCQn?TQ%ANiX
z6##%pwT-B=1Diy}L{edt61jZ8by8ywRe&a^=gRhrhI@*oFZR2R?+?oqo=FIGr&A&GNTWwvcMJ%BP&0Qf^PUK*SRf?TyhiN6BL3g!l@
z)fqFLyg@io>NpGCpaMN$^|h{^HN@8~*cRh71}h@|gQSS^D!((JF;
z69#JVZjM+<`!+-INu1aJ)kKv)-bHO##DJo3PW)FC?>JSyL$d0Nf+W!TP#Mk6=uH31
z@F41U3`w1_Z%e*4xtN+OW^4g<w)J2l$&wbjUr
z=Pa4&@9--R#yEizf2FuK=bB3%Hbdm!jor^`JP*8^73b
zXhnv-Z$pHx8f;|yKXSA{Yjkk}H15&lYPKvRd=)t77;*+trR9JoBp`zbvBIG>2dQN!
zTK6kD+X#`G>pbb6)M
z-jyP&Q+3(4yis@&D>>z?R=Hs_h7<`^KWsMSG)jo14d@}zmx@u2NiJM2ZB$Cc(AC6b
z(eu#4N&5Ks7}5k7?%`|#h-f=-$ZBnj@ua)G`k!Jd8mS_VgDQXVGQaH=%|(gqP>2h8
zlDD4+)CvdA0B1$*L6+`oLKDceZ(2uIHUqGN*bidA9hPj25d_OHq{?3mO5F?2COi^J
zuN$$sG0Fw;Bqpq5pA;adjF03m)+Faj^m|hFg66v`;w3gBSeRbJm9f6xFRw6fHrE%Fq
z;pe6A9my8Pr3l`=eRNh?H=m`F)tNq*?P>C*{>b#Fy2}@(DBSTZ&hlS0F;M29&lBgf
z+q%*3u1z+#1j%ObCFi+ST~_<9CJO8k_48w0u&cP&-(xZMzK(?#owkE~UA8me
z%-C<5{8$Z315BbuUwsMh$2X3ke$I7C-Y7rac~z!eZ2cUnLI@qoC479&S*LPbM|EH3
zz;OScb55t&pN69QXQ!TpkV1!JD4^pbaxtFJsY%f(RW_D=q(^x+IjGKi~p=c2Xp0wz>UIeAm2N%g=WDyOn
zY_+NjQy5Xxx_vt2CH*KQvzt4A)<{{A|Dc=<}i>wO;-6U}ymX5k>r1dMvP*?cY(UR28U3
zUY2%nd5&$%yYu=fx8HBx=<;4XN>aMw%%y$woOaReJr0ClVvV2LbTxCi-SQI6=H#&i
zX!^~U<@ml~cI-Eg=(OmWH>c1ZduZq9t{?b+ev+#8L^Tt9iq+``cz691dUAh7$cm!q
z`EPuaN?IzKwQ^c+jgjg-W^sa&hor!CYrijLWY+tO7e7>KN;N;@c8Btd?5f+6y70jy
ze@d=R_;aoPY%Bew+S=xN@_bOFYK72yu$-a%++`9iFOJsNeC@VoW8?{;2I!t@{DyLo1VYz=OmMBloY^
z2sOHUg+UK69=iNVR(36scXF+twaeQ-XD?Uv40M~e_E1H`xMVSi5OrxU(dmt+6mRTp
zVu$$@-(u>t`aFRTo`zre2VZM{)n|9-VPL#1_FOxpp@ehTkK8OII`g8F5AX7Q~?Z2&K@@=-2H+hf15C2v3t{;AeAzv9OVA+DX^4Odl`=CT
zjks*R`JEPZT|b*g2Tw&^N$us`eA4Pn$Q-eQJKoBF3~k^pGk)?%-Oao#?2bG^-@e&A
zSddM$$#efE77B_0$D_e<_ZGYxty+SwN
z@~ur;@Xt?M6FOIOU<*2pzH)}2)4FzjZc|Nuk{x#*nzHO_+wwLs-{0ucPGyzR?a$QC
zZ|gzExd)!Sf5Y5IiEusIhBj-8h<{{%#maNpFP{1!?B~;%?!|M0*9El?gCg%>CeoNf
aNn=Hcm+F7`RDc;bY8Pqm&gws?$^QpEvgoh?

literal 0
HcmV?d00001

diff --git a/src/modules/keyboardq/data/button_bkg_right.png.license b/src/modules/keyboardq/data/button_bkg_right.png.license
new file mode 100644
index 0000000000..d36c167bbd
--- /dev/null
+++ b/src/modules/keyboardq/data/button_bkg_right.png.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2019 MarcoPellin 
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/src/modules/keyboardq/data/de.xml b/src/modules/keyboardq/data/de.xml
new file mode 100644
index 0000000000..55513157ed
--- /dev/null
+++ b/src/modules/keyboardq/data/de.xml
@@ -0,0 +1,66 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/empty.xml b/src/modules/keyboardq/data/empty.xml
new file mode 100644
index 0000000000..74e913a071
--- /dev/null
+++ b/src/modules/keyboardq/data/empty.xml
@@ -0,0 +1,64 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/en.xml b/src/modules/keyboardq/data/en.xml
new file mode 100644
index 0000000000..2ab9a344de
--- /dev/null
+++ b/src/modules/keyboardq/data/en.xml
@@ -0,0 +1,64 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/enter.svg b/src/modules/keyboardq/data/enter.svg
new file mode 100755
index 0000000000..c66a749213
--- /dev/null
+++ b/src/modules/keyboardq/data/enter.svg
@@ -0,0 +1,43 @@
+
+
+
+
+
+	
+		
+	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/keyboardq/data/enter.svg.license b/src/modules/keyboardq/data/enter.svg.license
new file mode 100644
index 0000000000..36158c6040
--- /dev/null
+++ b/src/modules/keyboardq/data/enter.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2019 https://www.onlinewebfonts.com/fonts
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/src/modules/keyboardq/data/es.xml b/src/modules/keyboardq/data/es.xml
new file mode 100644
index 0000000000..6f69c9cbeb
--- /dev/null
+++ b/src/modules/keyboardq/data/es.xml
@@ -0,0 +1,64 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/fr.xml b/src/modules/keyboardq/data/fr.xml
new file mode 100644
index 0000000000..0f77c3f06a
--- /dev/null
+++ b/src/modules/keyboardq/data/fr.xml
@@ -0,0 +1,66 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/generic.xml b/src/modules/keyboardq/data/generic.xml
new file mode 100644
index 0000000000..7304626c4c
--- /dev/null
+++ b/src/modules/keyboardq/data/generic.xml
@@ -0,0 +1,64 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/generic_qz.xml b/src/modules/keyboardq/data/generic_qz.xml
new file mode 100644
index 0000000000..c896f59fff
--- /dev/null
+++ b/src/modules/keyboardq/data/generic_qz.xml
@@ -0,0 +1,66 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/pt.xml b/src/modules/keyboardq/data/pt.xml
new file mode 100644
index 0000000000..0142260ee9
--- /dev/null
+++ b/src/modules/keyboardq/data/pt.xml
@@ -0,0 +1,64 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/ru.xml b/src/modules/keyboardq/data/ru.xml
new file mode 100644
index 0000000000..38f2b6836b
--- /dev/null
+++ b/src/modules/keyboardq/data/ru.xml
@@ -0,0 +1,64 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/scan.xml b/src/modules/keyboardq/data/scan.xml
new file mode 100644
index 0000000000..76981f3c13
--- /dev/null
+++ b/src/modules/keyboardq/data/scan.xml
@@ -0,0 +1,64 @@
+
+
+
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+
diff --git a/src/modules/keyboardq/data/shift.license b/src/modules/keyboardq/data/shift.license
new file mode 100644
index 0000000000..36158c6040
--- /dev/null
+++ b/src/modules/keyboardq/data/shift.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2019 https://www.onlinewebfonts.com/fonts
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/src/modules/keyboardq/data/shift.svg b/src/modules/keyboardq/data/shift.svg
new file mode 100755
index 0000000000..825ba649b1
--- /dev/null
+++ b/src/modules/keyboardq/data/shift.svg
@@ -0,0 +1,7 @@
+
+
+
+
+ Svg Vector Icons : http://www.onlinewebfonts.com/icon 
+
+
diff --git a/src/modules/keyboardq/keyboardq.qml b/src/modules/keyboardq/keyboardq.qml
index 8f8bf05d1f..1d59cf30e8 100644
--- a/src/modules/keyboardq/keyboardq.qml
+++ b/src/modules/keyboardq/keyboardq.qml
@@ -1,200 +1,138 @@
-/* === This file is part of Calamares -  ===
+/* === This file is part of Calamares -  ===
  *
- *   SPDX-FileCopyrightText: 2020 Anke Boersma 
+ *   SPDX-FileCopyrightText: 2020 - 2021 Anke Boersma 
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ *   Calamares is Free Software: see the License-Identifier above.
  *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see .
  */
 
 import io.calamares.core 1.0
 import io.calamares.ui 1.0
 
-import QtQuick 2.10
-import QtQuick.Controls 2.10
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 import QtQuick.Window 2.14
 import QtQuick.Layouts 1.3
 
 import org.kde.kirigami 2.7 as Kirigami
+import "data"
 
-Page {
+Item {
     width: 800 //parent.width
-    height: 500
-
-     StackView {
-        id: stack
+    height: 600
+
+    readonly property color backgroundColor: "#E6E9EA" //Kirigami.Theme.backgroundColor
+    readonly property color listBackgroundColor: "white"
+    readonly property color textFieldColor: "#121212"
+    readonly property color textFieldBackgroundColor: "#F8F8F8"
+    readonly property color textColor: Kirigami.Theme.textColor
+    readonly property color highlightedTextColor: Kirigami.Theme.highlightedTextColor
+    readonly property color highlightColor: Kirigami.Theme.highlightColor
+
+    property var langXml: ["de", "en", "es", "fr", "ru",]
+    property var arXml: ["Arabic"]
+    property var ruXml: ["Azerba", "Belaru", "Kazakh", "Kyrgyz", "Mongol",
+        "Russia", "Tajik", "Ukrain"]
+    property var frXml: ["Bambar", "Belgia","French", "Wolof"]
+    property var enXml: ["Bikol", "Chines", "Englis", "Irish", "Lithua", "Maori"]
+    property var esXml: ["Spanis"]
+    property var deXml: ["German"]
+    property var ptXml: ["Portug"]
+    property var scanXml: ["Danish", "Finnis", "Norweg", "Swedis"]
+    property var afganiXml: ["Afghan"]
+    property var genericXml: ["Armeni", "Bulgar", "Dutch", "Estoni", "Icelan",
+        "Indone", "Italia", "Latvia", "Maltes", "Moldav", "Romani", "Swahil", "Turkis"]
+    property var genericQzXml: ["Albani", "Bosnia", "Croati", "Czech", "Hungar",
+        "Luxemb", "Monten", "Polish", "Serbia", "Sloven", "Slovak"]
+    property var genericAzXml: []
+
+    property var keyIndex: []
+
+    Rectangle {
+        id: backgroundItem
         anchors.fill: parent
-        clip: true
-
-        initialItem: Item {
+        color: backgroundColor
+
+        Label {
+            id: header
+            anchors.horizontalCenter: parent.horizontalCenter
+            text: qsTr("To activate keyboard preview, select a layout.")
+            color: textColor
+            font.bold: true
+        }
 
-            Label {
+        Label {
+            id: intro
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.top: header.bottom
+            color: textColor
+            horizontalAlignment: Text.AlignHCenter
+            width: parent.width / 1.2
+            wrapMode: Text.WordWrap
+            text: ( config.prettyStatus)
+        }
 
-                id: header
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: qsTr("Keyboard Model")
-                color: Kirigami.Theme.textColor
-                font.bold: true
-                font.weight: Font.Bold
-                font.pointSize: 24
-            }
+        RowLayout {
+            id: models
+            anchors.top: intro.bottom
+            anchors.topMargin: 10
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: parent.width /1.5
+            spacing: 10
 
             Label {
-
-                anchors.horizontalCenter: parent.horizontalCenter
-                anchors.top: header.bottom
-                color: Kirigami.Theme.textColor
-                horizontalAlignment: Text.AlignHCenter
-                width: parent.width / 1.5
-                wrapMode: Text.WordWrap
-                text: qsTr("Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.")
+                Layout.alignment: Qt.AlignCenter
+                text: qsTr("Keyboard Model:")
+                color: textColor
+                font.bold: true
             }
 
-            ListView {
-
-                id: list1
-
-                ScrollBar.vertical: ScrollBar {
-
-                    active: true
-                }
-
-                width: parent.width / 2
-                height: 250
-                anchors.centerIn: parent
-                anchors.verticalCenterOffset: -30
-                focus: true
-                clip: true
-                boundsBehavior: Flickable.StopAtBounds
-                spacing: 2
-
-                Rectangle {
-
-                    z: parent.z - 1
-                    anchors.fill: parent
-                    color: "#BDC3C7"
-                    radius: 5
-                    opacity: 0.7
-                }
-
+            ComboBox {
+                Layout.fillWidth: true
+                textRole: "label"
                 model: config.keyboardModelsModel
-                //model: ["Africa", "America", "Antarctica", "Arctic", "Asia", "Atlantic", "Australia", "Europe", "Indian", "Pacific"]
-
                 currentIndex: model.currentIndex
-                delegate: ItemDelegate {
-
-                    hoverEnabled: true
-                    width: parent.width
-                    highlighted: ListView.isCurrentItem
-
-                    RowLayout {
-                        anchors.fill: parent
-
-                        Label {
-
-                            text: model.label // modelData
-                            Layout.fillHeight: true
-                            Layout.fillWidth: true
-                            width: parent.width
-                            height: 32
-                            color: highlighted ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
-
-                            background: Rectangle {
-
-                                color: highlighted || hovered ? Kirigami.Theme.highlightColor : "white" //Kirigami.Theme.backgroundColor
-                                opacity: highlighted || hovered ? 0.5 : 0.3
-                            }
-                        }
-
-                        Kirigami.Icon {
-
-                            source: "checkmark"
-                            Layout.preferredWidth: 22
-                            Layout.preferredHeight: 22
-                            color: Kirigami.Theme.highlightedTextColor
-                            visible: highlighted
-                        }
-                    }
-
-                    onClicked: {
-
-                        list1.model.currentIndex = index
-                        stack.push(layoutsList)
-                        list1.positionViewAtIndex(index, ListView.Center)
-                    }
-                }
+                onCurrentIndexChanged: config.keyboardModels = currentIndex
             }
         }
 
-        Component {
-            id: layoutsList
-
-            Item {
-
-                Label {
+        StackView {
+            id: stack
+            anchors.top: models.bottom
+            anchors.topMargin: 10
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.bottom: parent.bottom
+            clip: true
 
-                id: header
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: qsTr("Keyboard Layout")
-                color: Kirigami.Theme.textColor
-                font.bold: true
-                font.weight: Font.Bold
-                font.pointSize: 24
-                }
-
-                Label {
-
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    anchors.top: header.bottom
-                    color: Kirigami.Theme.textColor
-                    horizontalAlignment: Text.AlignHCenter
-                    width: parent.width / 1.5
-                    wrapMode: Text.WordWrap
-                    text: config.prettyStatus
-                    //text: qsTr("Set keyboard model or use the default one based on the detected hardware.")
-                }
+            initialItem: Item {
 
                 ListView {
-
-                    id: list2
+                    id: layouts
 
                     ScrollBar.vertical: ScrollBar {
-
                         active: true
                     }
 
                     width: parent.width / 2
-                    height: 250
-                    anchors.centerIn: parent
-                    anchors.verticalCenterOffset: -30
+                    height: 200
+                    anchors.horizontalCenter: parent.horizontalCenter
                     focus: true
                     clip: true
                     boundsBehavior: Flickable.StopAtBounds
                     spacing: 2
 
                     Rectangle {
-
                         z: parent.z - 1
                         anchors.fill: parent
-                        color: "#BDC3C7"
-                        radius: 5
+                        color: listBackgroundColor
                         opacity: 0.7
                     }
 
                     model: config.keyboardLayoutsModel
-                    //model: ["Brussels", "London", "Madrid", "New York", "Melbourne", "London", "Madrid", "New York", "Brussels", "London", "Madrid", "New York", "Brussels", "London", "Madrid", "New York"]
-
                     currentIndex: model.currentIndex
+                    Component.onCompleted: positionViewAtIndex(model.currentIndex, ListView.Center)
                     delegate: ItemDelegate {
 
                         hoverEnabled: true
@@ -202,203 +140,169 @@ Page {
                         highlighted: ListView.isCurrentItem
 
                         RowLayout {
-                        anchors.fill: parent
+                            anchors.fill: parent
 
                             Label {
-
-                                text: model.label // modelData
+                                id: label1
+                                text: model.label
                                 Layout.fillHeight: true
                                 Layout.fillWidth: true
+                                padding: 10
                                 width: parent.width
-                                height: 30
-                                color: highlighted ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
+                                height: 32
+                                color: highlighted ? highlightedTextColor : textColor
 
                                 background: Rectangle {
-
-                                    color: highlighted || hovered ? Kirigami.Theme.highlightColor : "white" //Kirigami.Theme.backgroundColor
+                                    color: highlighted || hovered ? highlightColor : listBackgroundColor
                                     opacity: highlighted || hovered ? 0.5 : 0.3
                                 }
                             }
-
-                            Kirigami.Icon {
-
-                                source: "checkmark"
-                                Layout.preferredWidth: 22
-                                Layout.preferredHeight: 22
-                                color: Kirigami.Theme.highlightedTextColor
-                                visible: highlighted
-                            }
                         }
 
                         onClicked: {
 
-                            list2.model.currentIndex = index
+                            layouts.model.currentIndex = index
+                            keyIndex = label1.text.substring(0,6)
                             stack.push(variantsList)
-                            list2.positionViewAtIndex(index, ListView.Center)
+                            layouts.positionViewAtIndex(index, ListView.Center)
                         }
                     }
                 }
+                Button {
 
-                ColumnLayout {
-
-                    spacing: 2
+                    Layout.fillWidth: true
                     anchors.verticalCenter: parent.verticalCenter
-                    anchors.verticalCenterOffset: -30
-                    anchors.left: parent.left 
+                    anchors.verticalCenterOffset: -parent.height / 3.5
+                    anchors.left: parent.left
                     anchors.leftMargin: parent.width / 15
-
-                    Button {
-
-                        icon.name: "go-previous"
-                        text: qsTr("Models")
-                        onClicked: stack.pop()
-                    }
-
-                    Button {
-
-                        icon.name: "go-next"
-                        text: qsTr("Variants")
-                        onClicked: stack.push(variantsList)
-                    }
+                    icon.name: "go-next"
+                    text: qsTr("Variants")
+                    onClicked: stack.push(variantsList)
                 }
             }
-        }
-
-        Component {
-            id: variantsList
-
-            Item {
-
-                Label {
-
-                    id: header
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    text: qsTr("Keyboard Variant")
-                    color: Kirigami.Theme.textColor
-                    font.bold: true
-                    font.weight: Font.Bold
-                    font.pointSize: 24
-                }
-
-                Label {
-
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    anchors.top: header.bottom
-                    color: Kirigami.Theme.textColor
-                    horizontalAlignment: Text.AlignHCenter
-                    width: parent.width / 1.5
-                    wrapMode: Text.WordWrap
-                    text: config.prettyStatus
-                    //text: qsTr("Variant keyboard model or use the default one based on the detected hardware.")
-                }
-
-                ListView {
-
-                    id: list3
-
-                    ScrollBar.vertical: ScrollBar {
-
-                        active: true
-                    }
 
-                    width: parent.width / 2
-                    height: 250
-                    anchors.centerIn: parent
-                    anchors.verticalCenterOffset: -30
-                    focus: true
-                    clip: true
-                    boundsBehavior: Flickable.StopAtBounds
-                    spacing: 2
-
-                    Rectangle {
-
-                        z: parent.z - 1
-                        anchors.fill: parent
-                        color: "#BDC3C7"
-                        radius: 5
-                        opacity: 0.7
-                    }
-
-                    model: config.keyboardVariantsModel
-                    //model: ["Brussels", "London", "Madrid", "New York", "Melbourne", "London", "Madrid", "New York", "Brussels", "London", "Madrid", "New York", "Brussels", "London", "Madrid", "New York"]
-
-                    currentIndex: model.currentIndex
-                    delegate: ItemDelegate {
+            Component {
+                id: variantsList
 
-                        hoverEnabled: true
-                        width: parent.width
-                        highlighted: ListView.isCurrentItem
+                Item {
 
-                        RowLayout {
-                        anchors.fill: parent
+                    ListView {
+                        id: variants
 
-                            Label {
+                        ScrollBar.vertical: ScrollBar {
+                            active: true
+                        }
 
-                                text: model.label //modelData
-                                Layout.fillHeight: true
-                                Layout.fillWidth: true
-                                width: parent.width
-                                height: 30
-                                color: highlighted ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
+                        width: parent.width / 2
+                        height: 200
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        anchors.topMargin: 10
+                        focus: true
+                        clip: true
+                        boundsBehavior: Flickable.StopAtBounds
+                        spacing: 2
+
+                        Rectangle {
+                            z: parent.z - 1
+                            anchors.fill: parent
+                            color: listBackgroundColor
+                            opacity: 0.7
+                        }
 
-                                background: Rectangle {
+                        model: config.keyboardVariantsModel
+                        currentIndex: model.currentIndex
+                        Component.onCompleted: positionViewAtIndex(model.currentIndex, ListView.Center)
 
-                                    color: highlighted || hovered ? Kirigami.Theme.highlightColor : "white" //Kirigami.Theme.backgroundColor
-                                    opacity: highlighted || hovered ? 0.5 : 0.3
+                        delegate: ItemDelegate {
+                            hoverEnabled: true
+                            width: parent.width
+                            highlighted: ListView.isCurrentItem
+
+                            RowLayout {
+                            anchors.fill: parent
+
+                                Label {
+                                    text: model.label
+                                    Layout.fillHeight: true
+                                    Layout.fillWidth: true
+                                    padding: 10
+                                    width: parent.width
+                                    height: 30
+                                    color: highlighted ? highlightedTextColor : textColor
+
+                                    background: Rectangle {
+                                        color: highlighted || hovered ? highlightColor : listBackgroundColor
+                                        opacity: highlighted || hovered ? 0.5 : 0.3
+                                    }
                                 }
                             }
 
-                            Kirigami.Icon {
-
-                                source: "checkmark"
-                                Layout.preferredWidth: 22
-                                Layout.preferredHeight: 22
-                                color: Kirigami.Theme.highlightedTextColor
-                                visible: highlighted
+                            onClicked: {
+                                variants.model.currentIndex = index
+                                variants.positionViewAtIndex(index, ListView.Center)
                             }
                         }
-
-                        onClicked: {
-
-                            list3.model.currentIndex = index
-                            list3.positionViewAtIndex(index, ListView.Center)
-                        }
                     }
-                }
-                
-                Button {
 
-                    Layout.fillWidth: true
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.verticalCenterOffset: -30
-                    anchors.left: parent.left 
-                    anchors.leftMargin: parent.width / 15
-                    icon.name: "go-previous"
-                    text: qsTr("Layouts")
-                    onClicked: stack.pop()
+                    Button {
+                        Layout.fillWidth: true
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.verticalCenterOffset: -parent.height / 3.5
+                        anchors.left: parent.left
+                        anchors.leftMargin: parent.width / 15
+                        icon.name: "go-previous"
+                        text: qsTr("Layouts")
+                        onClicked: stack.pop()
+                    }
                 }
             }
         }
-    }
 
-    TextField {
-
-        placeholderText: qsTr("Test your keyboard")
-        height: 48
-        width: parent.width / 1.5
-        horizontalAlignment: TextInput.AlignHCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: parent.height / 10
-        color: "#1F1F1F"
-
-        background:Rectangle {
+        TextField {
+            id: textInput
+            placeholderText: qsTr("Type here to test your keyboard")
+            height: 36
+            width: parent.width / 1.5
+            horizontalAlignment: TextInput.AlignHCenter
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.bottom: keyboard.top
+            anchors.bottomMargin: parent.height / 25
+            color: textFieldColor
+
+            background:Rectangle {
+                z: parent.z - 1
+                anchors.fill: parent
+                color: textFieldBackgroundColor
+                radius: 2
+            }
+        }
 
-            z: parent.z - 1
-            anchors.fill: parent
-            color: "#BDC3C7"
-            radius: 2
-            opacity: 0.3
+        Keyboard {
+            id: keyboard
+            width: parent.width
+            height: parent.height / 3
+            anchors.bottom: parent.bottom
+            source: langXml.includes(keyIndex) ? (keyIndex + ".xml") :
+                afganiXml.includes(keyIndex) ? "afgani.xml" :
+                scanXml.includes(keyIndex) ? "scan.xml" :
+                genericXml.includes(keyIndex) ? "generic.xml" :
+                genericQzXml.includes(keyIndex) ? "generic_qz.xml" :
+                arXml.includes(keyIndex) ? "ar.xml" :
+                deXml.includes(keyIndex) ? "de.xml" :
+                enXml.includes(keyIndex) ? "en.xml" :
+                esXml.includes(keyIndex) ? "es.xml" :
+                frXml.includes(keyIndex) ? "fr.xml" :
+                ptXml.includes(keyIndex) ? "pt.xml" :
+                ruXml.includes(keyIndex) ? "ru.xml" :"empty.xml"
+            rows: 4
+            columns: 10
+            keyColor: "transparent"
+            keyPressedColorOpacity: 0.2
+            keyImageLeft: "button_bkg_left.png"
+            keyImageRight: "button_bkg_right.png"
+            keyImageCenter: "button_bkg_center.png"
+            target: textInput
+            onEnterClicked: console.log("Enter!")
         }
     }
 }

From 73bfc6ca32fb88816aa2cda163eaa367adaa4b17 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 11:38:54 +0200
Subject: [PATCH 408/492] [libcalamares] Use structured bindings to unpack a
 std::pair

---
 src/libcalamares/locale/Translation.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libcalamares/locale/Translation.cpp b/src/libcalamares/locale/Translation.cpp
index 0a2e594be0..4afb1bbc83 100644
--- a/src/libcalamares/locale/Translation.cpp
+++ b/src/libcalamares/locale/Translation.cpp
@@ -56,11 +56,11 @@ Translation::Translation( const QString& locale, LabelFormat format, QObject* pa
     , m_locale( getLocale( locale ) )
     , m_localeId( locale.isEmpty() ? m_locale.name() : locale )
 {
-    auto special = specialCase( locale );
+    auto [ _, name ] = specialCase( locale );
 
     QString longFormat = QObject::tr( "%1 (%2)" );
 
-    QString languageName = special.second ? *special.second : m_locale.nativeLanguageName();
+    QString languageName = name ? *name : m_locale.nativeLanguageName();
     QString englishName = m_locale.languageToString( m_locale.language() );
 
     if ( languageName.isEmpty() )
@@ -87,8 +87,8 @@ Translation::getLocale( const QString& localeName )
         return QLocale();
     }
 
-    auto special = specialCase( localeName );
-    return special.first ? *special.first : QLocale( localeName );
+    auto [ locale, _ ] = specialCase( localeName );
+    return locale ? *locale : QLocale( localeName );
 }
 
 }  // namespace Locale

From ad1a4b647970dda2359110416342e87f0c71e641 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 11:42:32 +0200
Subject: [PATCH 409/492] [libcalamares] APIdox on Translation

---
 src/libcalamares/locale/Translation.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/libcalamares/locale/Translation.h b/src/libcalamares/locale/Translation.h
index db5be3c7c0..67de908219 100644
--- a/src/libcalamares/locale/Translation.h
+++ b/src/libcalamares/locale/Translation.h
@@ -86,7 +86,16 @@ class Translation : public QObject
     /** @brief Get the Qt locale. */
     QLocale locale() const { return m_locale; }
 
+    /** @brief Get the Qt-internal name (code) of the locale
+     *
+     * This is not necessarily the same as what is in id().
+     */
     QString name() const { return m_locale.name(); }
+    /** @brief Gets the Calamares internal name (code) of the locale.
+     *
+     * This is a strongly-typed return to avoid it ending up all over
+     * the place as a QString.
+     */
     Id id() const { return { m_localeId }; }
 
     /// @brief Convenience accessor to the language part of the locale

From 5f4e65bc773485f0f26d2c96106e170103792d35 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 12:35:37 +0200
Subject: [PATCH 410/492] [libcalamares] Code-format Retranslator, hide
 internal symbols

---
 src/libcalamares/utils/Retranslator.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index 2c1d2edb3e..48b61c12ac 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -19,6 +19,9 @@
 #include 
 #include 
 
+namespace
+{
+
 static bool s_allowLocalTranslations = false;
 
 /** @brief Helper class for loading translations
@@ -159,6 +162,8 @@ loadSingletonTranslator( TranslationLoader&& loader, QTranslator*& translator_p
     }
 }
 
+}  // namespace
+
 namespace CalamaresUtils
 {
 static QTranslator* s_brandingTranslator = nullptr;
@@ -211,13 +216,15 @@ Retranslator::eventFilter( QObject* obj, QEvent* e )
     return QObject::eventFilter( obj, e );
 }
 
-Retranslator* Retranslator::instance()
+Retranslator*
+Retranslator::instance()
 {
-    static Retranslator s_instance(nullptr);
+    static Retranslator s_instance( nullptr );
     return &s_instance;
 }
 
-void Retranslator::attach(QObject* o, std::function f)
+void
+Retranslator::attach( QObject* o, std::function< void() > f )
 {
     connect( instance(), &Retranslator::languageChanged, o, f );
     f();

From 3ff5896dc65320c30b1676dfb844e5918deff42b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 12:35:47 +0200
Subject: [PATCH 411/492] [libcalamares] Remove unused method

---
 src/libcalamares/locale/Translation.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/libcalamares/locale/Translation.h b/src/libcalamares/locale/Translation.h
index 67de908219..39b177351a 100644
--- a/src/libcalamares/locale/Translation.h
+++ b/src/libcalamares/locale/Translation.h
@@ -86,11 +86,6 @@ class Translation : public QObject
     /** @brief Get the Qt locale. */
     QLocale locale() const { return m_locale; }
 
-    /** @brief Get the Qt-internal name (code) of the locale
-     *
-     * This is not necessarily the same as what is in id().
-     */
-    QString name() const { return m_locale.name(); }
     /** @brief Gets the Calamares internal name (code) of the locale.
      *
      * This is a strongly-typed return to avoid it ending up all over

From 4e60f8af135f721570b4bf86e685db6ec5425c42 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 12:51:57 +0200
Subject: [PATCH 412/492] [libcalamares] Use strong types for locale Ids

Change the API to force strong type for more methods.
This cascades to a couple of consumers.
---
 src/libcalamares/locale/Translation.cpp       | 22 ++++++++++---------
 src/libcalamares/locale/Translation.h         |  6 ++---
 src/libcalamares/locale/TranslationsModel.cpp |  2 +-
 src/modules/locale/Config.cpp                 |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/libcalamares/locale/Translation.cpp b/src/libcalamares/locale/Translation.cpp
index 4afb1bbc83..fb8890e87d 100644
--- a/src/libcalamares/locale/Translation.cpp
+++ b/src/libcalamares/locale/Translation.cpp
@@ -25,8 +25,9 @@
  * Returns a pair of nullptrs for non-special cases.
  */
 static std::pair< QLocale*, QString* >
-specialCase( const QString& localeName )
+specialCase( const CalamaresUtils::Locale::Translation::Id& locale )
 {
+    const QString localeName = locale.name;
     if ( localeName == "sr@latin" )
     {
         static QLocale loc( QLocale::Language::Serbian, QLocale::Script::LatinScript, QLocale::Country::Serbia );
@@ -47,16 +48,16 @@ namespace Locale
 {
 
 Translation::Translation( QObject* parent )
-    : Translation( QString(), LabelFormat::IfNeededWithCountry, parent )
+    : Translation( { QString() }, LabelFormat::IfNeededWithCountry, parent )
 {
 }
 
-Translation::Translation( const QString& locale, LabelFormat format, QObject* parent )
+Translation::Translation( const Id& localeId, LabelFormat format, QObject* parent )
     : QObject( parent )
-    , m_locale( getLocale( locale ) )
-    , m_localeId( locale.isEmpty() ? m_locale.name() : locale )
+    , m_locale( getLocale( localeId ) )
+    , m_localeId( localeId.name.isEmpty() ? m_locale.name() : localeId.name )
 {
-    auto [ _, name ] = specialCase( locale );
+    auto [ _, name ] = specialCase( localeId );
 
     QString longFormat = QObject::tr( "%1 (%2)" );
 
@@ -65,11 +66,11 @@ Translation::Translation( const QString& locale, LabelFormat format, QObject* pa
 
     if ( languageName.isEmpty() )
     {
-        languageName = QString( "* %1 (%2)" ).arg( locale, englishName );
+        languageName = QString( "* %1 (%2)" ).arg( localeId.name, englishName );
     }
 
     bool needsCountryName = ( format == LabelFormat::AlwaysWithCountry )
-        || ( locale.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 1 );
+        || ( localeId.name.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 1 );
     QString countryName = ( needsCountryName ?
 
                                              m_locale.nativeCountryName()
@@ -80,14 +81,15 @@ Translation::Translation( const QString& locale, LabelFormat format, QObject* pa
 }
 
 QLocale
-Translation::getLocale( const QString& localeName )
+Translation::getLocale( const Id& localeId )
 {
+    const QString& localeName = localeId.name;
     if ( localeName.isEmpty() )
     {
         return QLocale();
     }
 
-    auto [ locale, _ ] = specialCase( localeName );
+    auto [ locale, _ ] = specialCase( localeId );
     return locale ? *locale : QLocale( localeName );
 }
 
diff --git a/src/libcalamares/locale/Translation.h b/src/libcalamares/locale/Translation.h
index 39b177351a..5e5ce33bac 100644
--- a/src/libcalamares/locale/Translation.h
+++ b/src/libcalamares/locale/Translation.h
@@ -60,9 +60,7 @@ class Translation : public QObject
      * The @p format determines whether the country name is always present
      * in the label (human-readable form) or only if needed for disambiguation.
      */
-    Translation( const QString& localeName,
-                 LabelFormat format = LabelFormat::IfNeededWithCountry,
-                 QObject* parent = nullptr );
+    Translation( const Id& localeId, LabelFormat format = LabelFormat::IfNeededWithCountry, QObject* parent = nullptr );
 
 
     /** @brief Define a sorting order.
@@ -103,7 +101,7 @@ class Translation : public QObject
      *
      * This obeys special cases as described in the class documentation.
      */
-    static QLocale getLocale( const QString& localeName );
+    static QLocale getLocale( const Id& localeId );
 
 private:
     QLocale m_locale;
diff --git a/src/libcalamares/locale/TranslationsModel.cpp b/src/libcalamares/locale/TranslationsModel.cpp
index af1bd18011..25d075df4e 100644
--- a/src/libcalamares/locale/TranslationsModel.cpp
+++ b/src/libcalamares/locale/TranslationsModel.cpp
@@ -29,7 +29,7 @@ TranslationsModel::TranslationsModel( const QStringList& locales, QObject* paren
 
     for ( const auto& l : locales )
     {
-        m_locales.push_back( new Translation( l, Translation::LabelFormat::IfNeededWithCountry, this ) );
+        m_locales.push_back( new Translation( { l }, Translation::LabelFormat::IfNeededWithCountry, this ) );
     }
 }
 
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index 9627fcfc3f..ce48edd824 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -370,7 +370,7 @@ localeLabel( const QString& s )
 {
     using CalamaresUtils::Locale::Translation;
 
-    Translation lang( s, Translation::LabelFormat::AlwaysWithCountry );
+    Translation lang( { s }, Translation::LabelFormat::AlwaysWithCountry );
     return lang.label();
 }
 

From 24162cb162369094537177ce68bdbbeda382cf0b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 15:47:30 +0200
Subject: [PATCH 413/492] i18n: repair language names for Chinese

Prompted by Linlinger, I've reconsidered the names of languages
in the drop-down in the welcome page. We already have the
infrastructure for assigning specific names / locales to
"Calamares locale names" (which match Transifex names, not
necessarily Qt names). Use that to put exactly two Chinese-
language translations in the drop-down:
- Simplified Chinese (code zh_CN)
- Traditional Chinese (code zh_TW)
Drop zh (which is a peculiar locale name anyway) and zh_HK
(which is Traditional Chinese, but using the geographic
boundary is a bit weird; we're going to ignore the
minor orthographic differences with Traditional Chinese
written elsewhere for now).

Note that this makes the drop-down show "Chinese"
in the English column, twice; the difference is visible
only in the native-language representation.

SEE #1741
---
 CMakeLists.txt                          |  4 ++--
 src/libcalamares/locale/Translation.cpp | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27fcda865a..99ee4330ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,9 +138,9 @@ set( _tx_complete az az_AZ ca de fi_FI he hi hr ja ko lt pt_BR sq
 set( _tx_good as be ca@valencia cs_CZ da fr fur it_IT ml nl pt_PT
     ru sk tg tr_TR vi zh_CN )
 set( _tx_ok ar ast bg bn el en_GB es es_MX es_PR et eu fa gl hu id
-    is mr nb pl ro si sl sr sr@latin th zh_HK )
+    is mr nb pl ro si sl sr sr@latin th )
 set( _tx_incomplete eo es_PE fr_CH gu id_ID ie kk kn ko_KR lo lv mk
-    ne ne_NP ru_RU te ur uz zh )
+    ne ne_NP ru_RU te ur uz )
 
 ### Required versions
 #
diff --git a/src/libcalamares/locale/Translation.cpp b/src/libcalamares/locale/Translation.cpp
index fb8890e87d..d439f51b7b 100644
--- a/src/libcalamares/locale/Translation.cpp
+++ b/src/libcalamares/locale/Translation.cpp
@@ -38,6 +38,18 @@ specialCase( const CalamaresUtils::Locale::Translation::Id& locale )
         static QString name = QStringLiteral( "Català (València)" );
         return { nullptr, &name };
     }
+    if ( localeName == "zh_CN" )
+    {
+        // Simplified Chinese, but drop the (China) from the name
+        static QString name = QStringLiteral( "简体中文" );
+        return { nullptr, &name };
+    }
+    if ( localeName == "zh_TW" )
+    {
+        // Traditional Chinese, but drop (Taiwan) from the name
+        static QString name = QStringLiteral( "繁體中文" );
+        return { nullptr, &name };
+    }
 
     return { nullptr, nullptr };
 }
@@ -70,11 +82,9 @@ Translation::Translation( const Id& localeId, LabelFormat format, QObject* paren
     }
 
     bool needsCountryName = ( format == LabelFormat::AlwaysWithCountry )
-        || ( localeId.name.contains( '_' ) && QLocale::countriesForLanguage( m_locale.language() ).count() > 1 );
-    QString countryName = ( needsCountryName ?
-
-                                             m_locale.nativeCountryName()
-                                             : QString() );
+        || ( !name && localeId.name.contains( '_' )
+             && QLocale::countriesForLanguage( m_locale.language() ).count() > 1 );
+    QString countryName = needsCountryName ? m_locale.nativeCountryName() : QString();
     m_label = needsCountryName ? longFormat.arg( languageName, countryName ) : languageName;
     m_englishLabel = needsCountryName ? longFormat.arg( englishName, QLocale::countryToString( m_locale.country() ) )
                                       : englishName;

From 06d12fc9246bdfd4d0ec787f3785715adf5b7953 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 8 Sep 2021 11:04:35 +0200
Subject: [PATCH 414/492] [packagechooser] Remove unneeded include

---
 src/modules/packagechooser/ItemAppStream.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/packagechooser/ItemAppStream.cpp b/src/modules/packagechooser/ItemAppStream.cpp
index 787db0b3f4..5d48bbfa29 100644
--- a/src/modules/packagechooser/ItemAppStream.cpp
+++ b/src/modules/packagechooser/ItemAppStream.cpp
@@ -13,7 +13,6 @@
  */
 #include "PackageModel.h"
 
-#include "locale/LabelModel.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
@@ -87,7 +86,6 @@ fromComponent( AppStream::Component& component )
         }
     }
 
-
     auto screenshots = component.screenshots();
     if ( screenshots.count() > 0 )
     {

From 438302fcf5b6ae26459613e73c8c7695c23fc491 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 16:31:24 +0200
Subject: [PATCH 415/492] i18n: Shuffle the build so that all the bits are in
 lang/

Move the CMake code responsible for building the translations from
the src/calamares directory (yeah, yeah, the translations need to
link into the executable) into lang/ (which is where the source
and other infrastructure lives).
---
 CMakeLists.txt               |  5 +++-
 lang/CMakeLists.txt          | 44 ++++++++++++++++++++++++++++++++++++
 src/calamares/CMakeLists.txt | 39 ++++----------------------------
 3 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99ee4330ed..b4ac779469 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -404,7 +404,10 @@ set(Calamares_WITH_QML ${WITH_QML})
 
 ### Transifex Translation status
 #
-# Construct language lists for use.
+# Construct language lists for use. This massages the language lists
+# for use with older Qt (which does not support Esperanto) and checks
+# for some obvious error. The actual work of compiling translations
+# is done in the lang/ directory.
 #
 if( Qt5_VERSION VERSION_GREATER 5.12.1 )
     # At least Qt 5.12.2 seems to support Esperanto in QLocale
diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 8658653ab2..72aae95886 100644
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -4,6 +4,14 @@
 #   SPDX-License-Identifier: BSD-2-Clause
 #
 ###
+#
+# This CMakeList handles the following i18n / language targets:
+#
+# - creating a translation test-tool
+# - building the Python (gettext-based) translations
+# - compiling all the Qt translations into a C++ file calamares-i18n.cxx
+# - defines an OBJECT LIBRARY calamares-i18n for linking the compiled
+#   translations into an executable.
 
 include( CalamaresAddTranslations )
 
@@ -18,3 +26,39 @@ install_calamares_gettext_translations( python
     FILENAME python.mo
     RENAME calamares-python.mo
 )
+
+### TRANSLATIONS
+#
+#
+set( TS_FILES "" )
+set( calamares_i18n_qrc_content "" )
+
+# calamares and qt language files
+foreach( lang ${CALAMARES_TRANSLATION_LANGUAGES} )
+    foreach( tlsource "calamares_${lang}" "tz_${lang}" "kb_${lang}" )
+        if( EXISTS "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts" )
+            string( APPEND calamares_i18n_qrc_content "${tlsource}.qm\n" )
+            list( APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts" )
+        endif()
+    endforeach()
+endforeach()
+
+set( trans_file calamares_i18n )
+set( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc )
+set( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/calamares-i18n.cxx )
+set( CALAMARES_TRANSLATIONS_SOURCE ${trans_outfile} )
+
+configure_file( ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${trans_infile} @ONLY )
+
+qt5_add_translation(QM_FILES ${TS_FILES})
+
+# Run the resource compiler (rcc_options should already be set)
+add_custom_command(
+    OUTPUT ${trans_outfile}
+    COMMAND "${Qt5Core_RCC_EXECUTABLE}"
+    ARGS ${rcc_options} --format-version 1 -name ${trans_file} -o ${trans_outfile} ${trans_infile}
+    MAIN_DEPENDENCY ${trans_infile}
+    DEPENDS ${QM_FILES}
+)
+
+add_library(calamares-i18n OBJECT ${trans_outfile})
diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index cf00dca37c..d06a53d83e 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -34,45 +34,15 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-### TRANSLATIONS
-#
-#
-set( TS_FILES "" )
-set( calamares_i18n_qrc_content "" )
-
-# calamares and qt language files
-foreach( lang ${CALAMARES_TRANSLATION_LANGUAGES} )
-    foreach( tlsource "calamares_${lang}" "tz_${lang}" "kb_${lang}" )
-        if( EXISTS "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts" )
-            set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}${tlsource}.qm\n" )
-            list( APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts" )
-        endif()
-    endforeach()
-endforeach()
-
-set( trans_file calamares_i18n )
-set( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc )
-set( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx )
-
-configure_file( ${CMAKE_SOURCE_DIR}/lang/calamares_i18n.qrc.in ${trans_infile} @ONLY )
-
-qt5_add_translation(QM_FILES ${TS_FILES})
-
-# Run the resource compiler (rcc_options should already be set)
-add_custom_command(
-    OUTPUT ${trans_outfile}
-    COMMAND "${Qt5Core_RCC_EXECUTABLE}"
-    ARGS ${rcc_options} --format-version 1 -name ${trans_file} -o ${trans_outfile} ${trans_infile}
-    MAIN_DEPENDENCY ${trans_infile}
-    DEPENDS ${QM_FILES}
-)
-
 ### EXECUTABLE
 #
 # "calamares_bin" is the main application, not to be confused with
 # the target "calamares" which is the non-GUI library part.
 #
-add_executable( calamares_bin ${calamaresSources} calamares.qrc ${trans_outfile} )
+# The calamares-i18n.cxx file -- full path in CALAMARES_TRANSLATIONS_SOURCE --
+# is created as a target in the lang/ directory. This is compiled to a
+# library (it's just the result of a QRC compile).
+add_executable( calamares_bin ${calamaresSources} calamares.qrc )
 target_include_directories( calamares_bin PRIVATE ${CMAKE_SOURCE_DIR} )
 set_target_properties(calamares_bin
     PROPERTIES
@@ -91,6 +61,7 @@ target_link_libraries( calamares_bin
     PRIVATE
         calamares
         calamaresui
+        calamares-i18n
         Qt5::Core
         Qt5::Widgets
         KF5::CoreAddons

From 683bad19fc03a2ea16ffc311456917b408d8322d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 17:15:30 +0200
Subject: [PATCH 416/492] i18n: introduce a "TranslationFix"

This is intended to apply translations to some common Qt UI components.

Example: a QMessageBox with standard buttons OK and Cancel; the text
for that is determined at startup using the system locale, and later
changes to the current locale or the current translation catalog,
do not affect OK and Cancel. It might be possible to load a catalog
with the right translation strings, except that there is no way to
know what the context or catalog **is** for the strings that are
used to label standard buttons: they can come from Qt base, or
the platform, or the theme. Merely loading the Qt Base translations
for the correct language does not help, because those translations
do not contain an "OK" string with the context used for standard
buttons.

Do the translation by hand; then we have all of the Calamares
languages covered, too, which is more than the Qt translations do.
---
 src/libcalamaresui/CMakeLists.txt             |  1 +
 src/libcalamaresui/widgets/TranslationFix.cpp | 40 +++++++++++++++++++
 src/libcalamaresui/widgets/TranslationFix.h   | 31 ++++++++++++++
 src/modules/welcome/WelcomePage.cpp           |  2 +
 4 files changed, 74 insertions(+)
 create mode 100644 src/libcalamaresui/widgets/TranslationFix.cpp
 create mode 100644 src/libcalamaresui/widgets/TranslationFix.h

diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 20fae9a19d..a704b74844 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -29,6 +29,7 @@ set( calamaresui_SOURCES
     widgets/ClickableLabel.cpp
     widgets/FixedAspectRatioLabel.cpp
     widgets/PrettyRadioButton.cpp
+    widgets/TranslationFix.cpp
     widgets/WaitingWidget.cpp
     ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
 
diff --git a/src/libcalamaresui/widgets/TranslationFix.cpp b/src/libcalamaresui/widgets/TranslationFix.cpp
new file mode 100644
index 0000000000..6bd2900be0
--- /dev/null
+++ b/src/libcalamaresui/widgets/TranslationFix.cpp
@@ -0,0 +1,40 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   SPDX-FileCopyrightText: 2021 Adriaan de Groot 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "TranslationFix.h"
+
+#include 
+#include 
+#include 
+
+namespace Calamares
+{
+
+void
+fixButtonLabels( QMessageBox* box )
+{
+    if ( !box )
+    {
+        return;
+    }
+
+    static std::pair< decltype( QMessageBox::Ok ), const char* > maps[]
+        = { { QMessageBox::Ok, QT_TRANSLATE_NOOP( "StandardButtons", "&OK" ) } };
+
+    for ( auto [ sb, label ] : maps )
+    {
+        auto* button = box->button( sb );
+        if ( button )
+        {
+            button->setText( QCoreApplication::translate( "StandardButtons", label ) );
+        }
+    }
+}
+
+}  // namespace Calamares
diff --git a/src/libcalamaresui/widgets/TranslationFix.h b/src/libcalamaresui/widgets/TranslationFix.h
new file mode 100644
index 0000000000..107dad67d1
--- /dev/null
+++ b/src/libcalamaresui/widgets/TranslationFix.h
@@ -0,0 +1,31 @@
+/* === This file is part of Calamares -  ===
+ *
+ *   SPDX-FileCopyrightText: 2021 Adriaan de Groot 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef LIBCALAMARESUI_WIDGETS_TRANSLATIONFIX_H
+#define LIBCALAMARESUI_WIDGETS_TRANSLATIONFIX_H
+
+#include "DllMacro.h"
+
+class QMessageBox;
+
+namespace Calamares
+{
+
+/** @brief Fixes the labels on the standard buttons of the message box
+ *
+ * Updates OK / Cancel / Yes / No because there does not
+ * seem to be a way to do so in the Retranslator code
+ * (in libcalamares) since the translated strings may come
+ * from a variety of platform-plugin sources and we can't
+ * guess the context.
+ */
+void UIDLLEXPORT fixButtonLabels( QMessageBox* );
+}  // namespace Calamares
+
+#endif
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index a82d873e9d..1ea3f2429b 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -26,6 +26,7 @@
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Retranslator.h"
+#include "widgets/TranslationFix.h"
 
 #include 
 #include 
@@ -251,6 +252,7 @@ WelcomePage::showAboutBox()
                         .arg( Calamares::Branding::instance()->versionedName() ),
                     QMessageBox::Ok,
                     this );
+    Calamares::fixButtonLabels( &mb );
     mb.setIconPixmap( CalamaresUtils::defaultPixmap(
         CalamaresUtils::Squid,
         CalamaresUtils::Original,

From 8c84ae9ff66bdcdab8babf6c6318e4dcfa59d61e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 17:20:07 +0200
Subject: [PATCH 417/492] [license] Remove unused header

---
 src/modules/license/LicensePage.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp
index cb5481a1ee..8700aad604 100644
--- a/src/modules/license/LicensePage.cpp
+++ b/src/modules/license/LicensePage.cpp
@@ -31,7 +31,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 

From dcfbb766dcf089e482700bf397d4ceeda8e1cefa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 17:24:24 +0200
Subject: [PATCH 418/492] [libcalamaresui] Use fixed standard-buttons labels

Move some of the texts to the new TranslationFix, from ViewManager,
and use them. Keep them in ViewManager, too, so that the translations
with context ViewManager are not removed just now.
---
 src/libcalamaresui/ViewManager.cpp            | 14 +++++++++-----
 src/libcalamaresui/widgets/TranslationFix.cpp |  9 +++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp
index f6edbfc2a0..57570ad64c 100644
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@@ -24,6 +24,7 @@
 #include "viewpages/BlankViewStep.h"
 #include "viewpages/ExecutionViewStep.h"
 #include "viewpages/ViewStep.h"
+#include "widgets/TranslationFix.h"
 
 #include 
 #include 
@@ -82,6 +83,12 @@ ViewManager::ViewManager( QObject* parent )
     connect( JobQueue::instance(), &JobQueue::finished, this, &ViewManager::next );
 
     CALAMARES_RETRANSLATE_SLOT( &ViewManager::updateButtonLabels );
+
+#ifdef PRESERVE_FOR_TRANSLATION_PURPOSES
+    tr( "&Yes" );
+    tr( "&No" );
+    tr( "&Close" );
+#endif
 }
 
 
@@ -176,15 +183,13 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
     {
         msgBox->setStandardButtons( QMessageBox::Yes | QMessageBox::No );
         msgBox->setDefaultButton( QMessageBox::No );
-        msgBox->button( QMessageBox::Yes )->setText( tr( "&Yes" ) );
-        msgBox->button( QMessageBox::No )->setText( tr( "&No" ) );
     }
     else
     {
         msgBox->setStandardButtons( QMessageBox::Close );
         msgBox->setDefaultButton( QMessageBox::Close );
-        msgBox->button( QMessageBox::Close )->setText( tr( "&Close" ) );
     }
+    Calamares::fixButtonLabels( msgBox );
     msgBox->show();
 
     cDebug() << "Calamares will quit when the dialog closes.";
@@ -516,8 +521,7 @@ ViewManager::confirmCancelInstallation()
                                                      "The installer will quit and all changes will be lost." );
     QMessageBox mb( QMessageBox::Question, title, question, QMessageBox::Yes | QMessageBox::No, m_widget );
     mb.setDefaultButton( QMessageBox::No );
-    mb.button( QMessageBox::Yes )->setText( tr( "&Yes" ) );
-    mb.button( QMessageBox::No )->setText( tr( "&No" ) );
+    Calamares::fixButtonLabels( &mb );
     int response = mb.exec();
     return response == QMessageBox::Yes;
 }
diff --git a/src/libcalamaresui/widgets/TranslationFix.cpp b/src/libcalamaresui/widgets/TranslationFix.cpp
index 6bd2900be0..1262fceb53 100644
--- a/src/libcalamaresui/widgets/TranslationFix.cpp
+++ b/src/libcalamaresui/widgets/TranslationFix.cpp
@@ -24,8 +24,13 @@ fixButtonLabels( QMessageBox* box )
         return;
     }
 
-    static std::pair< decltype( QMessageBox::Ok ), const char* > maps[]
-        = { { QMessageBox::Ok, QT_TRANSLATE_NOOP( "StandardButtons", "&OK" ) } };
+    static std::pair< decltype( QMessageBox::Ok ), const char* > maps[] = {
+        { QMessageBox::Ok, QT_TRANSLATE_NOOP( "StandardButtons", "&OK" ) },
+        { QMessageBox::Yes, QT_TRANSLATE_NOOP( "StandardButtons", "&Yes" ) },
+        { QMessageBox::No, QT_TRANSLATE_NOOP( "StandardButtons", "&No" ) },
+        { QMessageBox::Cancel, QT_TRANSLATE_NOOP( "StandardButtons", "&Cancel" ) },
+        { QMessageBox::Close, QT_TRANSLATE_NOOP( "StandardButtons", "&Close" ) },
+    };
 
     for ( auto [ sb, label ] : maps )
     {

From 7516740bbf4b5f168251b5c41d40afaea29ea900 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 7 Sep 2021 17:57:22 +0200
Subject: [PATCH 419/492] [interactiveterminal] Fix up standard buttons

---
 .../interactiveterminal/InteractiveTerminalPage.cpp        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp
index 65818aa030..afd39936b5 100644
--- a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp
+++ b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp
@@ -13,6 +13,7 @@
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "viewpages/ViewStep.h"
+#include "widgets/TranslationFix.h"
 
 #include 
 #include 
@@ -40,8 +41,10 @@ InteractiveTerminalPage::InteractiveTerminalPage( QWidget* parent )
 void
 InteractiveTerminalPage::errorKonsoleNotInstalled()
 {
-    QMessageBox::critical(
-        this, tr( "Konsole not installed" ), tr( "Please install KDE Konsole and try again!" ), QMessageBox::Ok );
+    QMessageBox mb(QMessageBox::Critical,
+        tr( "Konsole not installed" ), tr( "Please install KDE Konsole and try again!" ), QMessageBox::Ok );
+    Calamares::fixButtonLabels( &mb );
+    mb.exec();
 }
 
 void

From 6e0a8d8ca198816026a0a1983c9a27655f504764 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 8 Sep 2021 10:58:33 +0200
Subject: [PATCH 420/492] [libcalamaresui] Translate button texts for
 paste-message

---
 src/libcalamaresui/utils/Paste.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp
index a29d6d3627..9190fcf5c7 100644
--- a/src/libcalamaresui/utils/Paste.cpp
+++ b/src/libcalamaresui/utils/Paste.cpp
@@ -13,6 +13,7 @@
 #include "DllMacro.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
+#include "widgets/TranslationFix.h"
 
 #include 
 #include 
@@ -166,8 +167,12 @@ CalamaresUtils::Paste::doLogUploadUI( QWidget* parent )
         pasteUrlMessage = pasteUrlFmt.arg( pasteUrl );
     }
 
-    QMessageBox::critical(
-        nullptr, QCoreApplication::translate( "Calamares::ViewManager", "Install Log Paste URL" ), pasteUrlMessage );
+    QMessageBox mb( QMessageBox::Critical,
+                    QCoreApplication::translate( "Calamares::ViewManager", "Install Log Paste URL" ),
+                    pasteUrlMessage,
+                    QMessageBox::Ok );
+    Calamares::fixButtonLabels( &mb );
+    mb.exec();
     return pasteUrl;
 }
 

From 226419f7947a8d0f86b6de58e6ec389eeb9766ca Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 8 Sep 2021 10:58:38 +0200
Subject: [PATCH 421/492] [partition] Translate button texts in warning boxes

---
 src/modules/partition/PartitionViewStep.cpp | 69 +++++++++++++--------
 src/modules/partition/gui/PartitionPage.cpp |  9 ++-
 2 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 1fe7bdfab2..c179548101 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -30,6 +30,7 @@
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
 #include "utils/Variant.h"
+#include "widgets/TranslationFix.h"
 #include "widgets/WaitingWidget.h"
 
 #include 
@@ -51,7 +52,8 @@ PartitionViewStep::PartitionViewStep( QObject* parent )
 
     m_waitingWidget = new WaitingWidget( QString() );
     m_widget->addWidget( m_waitingWidget );
-    CALAMARES_RETRANSLATE( if (m_waitingWidget) {  m_waitingWidget->setText( tr( "Gathering system information..." ) ); } );
+    CALAMARES_RETRANSLATE(
+        if ( m_waitingWidget ) { m_waitingWidget->setText( tr( "Gathering system information..." ) ); } );
 
     m_core = new PartitionCoreModule( this );  // Unusable before init is complete!
     // We're not done loading, but we need the configuration map first.
@@ -527,47 +529,57 @@ PartitionViewStep::onLeave()
             {
                 message = tr( "No EFI system partition configured" );
             }
-            else if ( !(okType && okSize && okFlag ) )
+            else if ( !( okType && okSize && okFlag ) )
             {
                 message = tr( "EFI system partition configured incorrectly" );
             }
 
-            if ( !esp || !(okType&&okSize &&okFlag)) {
-            description = tr( "An EFI system partition is necessary to start %1."
-                                "

    "
-                                "To configure an EFI system partition, go back and "
-                                "select or create a suitable filesystem.").arg( branding->shortProductName() );
+            if ( !esp || !( okType && okSize && okFlag ) )
+            {
+                description = tr( "An EFI system partition is necessary to start %1."
+                                  "

    "
+                                  "To configure an EFI system partition, go back and "
+                                  "select or create a suitable filesystem." )
+                                  .arg( branding->shortProductName() );
             }
-            if (!esp) {
+            if ( !esp )
+            {
                 cDebug() << o << "No ESP mounted";
-                description.append(' ');
-                description.append(tr("The filesystem must be mounted on %1.").arg(espMountPoint));
+                description.append( ' ' );
+                description.append(
+                    tr( "The filesystem must be mounted on %1." ).arg( espMountPoint ) );
             }
-            if (!okType) {
+            if ( !okType )
+            {
                 cDebug() << o << "ESP wrong type";
-                description.append(' ');
-                description.append(tr("The filesystem must have type FAT32."));
+                description.append( ' ' );
+                description.append( tr( "The filesystem must have type FAT32." ) );
             }
-            if (!okSize) {
+            if ( !okSize )
+            {
                 cDebug() << o << "ESP too small";
-                description.append(' ');
-                description.append(tr("The filesystem must be at least %1 MiB in size.").arg( PartUtils::efiFilesystemMinimumSize() ));
+                description.append( ' ' );
+                description.append( tr( "The filesystem must be at least %1 MiB in size." )
+                                        .arg( PartUtils::efiFilesystemMinimumSize() ) );
             }
-            if (!okFlag)
+            if ( !okFlag )
             {
                 cDebug() << o << "ESP missing flag";
-                description.append(' ');
-                description.append(tr("The filesystem must have flag %1 set.").arg(PartitionTable::flagName( espFlag )));
+                description.append( ' ' );
+                description.append( tr( "The filesystem must have flag %1 set." )
+                                        .arg( PartitionTable::flagName( espFlag ) ) );
             }
-            if (!description.isEmpty()) {
+            if ( !description.isEmpty() )
+            {
                 description.append( "

    " );
-                description.append( tr(
-                                  "You can continue without setting up an EFI system "
-                                  "partition but your system may fail to start." ));
+                description.append( tr( "You can continue without setting up an EFI system "
+                                        "partition but your system may fail to start." ) );
             }
             if ( !message.isEmpty() )
             {
-                QMessageBox::warning( m_manualPartitionPage, message, description );
+                QMessageBox mb( QMessageBox::Warning, message, description, QMessageBox::Ok, m_manualPartitionPage );
+                Calamares::fixButtonLabels( &mb );
+                mb.exec();
             }
         }
         else
@@ -591,7 +603,10 @@ PartitionViewStep::onLeave()
                                           "to start %1 on a BIOS system with GPT." )
                                           .arg( branding->shortProductName() );
 
-                QMessageBox::information( m_manualPartitionPage, message, description );
+                QMessageBox mb(
+                    QMessageBox::Information, message, description, QMessageBox::Ok, m_manualPartitionPage );
+                Calamares::fixButtonLabels( &mb );
+                mb.exec();
             }
         }
 
@@ -621,7 +636,9 @@ PartitionViewStep::onLeave()
                                   "recreate it, selecting Encrypt "
                                   "in the partition creation window." );
 
-                QMessageBox::warning( m_manualPartitionPage, message, description );
+                QMessageBox mb( QMessageBox::Warning, message, description, QMessageBox::Ok, m_manualPartitionPage );
+                Calamares::fixButtonLabels( &mb );
+                mb.exec();
             }
         }
     }
diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index d22f6f01db..c8a58272e4 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -258,13 +258,16 @@ PartitionPage::checkCanCreate( Device* device )
 
         if ( ( table->numPrimaries() >= table->maxPrimaries() ) && !table->hasExtended() )
         {
-            QMessageBox::warning(
-                this,
+            QMessageBox mb(
+                QMessageBox::Warning,
                 tr( "Can not create new partition" ),
                 tr( "The partition table on %1 already has %2 primary partitions, and no more can be added. "
                     "Please remove one primary partition and add an extended partition, instead." )
                     .arg( device->name() )
-                    .arg( table->numPrimaries() ) );
+                    .arg( table->numPrimaries() ),
+                QMessageBox::Ok );
+            Calamares::fixButtonLabels( &mb );
+            mb.exec();
             return false;
         }
         return true;

From 4a6753c867f364e8c5bf46a7a7b1d809b51b4d9a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 8 Sep 2021 11:26:21 +0200
Subject: [PATCH 422/492] [packagechooser] Restore (renamed) include that is
 needed after all

---
 src/modules/packagechooser/ItemAppStream.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/packagechooser/ItemAppStream.cpp b/src/modules/packagechooser/ItemAppStream.cpp
index 5d48bbfa29..dbd1db4bc2 100644
--- a/src/modules/packagechooser/ItemAppStream.cpp
+++ b/src/modules/packagechooser/ItemAppStream.cpp
@@ -13,6 +13,7 @@
  */
 #include "PackageModel.h"
 
+#include "locale/TranslationsModel.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 

From e47dc4aa788bbed4693e89db4eda394e5764d931 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 8 Sep 2021 11:28:38 +0200
Subject: [PATCH 423/492] [partition] Fix build with translated buttons

---
 src/modules/partition/gui/PartitionPage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index c8a58272e4..9d7a2f0d75 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -31,13 +31,13 @@
 #include "ui_CreatePartitionTableDialog.h"
 #include "ui_PartitionPage.h"
 
+#include "Branding.h"
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "partition/PartitionQuery.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
-
-#include "Branding.h"
+#include "widgets/TranslationFix.h"
 
 // KPMcore
 #include 

From 11c79ee537674a18ee1e2bb4da8c91e8445a4032 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Wed, 8 Sep 2021 13:01:02 +0200
Subject: [PATCH 424/492] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_ar.ts          | 390 +++++++++++-----------
 lang/calamares_as.ts          | 400 ++++++++++++-----------
 lang/calamares_ast.ts         | 396 +++++++++++-----------
 lang/calamares_az.ts          | 400 ++++++++++++-----------
 lang/calamares_az_AZ.ts       | 400 ++++++++++++-----------
 lang/calamares_be.ts          | 400 ++++++++++++-----------
 lang/calamares_bg.ts          | 397 +++++++++++-----------
 lang/calamares_bn.ts          | 392 +++++++++++-----------
 lang/calamares_ca.ts          | 401 ++++++++++++-----------
 lang/calamares_ca@valencia.ts | 400 ++++++++++++-----------
 lang/calamares_cs_CZ.ts       | 597 +++++++++++++++++-----------------
 lang/calamares_da.ts          | 400 ++++++++++++-----------
 lang/calamares_de.ts          | 400 ++++++++++++-----------
 lang/calamares_el.ts          | 392 +++++++++++-----------
 lang/calamares_en.ts          |  41 +--
 lang/calamares_en_GB.ts       | 396 +++++++++++-----------
 lang/calamares_eo.ts          | 384 +++++++++++-----------
 lang/calamares_es.ts          | 396 +++++++++++-----------
 lang/calamares_es_MX.ts       | 396 +++++++++++-----------
 lang/calamares_es_PE.ts       | 380 +++++++++++-----------
 lang/calamares_es_PR.ts       | 380 +++++++++++-----------
 lang/calamares_et.ts          | 396 +++++++++++-----------
 lang/calamares_eu.ts          | 384 +++++++++++-----------
 lang/calamares_fa.ts          | 390 +++++++++++-----------
 lang/calamares_fi_FI.ts       | 404 ++++++++++++-----------
 lang/calamares_fr.ts          | 400 ++++++++++++-----------
 lang/calamares_fr_CH.ts       | 380 +++++++++++-----------
 lang/calamares_fur.ts         | 400 ++++++++++++-----------
 lang/calamares_gl.ts          | 396 +++++++++++-----------
 lang/calamares_gu.ts          | 380 +++++++++++-----------
 lang/calamares_he.ts          | 401 ++++++++++++-----------
 lang/calamares_hi.ts          | 400 ++++++++++++-----------
 lang/calamares_hr.ts          | 400 ++++++++++++-----------
 lang/calamares_hu.ts          | 397 +++++++++++-----------
 lang/calamares_id.ts          | 398 +++++++++++------------
 lang/calamares_id_ID.ts       | 380 +++++++++++-----------
 lang/calamares_ie.ts          | 386 +++++++++++-----------
 lang/calamares_is.ts          | 394 +++++++++++-----------
 lang/calamares_it_IT.ts       | 400 ++++++++++++-----------
 lang/calamares_ja.ts          | 401 ++++++++++++-----------
 lang/calamares_kk.ts          | 380 +++++++++++-----------
 lang/calamares_kn.ts          | 382 +++++++++++-----------
 lang/calamares_ko.ts          | 400 ++++++++++++-----------
 lang/calamares_ko_KR.ts       | 380 +++++++++++-----------
 lang/calamares_lo.ts          | 380 +++++++++++-----------
 lang/calamares_lt.ts          | 401 ++++++++++++-----------
 lang/calamares_lv.ts          | 380 +++++++++++-----------
 lang/calamares_mk.ts          | 380 +++++++++++-----------
 lang/calamares_ml.ts          | 396 +++++++++++-----------
 lang/calamares_mr.ts          | 384 +++++++++++-----------
 lang/calamares_nb.ts          | 380 +++++++++++-----------
 lang/calamares_ne.ts          | 380 +++++++++++-----------
 lang/calamares_ne_NP.ts       | 380 +++++++++++-----------
 lang/calamares_nl.ts          | 400 ++++++++++++-----------
 lang/calamares_pl.ts          | 396 +++++++++++-----------
 lang/calamares_pt_BR.ts       | 400 ++++++++++++-----------
 lang/calamares_pt_PT.ts       | 400 ++++++++++++-----------
 lang/calamares_ro.ts          | 396 +++++++++++-----------
 lang/calamares_ru.ts          | 400 ++++++++++++-----------
 lang/calamares_ru_RU.ts       | 380 +++++++++++-----------
 lang/calamares_si.ts          | 382 +++++++++++-----------
 lang/calamares_sk.ts          | 400 ++++++++++++-----------
 lang/calamares_sl.ts          | 382 +++++++++++-----------
 lang/calamares_sq.ts          | 401 ++++++++++++-----------
 lang/calamares_sr.ts          | 384 +++++++++++-----------
 lang/calamares_sr@latin.ts    | 382 +++++++++++-----------
 lang/calamares_sv.ts          | 401 ++++++++++++-----------
 lang/calamares_te.ts          | 380 +++++++++++-----------
 lang/calamares_tg.ts          | 400 ++++++++++++-----------
 lang/calamares_th.ts          | 386 +++++++++++-----------
 lang/calamares_tr_TR.ts       | 402 ++++++++++++-----------
 lang/calamares_uk.ts          | 401 ++++++++++++-----------
 lang/calamares_ur.ts          | 380 +++++++++++-----------
 lang/calamares_uz.ts          | 380 +++++++++++-----------
 lang/calamares_vi.ts          | 400 ++++++++++++-----------
 lang/calamares_zh.ts          | 380 +++++++++++-----------
 lang/calamares_zh_CN.ts       | 402 ++++++++++++-----------
 lang/calamares_zh_HK.ts       | 380 +++++++++++-----------
 lang/calamares_zh_TW.ts       | 401 ++++++++++++-----------
 79 files changed, 15338 insertions(+), 15486 deletions(-)

diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts
index e877be05ea..0c946cb068 100644
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 المثبت
     
@@ -543,149 +543,149 @@ The installer will quit and all changes will be lost.
       نموذج
     
     
-      
+      
       Select storage de&vice:
       اختر &جهاز التّخزين:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       الحاليّ:
     
     
-      
+      
       After:
       بعد:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>تقسيم يدويّ</strong><br/>يمكنك إنشاء أو تغيير حجم الأقسام بنفسك.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>اختر قسمًا لتقليصه، ثمّ اسحب الشّريط السّفليّ لتغيير حجمه </strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       مكان محمّل الإقلاع:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>اختر القسم حيث سيكون التّثبيت عليه</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       تعذّر إيجاد قسم النّظام EFI في أيّ مكان. فضلًا ارجع واستخدم التّقسيم اليدويّ لإعداد %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       قسم النّظام EFI على %1 سيُستخدم لبدء %2.
     
     
-      
+      
       EFI system partition:
       قسم نظام EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       لا يبدو أن في جهاز التّخزين أيّ نظام تشغيل. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>مسح القرص</strong><br/>هذا س<font color="red">يمسح</font> كلّ البيانات الموجودة في جهاز التّخزين المحدّد.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>ثبّت جنبًا إلى جنب</strong><br/>سيقلّص المثبّت قسمًا لتفريغ مساحة لِ‍ %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>استبدل قسمًا</strong><br/>يستبدل قسمًا مع %1 .
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       على جهاز التّخزين %1. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       على جهاز التّخزين هذا نظام تشغيل ذأصلًا. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       على جهاز التّخزين هذا عدّة أنظمة تشغيل. ما الذي تودّ فعله؟<br/>يمكنك مراجعة الاختيارات وتأكيدها قبل تطبيقها على جهاز التّخزين.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -753,12 +753,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       اضبط طراز لوحة المفتاتيح ليكون %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       اضبط تخطيط لوحة المفاتيح إلى %1/%2.
     
@@ -808,47 +808,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       لا يستوفِ هذا الحاسوب أدنى متطلّبات تثبيت %1.<br/>لا يمكن متابعة التّثبيت. <a href="#details">التّفاصيل...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       لا يستوفِ هذا الحاسوب بعض المتطلّبات المستحسنة لتثبيت %1.<br/>يمكن للمثبّت المتابعة، ولكن قد تكون بعض الميزات معطّلة.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       سيطرح البرنامج بعض الأسئلة عليك ويعدّ %2 على حاسوبك.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -943,15 +943,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      الخلاصة
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      هذه نظرة عامّة عمّا سيحصل ما إن تبدأ عمليّة التّثبيت.
+    
   
   
     ContextualProcessJob
@@ -2484,6 +2509,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2767,17 +2800,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       أمتأكّد من إنشاء جدول تقسيم جديد على %1؟
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2795,107 +2828,82 @@ The installer will quit and all changes will be lost.
       الأقسام
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      ثبّت %1 <strong>جنبًا إلى جنب</strong> مع نظام تشغيل آخر.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>امسح</strong> القرص وثبّت %1.
+      
+      Current:
+      الحاليّ:
     
     
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>استبدل</strong> قسمًا ب‍ %1.
+      
+      After:
+      بعد:
     
     
-      
-      <strong>Manual</strong> partitioning.
-      تقسيم <strong>يدويّ</strong>.
+      
+      No EFI system partition configured
+      لم يُضبط أيّ قسم نظام EFI
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>امسح</strong> القرص <strong>%2</strong> (%3) وثبّت %1.
-    
-    
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>استبدل</strong> قسمًا على القرص <strong>%2</strong> (%3) ب‍ %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      Current:
-      الحاليّ:
-    
-    
-      
-      After:
-      بعد:
-    
-    
-      
-      No EFI system partition configured
-      لم يُضبط أيّ قسم نظام EFI
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      راية قسم نظام EFI غير مضبوطة
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3027,7 +3035,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3350,44 +3358,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       لأفضل النّتائج، تحقّق من أن الحاسوب:
     
     
-      
+      
       System requirements
       متطلّبات النّظام
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      لا يستوفِ هذا الحاسوب أدنى متطلّبات تثبيت %1.<br/>لا يمكن متابعة التّثبيت. <a href="#details">التّفاصيل...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      لا يستوفِ هذا الحاسوب بعض المتطلّبات المستحسنة لتثبيت %1.<br/>يمكن للمثبّت المتابعة، ولكن قد تكون بعض الميزات معطّلة.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      سيطرح البرنامج بعض الأسئلة عليك ويعدّ %2 على حاسوبك.
-    
-  
   
     ScanningDialog
     
@@ -3679,27 +3659,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      هذه نظرة عامّة عمّا سيحصل ما إن تبدأ عمليّة التّثبيت.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      الخلاصة
-    
-  
   
     TrackingInstallJob
     
@@ -4031,7 +3990,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       مرحبا بك
     
@@ -4039,7 +3998,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       مرحبا بك
     
@@ -4109,19 +4068,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4186,6 +4145,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4222,132 +4220,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       ما اسمك؟
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       ما الاسم الذي تريده لتلج به؟
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       ما اسم هذا الحاسوب؟
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       اختر كلمة مرور لإبقاء حسابك آمنًا.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       استخدم نفس كلمة المرور لحساب المدير.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts
index fea72b6a77..5a52a5b766 100644
--- a/lang/calamares_as.ts
+++ b/lang/calamares_as.ts
@@ -491,12 +491,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 চেত্ আপ প্ৰোগ্ৰেম
     
     
-      
+      
       %1 Installer
       %1 ইনস্তলাৰ
     
@@ -535,149 +535,149 @@ The installer will quit and all changes will be lost.
       ৰূপ
     
     
-      
+      
       Select storage de&vice:
       স্তোৰেজ ডিভাইচ চয়ণ কৰক (&v):
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       বর্তমান:
     
     
-      
+      
       After:
       পিছত:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>মেনুৱেল  বিভাজন</strong><br/>আপুনি নিজে বিভাজন বনাব বা বিভজনৰ আয়তন সলনি কৰিব পাৰে।
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1ক %2ৰ গৃহ বিভাজন হিচাপে পুনৰ ব্যৱহাৰ কৰক।
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>আয়তন সলনি কৰিবলৈ বিভাজন বাচনি কৰক, তাৰ পিছত তলৰ "বাৰ্" ডালৰ সহায়ত আয়তন চেত্ কৰক</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 বিভজনক সৰু কৰি %2MiB কৰা হ'ব আৰু %4ৰ বাবে %3MiBৰ নতুন বিভজন বনোৱা হ'ব।
     
     
-      
+      
       Boot loader location:
       বুত্ লোডাৰৰ অৱস্থান:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>ইনস্তল​ কৰিবলৈ এখন বিভাজন চয়ন কৰক</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       এই চিছটেমত এখনো EFI চিছটেম বিভাজন কতো পোৱা নগ'ল। অনুগ্ৰহ কৰি উভতি যাওক আৰু মেনুৱেল বিভাজন প্ৰক্ৰিয়া দ্বাৰা %1 চেত্ আপ কৰক।
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1ত থকা EFI চিছটেম বিভাজনটো %2ক আৰম্ভ কৰাৰ বাবে ব্যৱহাৰ কৰা হ'ব।
     
     
-      
+      
       EFI system partition:
       EFI চিছটেম বিভাজন:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এইটো ষ্টোৰেজ ডিভাইচত কোনো অপাৰেটিং চিছটেম নাই যেন লাগে। আপুনি কি কৰিব বিচাৰে?<br/>আপুনি ষ্টোৰেজ ডিভাইচটোত কিবা সলনি কৰাৰ আগতে পুনৰীক্ষণ আৰু চয়ন নিশ্চিত কৰিব পাৰিব।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>ডিস্কত থকা গোটেই ডাটা আতৰাওক।</strong><br/> ইয়াৰ দ্ৱাৰা ষ্টোৰেজ ডিভাইছত বৰ্তমান থকা সকলো ডাটা <font color="red">বিলোপ</font> কৰা হ'ব।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>সমান্তৰালভাৱে ইনস্তল কৰক</strong><br/> ইনস্তলাৰটোৱে %1ক ইনস্তল​ কৰাৰ বাবে এখন বিভাজন সৰু কৰি দিব।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>বিভাজন সলনি কৰক</strong> <br/>এখন বিভাজনক % ৰ্ সৈতে সলনি কৰক।
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এইটো ষ্টোৰেজ ডিভাইচত %1 আছে। <br/> আপুনি কি কৰিব বিচাৰে? ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব।
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এইটো ষ্টোৰেজ ডিভাইচত ইতিমধ্যে এটা অপাৰেটিং চিছটেম আছে। আপুনি কি কৰিব বিচাৰে? <br/>ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব।
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এইটো ষ্টোৰেজ ডিভাইচত একাধিক এটা অপাৰেটিং চিছটেম আছে। আপুনি কি কৰিব বিচাৰে? 1ষ্টোৰেজ ডিভাইচটোত যিকোনো সলনি কৰাৰ আগত আপুনি পুনৰীক্ষণ আৰু সলনি কৰিব পাৰিব।
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       কোনো স্ৱেপ নাই
     
     
-      
+      
       Reuse Swap
       স্ৱেপ পুনৰ ব্যৱহাৰ কৰক
     
     
-      
+      
       Swap (no Hibernate)
       স্ৱেপ (হাইবাৰনেট নোহোৱাকৈ)
     
     
-      
+      
       Swap (with Hibernate)
       স্ৱোআপ (হাইবাৰনেটৰ সৈতে)
     
     
-      
+      
       Swap to file
       ফাইললৈ স্ৱোআপ কৰক।
     
@@ -745,12 +745,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       কিবোৰ্ডৰ মডেল %1ত চেট্ কৰক।<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       কিবোৰ্ডৰ লেআউট %1/%2 চেট্ কৰক।
     
@@ -800,47 +800,47 @@ The installer will quit and all changes will be lost.
       নেটৱৰ্ক্ ইনস্তলেচন। (নিস্ক্ৰিয়: পেকেজ সুচী বিচাৰি পোৱা নগ'ল, আপোনাৰ নেটৱৰ্ক্ সংযোগ পৰীক্ষা কৰক)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       %1 চেত্ আপৰ বাবে নিম্নতম আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>স্থাপন প্ৰক্ৰিয়া অবিৰত ৰাখিব নোৱাৰিব। <a href="#details">বিৱৰণ...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       %1 ইনস্তলচেন​ৰ বাবে নিম্নতম আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>ইনস্তলচেন​ প্ৰক্ৰিয়া অবিৰত ৰাখিব নোৱাৰিব। <a href="#details">বিৱৰণ...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       %1 চেত্ আপৰ বাবে পৰামৰ্শ দিয়া আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>স্থাপন প্ৰক্ৰিয়া অবিৰত ৰাখিব পাৰিব, কিন্তু কিছুমান সুবিধা নিষ্ক্রিয় হৈ থাকিব। 
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       %1 ইনস্তলচেন​ৰ বাবে পৰামৰ্শ দিয়া আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। ইনস্তলচেন​ অবিৰত ৰাখিব পাৰিব, কিন্তু কিছুমান সুবিধা নিষ্ক্রিয় হৈ থাকিব। 
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       এইটো প্ৰগ্ৰেমে অপোনাক কিছুমান প্ৰশ্ন সুধিব আৰু অপোনাৰ কম্পিউটাৰত %2 স্থাপন কৰিব।
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       %1ৰ Calamares চেত্ আপ প্ৰগ্ৰামলৈ আদৰণি জনাইছো।
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1> %1 চেত্ আপলৈ আদৰণি জনাইছো।</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1ৰ কেলামাৰেচ ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1>
     
@@ -935,15 +935,40 @@ The installer will quit and all changes will be lost.
       %1ৰ ইনস্তলচেন সম্পুৰ্ণ হ'ল।
     
     
-      
+      
       Package Selection
       পেকেজ নিৰ্বাচন
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       সুচীৰ পৰা পণ্য এটা বাচনি কৰক। বাচনি কৰা পণ্যটো ইনস্তল হ'ব।
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      সাৰাংশ
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      চেত্ আপ প্ৰক্ৰিয়া হ'লে কি হ'ব এয়া এটা অৱলোকন।
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      ইনস্তল প্ৰক্ৰিয়া হ'লে কি হ'ব এয়া এটা অৱলোকন।
+    
   
   
     ContextualProcessJob
@@ -2442,6 +2467,14 @@ The installer will quit and all changes will be lost.
       সুচীৰ পৰা পণ্য এটা বাচনি কৰক। বাচনি কৰা পণ্যটো ইনস্তল হ'ব।
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      পেকেজ
+    
+  
   
     PackageChooserViewStep
     
@@ -2725,17 +2758,17 @@ The installer will quit and all changes will be lost.
       বুট লোডাৰ ইনস্তল কৰক (&I):
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       আপুনি নিশ্চিতভাৱে %1ত নতুন তালিকা বনাব বিচাৰে নেকি?
     
     
-      
+      
       Can not create new partition
       নতুন বিভাজন বনাব নোৱৰি
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       %1ত থকা বিভাজন তালিকাত ইতিমধ্যে %2 মূখ্য বিভাজন আছে, আৰু একো যোগ কৰিব নোৱাৰিব। তাৰ সলনি এখন মূখ্য বিভাজন বিলোপ কৰক আৰু এখন প্ৰসাৰিত বিভাজন যোগ কৰক।
     
@@ -2753,107 +2786,82 @@ The installer will quit and all changes will be lost.
       বিভাজনসমুহ
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      %1ক বেলেগ এটা অপাৰেটিং চিছটেমৰ <strong>লগত </strong>ইনস্তল কৰক।
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      ডিস্কত থকা সকলো ডাটা <strong>আতৰাওক</strong> আৰু %1 ইনস্তল কৰক।
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      এখন বিভাজন %1ৰ লগত <strong>সলনি</strong> কৰক।
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>মেনুৱেল</strong> বিভাজন।
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      %1ক <strong>%2</strong>(%3)ত ডিস্কত থকা বেলেগ অপাৰেটিং চিছটেমৰ <strong>লগত</strong> ইনস্তল কৰক।
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>%2</strong> (%3)ডিস্কত থকা সকলো ডাটা <strong>আতৰাওক</strong> আৰু %1 ইনস্তল কৰক।
+      
+      Current:
+      বর্তমান:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>%2</strong> (%3) ডিস্কত এখন বিভাজন %1ৰ লগত <strong>সলনি</strong> কৰক।
+      
+      After:
+      পিছত:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>%1</strong> (%2) ডিস্কত <strong>মেনুৱেল</strong> বিভাজন।
+      
+      No EFI system partition configured
+      কোনো EFI চিছটেম বিভাজন কনফিগাৰ কৰা হোৱা নাই
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      ডিস্ক্ <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      বর্তমান:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      পিছত:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      কোনো EFI চিছটেম বিভাজন কনফিগাৰ কৰা হোৱা নাই
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      %1 আৰম্ভ কৰিবলৈ এটা EFI চিছটেম থকাটো আৱশ্যক। <br/><br/>এটা EFI চিছটেম কন্ফিগাৰ কৰিবলৈ উভতি যাওক আৰু FAT32 ফাইল চিছটেম এটা বাচনি কৰক যিটোত <strong>%3</strong> ফ্লেগ  সক্ষম হৈ আছে আৰু <strong>%2</strong> মাউন্ট্ পইণ্ট্ আছে।<br/><br/>আপুনি EFI চিছটেমবিভাজন কন্ফিগাৰ নকৰাকৈ অগ্ৰসৰ হ'ব পাৰে কিন্তু ইয়াৰ ফলত চিছটেম বিফল হ'ব পাৰে।
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      %1 আৰম্ভ কৰিবলৈ এটা EFI চিছটেম থকাটো আৱশ্যক। %2 মাউন্ট্ পইন্ট্ নোহোৱকৈ কন্ফিগাৰ কৰা হৈছিল, কিন্তু ইয়াৰ esp ফ্লেগ ছেট কৰা হোৱা নাই। ফ্লেগ্ ছেট কৰিবলৈ উভতি যাওক আৰু বিভাজন সলনি কৰক। আপুনি     ফ্লেগ ছেট নকৰাকৈ অগ্ৰসৰ হ'ব পাৰে কিন্তু ইয়াৰ ফলত চিছটেম বিফল হ'ব পাৰে। 
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      EFI চিছটেম বিভাজনত ফ্লেগ চেট কৰা নাই
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       GPTৰ BIOSত ব্যৱহাৰৰ বাবে বিকল্প
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       এটা GPT পৰ্তিসোন টেবুল সকলো স্যস্তেমৰ বাবে উত্তম বিকল্প হয় | এই ইন্সালাৰতোৱে তেনে স্থাপনকৰণ BIOS স্যস্তেমতো কৰে |<br/><br/>এটা GPT পৰ্তিসোন টেবুল কনফিগাৰ কৰিবলৈ ( যদি আগতে কৰা নাই ) পাছলৈ গৈ  পৰ্তিসোন টেবুলখনক GPTলৈ পৰিৱৰ্তন কৰক,  তাৰপাচত 8 MBৰ উনফোৰমেতেট পৰ্তিতিওন এটা বনাব | <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
     
     
-      
+      
       Boot partition not encrypted
       বুত্ বিভাজন এনক্ৰিপ্ত্ নহয়
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       এনক্ৰিপ্তেড ৰুট বিভাজনৰ সৈতে এটা বেলেগ বুট বিভাজন চেত্ আপ কৰা হৈছিল, কিন্তু বুট বিভাজন এনক্ৰিপ্তেড কৰা হোৱা নাই। <br/><br/>এইধৰণৰ চেত্ আপ সুৰক্ষিত নহয় কাৰণ গুৰুত্ব্পুৰ্ণ চিছটেম ফাইল আন্এনক্ৰিপ্তেড বিভাজনত ৰখা হয়। <br/>আপুনি বিচাৰিলে চলাই থাকিব পাৰে কিন্তু পিছ্ত চিছটেম আৰম্ভৰ সময়ত ফাইল চিছটেম খোলা যাব। <br/>বুট বিভাজন এনক্ৰিপ্ত্ কৰিবলৈ উভতি যাওক আৰু বিভাজন বনোৱা windowত <strong>Encrypt</strong> বাচনি কৰি আকৌ বনাওক।
     
     
-      
+      
       has at least one disk device available.
       অতি কমেও এখন ডিস্ক্ উপলব্ধ আছে।
     
     
-      
+      
       There are no partitions to install on.
       ইনস্তল কৰিবলৈ কোনো বিভাজন নাই।
     
@@ -2988,7 +2996,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3312,44 +3320,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       উত্কৃষ্ট ফলাফলৰ বাবে অনুগ্ৰহ কৰি নিশ্চিত কৰক যে এইটো কম্পিউটাৰ হয়:
     
     
-      
+      
       System requirements
       চিছটেমৰ আৱশ্যকতাবোৰ
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      %1 চেত্ আপৰ বাবে নিম্নতম আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>স্থাপন প্ৰক্ৰিয়া অবিৰত ৰাখিব নোৱাৰিব। <a href="#details">বিৱৰণ...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      %1 ইনস্তলচেন​ৰ বাবে নিম্নতম আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>ইনস্তলচেন​ প্ৰক্ৰিয়া অবিৰত ৰাখিব নোৱাৰিব। <a href="#details">বিৱৰণ...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      %1 চেত্ আপৰ বাবে পৰামৰ্শ দিয়া আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। <br/>স্থাপন প্ৰক্ৰিয়া অবিৰত ৰাখিব পাৰিব, কিন্তু কিছুমান সুবিধা নিষ্ক্রিয় হৈ থাকিব। 
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      %1 ইনস্তলচেন​ৰ বাবে পৰামৰ্শ দিয়া আৱশ্যকতা এই কম্পিউটাৰটোৱে পূৰ্ণ নকৰে। ইনস্তলচেন​ অবিৰত ৰাখিব পাৰিব, কিন্তু কিছুমান সুবিধা নিষ্ক্রিয় হৈ থাকিব। 
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      এইটো প্ৰগ্ৰেমে অপোনাক কিছুমান প্ৰশ্ন সুধিব আৰু অপোনাৰ কম্পিউটাৰত %2 স্থাপন কৰিব।
-    
-  
   
     ScanningDialog
     
@@ -3641,27 +3621,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      চেত্ আপ প্ৰক্ৰিয়া হ'লে কি হ'ব এয়া এটা অৱলোকন।
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      ইনস্তল প্ৰক্ৰিয়া হ'লে কি হ'ব এয়া এটা অৱলোকন।
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      সাৰাংশ
-    
-  
   
     TrackingInstallJob
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       আদৰণি
     
@@ -4001,7 +3960,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       আদৰণি
     
@@ -4071,21 +4030,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>ভাষা</h1> </br>
                     চিছটেমৰ স্থানীয় ছেটিংস্ কমাণ্ডলাইনৰ কিছুমান উপভোক্তা ইন্টাৰফেছ উপাদানৰ ভাষা আৰু আখৰবোৰত প্ৰভাৱ পেলায়। বৰ্তমান ছেটিংস্ হ'ল:  <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>স্থানীয়</h1> </br>
                     চিছটেমৰ স্থানীয় ছেটিংসে  উপাদানৰ নম্বৰ আৰু  তাৰিখ সজ্জা প্ৰভাৱ পেলায়। বৰ্তমান ছেটিংস্ হ'ল:  <strong>%1</strong>.
     
     
-      
+      
       Back
       পাছলৈ
     
@@ -4151,6 +4110,45 @@ Output:
             <p>এই খিনি ৰিলিজ নোতৰ উদাহৰণ </p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4187,132 +4185,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       আপোনাৰ নাম কি?
     
     
-      
+      
       Your Full Name
       আপোনাৰ সম্পূৰ্ণ নাম
     
     
-      
+      
       What name do you want to use to log in?
       লগইনত আপোনি কি নাম ব্যৱহাৰ কৰিব বিচাৰে?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       কেৱল lowercase বৰ্ণ, সংখ্যা, underscore আৰু hyphenৰ হে মাত্ৰ অনুমতি আছে।
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       এইটো কম্পিউটাৰৰ নাম কি?
     
     
-      
+      
       Computer Name
       কম্পিউটাৰৰ নাম
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       আপোনাৰ একাউণ্ট সুৰক্ষিত ৰাখিবলৈ পাছৱৰ্ড এটা বাছনি কৰক।
     
     
-      
+      
       Password
       পাছৱৰ্ড
     
     
-      
+      
       Repeat Password
       পাছৱৰ্ড পুনৰ লিখক।
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       এই বাকচটো চিহ্নিত কৰিলে পাছ্ৱৰ্ডৰ প্ৰৱলতা কৰা হ'ব আৰু আপুনি দুৰ্বল পাছৱৰ্ড ব্যৱহাৰ কৰিব নোৱাৰিব।
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       প্ৰশাসনীয় একাউন্টৰ বাবে একে পাছৱৰ্ড্ ব্যৱহাৰ কৰক।
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts
index e6fa0bc715..466ad6bc42 100644
--- a/lang/calamares_ast.ts
+++ b/lang/calamares_ast.ts
@@ -491,12 +491,12 @@ L'instalador va colar y van perdese tolos cambeos.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Programa de configuración de %1
     
     
-      
+      
       %1 Installer
       Instalador de %1
     
@@ -535,149 +535,149 @@ L'instalador va colar y van perdese tolos cambeos.
       Formulariu
     
     
-      
+      
       Select storage de&vice:
       Esbilla un preséu d'al&macenamientu:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Anguaño:
     
     
-      
+      
       After:
       Dempués:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionáu manual</strong><br/>Vas poder crear o redimensionar particiones.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reusu de %s como partición d'aniciu pa %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Esbilla una partición a redimensionar, dempués arrastra la barra baxera pa facelo</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 va redimensionase a %2MB y va crease una partición de %3MB pa %4.
     
     
-      
+      
       Boot loader location:
       Allugamientu del xestor d'arrinque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Esbilla una partición na qu'instalar</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nun pudo alcontrase per nenyures una partición del sistema EFI. Volvi p'atrás y usa'l particionáu manual pa configurar %1, por favor.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partición del sistema EFI en %1 va usase p'aniciar %2.
     
     
-      
+      
       EFI system partition:
       Partición del sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esti preséu d'almacenamientu nun paez que tenga un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Desaniciu d'un discu</strong><br/>Esto va <font color="red">desaniciar</font> tolos datos presentes nel preséu d'almacenamientu esbilláu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalación anexa</strong><br/>L'instalador va redimensionar una partición pa dexar sitiu a %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Troquéu d'una partición</strong><br/>Troca una parción con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esti preséu d'almacenamientu tien %1 nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esti preséu d'almacenamientu yá tien un sistema operativu nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esti preséu d'almacenamientu tien varios sistemes operativos nelli. ¿Qué te prestaría facer?<br/>Vas ser a revisar y confirmar lo qu'escueyas enantes de que se faiga cualesquier cambéu nel preséu d'almacenamientu.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Ensin intercambéu
     
     
-      
+      
       Reuse Swap
       Reusar un intercambéu
     
     
-      
+      
       Swap (no Hibernate)
       Intercambéu (ensin ivernación)
     
     
-      
+      
       Swap (with Hibernate)
       Intercambéu (con ivernación)
     
     
-      
+      
       Swap to file
       Intercambéu nun ficheru
     
@@ -745,12 +745,12 @@ L'instalador va colar y van perdese tolos cambeos.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Va afitase'l modelu del tecláu a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Va afitase la distrubución del tecláu a %1/%2.
     
@@ -800,47 +800,47 @@ L'instalador va colar y van perdese tolos cambeos.
       Instalación per rede. (Desactivada: Nun pue dise en cata de les llistes de paquetes, comprueba la conexón a internet)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Esti ordenador nun satisfaz dalgún de los requirimientos mínimos pa configurar %1.<br/>La configuración nun pue siguir. <a href="#details">Detalles...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Esti ordenador nun satisfaz los requirimientos mínimos pa instalar %1.<br/>La instalación nun pue siguir. <a href="#details">Detalles...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Esti ordenador nun satisfaz dalgún de los requirimientos aconseyaos pa configurar %1.<br/>La configuración pue siguir pero dalgunes carauterístiques podríen desactivase.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Esti ordenador nun satisfaz dalgún requirimientu aconseyáu pa instalar %1.<br/>La instalación pue siguir pero podríen desactivase dalgunes carauterístiques.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Esti programa va facete dalgunes entrugues y va configurar %2 nel ordenador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Afáyate nel programa de configuración de Calamares pa %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Afáyate na configuración de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Afáyate nel instalador Calamares pa %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Afáyate nel instalador de %1</h1>
     
@@ -935,15 +935,40 @@ L'instalador va colar y van perdese tolos cambeos.
       Completóse la instalación de %1.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Sumariu
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Esto ye una previsualización de lo que va asoceder nel momentu qu'anicies el procesu de configuración.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Esto ye una previsualización de lo que va asoceder nel momentu qu'anicies el procesu d'instalación.
+    
   
   
     ContextualProcessJob
@@ -2440,6 +2465,14 @@ L'instalador va colar y van perdese tolos cambeos.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paquetes
+    
+  
   
     PackageChooserViewStep
     
@@ -2723,17 +2756,17 @@ L'instalador va colar y van perdese tolos cambeos.
       I&nstalar el xestor d'arrinque en:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       ¿De xuru que quies crear una tabla de particiones nueva en %1?
     
     
-      
+      
       Can not create new partition
       Nun pue crease la partición nueva
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       La tabla de particiones en %1 yá tien %2 particiones primaries y nun puen amestase más. Desanicia una partición primaria y amiesta otra estendida.
     
@@ -2751,107 +2784,82 @@ L'instalador va colar y van perdese tolos cambeos.
       Particiones
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Va instalase %1 <strong>xunto a</strong> otru sistema operativu.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Va desaniciase</strong>'l discu y va instalase %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Va trocase</strong> una partición con %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Particionáu <strong>manual</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Va instalase %1 <strong>xunto a</strong> otru sistema operativu nel discu <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Va desaniciase</strong>'l discu <strong>%2</strong> (%3) y va instalase %1.
+      
+      Current:
+      Anguaño:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Va trocase</strong> una partición nel discu <strong>%2</strong> (%3) con %1.
+      
+      After:
+      Dempués:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Particionáu <strong>manual</strong> nel discu <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Nun se configuró nenguna partición del sistema EFI
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Discu <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Anguaño:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Dempués:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Nun se configuró nenguna partición del sistema EFI
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      Nun s'afitó la bandera del sistema EFI
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       La partición d'arrinque nun ta cifrada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Configuróse una partición d'arrinque xunto con una partición raigañu cifrada pero la partición d'arrinque nun ta cifrada.<br/><br/>Hai problemes de seguranza con esta triba de configuración porque los ficheros importantes del sistema caltiénense nuna partición ensin cifrar.<br/>Podríes siguir si quixeres pero'l desbloquéu del sistema de ficheros va asoceder más sero nel aniciu del sistema.<br/>Pa cifrar la partición raigañu, volvi p'atrás y recreala esbillando <strong>Cifrar</strong> na ventana de creación de particiones.
     
     
-      
+      
       has at least one disk device available.
       tien polo menos un preséu disponible d'almacenamientu
     
     
-      
+      
       There are no partitions to install on.
       Nun hai particiones nes qu'instalar.
     
@@ -2986,7 +2994,7 @@ Salida:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3312,44 +3320,16 @@ Salida:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Pa los meyores resultaos, asegúrate qu'esti ordenador:
     
     
-      
+      
       System requirements
       Requirimientos del sistema
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Esti ordenador nun satisfaz dalgún de los requirimientos mínimos pa configurar %1.<br/>La configuración nun pue siguir. <a href="#details">Detalles...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Esti ordenador nun satisfaz los requirimientos mínimos pa instalar %1.<br/>La instalación nun pue siguir. <a href="#details">Detalles...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Esti ordenador nun satisfaz dalgún de los requirimientos aconseyaos pa configurar %1.<br/>La configuración pue siguir pero dalgunes carauterístiques podríen desactivase.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Esti ordenador nun satisfaz dalgún requirimientu aconseyáu pa instalar %1.<br/>La instalación pue siguir pero podríen desactivase dalgunes carauterístiques.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Esti programa va facete dalgunes entrugues y va configurar %2 nel ordenador.
-    
-  
   
     ScanningDialog
     
@@ -3641,27 +3621,6 @@ Salida:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Esto ye una previsualización de lo que va asoceder nel momentu qu'anicies el procesu de configuración.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Esto ye una previsualización de lo que va asoceder nel momentu qu'anicies el procesu d'instalación.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Sumariu
-    
-  
   
     TrackingInstallJob
     
@@ -3993,7 +3952,7 @@ Salida:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Acoyida
     
@@ -4001,7 +3960,7 @@ Salida:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Acoyida
     
@@ -4071,19 +4030,19 @@ Salida:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4148,6 +4107,45 @@ Salida:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4184,132 +4182,132 @@ Salida:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       ¿Cómo te llames?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       ¿Qué nome quies usar p'aniciar sesión?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       ¿Cómo va llamase esti ordenador?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Escueyi una contraseña pa caltener segura la cuenta.
     
     
-      
+      
       Password
       Contraseña
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Usar la mesma contraseña pa la cuenta d'alministrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts
index e6a97ab0bd..f9ae263eea 100644
--- a/lang/calamares_az.ts
+++ b/lang/calamares_az.ts
@@ -495,12 +495,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Quraşdırıcı proqram
     
     
-      
+      
       %1 Installer
       %1 Quraşdırıcı
     
@@ -539,149 +539,149 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Format
     
     
-      
+      
       Select storage de&vice:
       Yaddaş ci&hazını seçmək:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Cari:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Əl ilə bölmək</strong><br/>Siz bölməni özünüz yarada və ölçüsünü dəyişə bilərsiniz.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 Ev bölməsi olaraq %2 üçün istifadə edilsin.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Kiçiltmək üçün bir bölmə seçərək altdakı çübüğü sürüşdürərək ölçüsünü verin</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 %2MB-a qədər azalacaq və %4 üçün yeni bölmə %3MB disk bölməsi yaradılacaq.
     
     
-      
+      
       Boot loader location:
       Ön yükləyici (boot) yeri:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Quraşdırılacaq disk bölməsini seçin</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI sistem bölməsi tapılmadı. Geriyə qayıdın və %1 bölməsini əllə yaradın.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 EFI sistemi %2 başlatmaq üçün istifadə olunacaqdır.
     
     
-      
+      
       EFI system partition:
       EFI sistem bölməsi:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazıda əməliyyat sistemi görünmür. Nə etmək istəyərdiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font>seçimi hal-hazırda, seçilmiş diskdəki bütün verilənləri siləcəkdir.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Yanına quraşdırın</strong><br/>Quraşdırıcı, bölməni kiçildərək %1 üçün boş disk sahəsi yaradacaqdır.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Bölməni başqası ilə əvəzləmək</strong><br/>Bölməni %1 ilə əvəzləyir.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda %1 var. Nə etmək istəyirsiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda artıq bir əməliyyat sistemi var. Nə etmək istərdiniz?.<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda bir neçə əməliyyat sistemi mövcuddur. Nə etmək istərdiniz? Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Bu yaddaş qurğusunda artıq əməliyyat sistemi var, lakin, bölmə cədvəli <strong>%1</strong>, lazım olan <strong>%2</strong> ilə fərqlidir.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Bu yaddaş qurğusunda bölmələrdən biri <strong>quraşdırılmışdır</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Bu yaddaş qurğusu <strong>qeyri-aktiv RAİD</strong> qurğusunun bir hissəsidir.
     
     
-      
+      
       No Swap
       Mübadilə bölməsi olmadan
     
     
-      
+      
       Reuse Swap
       Mövcud mübadilə bölməsini istifadə etmək
     
     
-      
+      
       Swap (no Hibernate)
       Mübadilə bölməsi (yuxu rejimi olmadan)
     
     
-      
+      
       Swap (with Hibernate)
       Mübadilə bölməsi (yuxu rejimi ilə)
     
     
-      
+      
       Swap to file
       Mübadilə faylı
     
@@ -749,12 +749,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Klaviatura modelini %1 olaraq təyin etmək.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Klaviatura qatını %1/%2 olaraq təyin etmək.
     
@@ -804,47 +804,47 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şəbəkə üzərindən quraşdırmaq (Söndürüldü: paket siyahıları qəbul edilmir, şəbəkə bağlantınızı yoxlayın)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Bu proqram sizə bəzi suallar verəcək və %2 əməliyyat sistemini sizin komputerinizə qurmağa kömək edəcək.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 üçün Calamares quraşdırma proqramına xoş gəldiniz!</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 quraşdırmaq üçün xoş gəldiniz</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 üçün Calamares quraşdırıcısına xoş gəldiniz!</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 quraşdırıcısına xoş gəldiniz</h1>
     
@@ -939,15 +939,40 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.%1-n quraşdırılması başa çatdı.
     
     
-      
+      
       Package Selection
       Paket seçimi
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Lütfən məhsulu siyahıdan seçin. Seçilmiş məhsul quraşdırılacaqdır.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Nəticə
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
+    
   
   
     ContextualProcessJob
@@ -2446,6 +2471,14 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Lütfən məhsulu siyahıdan seçin. Seçilmiş məhsul quraşdırılacaqdır.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paketlər
+    
+  
   
     PackageChooserViewStep
     
@@ -2729,17 +2762,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Ön yükləy&icinin quraşdırılma yeri:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       %1-də yeni bölmə yaratmaq istədiyinizə əminsiniz?
     
     
-      
+      
       Can not create new partition
       Yeni bölmə yaradıla bilmir
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       %1 üzərindəki bölmə cədvəlində %2 birinci disk bölümü var və artıq əlavə edilə bilməz. 
 Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndirilmiş bölmə əlavə edin.
@@ -2758,107 +2791,82 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril
       Bölmələr
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Digər əməliyyat sistemini %1 <strong>yanına</strong> quraşdırmaq.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      Diski <strong>çıxarmaq</strong> və %1 quraşdırmaq.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      Bölməni %1 ilə <strong>əvəzləmək</strong>.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Əl ilə</strong> bölüşdürmə.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      <strong>%2</strong> (%3) diskində başqa əməliyyat sistemini %1 <strong>yanında</strong> quraşdırmaq.
+      
+      Current:
+      Cari:
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>%2</strong> (%3) diskini <strong>çıxartmaq</strong> və %1 quraşdırmaq.
+      
+      After:
+      Sonra:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>%2</strong> (%3) diskində bölməni %1 ilə <strong>əvəzləmək</strong>.
+      
+      No EFI system partition configured
+      EFI sistemi bölməsi tənzimlənməyib
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>%1</strong> (%2) diskində <strong>əl ilə</strong> bölüşdürmə.
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      <strong>%1</strong> (%2) diski
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      Current:
-      Cari:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      After:
-      Sonra:
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      No EFI system partition configured
-      EFI sistemi bölməsi tənzimlənməyib
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      EFİ sistemi bölməsi, %1 başlatmaq üçün vacibdir. <br/><br/>EFİ sistemi bölməsini yaratmaq üçün geriyə qayıdın və aktiv edilmiş<strong>%3</strong> bayrağı və <strong>%2</strong> qoşulma nöqtəsi ilə FAT32 fayl sistemi seçin və ya yaradın.<br/><br/>Siz EFİ sistemi bölməsi yaratmadan da davam edə bilərsiniz, lakin bu halda sisteminiz açılmaya bilər.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      %1 başlatmaq üçün EFİ sistem bölməsi vacibdir.<br/><br/>Bölmə <strong>%2</strong> qoşulma nöqtəsi ilə yaradılıb, lakin onun <strong>%3</strong> bayrağı seçilməyib.<br/>Bayrağı seçmək üçün geriyə qayıdın və bölməyə süzəliş edin.<br/><br/>Siz bayrağı seçmədən də davam edə bilərsiniz, lakin bu halda sisteminiz açılmaya bilər.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
-      EFI system partition flag not set
-      EFİ sistem bölməsi bayraqı seçilməyib
-    
-    
-      
+      
       Option to use GPT on BIOS
       BIOS-da GPT istifadəsi seçimi
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT bölmə cədvəli bütün sistemlər üçün yaxşıdır. Bu quraşdırıcı BIOS sistemləri üçün də belə bir quruluşu dəstəkləyir.<br/><br/>BİOS-da GPT bölmələr cədvəlini ayarlamaq üçün (əgər bu edilməyibsə) geriyə qayıdın və bölmələr cədvəlini GPT-yə qurun, sonra isə <strong>bios_grub</strong> bayrağı seçilmiş 8 MB-lıq formatlanmamış bölmə yaradın.<br/><br/>8 MB-lıq formatlanmamış bölmə GPT ilə BİOS sistemində %1 başlatmaq üçün lazımdır.
     
     
-      
+      
       Boot partition not encrypted
       Ön yükləyici bölməsi çifrələnməyib
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Şifrəli bir kök bölməsi ilə birlikdə ayrı bir ön yükləyici bölməsi qurulub, ancaq ön yükləyici bölməsi şifrələnməyib.<br/><br/>Bu cür quraşdırma ilə bağlı təhlükəsizlik problemləri olur, çünki vacib sistem sənədləri şifrəsiz bölmədə saxlanılır.<br/>İstəyirsinizsə davam edə bilərsiniz, lakin, fayl sisteminin kilidi, sistem başladıldıqdan daha sonra açılacaqdır.<br/>Yükləmə hissəsini şifrələmək üçün geri qayıdın və bölmə yaratma pəncərəsində <strong>Şifrələmə</strong> menyusunu seçərək onu yenidən yaradın.
     
     
-      
+      
       has at least one disk device available.
       ən az bir disk qurğusu mövcuddur.
     
     
-      
+      
       There are no partitions to install on.
       Quraşdırmaq üçün bölmə yoxdur.
     
@@ -2993,7 +3001,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3319,44 +3327,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Ən yaşxı nəticə üçün lütfən, əmin olun ki, bu kompyuter:
     
     
-      
+      
       System requirements
       Sistem tələbləri
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Bu proqram sizə bəi suallar verəcək və %2 sizin komputerinizə qurmağa kömək edəcək.
-    
-  
   
     ScanningDialog
     
@@ -3648,27 +3628,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Nəticə
-    
-  
   
     TrackingInstallJob
     
@@ -4000,7 +3959,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Xoş Gəldiniz
     
@@ -4008,7 +3967,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Xoş Gəldiniz
     
@@ -4089,21 +4048,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Dillər</h1> </br>
                     Sistemin yer ayarları bəzi istifadəçi interfeysi elementləri əmrlər sətri üçün dil və simvolların ayarlanmasına təsir edir. Cari ayar: <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Yerlər</h1></br>
                  Sistemin məkan ayarları say və tarix formatlarəna təsir edir. Cari ayar <strong>%1</strong>-dir
     
     
-      
+      
       Back
       Geriyə
     
@@ -4169,6 +4128,45 @@ Output:
             <p>Bunlar buraxılış qeydləri nümunəsidir.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4225,132 +4223,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       İnzibatçı tapşırıqlarını yerinə yetirmək və sistemə giriş üçün istifadəçi adını və istifadəçi hesabı məlumatlarını daxil edin
     
     
-      
+      
       What is your name?
       Adınız nədir?
     
     
-      
+      
       Your Full Name
       Tam adınız
     
     
-      
+      
       What name do you want to use to log in?
       Giriş üçün hansı adı istifadə etmək istəyirsiniz?
     
     
-      
+      
       Login Name
       Giriş Adı
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər.
     
     
-      
+      
       root is not allowed as username.
       kökə istifadəçi_adı kimi icazə verilmir.
     
     
-      
+      
       What is the name of this computer?
       Bu kompyuterin adı nədir?
     
     
-      
+      
       Computer Name
       Kompyuterin adı
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək.
     
     
-      
+      
       localhost is not allowed as hostname.
       yerli hosta host_adı kimi icazə verilmir.
     
     
-      
+      
       Choose a password to keep your account safe.
       Hesabınızın təhlükəsizliyi üçün şifrə seçin.
     
     
-      
+      
       Password
       Şifrə
     
     
-      
+      
       Repeat Password
       Şifrənin təkararı
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir.
     
     
-      
+      
       Validate passwords quality
       Şifrənin keyfiyyətini yoxlamaq
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz.
     
     
-      
+      
       Log in automatically without asking for the password
       Şifrə soruşmadan sistemə daxil olmaq
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Yalnız hərflərə, saylara, alt cizgisinə və tire işarəsinə icazə verilir, ən az iki simvol.
     
     
-      
+      
       Reuse user password as root password
       İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək
     
     
-      
+      
       Use the same password for the administrator account.
       İdarəçi hesabı üçün eyni şifrədən istifadə etmək.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Hesabınızı qorumaq üçün kök şifrəsini seçin.
     
     
-      
+      
       Root Password
       Kök Şifrəsi
     
     
-      
+      
       Repeat Root Password
       Kök Şifrəsini təkrar yazın
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin.
     
diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts
index 8fa6b0ca2d..af9838fba7 100644
--- a/lang/calamares_az_AZ.ts
+++ b/lang/calamares_az_AZ.ts
@@ -495,12 +495,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Quraşdırıcı proqram
     
     
-      
+      
       %1 Installer
       %1 Quraşdırıcı
     
@@ -539,149 +539,149 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Format
     
     
-      
+      
       Select storage de&vice:
       Yaddaş ci&hazını seçmək:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Cari:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Əl ilə bölmək</strong><br/>Siz bölməni özünüz yarada və ölçüsünü dəyişə bilərsiniz.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 Ev bölməsi olaraq %2 üçün istifadə edilsin.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Kiçiltmək üçün bir bölmə seçərək altdakı çübüğü sürüşdürərək ölçüsünü verin</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 %2MB-a qədər azalacaq və %4 üçün yeni bölmə %3MB disk bölməsi yaradılacaq.
     
     
-      
+      
       Boot loader location:
       Ön yükləyici (boot) yeri:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Quraşdırılacaq disk bölməsini seçin</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI sistem bölməsi tapılmadı. Geriyə qayıdın və %1 bölməsini əllə yaradın.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 EFI sistemi %2 başlatmaq üçün istifadə olunacaqdır.
     
     
-      
+      
       EFI system partition:
       EFI sistem bölməsi:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazıda əməliyyat sistemi görünmür. Nə etmək istəyərdiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Diski təmizləmək</strong><br/> <font color="red">Silmək</font>seçimi hal-hazırda, seçilmiş diskdəki bütün verilənləri siləcəkdir.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Yanına quraşdırın</strong><br/>Quraşdırıcı, bölməni kiçildərək %1 üçün boş disk sahəsi yaradacaqdır.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Bölməni başqası ilə əvəzləmək</strong><br/>Bölməni %1 ilə əvəzləyir.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda %1 var. Nə etmək istəyirsiniz?<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda artıq bir əməliyyat sistemi var. Nə etmək istərdiniz?.<br/>Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu cihazda bir neçə əməliyyat sistemi mövcuddur. Nə etmək istərdiniz? Bu cihazda dəyişiklik etmədən öncə siz seçiminizi dəqiqləşdirə, dəyişə və təsdiq edə bilərsiniz.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Bu yaddaş qurğusunda artıq əməliyyat sistemi var, lakin, bölmə cədvəli <strong>%1</strong>, lazım olan <strong>%2</strong> ilə fərqlidir.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Bu yaddaş qurğusunda bölmələrdən biri <strong>quraşdırılmışdır</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Bu yaddaş qurğusu <strong>qeyri-aktiv RAİD</strong> qurğusunun bir hissəsidir.
     
     
-      
+      
       No Swap
       Mübadilə bölməsi olmadan
     
     
-      
+      
       Reuse Swap
       Mövcud mübadilə bölməsini istifadə etmək
     
     
-      
+      
       Swap (no Hibernate)
       Mübadilə bölməsi (yuxu rejimi olmadan)
     
     
-      
+      
       Swap (with Hibernate)
       Mübadilə bölməsi (yuxu rejimi ilə)
     
     
-      
+      
       Swap to file
       Mübadilə faylı
     
@@ -749,12 +749,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Klaviatura modelini %1 olaraq təyin etmək.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Klaviatura qatını %1/%2 olaraq təyin etmək.
     
@@ -804,47 +804,47 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Şəbəkə üzərindən quraşdırmaq (Söndürüldü: paket siyahıları qəbul edilmir, şəbəkə bağlantınızı yoxlayın)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Bu kompüter, %1 quraşdırılması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Bu proqram sizə bəzi suallar verəcək və %2 əməliyyat sistemini sizin komputerinizə qurmağa kömək edəcək.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 üçün Calamares quraşdırma proqramına xoş gəldiniz!</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 quraşdırmaq üçün xoş gəldiniz</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 üçün Calamares quraşdırıcısına xoş gəldiniz!</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 quraşdırıcısına xoş gəldiniz</h1>
     
@@ -939,15 +939,40 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.%1-n quraşdırılması başa çatdı.
     
     
-      
+      
       Package Selection
       Paket seçimi
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Lütfən məhsulu siyahıdan seçin. Seçilmiş məhsul quraşdırılacaqdır.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Nəticə
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
+    
   
   
     ContextualProcessJob
@@ -2446,6 +2471,14 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Lütfən məhsulu siyahıdan seçin. Seçilmiş məhsul quraşdırılacaqdır.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paketlər
+    
+  
   
     PackageChooserViewStep
     
@@ -2729,17 +2762,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Ön yükləy&icinin quraşdırılma yeri:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       %1-də yeni bölmə yaratmaq istədiyinizə əminsiniz?
     
     
-      
+      
       Can not create new partition
       Yeni bölmə yaradıla bilmir
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       %1 üzərindəki bölmə cədvəlində %2 birinci disk bölümü var və artıq əlavə edilə bilməz. 
 Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndirilmiş bölmə əlavə edin.
@@ -2758,107 +2791,82 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril
       Bölmələr
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Digər əməliyyat sistemini %1 <strong>yanına</strong> quraşdırmaq.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      Diski <strong>çıxarmaq</strong> və %1 quraşdırmaq.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      Bölməni %1 ilə <strong>əvəzləmək</strong>.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Əl ilə</strong> bölüşdürmə.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      <strong>%2</strong> (%3) diskində başqa əməliyyat sistemini %1 <strong>yanında</strong> quraşdırmaq.
+      
+      Current:
+      Cari:
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>%2</strong> (%3) diskini <strong>çıxartmaq</strong> və %1 quraşdırmaq.
+      
+      After:
+      Sonra:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>%2</strong> (%3) diskində bölməni %1 ilə <strong>əvəzləmək</strong>.
+      
+      No EFI system partition configured
+      EFI sistemi bölməsi tənzimlənməyib
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>%1</strong> (%2) diskində <strong>əl ilə</strong> bölüşdürmə.
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      <strong>%1</strong> (%2) diski
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      Current:
-      Cari:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      After:
-      Sonra:
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      No EFI system partition configured
-      EFI sistemi bölməsi tənzimlənməyib
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      EFİ sistemi bölməsi, %1 başlatmaq üçün vacibdir. <br/><br/>EFİ sistemi bölməsini yaratmaq üçün geriyə qayıdın və aktiv edilmiş<strong>%3</strong> bayrağı və <strong>%2</strong> qoşulma nöqtəsi ilə FAT32 fayl sistemi seçin və ya yaradın.<br/><br/>Siz EFİ sistemi bölməsi yaratmadan da davam edə bilərsiniz, lakin bu halda sisteminiz açılmaya bilər.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      %1 başlatmaq üçün EFİ sistem bölməsi vacibdir.<br/><br/>Bölmə <strong>%2</strong> qoşulma nöqtəsi ilə yaradılıb, lakin onun <strong>%3</strong> bayrağı seçilməyib.<br/>Bayrağı seçmək üçün geriyə qayıdın və bölməyə süzəliş edin.<br/><br/>Siz bayrağı seçmədən də davam edə bilərsiniz, lakin bu halda sisteminiz açılmaya bilər.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
-      EFI system partition flag not set
-      EFİ sistem bölməsi bayraqı seçilməyib
-    
-    
-      
+      
       Option to use GPT on BIOS
       BIOS-da GPT istifadəsi seçimi
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT bölmə cədvəli bütün sistemlər üçün yaxşıdır. Bu quraşdırıcı BIOS sistemləri üçün də belə bir quruluşu dəstəkləyir.<br/><br/>BİOS-da GPT bölmələr cədvəlini ayarlamaq üçün (əgər bu edilməyibsə) geriyə qayıdın və bölmələr cədvəlini GPT-yə qurun, sonra isə <strong>bios_grub</strong> bayrağı seçilmiş 8 MB-lıq formatlanmamış bölmə yaradın.<br/><br/>8 MB-lıq formatlanmamış bölmə GPT ilə BİOS sistemində %1 başlatmaq üçün lazımdır.
     
     
-      
+      
       Boot partition not encrypted
       Ön yükləyici bölməsi çifrələnməyib
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Şifrəli bir kök bölməsi ilə birlikdə ayrı bir ön yükləyici bölməsi qurulub, ancaq ön yükləyici bölməsi şifrələnməyib.<br/><br/>Bu cür quraşdırma ilə bağlı təhlükəsizlik problemləri olur, çünki vacib sistem sənədləri şifrəsiz bölmədə saxlanılır.<br/>İstəyirsinizsə davam edə bilərsiniz, lakin, fayl sisteminin kilidi, sistem başladıldıqdan daha sonra açılacaqdır.<br/>Yükləmə hissəsini şifrələmək üçün geri qayıdın və bölmə yaratma pəncərəsində <strong>Şifrələmə</strong> menyusunu seçərək onu yenidən yaradın.
     
     
-      
+      
       has at least one disk device available.
       ən az bir disk qurğusu mövcuddur.
     
     
-      
+      
       There are no partitions to install on.
       Quraşdırmaq üçün bölmə yoxdur.
     
@@ -2993,7 +3001,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3319,44 +3327,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Ən yaşxı nəticə üçün lütfən, əmin olun ki, bu kompyuter:
     
     
-      
+      
       System requirements
       Sistem tələbləri
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilməz. <a href="#details">Ətraflı məlumatlar...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Bu kompüter %1 qurulması üçün minimum tələblərə cavab vermir. <br/>Quraşdırılma davam etdirilə bilər, lakin bəzi imkanları əlçatmaz ola bilər.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Bu proqram sizə bəi suallar verəcək və %2 sizin komputerinizə qurmağa kömək edəcək.
-    
-  
   
     ScanningDialog
     
@@ -3648,27 +3628,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Bu quraşdırma proseduruna başladıqdan sonra nələrin baş verəcəyinə ümumi baxışdır.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Nəticə
-    
-  
   
     TrackingInstallJob
     
@@ -4000,7 +3959,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Xoş Gəldiniz
     
@@ -4008,7 +3967,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Xoş Gəldiniz
     
@@ -4089,21 +4048,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Dillər</h1> </br>
                     Sistemin yer ayarları bəzi istifadəçi interfeysi elementləri əmrlər sətri üçün dil və simvolların ayarlanmasına təsir edir. Cari ayar: <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Yerlər</h1></br>
                  Sistemin məkan ayarları say və tarix formatlarəna təsir edir. Cari ayar <strong>%1</strong>-dir
     
     
-      
+      
       Back
       Geriyə
     
@@ -4169,6 +4128,45 @@ Output:
             <p>Bunlar buraxılış qeydləri nümunəsidir.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4225,132 +4223,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       İnzibatçı tapşırıqlarını yerinə yetirmək və sistemə giriş üçün istifadəçi adını və istifadəçi hesabı məlumatlarını daxil edin
     
     
-      
+      
       What is your name?
       Adınız nədir?
     
     
-      
+      
       Your Full Name
       Tam adınız
     
     
-      
+      
       What name do you want to use to log in?
       Giriş üçün hansı adı istifadə etmək istəyirsiniz?
     
     
-      
+      
       Login Name
       Giriş Adı
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Yalnız kiçik hərflərdən, simvollardan, alt cizgidən və defisdən istifadə oluna bilər.
     
     
-      
+      
       root is not allowed as username.
       kökə istifadəçi_adı kimi icazə verilmir.
     
     
-      
+      
       What is the name of this computer?
       Bu kompyuterin adı nədir?
     
     
-      
+      
       Computer Name
       Kompyuterin adı
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək.
     
     
-      
+      
       localhost is not allowed as hostname.
       yerli hosta host_adı kimi icazə verilmir.
     
     
-      
+      
       Choose a password to keep your account safe.
       Hesabınızın təhlükəsizliyi üçün şifrə seçin.
     
     
-      
+      
       Password
       Şifrə
     
     
-      
+      
       Repeat Password
       Şifrənin təkararı
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir.
     
     
-      
+      
       Validate passwords quality
       Şifrənin keyfiyyətini yoxlamaq
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Bu qutu işarələndikdə, şifrənin etibarlıq səviyyəsi yoxlanılır və siz zəif şifrədən istifadə edə bilməyəcəksiniz.
     
     
-      
+      
       Log in automatically without asking for the password
       Şifrə soruşmadan sistemə daxil olmaq
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Yalnız hərflərə, saylara, alt cizgisinə və tire işarəsinə icazə verilir, ən az iki simvol.
     
     
-      
+      
       Reuse user password as root password
       İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək
     
     
-      
+      
       Use the same password for the administrator account.
       İdarəçi hesabı üçün eyni şifrədən istifadə etmək.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Hesabınızı qorumaq üçün kök şifrəsini seçin.
     
     
-      
+      
       Root Password
       Kök Şifrəsi
     
     
-      
+      
       Repeat Root Password
       Kök Şifrəsini təkrar yazın
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin.
     
diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts
index 27ab2e0764..f5a40252f4 100644
--- a/lang/calamares_be.ts
+++ b/lang/calamares_be.ts
@@ -493,12 +493,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Праграма ўсталёўкі %1
     
     
-      
+      
       %1 Installer
       Праграма ўсталёўкі %1
     
@@ -537,149 +537,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Абраць &прыладу захоўвання:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Бягучы:
     
     
-      
+      
       After:
       Пасля:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Уласнаручная разметка</strong><br/>Вы можаце самастойна ствараць раздзелы або змяняць іх памеры.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Выкарыстаць %1 як хатні раздзел для %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Абярыце раздзел для памяншэння і цягніце паўзунок, каб змяніць памер</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 будзе паменшаны да %2MiB і новы раздзел %3MiB будзе створаны для %4.
     
     
-      
+      
       Boot loader location:
       Размяшчэнне загрузчыка:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Абярыце раздзел для ўсталёўкі </strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Не выяўлена сістэмнага раздзела EFI. Калі ласка, вярніцеся назад і зрабіце разметку %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Сістэмны раздзел EFI на %1 будзе выкарыстаны для запуску %2.
     
     
-      
+      
       EFI system partition:
       Сістэмны раздзел EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Здаецца, на гэтай прыладзе няма аперацыйнай сістэмы. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Сцерці дыск</strong><br/>Гэта <font color="red">выдаліць</font> усе даныя на абранай прыладзе.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Усталяваць побач</strong><br/>Праграма ўсталёўкі паменшыць раздзел, каб вызваліць месца для %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Замяніць раздзел </strong><br/>Заменіць раздзел на %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На гэтай прыладзе ёсць %1. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На гэтай прыладзе ўжо ёсць аперацыйная сістэма. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На гэтай прыладзе ўжо ёсць некалькі аперацыйных сістэм. Што будзеце рабіць?<br/>Вы зможаце змяніць альбо пацвердзіць свой выбар да таго як на прыладзе ўжывуцца змены.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       На гэтай прыладзе ўжо ўсталяваная аперацыйная сістэма, але табліца раздзелаў <strong>%1</strong> не такая, як патрэбна <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Адзін з раздзелаў гэтай назапашвальнай прылады<strong>прымантаваны</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Гэтая назапашвальная прылада ёсць часткай<strong>неактыўнага RAID</strong>.
     
     
-      
+      
       No Swap
       Без раздзела падпампоўкі
     
     
-      
+      
       Reuse Swap
       Выкарыстаць існы раздзел падпампоўкі
     
     
-      
+      
       Swap (no Hibernate)
       Раздзел падпампоўкі (без усыплення)
     
     
-      
+      
       Swap (with Hibernate)
       Раздзел падпампоўкі (з усыпленнем)
     
     
-      
+      
       Swap to file
       Раздзел падпампоўкі ў файле
     
@@ -747,12 +747,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Вызначыць мадэль клавіятуры %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Вызначыць раскладку клавіятуры %1/%2.
     
@@ -802,47 +802,47 @@ The installer will quit and all changes will be lost.
       Сеткавая ўсталёўка. (Адключана: немагчыма атрымаць спіс пакункаў, праверце ваша сеткавае злучэнне)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Гэты камп’ютар не адпавядае мінімальным патрэбам для ўсталёўкі %1.<br/>Немагчыма працягнуць. <a href="#details">Падрабязней...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Гэты камп’ютар не адпавядае мінімальным патрэбам для ўсталёўкі %1.<br/>Немагчыма працягнуць. <a href="#details">Падрабязней...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.<br/>Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.<br/>Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Гэтая праграма задасць вам некалькі пытанняў і дапаможа ўсталяваць %2 на ваш камп’ютар.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Вітаем у праграме ўсталёўкі Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Вітаем у праграме ўсталёўкі %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Вітаем у праграме ўсталёўкі Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Вітаем у праграме ўсталёўкі %1</h1>
     
@@ -937,15 +937,40 @@ The installer will quit and all changes will be lost.
       Усталёўка %1 завершаная.
     
     
-      
+      
       Package Selection
       Выбар пакункаў
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Калі ласка, абярыце прадукт са спіса. Абраны прадукт будзе ўсталяваны.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Агулам
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Гэта агляд дзеянняў, якія здейсняцца падчас запуску працэдуры ўсталёўкі.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Гэта агляд дзеянняў, якія здейсняцца падчас запуску працэдуры ўсталёўкі.
+    
   
   
     ContextualProcessJob
@@ -2462,6 +2487,14 @@ The installer will quit and all changes will be lost.
       Калі ласка, абярыце прадукт са спіса. Абраны прадукт будзе ўсталяваны.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Пакункі
+    
+  
   
     PackageChooserViewStep
     
@@ -2745,17 +2778,17 @@ The installer will quit and all changes will be lost.
       &Усталяваць загрузчык на:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Сапраўды хочаце стварыць новую табліцу раздзелаў на %1?
     
     
-      
+      
       Can not create new partition
       Не атрымалася стварыць новы раздзел
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       У табліцы раздзелаў на %1 ужо %2 першасных раздзелаў, больш дадаць немагчыма. Выдаліце адзін з першасных і дадайце пашыраны раздзел.
     
@@ -2773,107 +2806,82 @@ The installer will quit and all changes will be lost.
       Раздзелы
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Усталяваць %1 <strong>побач</strong> з іншай аперацыйнай сістэмай.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Ачысціць</strong> дыск і ўсталяваць %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Замяніць</strong> раздзел на %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Уласнаручная</strong> разметка.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Усталяваць %1 <strong>побач</strong> з іншай аперацыйнай сістэмай на дыск<strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Ачысціць</strong> дыск <strong>%2</strong> (%3) і ўсталяваць %1.
+      
+      Current:
+      Бягучы:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Замяніць</strong> раздзел на дыску <strong>%2</strong> (%3) на %1.
+      
+      After:
+      Пасля:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Уласнаручная</strong> разметка дыска<strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Няма наладжанага сістэмнага раздзела EFI
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Дыск <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Бягучы:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Пасля:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Няма наладжанага сістэмнага раздзела EFI
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Для таго, каб пачаць %1, патрабуецца сістэмны раздзел EFI.<br/><br/> Каб наладзіць сістэмны раздзел EFI, вярніцеся назад, абярыце альбо стварыце файлавую сістэму FAT32 са сцягам <strong>%3</strong> і пунктам мантавання <strong>%2</strong>.<br/><br/>Вы можаце працягнуць і без наладкі сістэмнага раздзела EFI, але ваша сістэма можа не загрузіцца.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Для таго, каб пачаць %1, патрабуецца сістэмны раздзел EFI.<br/><br/>Быў наладжаны раздзел з пунктам мантавання<strong>%2</strong> але яго сцяг <strong>%3</strong> не вызначаны.<br/>Каб вызначыць сцяг, вярніцеся назад і адрэдагуйце раздзел.<br/><br/> Вы можаце працягнуць без наладкі раздзела, але ваша сістэма можа не загрузіцца.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Не вызначаны сцяг сістэмнага раздзела EFI
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Параметр для выкарыстання GPT у BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Табліца раздзелаў GPT - найлепшы варыянт для ўсіх сістэм. Гэтая праграма ўсталёўкі таксама падтрымлівае гэты варыянт і для BIOS.<br/><br/>Каб наладзіць GPT для BIOS (калі гэта яшчэ не зроблена), вярніцеся назад і абярыце табліцу раздзелаў GPT, пасля стварыце нефарматаваны раздзел памерам 8 МБ са сцягам <strong>bios_grub</strong>.<br/><br/>Гэты раздзел патрэбны для запуску %1 у BIOS з GPT.
     
     
-      
+      
       Boot partition not encrypted
       Загрузачны раздзел не зашыфраваны
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Уключана шыфраванне каранёвага раздзела, але выкарыстаны асобны загрузачны раздзел без шыфравання.<br/><br/>Пры такой канфігурацыі могуць узнікнуць праблемы з бяспекай, бо важныя сістэмныя даныя будуць захоўвацца на раздзеле без шыфравання.<br/>Вы можаце працягнуць, але файлавая сістэма разблакуецца падчас запуску сістэмы.<br/>Каб уключыць шыфраванне загрузачнага раздзела, вярніцеся назад і стварыце яго нанова, адзначыўшы <strong>Шыфраваць</strong> у акне стварэння раздзела.
     
     
-      
+      
       has at least one disk device available.
       ёсць прынамсі адна даступная дыскавая прылада.
     
     
-      
+      
       There are no partitions to install on.
       Няма раздзелаў для ўсталёўкі.
     
@@ -3008,7 +3016,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3334,44 +3342,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Для дасягнення найлепшых вынікаў пераканайцеся, што гэты камп’ютар:
     
     
-      
+      
       System requirements
       Сістэмныя патрабаванні
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Гэты камп’ютар не адпавядае мінімальным патрэбам для ўсталёўкі %1.<br/>Немагчыма працягнуць. <a href="#details">Падрабязней...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Гэты камп’ютар не адпавядае мінімальным патрэбам для ўсталёўкі %1.<br/>Немагчыма працягнуць. <a href="#details">Падрабязней...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.<br/>Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.<br/>Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Гэтая праграма задасць вам некалькі пытанняў і дапаможа ўсталяваць %2 на ваш камп’ютар.
-    
-  
   
     ScanningDialog
     
@@ -3663,27 +3643,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Гэта агляд дзеянняў, якія здейсняцца падчас запуску працэдуры ўсталёўкі.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Гэта агляд дзеянняў, якія здейсняцца падчас запуску працэдуры ўсталёўкі.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Агулам
-    
-  
   
     TrackingInstallJob
     
@@ -4015,7 +3974,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Вітаем
     
@@ -4023,7 +3982,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Вітаем
     
@@ -4103,21 +4062,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Мовы</h1></br>
                     Сістэмныя рэгіянальныя налады вызначаюць мову і кадаванне для пэўных элементаў інтэрфейсу загаднага радка. Бягучыя налады <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Рэгіянальныя налады</h1></br>
                     Сістэмныя рэгіянальныя налады вызначаюць фармат нумароў і датаў. Бягучыя налады <strong>%1</strong>.
     
     
-      
+      
       Back
       Назад
     
@@ -4183,6 +4142,45 @@ Output:
             <p>Гэта прыклад нататак да выпуску.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4240,132 +4238,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Абярыце свае імя карыстальніка і ўліковыя даныя для ўваходу і выканання задач адміністратара
     
     
-      
+      
       What is your name?
       Як ваша імя?
     
     
-      
+      
       Your Full Name
       Ваша поўнае імя
     
     
-      
+      
       What name do you want to use to log in?
       Якое імя вы хочаце выкарыстоўваць для ўваходу?
     
     
-      
+      
       Login Name
       Лагін
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Дазваляюцца толькі літары, лічбы, знакі падкрэслівання, працяжнікі.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Якая назва гэтага камп’ютара?
     
     
-      
+      
       Computer Name
       Назва камп’ютара
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Назва будзе выкарыстоўвацца для пазначэння камп’ютара ў сетцы.
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Абярыце пароль для абароны вашага акаўнта.
     
     
-      
+      
       Password
       Пароль
     
     
-      
+      
       Repeat Password
       Паўтарыце пароль
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Увядзіце двойчы аднолькавы пароль. Гэта неабходна для таго, каб пазбегнуць памылак. Надзейны пароль павінен складацца з літар, лічбаў, знакаў пунктуацыі. Ён павінен змяшчаць прынамсі 8 знакаў, яго перыядычна трэба змяняць.
     
     
-      
+      
       Validate passwords quality
       Праверка якасці пароляў
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Калі адзначана, будзе выконвацца праверка надзейнасці пароля, таму вы не зможаце выкарыстаць слабы пароль.
     
     
-      
+      
       Log in automatically without asking for the password
       Аўтаматычна ўваходзіць без уводу пароля
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Выкарыстоўваць пароль карыстальніка як пароль адміністратара
     
     
-      
+      
       Use the same password for the administrator account.
       Выкарыстоўваць той жа пароль для акаўнта адміністратара.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Абярыце пароль адміністратара для абароны вашага акаўнта.
     
     
-      
+      
       Root Password
       Пароль адміністратара
     
     
-      
+      
       Repeat Root Password
       Паўтарыце пароль адміністратара
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Увядзіце пароль двойчы, каб пазбегнуць памылак уводу.
     
diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index 8926c2850c..320e06875a 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -490,12 +490,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 Инсталатор
     
@@ -534,149 +534,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Изберете ус&тройство за съхранение:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Сегашен:
     
     
-      
+      
       After:
       След:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Самостоятелно поделяне</strong><br/>Можете да създадете или преоразмерите дяловете сами.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Използване на %1 като домашен дял за %2
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Изберете дял за смаляване, после влачете долната лента за преоразмеряване</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Локация на програмата за начално зареждане:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Изберете дял за инсталацията</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI системен дял не е намерен. Моля, опитайте пак като използвате ръчно поделяне за %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI системен дял в %1 ще бъде използван за стартиране на %2.
     
     
-      
+      
       EFI system partition:
       EFI системен дял:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Това устройство за съхранение няма инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Изтриване на диска</strong><br/>Това ще <font color="red">изтрие</font> всички данни върху устройството за съхранение.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Инсталирайте покрай</strong><br/>Инсталатора ще раздроби дяла за да направи място за %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Замени дял</strong><br/>Заменя този дял с %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Това устройство за съхранение има инсталиран %1. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Това устройство за съхранение има инсталирана операционна система. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Това устройство за съхранение има инсталирани операционни системи. Какво ще правите?<br/>Ще може да прегледате и потвърдите избора си, преди да се направят промени по устройството за съхранение.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -744,12 +744,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Постави модел на клавиатурата на %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Постави оформлението на клавиатурата на %1/%2.
     
@@ -799,48 +799,48 @@ The installer will quit and all changes will be lost.
       Мрежова инсталация. (Изключена: Списъкът с пакети не може да бъде извлечен, проверете Вашата Интернет връзка)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Този компютър не отговаря на минималните изисквания за инсталиране %1.<br/>Инсталацията не може да продължи.
 <a href="#details">Детайли...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Този компютър не отговаря на някои от препоръчителните изисквания за инсталиране %1.<br/>Инсталацията може да продължи, но някои свойства могат да бъдат недостъпни.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Тази програма ще ви зададе няколко въпроса и ще конфигурира %2 на вашия компютър.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -935,15 +935,40 @@ The installer will quit and all changes will be lost.
       Инсталацията на %1 е завършена.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Обобщение
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Това е преглед на промените, които ще се извършат, след като започнете процедурата по инсталиране.
+    
   
   
     ContextualProcessJob
@@ -2440,6 +2465,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2723,17 +2756,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Сигурни ли сте че искате да създадете нова таблица на дяловете върху %1?
     
     
-      
+      
       Can not create new partition
       Не може да се създаде нов дял
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Таблицата на дяловете на %1 вече има %2 главни дялове, повече не може да се добавят. Моля, премахнете един главен дял и добавете разширен дял, на негово място.
     
@@ -2751,107 +2784,82 @@ The installer will quit and all changes will be lost.
       Дялове
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Инсталирай %1 <strong>заедно</strong> с друга операционна система.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Изтрий</strong> диска и инсталирай %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Замени</strong> дял с %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Ръчно</strong> поделяне.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Инсталирай %1 <strong>заедно</strong> с друга операционна система на диск <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Изтрий</strong> диск <strong>%2</strong> (%3) и инсталирай %1.
+      
+      Current:
+      Сегашен:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Замени</strong> дял на диск <strong>%2</strong> (%3) с %1.
+      
+      After:
+      След:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Ръчно</strong> поделяне на диск <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Няма конфигуриран EFI системен дял
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Диск <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Сегашен:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      След:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Няма конфигуриран EFI системен дял
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      Не е зададен флаг на EFI системен дял
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Липсва криптиране на дял за начално зареждане
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2985,7 +2993,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3308,45 +3316,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       За най-добри резултати, моля бъдете сигурни че този компютър:
     
     
-      
+      
       System requirements
       Системни изисквания
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Този компютър не отговаря на минималните изисквания за инсталиране %1.<br/>Инсталацията не може да продължи.
-<a href="#details">Детайли...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Този компютър не отговаря на някои от препоръчителните изисквания за инсталиране %1.<br/>Инсталацията може да продължи, но някои свойства могат да бъдат недостъпни.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Тази програма ще ви зададе няколко въпроса и ще конфигурира %2 на вашия компютър.
-    
-  
   
     ScanningDialog
     
@@ -3638,27 +3617,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Това е преглед на промените, които ще се извършат, след като започнете процедурата по инсталиране.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Обобщение
-    
-  
   
     TrackingInstallJob
     
@@ -3990,7 +3948,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Добре дошли
     
@@ -3998,7 +3956,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Добре дошли
     
@@ -4068,19 +4026,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4145,6 +4103,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4181,132 +4178,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Какво е вашето име?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Какво име искате да използвате за влизане?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Какво е името на този компютър?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Изберете парола за да държите вашият акаунт в безопасност.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Използвайте същата парола за администраторския акаунт.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts
index 15905ef64d..f9d76c500f 100644
--- a/lang/calamares_bn.ts
+++ b/lang/calamares_bn.ts
@@ -490,12 +490,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 ইনস্টল
     
@@ -534,149 +534,149 @@ The installer will quit and all changes will be lost.
       ফর্ম
     
     
-      
+      
       Select storage de&vice:
       স্টোরেজ ডিএবংভাইস নির্বাচন করুন:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       বর্তমান:
     
     
-      
+      
       After:
       পরে:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>সংকুচিত করার জন্য একটি পার্টিশন নির্বাচন করুন, তারপর নিচের বারটি পুনঃআকারের জন্য টেনে আনুন</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       বুট লোডার অবস্থান:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>ইনস্টল করতে একটি পার্টিশন নির্বাচন করুন</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 এ EFI সিস্টেম পার্টিশন %2 শুরু করার জন্য ব্যবহার করা হবে।
     
     
-      
+      
       EFI system partition:
       EFI সিস্টেম পার্টিশন:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এই স্টোরেজ ডিভাইসে কোন অপারেটিং সিস্টেম আছে বলে মনে হয় না। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>ডিস্ক মুছে ফেলুন</strong> <br/>এটি বর্তমানে নির্বাচিত স্টোরেজ ডিভাইসে উপস্থিত সকল উপাত্ত <font color="red">মুছে ফেলবে</font>।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>ইনস্টল করুন পাশাপাশি</strong> <br/>ইনস্টলার %1 এর জন্য জায়গা তৈরি করতে একটি পার্টিশন সংকুচিত করবে।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>একটি পার্টিশন প্রতিস্থাপন করুন</strong><br/>%1-এর সাথে একটি পার্টিশন প্রতিস্থাপন করে।
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এই সঞ্চয় যন্ত্রটিতে %1 আছে। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন।
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এই স্টোরেজ ডিভাইসে ইতোমধ্যে একটি অপারেটিং সিস্টেম আছে। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       এই স্টোরেজ ডিভাইসে একাধিক অপারেটিং সিস্টেম আছে। তুমি কি করতে চাও? <br/>স্টোরেজ ডিভাইসে কোন পরিবর্তন করার আগে আপনি আপনার পছন্দপর্যালোচনা এবং নিশ্চিত করতে সক্ষম হবেন.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -744,12 +744,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       %1-এ কীবোর্ড নকশা নির্ধারণ করুন।
     
     
-      
+      
       Set keyboard layout to %1/%2.
       %1/%2 এ কীবোর্ড বিন্যাস নির্ধারণ করুন।
     
@@ -799,47 +799,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -934,15 +934,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      সারাংশ
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      আপনি ইনস্টল প্রক্রিয়া শুরু করার পর কি হবে তার একটি পর্যালোচনা।
+    
   
   
     ContextualProcessJob
@@ -2439,6 +2464,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2722,17 +2755,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       আপনি কি নিশ্চিত যে আপনি %1 এ একটি নতুন পার্টিশন টেবিল তৈরি করতে চান?
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2750,107 +2783,82 @@ The installer will quit and all changes will be lost.
       পার্টিশনগুলো
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      অন্য অপারেটিং সিস্টেমের <strong>পাশাপাশি</strong> %1 ইনস্টল করুন।
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      ডিস্ক <strong>মুছে ফেলুন</strong> এবং %1 সংস্থাপন করুন।
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      %1 দিয়ে একটি পার্টিশন <strong>প্রতিস্থাপন করুন</strong>।
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>ম্যানুয়াল</strong> পার্টিশনিং।
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      <strong>%2</strong> (%3) ডিস্কে অন্য অপারেটিং সিস্টেমের <strong>পাশাপাশি</strong> %1 ইনস্টল করুন।
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      ডিস্ক <strong>%2</strong> (%3) <strong>মুছে ফেলুন</strong> এবং %1 সংস্থাপন করুন।
+      
+      Current:
+      বর্তমান:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      %1 দিয়ে <strong>%2</strong> (%3) ডিস্কে একটি পার্টিশন <strong>প্রতিস্থাপন করুন</strong>।
+      
+      After:
+      পরে:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>%1</strong>  (%2) ডিস্কে <strong>ম্যানুয়াল</strong> পার্টিশন করা হচ্ছে।
+      
+      No EFI system partition configured
+      
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      ডিস্ক <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      বর্তমান:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      পরে:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2982,7 +2990,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3305,44 +3313,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3634,27 +3614,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      আপনি ইনস্টল প্রক্রিয়া শুরু করার পর কি হবে তার একটি পর্যালোচনা।
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      সারাংশ
-    
-  
   
     TrackingInstallJob
     
@@ -3986,7 +3945,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       স্বাগতম
     
@@ -3994,7 +3953,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       স্বাগতম
     
@@ -4064,19 +4023,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4141,6 +4100,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4177,132 +4175,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       আপনার নাম কি?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       লগ-ইন করতে আপনি কোন নাম ব্যবহার করতে চান?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       এই কম্পিউটারের নাম কি?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       আপনার অ্যাকাউন্ট সুরক্ষিত রাখতে একটি পাসওয়ার্ড নির্বাচন করুন।
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       প্রশাসক হিসাবের জন্য একই গুপ্ত-সংকেত ব্যবহার করুন।
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index 33c9ad2639..f800445908 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -495,12 +495,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Programa de configuració %1
     
     
-      
+      
       %1 Installer
       Instal·lador de %1
     
@@ -539,149 +539,149 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Formulari
     
     
-      
+      
       Select storage de&vice:
       Seleccioneu un dispositiu d'e&mmagatzematge:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Després:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particions manuals</strong><br/>Podeu crear o canviar la mida de les particions vosaltres mateixos.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilitza %1 com a partició de l'usuari per a %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Seleccioneu una partició per encongir i arrossegueu-la per redimensinar-la</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 s'encongirà a %2 MiB i es crearà una partició nova de %3 MB per a %4.
     
     
-      
+      
       Boot loader location:
       Ubicació del gestor d'arrencada:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Seleccioneu una partició per fer-hi la instal·lació.</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       No s'ha pogut trobar enlloc una partició EFI en aquest sistema. Si us plau, torneu enrere i use les particions manuals per configurar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
        La partició EFI de sistema a %1 s'usarà per iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partició EFI del sistema:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge no sembla que tingui un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Esborra el disc</strong><br/>Això <font color="red">suprimirà</font> totes les dades del dispositiu seleccionat.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instal·la'l al costat</strong><br/>L'instal·lador reduirà una partició per fer espai per a %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Reemplaça una partició</strong><br/>Reemplaça una partició per %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge té %1. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. 
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge ja té un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. 
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge ja múltiples sistemes operatius. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faci cap canvi al dispositiu. 
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Aquest dispositiu d'emmagatzematge ja té un sistema operatiu, però la taula de particions <strong>%1</strong> és diferent de la necessària: <strong>%2</strong>.<br/> 
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Aquest dispositiu d'emmagatzematge té una de les particions <strong>muntada</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Aquest sistema d'emmagatzematge forma part d'un dispositiu de <strong>RAID inactiu</strong>.
     
     
-      
+      
       No Swap
       Sense intercanvi
     
     
-      
+      
       Reuse Swap
       Reutilitza l'intercanvi
     
     
-      
+      
       Swap (no Hibernate)
       Intercanvi (sense hibernació)
     
     
-      
+      
       Swap (with Hibernate)
       Intercanvi (amb hibernació)
     
     
-      
+      
       Swap to file
       Intercanvi en fitxer
     
@@ -749,12 +749,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Establirà el model del teclat a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Establirà la distribució del teclat a %1/%2.
     
@@ -804,47 +804,47 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Instal·lació per xarxa. (Inhabilitada: no es poden obtenir les llistes de paquets, comproveu la connexió.)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Aquest ordinador no satisfà els requisits mínims per configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Aquest ordinador no satisfà els requisits mínims per instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Aquest ordinador no satisfà alguns dels requisits recomanats per configurar-hi %1.<br/>La configuració pot continuar, però algunes característiques podrien estar inhabilitades.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Aquest ordinador no satisfà alguns dels requisits recomanats per instal·lar-hi %1.<br/>La instal·lació pot continuar, però algunes característiques podrien estar inhabilitades.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Aquest programa us farà unes preguntes i instal·larà %2 a l'ordinador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Benvingut/da al programa de configuració del Calamares per a %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Benvingut/da a la configuració per a %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Benvingut/da a l'instal·lador Calamares per a %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Benvingut/da a l'instal·lador per a %1</h1>
     
@@ -939,15 +939,40 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       La instal·lació de %1 ha acabat.
     
     
-      
+      
       Package Selection
       Selecció de paquets
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Si us plau, trieu un producte de la llista. S'instal·larà el producte seleccionat.
     
+    
+      
+      Install option: <strong>%1</strong>
+      Opció d'instal·lació: <strong>%1</strong>
+    
+    
+      
+      None
+      Cap
+    
+    
+      
+      Summary
+      Resum
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Això és un resum del que passarà quan s'iniciï el procés de configuració.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Això és un resum del que passarà quan s'iniciï el procés d'instal·lació.
+    
   
   
     ContextualProcessJob
@@ -2446,6 +2471,14 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
       Si us plau, trieu un producte de la llista. S'instal·larà el producte seleccionat.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paquets
+    
+  
   
     PackageChooserViewStep
     
@@ -2729,17 +2762,17 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
       I&nstal·la el gestor d'arrencada a:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Esteu segurs que voleu crear una nova taula de particions a %1?
     
     
-      
+      
       Can not create new partition
       No es pot crear la partició nova
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       La taula de particions de %1 ja té %2 particions primàries i no se n'hi poden afegir més. Si us plau, suprimiu una partició primària i afegiu-hi una partició ampliada.
     
@@ -2757,107 +2790,82 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
       Particions
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Esborra</strong> el disc i instal·la-hi %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Reemplaça</strong> una partició amb %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Particions <strong>manuals</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu al disc <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Esborra</strong> el disc <strong>%2</strong> (%3) i instal·la-hi %1.
+      
+      Current:
+      Actual:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Reemplaça</strong> una partició del disc <strong>%2</strong> (%3) amb %1.
+      
+      After:
+      Després:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Particions <strong>manuals</strong> del disc <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      No hi ha cap partició EFI de sistema configurada
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disc <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      Partició de sistema EFI configurada incorrectament
     
     
-      
-      Current:
-      Actual:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      Cal una partició de sistema EFI per iniciar %1. <br/><br/>Per configurar-ne una, torneu enrere i seleccioneu o creeu un sistema de fitxers adequat.
     
     
-      
-      After:
-      Després:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      El sistema de fitxers ha d'estar muntat a <strong>%1</strong>.
     
     
-      
-      No EFI system partition configured
-      No hi ha cap partició EFI de sistema configurada
+      
+      The filesystem must have type FAT32.
+      El sistema de fitxers ha de ser del tipus FAT32.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Cal una partició EFI de sistema per iniciar %1. <br/><br/>Per configurar una partició EFI de sistema, torneu enrere i seleccioneu o creeu un sistema de fitxers FAT32 amb la bandera <strong>%3</strong> habilitada i el punt de muntatge <strong>%2</strong>. <br/><br/>Podeu continuar sense la creació d'una partició EFI de sistema, però el sistema podria no iniciar-se.
+      
+      The filesystem must be at least %1 MiB in size.
+      El sistema de fitxers ha de tenir un mínim de %1 MiB.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Cal una partició EFI de sistema per iniciar %1. <br/><br/> Ja s'ha configurat una partició amb el punt de muntatge <strong>%2</strong> però no se n'ha establert la bandera <strong>%3</strong>. <br/>Per establir-la-hi, torneu enrere i editeu la partició. <br/><br/>Podeu continuar sense establir la bandera, però el sistema podria no iniciar-se.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      El sistema de fitxers ha de tenir la bandera <strong>%1</strong> establerta.
     
     
-      
-      EFI system partition flag not set
-      No s'ha establert la bandera de la partició EFI del sistema
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      Podeu continuar sense configurar una partició del sistema EFI, però és possible que el sistema no s'iniciï.
     
     
-      
+      
       Option to use GPT on BIOS
       Opció per usar GPT amb BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       La millor opció per a tots els sistemes és una taula de particions GPT. Aquest instal·lador també admet aquesta configuració per a sistemes BIOS.<br/><br/>Per configurar una taula de particions GPT en un sistema BIOS, (si no s'ha fet ja) torneu enrere i establiu la taula de particions a GPT, després creeu una partició sense formatar de 8 MB amb la bandera <strong>bios_grub</strong> habilitada.<br/><br/>Cal una partició sense format de 8 MB per iniciar %1 en un sistema BIOS amb GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partició d'arrencada sense encriptar
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       S'ha establert una partició d'arrencada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrencada no està encriptada.<br/><br/>Hi ha assumptes de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers succeirà després, durant l'inici del sistema.<br/>Per encriptar la partició d'arrencada, torneu enrere i torneu-la a crear seleccionant <strong>Encripta</strong> a la finestra de creació de la partició.
     
     
-      
+      
       has at least one disk device available.
       tingui com a mínim un dispositiu de disc disponible.
     
     
-      
+      
       There are no partitions to install on.
       No hi ha particions per fer-hi una instal·lació.
     
@@ -2992,7 +3000,7 @@ Sortida:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3318,44 +3326,16 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Per obtenir els millors resultats, assegureu-vos, si us plau, que aquest ordinador...
     
     
-      
+      
       System requirements
       Requisits del sistema
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Aquest ordinador no satisfà els requisits mínims per configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Aquest ordinador no satisfà els requisits mínims per instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Aquest ordinador no satisfà alguns dels requisits recomanats per configurar-hi %1.<br/>La configuració pot continuar, però algunes característiques podrien estar inhabilitades.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Aquest ordinador no satisfà alguns dels requisits recomanats per instal·lar-hi %1.<br/>La instal·lació pot continuar, però algunes característiques podrien estar inhabilitades.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Aquest programa us farà unes preguntes i instal·larà %2 a l'ordinador.
-    
-  
   
     ScanningDialog
     
@@ -3647,27 +3627,6 @@ La configuració pot continuar, però algunes característiques podrien estar in
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Això és un resum del que passarà quan s'iniciï el procés de configuració.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Això és un resum del que passarà quan s'iniciï el procés d'instal·lació.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Resum
-    
-  
   
     TrackingInstallJob
     
@@ -3999,7 +3958,7 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Benvingut/da
     
@@ -4007,7 +3966,7 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Benvingut/da
     
@@ -4090,21 +4049,21 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Llengües</h1> </br>
                      La configuració local del sistema afecta la llengua i el joc de caràcters d'alguns elements de la interfície de línia d'ordres. La configuració actual és <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Configuració local</h1> </br>
                     La configuració local del sistema afecta el format de números i dates. La configuració actual és <strong>%1</strong>.
     
     
-      
+      
       Back
       Enrere
     
@@ -4170,6 +4129,46 @@ La configuració pot continuar, però algunes característiques podrien estar in
             <p>Aquestes són exemples de notes de la versió.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      El LibreOffice és un conjunt de programari d'ofimàtica potent i gratuït, usat per milions de persones a tot el món. Inclou diverses aplicacions que el converteixen en el paquet ofimàtic de codi obert i lliure més versàtil del mercat.<br/>
+Opció predeterminada.
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      Si no voleu instal·lar cap programari d'ofimàtica, només cal que seleccioneu Sense paquet d'ofimàtica. Sempre podeu afegir-ne un (o més) més endavant al sistema instal·lat quan arribi la necessitat.
+    
+    
+      
+      No Office Suite
+      Sense paquet d'ofimàtica
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      Creeu una instal·lació mínima d'escriptori, suprimiu totes les aplicacions addicionals i decidiu més tard què voleu afegir al vostre sistema. Exemples del que no hi haurà en aquesta instal·lació: no hi haurà paquet d'ofimàtica, ni reproductors multimèdia, ni visualitzador d'imatges ni suport d'impressió. Hi haruà només un escriptori, un navegador de fitxers, un gestor de paquets, un editor de text i un navegador web senzill.
+    
+    
+      
+      Minimal Install
+      Instal·lació mínima
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      Seleccioneu una opció per a la instal·lació o useu el valor predeterminat: LibreOffice inclòs.
+    
+  
   
     release_notes
     
@@ -4226,132 +4225,132 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Trieu el nom d'usuari i les credencials per iniciar la sessió i fer tasques d'administració.
     
     
-      
+      
       What is your name?
       Com us dieu?
     
     
-      
+      
       Your Full Name
       El nom complet
     
     
-      
+      
       What name do you want to use to log in?
       Quin nom voleu usar per iniciar la sessió?
     
     
-      
+      
       Login Name
       Nom d'entrada
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Si aquest ordinador l'usarà més d'una persona, podreu crear diversos comptes després de la instal·lació.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Només es permeten lletres en minúscula, números, ratlles baixes i guions.
     
     
-      
+      
       root is not allowed as username.
       No es permet root com a nom d'usuari.
     
     
-      
+      
       What is the name of this computer?
       Com es diu aquest ordinador?
     
     
-      
+      
       Computer Name
       Nom de l'ordinador
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa.
     
     
-      
+      
       localhost is not allowed as hostname.
       No es permet localhost com a nom d'amfitrió.
     
     
-      
+      
       Choose a password to keep your account safe.
       Trieu una contrasenya per tal de mantenir el compte segur.
     
     
-      
+      
       Password
       Contrasenya
     
     
-      
+      
       Repeat Password
       Repetiu la contrasenya.
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. Una bona contrasenya ha de contenir una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars.
     
     
-      
+      
       Validate passwords quality
       Valida la qualitat de les contrasenyes.
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no en podreu fer una de dèbil.
     
     
-      
+      
       Log in automatically without asking for the password
       Entra automàticament sense demanar la contrasenya.
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Només es permeten lletres, números, guionets, guionets baixos i un mínim de dos caràcters.
     
     
-      
+      
       Reuse user password as root password
       Reutilitza la contrasenya d'usuari com a contrasenya d'arrel.
     
     
-      
+      
       Use the same password for the administrator account.
       Usa la mateixa contrasenya per al compte d'administració.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Trieu una contrasenya d'arrel per mantenir el compte segur.
     
     
-      
+      
       Root Password
       Contrasenya d'arrel
     
     
-      
+      
       Repeat Root Password
       Repetiu la contrasenya d'arrel.
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia.
     
diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts
index dbe801dddc..f00b87ed3a 100644
--- a/lang/calamares_ca@valencia.ts
+++ b/lang/calamares_ca@valencia.ts
@@ -491,12 +491,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Programa de configuració %1
     
     
-      
+      
       %1 Installer
       Instal·lador de %1
     
@@ -535,149 +535,149 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Formulari
     
     
-      
+      
       Select storage de&vice:
       Seleccioneu un dispositiu d'e&mmagatzematge:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Després:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particions manuals</strong><br/>Podeu crear particions o canviar-ne la mida pel vostre compte.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilitza %1 com a partició de l'usuari per a %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Seleccioneu una partició per a reduir-la i arrossegueu-la per a redimensionar-la</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 es reduirà a %2 MiB i es crearà una partició nova de %3 MiB per a %4.
     
     
-      
+      
       Boot loader location:
       Ubicació del gestor d'arrancada:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Seleccioneu una partició per a fer-hi la instal·lació.</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       No s'ha pogut trobar una partició EFI en cap lloc d'aquest sistema. Torneu arrere i useu les particions manuals per a configurar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partició EFI de sistema en %1 s'usarà per a iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partició del sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Pareix que aquest dispositiu d'emmagatzematge no té cap sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Esborra el disc</strong><br/>Això <font color="red">suprimirà</font> totes les dades del dispositiu seleccionat.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instal·la'l al costat</strong><br/>L'instal·lador reduirà una partició per a fer espai per a %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Reemplaça una partició</strong><br/>Reemplaça una partició per %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge té %1. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge ja té un sistema operatiu. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Aquest dispositiu d'emmagatzematge ja té múltiples sistemes operatius. Què voleu fer?<br/>Podreu revisar i confirmar la tria abans que es faça cap canvi en el dispositiu.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Aquest dispositiu d'emmagatzematge ja té un sistema operatiu, però la taula de particions <strong>%1</strong> és diferent de la necessària: <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Aquest dispositiu d'emmagatzematge té una de les particions <strong>muntada</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Aquest dispositiu d'emmagatzematge forma part d'un dispositiu de <strong>RAID inactiu</strong>.
     
     
-      
+      
       No Swap
       Sense intercanvi
     
     
-      
+      
       Reuse Swap
       Reutilitza l'intercanvi
     
     
-      
+      
       Swap (no Hibernate)
       Intercanvi (sense hibernació)
     
     
-      
+      
       Swap (with Hibernate)
       Intercanvi (amb hibernació)
     
     
-      
+      
       Swap to file
       Intercanvi en fitxer
     
@@ -745,12 +745,12 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Estableix el model de teclat en %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Estableix la distribució del teclat a %1/%2.
     
@@ -800,47 +800,47 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Instal·lació per xarxa. (Inhabilitada: no es poden obtindre les llistes de paquets, comproveu la connexió.)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Aquest ordinador no satisfà els requisits mínims per a configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Aquest ordinador no satisfà els requisits mínims per a instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Aquest ordinador no satisfà alguns dels requisits recomanats per a configurar-hi %1.<br/>La configuració pot continuar, però és possible que algunes característiques no estiguen habilitades.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Aquest ordinador no satisfà alguns dels requisits recomanats per a instal·lar-hi %1.<br/>La instal·lació pot continuar, però és possible que algunes característiques no estiguen habilitades.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Aquest programa us farà unes preguntes i instal·larà %2 en l'ordinador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Us donen la benvinguda al programa de configuració del Calamares per a %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Us donen la benvinguda a la configuració per a %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Us donen la benvinguda a l'instal·lador del Calamares per a %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Us donen la benvinguda a l'instal·lador per a %1</h1>
     
@@ -935,15 +935,40 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       La instal·lació de %1 ha acabat.
     
     
-      
+      
       Package Selection
       Selecció de paquets
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Trieu un producte de la llista. S'instal·larà el producte seleccionat.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Resum
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Això és un resum de què passarà quan s'inicie el procés de configuració.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Això és un resum de què passarà quan s'inicie el procés d'instal·lació.
+    
   
   
     ContextualProcessJob
@@ -2442,6 +2467,14 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé
       Trieu un producte de la llista. S'instal·larà el producte seleccionat.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paquets
+    
+  
   
     PackageChooserViewStep
     
@@ -2725,17 +2758,17 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé
       I&nstal·la el gestor d'arrancada en:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Segur que voleu crear una nova taula de particions en %1?
     
     
-      
+      
       Can not create new partition
       No es pot crear la partició nova
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       La taula de particions de %1 ja té %2 particions primàries i no se n'hi poden afegir més. Suprimiu una partició primària i afegiu-hi una partició ampliada.
     
@@ -2753,107 +2786,82 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé
       Particions
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Esborra</strong> el disc i instal·la-hi %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Reemplaça</strong> una partició amb %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Particions <strong>manuals</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instal·la %1 <strong>al costat</strong> d'un altre sistema operatiu en el disc <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Esborra</strong> el disc <strong>%2</strong> (%3) i instal·la-hi %1.
+      
+      Current:
+      Actual:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Reemplaça</strong> una partició del disc <strong>%2</strong> (%3) amb %1.
+      
+      After:
+      Després:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Particions <strong>manuals</strong> del disc <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      No hi ha cap partició EFI de sistema configurada
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disc <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Actual:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Després:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      No hi ha cap partició EFI de sistema configurada
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Cal una partició EFI de sistema per a iniciar %1. <br/><br/>Per a configurar una partició EFI de sistema, torneu arrere i seleccioneu o creeu un sistema de fitxers FAT32 amb el marcador <strong>%3</strong> habilitada i el punt de muntatge <strong>%2</strong>. <br/><br/>Podeu continuar sense la creació d'una partició EFI de sistema, però el sistema podria no iniciar-se.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Cal una partició EFI de sistema per a iniciar %1. <br/><br/> Ja s'ha configurat una partició amb el punt de muntatge <strong>%2</strong> però no se n'ha establit el marcador <strong>%3</strong>. <br/>Per a establir-la-hi, torneu arrere i editeu la partició. <br/><br/>Podeu continuar sense establir la bandera, però el sistema podria no iniciar-se.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      No s'ha establit el marcador de la partició EFI del sistema
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Opció per a usar GPT amb BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       La millor opció per a tots els sistemes és una taula de particions GPT. Aquest instal·lador també admet aquesta configuració per a sistemes BIOS.<br/><br/>Per a configurar una taula de particions GPT en un sistema BIOS, (si no s'ha fet ja) torneu arrere i establiu la taula de particions a GPT, després creeu una partició sense formatar de 8 MB amb el marcador <strong>bios_grub</strong> habilitada.<br/><br/>Cal una partició sense format de 8 MB per a iniciar %1 en un sistema BIOS amb GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partició d'arrancada sense encriptar
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       S'ha establit una partició d'arrancada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrancada no està encriptada.<br/><br/>Hi ha qüestions de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers tindrà lloc després, durant l'inici del sistema.<br/>Per a encriptar la partició d'arrancada, torneu arrere i torneu-la a crear seleccionant <strong>Encripta</strong> en la finestra de creació de la partició.
     
     
-      
+      
       has at least one disk device available.
       té com a mínim un dispositiu de disc disponible.
     
     
-      
+      
       There are no partitions to install on.
       No hi ha particions per a fer-hi una instal·lació.
     
@@ -2988,7 +2996,7 @@ Eixida:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3314,44 +3322,16 @@ La configuració pot continuar, però és possible que algunes característiques
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Per a obtindre els millors resultats, assegureu-vos que aquest ordinador...
     
     
-      
+      
       System requirements
       Requisits de sistema
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Aquest ordinador no satisfà els requisits mínims per a configurar-hi %1.<br/> La configuració no pot continuar. <a href="#details">Detalls...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Aquest ordinador no satisfà els requisits mínims per a instal·lar-hi %1.<br/> La instal·lació no pot continuar. <a href="#details">Detalls...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Aquest ordinador no satisfà alguns dels requisits recomanats per a configurar-hi %1.<br/>La configuració pot continuar, però és possible que algunes característiques no estiguen habilitades.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Aquest ordinador no satisfà alguns dels requisits recomanats per a instal·lar-hi %1.<br/>La instal·lació pot continuar, però és possible que algunes característiques no estiguen habilitades.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Aquest programa us farà unes preguntes i instal·larà %2 en l'ordinador.
-    
-  
   
     ScanningDialog
     
@@ -3643,27 +3623,6 @@ La configuració pot continuar, però és possible que algunes característiques
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Això és un resum de què passarà quan s'inicie el procés de configuració.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Això és un resum de què passarà quan s'inicie el procés d'instal·lació.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Resum
-    
-  
   
     TrackingInstallJob
     
@@ -3995,7 +3954,7 @@ La configuració pot continuar, però és possible que algunes característiques
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Benvingut
     
@@ -4003,7 +3962,7 @@ La configuració pot continuar, però és possible que algunes característiques
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Benvingut
     
@@ -4084,21 +4043,21 @@ La configuració pot continuar, però és possible que algunes característiques
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Llengües</h1> </br>
                      La configuració local del sistema afecta la llengua i el joc de caràcters d'alguns elements de la interfície de línia d'ordres. La configuració actual és <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Configuració local</h1> </br>
                     La configuració local del sistema afecta el format de números i dates. La configuració actual és <strong>%1</strong>.
     
     
-      
+      
       Back
       Arrere
     
@@ -4164,6 +4123,45 @@ La configuració pot continuar, però és possible que algunes característiques
             <p>Aquestes són exemples de notes de la versió.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4220,132 +4218,132 @@ La configuració pot continuar, però és possible que algunes característiques
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Trieu el nom d'usuari i les credencials per a iniciar la sessió i fer tasques d'administració.
     
     
-      
+      
       What is your name?
       Quin és el vostre nom?
     
     
-      
+      
       Your Full Name
       Nom complet
     
     
-      
+      
       What name do you want to use to log in?
       Quin nom voleu utilitzar per a entrar al sistema?
     
     
-      
+      
       Login Name
       Nom d'entrada
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Si hi ha més d'una persona que ha d'usar aquest ordinador, podeu crear diversos comptes després de la instal·lació.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Només es permeten lletres en minúscula, números, ratlles baixes i guions.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Quin és el nom d'aquest ordinador?
     
     
-      
+      
       Computer Name
       Nom de l'ordinador
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Aquest nom s'usarà si feu visible aquest ordinador per a altres en una xarxa.
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Seleccioneu una contrasenya per a mantindre el vostre compte segur.
     
     
-      
+      
       Password
       Contrasenya
     
     
-      
+      
       Repeat Password
       Repetiu la contrasenya
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació. Hauria de tindre un mínim de huit caràcters i s'hauria de canviar sovint.
     
     
-      
+      
       Validate passwords quality
       Valida la qualitat de les contrasenyes.
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no podreu indicar-ne una de dèbil.
     
     
-      
+      
       Log in automatically without asking for the password
       Entra automàticament sense demanar la contrasenya.
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Reutilitza la contrasenya d'usuari com a contrasenya d'arrel.
     
     
-      
+      
       Use the same password for the administrator account.
       Usa la mateixa contrasenya per al compte d'administració.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Trieu una contrasenya d'arrel per mantindre el compte segur.
     
     
-      
+      
       Root Password
       Contrasenya d'arrel
     
     
-      
+      
       Repeat Root Password
       Repetiu la contrasenya d'arrel.
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Escriviu la mateixa contrasenya dues vegades per a poder comprovar-ne els errors de mecanografia.
     
diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index 3fc4012745..3c755e8ff2 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -6,7 +6,7 @@
     
       
       Manage auto-mount settings
-      
+      Spravovat nastavení automatického připojování (mount)
     
   
   
@@ -104,22 +104,22 @@
     
       
       Crashes Calamares, so that Dr. Konqui can look at it.
-      
+      Zhavaruje Calamares, takže se bude možné podívat v nástroji pro analýzu pádů (Dr. Konqui)
     
     
       
       Reloads the stylesheet from the branding directory.
-      
+      Znovu načíst tabulky stylů ze složky s přizpůsobením vzhledu.
     
     
       
       Uploads the session log to the configured pastebin.
-      
+      Nahraje záznam událostí z relace do nastavené instance pastebin.
     
     
       
       Send Session Log
-      
+      Odeslat záznamu událostí z relace
     
     
       
@@ -129,7 +129,7 @@
     
       
       Displays the tree of widget names in the log (for stylesheet debugging).
-      
+      Zobrazí v záznamu událostí strom ovládacích prvků (určeno pro ladění tabulek se styly).
     
     
       
@@ -152,7 +152,7 @@
     
       
       Install
-      Instalovat
+      Nainstalovat
     
   
   
@@ -342,7 +342,11 @@
 %1
 
 Link copied to clipboard
-      
+      Záznam událostí z instalace poskytnut na
+
+%1
+
+Odkaz na něj zkopírován do schránky
     
     
       
@@ -495,12 +499,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Instalátor %1
     
     
-      
+      
       %1 Installer
       %1 instalátor
     
@@ -510,12 +514,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Set filesystem label on %1.
-      
+      Nastavit jmenovku souborového systému na %1.
     
     
       
       Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
-      
+      Nastavit jmenovku souborového systému <strong>%1</strong> oddílu <strong>%2</strong>.
     
     
       
@@ -539,149 +543,149 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Formulář
     
     
-      
+      
       Select storage de&vice:
       &Vyberte úložné zařízení:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Stávající:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ruční rozdělení datového úložiště</strong><br/>Sami si můžete vytvořit vytvořit nebo zvětšit/zmenšit oddíly.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Zrecyklovat %1 na oddíl pro domovské složky %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Vyberte oddíl, který chcete zmenšit, poté posouváním na spodní liště změňte jeho velikost.</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 bude zmenšen na %2MiB a nový %3MiB oddíl pro %4 bude vytvořen.
     
     
-      
+      
       Boot loader location:
       Umístění zavaděče:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Vyberte oddíl na který nainstalovat</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nebyl nalezen žádný EFI systémový oddíl. Vraťte se zpět a nastavte %1 pomocí ručního rozdělení.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Pro zavedení %2 se využije EFI systémový oddíl %1.
     
     
-      
+      
       EFI system partition:
       EFI systémový oddíl:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Zdá se, že na tomto úložném zařízení není žádný operační systém. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Vymazat datové úložiště</strong><br/>Touto volbou budou <font color="red">smazána</font> všechna data, která se na něm nyní nacházejí.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Nainstalovat vedle</strong><br/>Instalátor zmenší oddíl a vytvoří místo pro %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Nahradit oddíl</strong><br/>Původní oddíl bude nahrazen %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Na tomto úložném zařízení bylo nalezeno %1. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Na tomto úložném zařízení se už nachází operační systém. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled a budete požádáni o jejich potvrzení.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Na tomto úložném zařízení se už nachází několik operačních systémů. Jak chcete postupovat?<br/>Než budou provedeny jakékoli změny na úložných zařízeních, bude zobrazen jejich přehled změn a budete požádáni o jejich potvrzení.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Na tomto úložném zařízení se už nachází operační systém, ale tabulka rozdělení <strong>%1</strong> je jiná než potřebná <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Některé z oddílů tohoto úložného zařízení jsou <strong>připojené</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Toto úložné zařízení je součástí <strong>Neaktivního RAID</strong> zařízení.
     
     
-      
+      
       No Swap
       Žádný odkládací prostor (swap)
     
     
-      
+      
       Reuse Swap
       Použít existující odkládací prostor
     
     
-      
+      
       Swap (no Hibernate)
       Odkládací prostor (bez uspávání na disk)
     
     
-      
+      
       Swap (with Hibernate)
       Odkládací prostor (s uspáváním na disk)
     
     
-      
+      
       Swap to file
       Odkládat do souboru
     
@@ -749,12 +753,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Nastavit model klávesnice na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Nastavit rozložení klávesnice na %1/%2.
     
@@ -786,12 +790,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Network Installation. (Disabled: Internal error)
-      
+      Instalace ze sítě. (Vypnuto: vnitřní chyba)
     
     
       
       Network Installation. (Disabled: No package list)
-      
+      Instalace ze sítě. (Vypnuto: Není seznam balíčků)
     
     
       
@@ -804,47 +808,47 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Síťová instalace. (Vypnuto: Nedaří se stáhnout seznamy balíčků – zkontrolujte připojení k síti)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Instalace nemůže pokračovat <a href="#details">Podrobnosti…</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Instalace nemůže pokračovat <a href="#details">Podrobnosti…</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Počítač nesplňuje některé doporučené požadavky pro instalaci %1.<br/>Instalace může pokračovat, ale některé funkce mohou být vypnuty.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Počítač nesplňuje některé doporučené požadavky pro instalaci %1.<br/>Instalace může pokračovat, ale některé funkce mohou být vypnuty.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Tento program vám položí několik dotazů, aby na základě odpovědí příslušně nainstaloval %2 na váš počítač.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
-      <h1>Vítejte v Calamares instalačním programu pro %1.</h1>
+      <h1>Vítejte v Calamares – instalačním programu pro %1.</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Vítejte v instalátoru %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Vítejte v Calamares, instalačním programu pro %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Vítejte v instalátoru %1.</h1>
     
@@ -896,7 +900,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       OK!
-      
+      OK!
     
     
       
@@ -911,12 +915,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       The setup of %1 did not complete successfully.
-      
+      Nastavení %1 nebylo úspěšně dokončeno.
     
     
       
       The installation of %1 did not complete successfully.
-      
+      Instalace %1 nebyla úspěšně dokončena.
     
     
       
@@ -939,15 +943,40 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Instalace %1 je dokončena.
     
     
-      
+      
       Package Selection
       Výběr balíčků
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Vyberte produkt ze seznamu. Ten vybraný bude nainstalován.
     
+    
+      
+      Install option: <strong>%1</strong>
+      Možnost instalace: <strong>%1</strong>
+    
+    
+      
+      None
+      Žádné
+    
+    
+      
+      Summary
+      Souhrn
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Toto je přehled událostí které nastanou po spuštění instalačního procesu.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Toto je přehled událostí které nastanou po spuštění instalačního procesu.
+    
   
   
     ContextualProcessJob
@@ -1012,12 +1041,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Label for the filesystem
-      
+      Jmenovka pro souborový systém
     
     
       
       FS Label:
-      
+      Jmenovka soubor. systému:
     
     
       
@@ -1050,12 +1079,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Create new %1MiB partition on %3 (%2) with entries %4.
-      
+      Vytvořit nový %1MiB oddíl na %3 (%2) s položkami %4.
     
     
       
       Create new %1MiB partition on %3 (%2).
-      
+      Vytvořit nový %1MiB oddíl na %3 (%2).
     
     
       
@@ -1065,12 +1094,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
-      
+      Vytvořit nový <strong>%1MiB</strong> oddíl na <strong>%3</strong> (%2) s položkami <em>%4</em>.
     
     
       
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
-      
+      Vytvořit nový <strong>%1MIB</strong> oddíl na <strong>%3</strong> (%2).
     
     
       
@@ -1155,7 +1184,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Preserving home directory
-      Zachování domovského adresáře
+      Zachování domovské složky
     
     
       
@@ -1166,7 +1195,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Configuring user %1
-      Konfigurace uživatele %1
+      Nastavuje se uživatel %1
     
     
       
@@ -1257,7 +1286,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem.
-      Vybrané úložné zařízení je <strong>loop</strong> zařízení.<br><br> Nejedná se o vlastní tabulku oddílů, je to pseudo zařízení, které zpřístupňuje soubory blokově. Tento typ nastavení většinou obsahuje jediný systém souborů.
+      Vybrané úložné zařízení je <strong>loop</strong> zařízení.<br><br> Nejedná se o vlastní tabulku oddílů, je to pseudo zařízení, které zpřístupňuje soubory blokově. Tento typ uspořádání většinou obsahuje jediný souborový systém.
     
     
       
@@ -1376,12 +1405,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Label for the filesystem
-      
+      Jmenovka pro souborový systém
     
     
       
       FS Label:
-      
+      Jmenovka soubor. systému:
     
     
       
@@ -1428,7 +1457,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
-      
+      Nainstalovat %1 na <strong>nový</strong> systémový oddíl %2 s funkcemi <em>%3</em>
     
     
       
@@ -1438,27 +1467,27 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
-      
+      Nastavit <strong>nový</strong> %2 oddíl s přípojným bodem <strong>%1</strong>a funkcemi <em>%3</em>.
     
     
       
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
-      
+      Nastavit <strong>nový</strong> %2 oddíl s přípojným bodem <strong>%1</strong>%3.
     
     
       
       Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
-      
+      Nainstalovat %2 na systémový oddíl %3 <strong>%1</strong> s funkcemi <em>%4</em>.
     
     
       
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
-      
+      Nastavit %3 oddíl <strong>%1</strong> s přípojným bodem <strong>%2</strong> a funkcemi <em>%4</em>.
     
     
       
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
-      
+      Nastavit %3 oddíl <strong>%1</strong> s přípojným bodem <strong>%2</strong> %4.
     
     
       
@@ -1889,7 +1918,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Quit
-      
+      Ukončit
     
   
   
@@ -2113,7 +2142,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Select your preferred Region, or use the default settings.
-      
+      Vyberte vámi upřednostňovanou oblast, nebo použijte výchozí nastavení.
     
     
       
@@ -2213,11 +2242,11 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       The password contains fewer than %n lowercase letters
-      
-        
-        
-        
-        
+      
+        Heslo obsahuje méně než %1 malé písmeno
+        Heslo obsahuje méně než %1 malá písmena
+        Heslo obsahuje méně než %1 malých písmen
+        Heslo obsahuje méně než %1 malá písmena
       
     
     
@@ -2253,41 +2282,41 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       The password contains fewer than %n digits
-      
-        
-        
-        
-        
+      
+        Heslo obsahuje méně než %1 číslici
+        Heslo obsahuje méně než %1 číslice
+        Heslo obsahuje méně než %1 číslice
+        Heslo obsahuje méně než %1 číslice
       
     
     
       
       The password contains fewer than %n uppercase letters
-      
-        
-        
-        
-        
+      
+        Heslo obsahuje méně než %n velké písmeno
+        Heslo obsahuje méně než %n velká písmena
+        Heslo obsahuje méně než %n velkých písmen
+        Heslo obsahuje méně než %n velká písmena
       
     
     
       
       The password contains fewer than %n non-alphanumeric characters
-      
-        
-        
-        
-        
+      
+        Heslo obsahuje méně než %n speciální znak
+        Heslo obsahuje méně než %n speciální znaky
+        Heslo obsahuje méně než %n speciálních znaků
+        Heslo obsahuje méně než %n speciální znaky
       
     
     
       
       The password is shorter than %n characters
-      
-        
-        
-        
-        
+      
+        Heslo je kratší než %1 znak
+        Heslo je kratší než %1 znaky
+        Heslo je kratší než %1 znaků
+        Heslo je kratší než %1 znaky
       
     
     
@@ -2298,41 +2327,41 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       The password contains fewer than %n character classes
-      
-        
-        
-        
-        
+      
+        Heslo obsahuje méně než %n druh znaků
+        Heslo obsahuje méně než %n druhy znaků
+        Heslo obsahuje méně než %n druhů znaků
+        Heslo obsahuje méně než %n druhy znaků
       
     
     
       
       The password contains more than %n same characters consecutively
-      
-        
-        
-        
-        
+      
+        Heslo obsahuje více než %1 stejný znak za sebou
+        Heslo obsahuje více než %1 stejné znaky za sebou
+        Heslo obsahuje více než %1 stejných znaků za sebou
+        Heslo obsahuje více než %1 stejné znaky za sebou
       
     
     
       
       The password contains more than %n characters of the same class consecutively
-      
-        
-        
-        
-        
+      
+        Heslo obsahuje více než %n znak stejného druhu za sebou
+        Heslo obsahuje více než %n znaky stejného druhu za sebou
+        Heslo obsahuje více než %n znaků stejného druhu za sebou
+        Heslo obsahuje více než %n znaky stejného druhu za sebou
       
     
     
       
       The password contains monotonic sequence longer than %n characters
-      
-        
-        
-        
-        
+      
+        Heslo obsahuje monotónní posloupnost delší než %n znak
+        Heslo obsahuje monotónní posloupnost delší než %n znaky
+        Heslo obsahuje monotónní posloupnost delší než %n znaků
+        Heslo obsahuje monotónní posloupnost delší než %n znaky
       
     
     
@@ -2464,6 +2493,14 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Vyberte produkt ze seznamu. Ten vybraný bude nainstalován.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Balíčky
+    
+  
   
     PackageChooserViewStep
     
@@ -2671,7 +2708,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       File System Label
-      
+      Jmenovka souborového systému
     
     
       
@@ -2694,7 +2731,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Storage de&vice:
-      Úložné zařízení
+      Úložné &zařízení:
     
     
       
@@ -2747,17 +2784,17 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Zavaděč systému &nainstalovat na:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Opravdu chcete na %1 vytvořit novou tabulku oddílů?
     
     
-      
+      
       Can not create new partition
       Nedaří se vytvořit nový oddíl
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Tabulka oddílů na %1 už obsahuje %2 hlavních oddílů a proto už není možné přidat další. Odeberte jeden z hlavních oddílů a namísto něj vytvořte rozšířený oddíl.
     
@@ -2775,107 +2812,82 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Oddíly
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Nainstalovat %1 <strong>vedle</strong> dalšího operačního systému.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Smazat</strong> obsah jednotky a nainstalovat %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Nahradit</strong> oddíl %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Ruční</strong> dělení úložiště.
+      
+      Current:
+      Stávající:
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Nainstalovat %1 <strong>vedle</strong> dalšího operačního systému na disk <strong>%2</strong> (%3).
+      
+      After:
+      Potom:
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Vymazat</strong> obsah jednotky <strong>%2</strong> (%3) a nainstalovat %1.
+      
+      No EFI system partition configured
+      Není nastavený žádný EFI systémový oddíl
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Nahradit</strong> oddíl na jednotce <strong>%2</strong> (%3) %1.
+      
+      EFI system partition configured incorrectly
+      EFI systémový oddíl není nastaven správně
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Ruční</strong> dělení jednotky <strong>%1</strong> (%2).
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      Aby bylo možné spouštět %1, je zapotřebí EFI systémový oddíl.<br/><br/>Takový nastavíte tak, že se vrátíte zpět a vyberete nebo vytvoříte příhodný souborový systém.
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Jednotka <strong>%1</strong> (%2)
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      Je třeba, aby souborový systém byl připojený na <strong>%1</strong>.
     
     
-      
-      Current:
-      Stávající:
+      
+      The filesystem must have type FAT32.
+      Je třeba, aby souborový systém byl typu FAT32.
     
     
-      
-      After:
-      Potom:
+      
+      The filesystem must be at least %1 MiB in size.
+      Je třeba, aby souborový systém byl alespoň %1 MiB velký.
     
     
-      
-      No EFI system partition configured
-      Není nastavený žádný EFI systémový oddíl
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      Je třeba, aby souborový systém měl nastavený příznak <strong>%1</strong>.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Pro spuštění %1 je potřeba EFI systémový oddíl.<br/><br/>Pro nastavení EFI systémového oddílu se vraťte zpět a vyberte nebo vytvořte oddíl typu FAT32 s příznakem <strong>%3</strong> a přípojným bodem <strong>%2</strong>.<br/><br/>Je možné pokračovat bez nastavení EFI systémového oddílu, ale systém nemusí jít spustit.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      Je možné pokračovat bez vytvoření EFI systémového oddílu, ale může se stát, že váš systém tím nenastartuje.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Pro spuštění %1 je potřeba EFI systémový oddíl.<br/><br/>Byl nastaven oddíl s přípojným bodem <strong>%2</strong> ale nemá nastaven příznak <strong>%3</strong>.<br/>Pro nastavení příznaku se vraťte zpět a upravte oddíl.<br/><br/>Je možné pokračovat bez nastavení příznaku, ale systém nemusí jít spustit.
-    
-    
-      
-      EFI system partition flag not set
-      Příznak EFI systémového oddílu není nastavený
-    
-    
-      
+      
       Option to use GPT on BIOS
       Volba použít GPT i pro BIOS zavádění (MBR)
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT tabulka oddílů je nejlepší volbou pro všechny systémy. Tento instalátor podporuje takové uspořádání i pro zavádění v režimu BIOS firmware.<br/><br/>Pro nastavení GPT tabulky oddílů v případě BIOS, (pokud už není provedeno) jděte zpět a nastavte tabulku oddílů na, dále vytvořte 8 MB oddíl (bez souborového systému s příznakem <strong>bios_grub</strong>.<br/><br/>Tento oddíl je zapotřebí pro spuštění %1 na systému s BIOS firmware/režimem a GPT.
     
     
-      
+      
       Boot partition not encrypted
       Zaváděcí oddíl není šifrován
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Kromě šifrovaného kořenového oddílu byl vytvořen i nešifrovaný oddíl zavaděče.<br/><br/>To by mohl být bezpečnostní problém, protože na nešifrovaném oddílu jsou důležité soubory systému.<br/>Pokud chcete, můžete pokračovat, ale odemykání souborového systému bude probíhat později při startu systému.<br/>Pro zašifrování oddílu zavaděče se vraťte a vytvořte ho vybráním možnosti <strong>Šifrovat</strong> v okně při vytváření oddílu.
     
     
-      
+      
       has at least one disk device available.
       má k dispozici alespoň jedno zařízení pro ukládání dat.
     
     
-      
+      
       There are no partitions to install on.
       Nejsou zde žádné oddíly na které by se dalo nainstalovat.
     
@@ -3010,7 +3022,7 @@ Výstup:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3336,44 +3348,16 @@ Výstup:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Nejlepších výsledků se dosáhne, pokud tento počítač bude:
     
     
-      
+      
       System requirements
       Požadavky na systém
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Instalace nemůže pokračovat <a href="#details">Podrobnosti…</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Instalace nemůže pokračovat <a href="#details">Podrobnosti…</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Počítač nesplňuje některé doporučené požadavky pro instalaci %1.<br/>Instalace může pokračovat, ale některé funkce mohou být vypnuty.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Počítač nesplňuje některé doporučené požadavky pro instalaci %1.<br/>Instalace může pokračovat, ale některé funkce mohou být vypnuty.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Tento program vám položí několik dotazů, aby na základě odpovědí příslušně nainstaloval %2 na váš počítač.
-    
-  
   
     ScanningDialog
     
@@ -3560,7 +3544,7 @@ Výstup:
     
       
       passwd terminated with error code %1.
-      Příkaz passwd ukončen s chybovým kódem %1.
+      Příkaz passwd skončil s chybovým kódem %1.
     
     
       
@@ -3622,12 +3606,12 @@ Výstup:
       
       
       Could not create groups in target system
-      V cílovém systému nelze vytvořit skupiny
+      V cílovém systému se nedaří vytvořit skupiny
     
     
       
       These groups are missing in the target system: %1
-      
+      Tyto skupiny chybí v cílovém systému chybí: %1
     
   
   
@@ -3635,7 +3619,7 @@ Výstup:
     
       
       Configure <pre>sudo</pre> users.
-      Nakonfigurujte <pre>sudo</pre> uživatele.
+      Nastavit <pre>sudo</pre> uživatele.
     
     
       
@@ -3665,27 +3649,6 @@ Výstup:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Toto je přehled událostí které nastanou po spuštění instalačního procesu.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Toto je přehled událostí které nastanou po spuštění instalačního procesu.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Souhrn
-    
-  
   
     TrackingInstallJob
     
@@ -4017,7 +3980,7 @@ Výstup:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Vítejte
     
@@ -4025,7 +3988,7 @@ Výstup:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Vítejte
     
@@ -4078,49 +4041,51 @@ Výstup:
     
       
       Installation Completed
-      
+      Instalace dokončena
     
     
       
       %1 has been installed on your computer.<br/>
             You may now restart into your new system, or continue using the Live environment.
-      
+      %1 bylo nainstalováno na váš počítač.<br/>
+            Nyní ho můžete restartovat do právě nainstalovaného systému, nebo pokračovat v používání stávajícího prostředí, spuštěného z instalačního média.
     
     
       
       Close Installer
-      
+      Zavřít instalátor
     
     
       
       Restart System
-      
+      Restartovat systém
     
     
       
       <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/>
             This log is copied to /var/log/installation.log of the target system.</p>
-      
+      <p>Úplný záznam událostí z instalace je k dispozici v souboru installation.log v domovské složce uživatele Live.<br/>
+            Tento záznam je zkopírován do /var/log/installation.log cílového systému.</p>
     
   
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Jazyky</h1> </br>
                     Systémová místní a jazyková nastavení ovlivní jazyk a znakovou sadu některých prvků uživatelského rozhraní příkazového řádku. Stávající nastavení je <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Místní a jazyková nastavení</h1> </br>
                     Místní a jazyková nastavení ovlivní formát čísel a datumů. Stávající nastavení je <strong>%1</strong>.
     
     
-      
+      
       Back
       Zpět
     
@@ -4186,6 +4151,46 @@ Výstup:
             <p>Toto je příklad poznámek k vydání.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      LibreOffice je vybavená a bezplatná sada kancelářských aplikací, používaná miliony lidí po celém světě. Obsahuje několika aplikací, které z ní dělají nejuniverzálnější svobodnou a open source sadu kancelářských aplikací na trhu.<br/>
+                    Výchozí volba.
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      Pokud nechcete nainstalovat žádnou sadu kancelářských aplikací, stačí jen zvolit Žádná sada kancelářských aplikací. V případě potřeby je možné kdykoli nějakou přidat na už nainstalovaný systém.
+    
+    
+      
+      No Office Suite
+      Bez sady kancelářských aplikací
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      Vytvořit minimální desktopovou instalaci, odebrat veškeré dodatečné aplikace a až později rozhodnout, co chcete do svého systému přidat. Příklady toho, co není součástí takové instalace je, že zde nebude žádná sada kancelářských aplikací, žádné přehrávače multimédií, žádný prohlížeč obrázků či podpora pro tisk. Bude zde pouze desktopové prostředí, správce souborů, správce balíčků, textový editor a jednoduchý webový prohlížeč.
+    
+    
+      
+      Minimal Install
+      Minimální instalace
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      Vyberte volbu pro vaší instalaci, nebo použijte výchozí: včetně LibreOffice.
+    
+  
   
     release_notes
     
@@ -4242,132 +4247,132 @@ Výstup:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
-      Vyberte své uživatelské jméno a přihlašovací údaje pro přihlášení a provádění administrátorských úkolů
+      Vyberte své uživatelské jméno a přihlašovací údaje pro přihlášení a provádění úkonů správy
     
     
-      
+      
       What is your name?
       Jak se jmenujete?
     
     
-      
+      
       Your Full Name
       Vaše celé jméno
     
     
-      
+      
       What name do you want to use to log in?
       Jaké jméno chcete používat pro přihlašování do systému?
     
     
-      
+      
       Login Name
       Přihlašovací jméno
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Pokud bude tento počítač používat více než jedna osoba, můžete po instalaci vytvořit více účtů.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Je možné použít pouze malá písmena, číslice, podtržítko a spojovník.
     
     
-      
+      
       root is not allowed as username.
-      
+      root není možné použít jako uživatelské jméno.
     
     
-      
+      
       What is the name of this computer?
       Jaký je název tohoto počítače?
     
     
-      
+      
       Computer Name
       Název počítače
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Tento název se použije, pokud počítač zviditelníte ostatním v síti.
     
     
-      
+      
       localhost is not allowed as hostname.
-      
+      localhost není možné použít jako název počítače.
     
     
-      
+      
       Choose a password to keep your account safe.
       Zvolte si heslo pro ochranu svého účtu.
     
     
-      
+      
       Password
       Heslo
     
     
-      
+      
       Repeat Password
       Zopakování zadání hesla
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní. Dobré heslo by mělo obsahovat směs písmen, čísel a interpunkce a mělo by mít alespoň osm znaků. Zvažte také jeho pravidelnou změnu.
     
     
-      
+      
       Validate passwords quality
       Ověřte kvalitu hesel
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Když je toto zaškrtnuto, je prověřována odolnost hesla a nebude umožněno použít snadno prolomitelné heslo.
     
     
-      
+      
       Log in automatically without asking for the password
       Přihlaste se automaticky bez zadávání hesla
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      Je možné použít pouze písmena, číslice, podtržítko a spojovník. Dále je třeba, aby délka byla alespoň dva znaky.
     
     
-      
+      
       Reuse user password as root password
       Použijte uživatelské heslo zároveň jako heslo root
     
     
-      
+      
       Use the same password for the administrator account.
       Použít stejné heslo i pro účet správce systému.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Zvolte heslo uživatele root, aby byl váš účet v bezpečí.
     
     
-      
+      
       Root Password
       Heslo uživatele root
     
     
-      
+      
       Repeat Root Password
       Opakujte root heslo
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní.
     
diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts
index f0ab19eae4..ceb580e23f 100644
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
@@ -491,12 +491,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1-opsætningsprogram
     
     
-      
+      
       %1 Installer
       %1-installationsprogram
     
@@ -535,149 +535,149 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Formular
     
     
-      
+      
       Select storage de&vice:
       Vælg lageren&hed:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Nuværende:
     
     
-      
+      
       After:
       Efter:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuel partitionering</strong><br/>Du kan selv oprette og ændre størrelse på partitioner.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Genbrug %1 som hjemmepartition til %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Vælg en partition der skal mindskes, træk herefter den nederste bjælke for at ændre størrelsen</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 vil blive skrumpet til %2 MiB og en ny %3 MiB partition vil blive oprettet for %4.
     
     
-      
+      
       Boot loader location:
       Placering af bootloader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Vælg en partition at installere på</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       En EFI-partition blev ikke fundet på systemet. Gå venligst tilbage og brug manuel partitionering til at opsætte %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI-systempartitionen ved %1 vil blive brugt til at starte %2.
     
     
-      
+      
       EFI system partition:
       EFI-systempartition:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Lagerenheden ser ikke ud til at indeholde et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Slet disk</strong><br/>Det vil <font color="red">slette</font> alt data på den valgte lagerenhed.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installér ved siden af</strong><br/>Installationsprogrammet vil mindske en partition for at gøre plads til %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Erstat en partition</strong><br/>Erstatter en partition med %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Lagerenheden har %1 på sig. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før det sker ændringer til lagerenheden.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Lagerenheden indeholder allerede et styresystem. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Lagerenheden indeholder flere styresystemer. Hvad ønsker du at gøre?<br/>Du vil få mulighed for at se og bekræfte dine valg før der sker ændringer til lagerenheden.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Lagerenheden har allerede et styresystem på den men partitionstabellen <strong>%1</strong> er ikke magen til den nødvendige <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Lagerenhden har en af sine partitioner <strong>monteret</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Lagringsenheden er en del af en <strong>inaktiv RAID</strong>-enhed.
     
     
-      
+      
       No Swap
       Ingen swap
     
     
-      
+      
       Reuse Swap
       Genbrug swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (ingen dvale)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (med dvale)
     
     
-      
+      
       Swap to file
       Swap til fil
     
@@ -745,12 +745,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Indstil tastaturmodel til %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Indstil tastaturlayout til %1/%2.
     
@@ -800,47 +800,47 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Netværksinstallation. (deaktiveret: kunne ikke hente pakkelister, tjek din netværksforbindelse)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Computeren imødekommer ikke minimumsystemkravene for at opsætte %1.<br/>Opsætningen kan ikke fortsætte. <a href="#details">Detaljer ...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Computeren imødekommer ikke minimumsystemkravene for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer ...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Computeren imødekommer ikke nogle af de anbefalede systemkrav for at opsætte %1.<br/>Opsætningen kan fortsætte, men nogle funktionaliteter kan være deaktiveret.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Computeren imødekommer ikke nogle af de anbefalede systemkrav for at installere %1.<br/>Installationen kan fortsætte, men nogle funktionaliteter kan være deaktiveret.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Programmet vil stille dig nogle spørgsmål og opsætte %2 på din computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Velkommen til Calamares-opsætningsprogrammet til %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Velkommen til %1-opsætningen</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Velkommen til Calamares-installationsprogrammet til %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Velkommen til %1-installationsprogrammet</h1>
     
@@ -935,15 +935,40 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Installationen af %1 er fuldført.
     
     
-      
+      
       Package Selection
       Valg af pakke
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Vælg venligst et produkt fra listen. Det valgte produkt installeres.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Opsummering
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Dette er et overblik over hvad der vil ske når du starter opsætningsprocessen.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Dette er et overblik over hvad der vil ske når du starter installationsprocessen.
+    
   
   
     ContextualProcessJob
@@ -2442,6 +2467,14 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Vælg venligst et produkt fra listen. Det valgte produkt installeres.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Pakker
+    
+  
   
     PackageChooserViewStep
     
@@ -2725,17 +2758,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.I&nstallér bootloader på:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Er du sikker på, at du vil oprette en ny partitionstabel på %1?
     
     
-      
+      
       Can not create new partition
       Kan ikke oprette ny partition
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Partitionstabellen på %1 har allerede %2 primære partitioner, og der kan ikke tilføjes flere. Fjern venligst en primær partition og tilføj i stedet en udvidet partition.
     
@@ -2753,107 +2786,82 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Partitioner
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Installér %1 <strong>ved siden af</strong> et andet styresystem.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Slet</strong> disk og installér %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Erstat</strong> en partition med %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Manuel</strong> partitionering.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Installér %1 <strong>ved siden af</strong> et andet styresystem på disk <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Slet</strong> disk <strong>%2</strong> (%3) og installér %1.
+      
+      Current:
+      Nuværende:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Erstat</strong> en partition på disk <strong>%2</strong> (%3) med %1.
+      
+      After:
+      Efter:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Manuel</strong> partitionering på disk <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Der er ikke konfigureret nogen EFI-systempartition
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disk <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Nuværende:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Efter:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Der er ikke konfigureret nogen EFI-systempartition
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      En EFI-systempartition er nødvendig for at starte %1.<br/><br/>For at konfigurere en EFI-systempartition skal du gå tilbage og vælge eller oprette et FAT32-filsystem med <strong>%3</strong>-flaget aktiveret og monteringspunkt <strong>%2</strong>.<br/><br/>Du kan fortsætte uden at opsætte en EFI-systempartition, men dit system vil muligvis ikke kunne starte.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      En EFI-systempartition er nødvendig for at starte %1.<br/><br/>En partition var konfigureret med monteringspunkt <strong>%2</strong>, men dens <strong>%3</strong>-flag var ikke indstillet.<br/>For at indstille flaget skal du gå tilbage og redigere partitionen.<br/><br/>Du kan fortsætte uden at konfigurere flaget, men dit system vil muligvis ikke kunne starte.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      EFI-systempartitionsflag ikke sat
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Valgmulighed til at bruge GPT på BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       En GPT-partitionstabel er den bedste valgmulighed til alle systemer. Installationsprogrammet understøtter også sådan en opsætning for BIOS-systemer.<br/><br/>Konfigurer en GPT-partitionstabel på BIOS, (hvis det ikke allerede er gjort) ved at gå tilbage og indstil partitionstabellen til GPT, opret herefter en 8 MB uformateret partition med <strong>bios_grub</strong>-flaget aktiveret.<br/><br/>En uformateret 8 MB partition er nødvendig for at starte %1 på et BIOS-system med GPT.
     
     
-      
+      
       Boot partition not encrypted
       Bootpartition ikke krypteret
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       En separat bootpartition blev opsat sammen med en krypteret rodpartition, men bootpartitionen er ikke krypteret.<br/><br/>Der er sikkerhedsmæssige bekymringer med denne slags opsætning, da vigtige systemfiler er gemt på en ikke-krypteret partition.<br/>Du kan fortsætte hvis du vil, men oplåsning af filsystemet sker senere under systemets opstart.<br/>For at kryptere bootpartitionen skal du gå tilbage og oprette den igen, vælge <strong>Kryptér</strong> i partitionsoprettelsesvinduet.
     
     
-      
+      
       has at least one disk device available.
       har mindst én tilgængelig diskenhed.
     
     
-      
+      
       There are no partitions to install on.
       Der er ikke nogen partitioner at installere på.
     
@@ -2988,7 +2996,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3315,44 +3323,16 @@ setting
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       For at få det bedste resultat sørg venligst for at computeren:
     
     
-      
+      
       System requirements
       Systemkrav
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Computeren imødekommer ikke minimumsystemkravene for at opsætte %1.<br/>Opsætningen kan ikke fortsætte. <a href="#details">Detaljer ...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Computeren imødekommer ikke minimumsystemkravene for at installere %1.<br/>Installationen kan ikke fortsætte. <a href="#details">Detaljer ...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Computeren imødekommer ikke nogle af de anbefalede systemkrav for at opsætte %1.<br/>Opsætningen kan fortsætte, men nogle funktionaliteter kan være deaktiveret.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Computeren imødekommer ikke nogle af de anbefalede systemkrav for at installere %1.<br/>Installationen kan fortsætte, men nogle funktionaliteter kan være deaktiveret.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Programmet vil stille dig nogle spørgsmål og opsætte %2 på din computer.
-    
-  
   
     ScanningDialog
     
@@ -3644,27 +3624,6 @@ setting
       %L1/%L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Dette er et overblik over hvad der vil ske når du starter opsætningsprocessen.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Dette er et overblik over hvad der vil ske når du starter installationsprocessen.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Opsummering
-    
-  
   
     TrackingInstallJob
     
@@ -3996,7 +3955,7 @@ setting
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Velkommen
     
@@ -4004,7 +3963,7 @@ setting
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Velkommen
     
@@ -4084,21 +4043,21 @@ setting
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Sprog</h1> </br>
                      Systemets lokalitetsindstilling påvirker sproget og tegnsættet for visse brugerfladeelementer i kommandolinjen. Den nuværende indstilling er <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Lokaliteter</h1> </br>
                     Systemets lokalitetsindstillinger påvirker tal- og datoformatet. Den nuværende indstilling er <strong>%1</strong>.
     
     
-      
+      
       Back
       Tilbage
     
@@ -4164,6 +4123,45 @@ setting
             <p>Dette er eksempler på udgivelsesnoter.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4220,132 +4218,132 @@ setting
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Vælg dit brugernavn og loginoplysninger som bruges til at logge ind med og udføre administrative opgaver
     
     
-      
+      
       What is your name?
       Hvad er dit navn?
     
     
-      
+      
       Your Full Name
       Dit fulde navn
     
     
-      
+      
       What name do you want to use to log in?
       Hvilket navn skal bruges til at logge ind?
     
     
-      
+      
       Login Name
       Loginnavn
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Det er kun tilladt at bruge bogstaver med småt, tal, understregning og bindestreg.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Hvad er navnet på computeren?
     
     
-      
+      
       Computer Name
       Computernavn
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Navnet bruges, hvis du gør computeren synlig for andre på et netværk.
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Vælg en adgangskode for at beskytte din konto.
     
     
-      
+      
       Password
       Adgangskode
     
     
-      
+      
       Repeat Password
       Gentag adgangskode
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl. En god adgangskode indeholder en blanding af bogstaver, tal og specialtegn, bør være mindst 8 tegn langt og bør skiftes jævnligt.
     
     
-      
+      
       Validate passwords quality
       Validér kvaliteten af adgangskoderne
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Når boksen er tilvalgt, så foretages der tjek af adgangskodens styrke og du vil ikke være i stand til at bruge en svag adgangskode.
     
     
-      
+      
       Log in automatically without asking for the password
       Log ind automatisk uden at spørge efter adgangskoden
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Genbrug brugeradgangskode som root-adgangskode
     
     
-      
+      
       Use the same password for the administrator account.
       Brug den samme adgangskode til administratorkontoen.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Vælg en root-adgangskode til at holde din konto sikker
     
     
-      
+      
       Root Password
       Root-adgangskode
     
     
-      
+      
       Repeat Root Password
       Gentag root-adgangskode
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Skriv den samme adgangskode to gange, så den kan blive tjekket for skrivefejl.
     
diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index e682848c5c..dee0c7fe38 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -495,12 +495,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Installationsprogramm
     
     
-      
+      
       %1 Installer
       %1 Installationsprogramm
     
@@ -540,149 +540,149 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Form
     
     
-      
+      
       Select storage de&vice:
       Speichermedium auswählen
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Aktuell:
     
     
-      
+      
       After:
       Nachher:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuelle Partitionierung</strong><br/>Sie können Partitionen eigenhändig erstellen oder in der Grösse verändern.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 als Home-Partition für %2 wiederverwenden.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Wählen Sie die zu verkleinernde Partition, dann ziehen Sie den Regler, um die Größe zu ändern</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 wird auf %2MiB verkleinert und eine neue Partition mit einer Größe von %3MiB wird für %4 erstellt werden.
     
     
-      
+      
       Boot loader location:
       Installationsziel des Bootloaders:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Wählen Sie eine Partition für die Installation</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Es wurde keine EFI-Systempartition auf diesem System gefunden. Bitte gehen Sie zurück und nutzen Sie die manuelle Partitionierung für das Einrichten von %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Die EFI-Systempartition %1 wird benutzt, um %2 zu starten.
     
     
-      
+      
       EFI system partition:
       EFI-Systempartition:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Auf diesem Speichermedium scheint kein Betriebssystem installiert zu sein. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen auf diesem Speichermedium vorgenommen werden.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Festplatte löschen</strong><br/>Dies wird alle vorhandenen Daten auf dem gewählten Speichermedium <font color="red">löschen</font>. 
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Parallel dazu installieren</strong><br/>Das Installationsprogramm wird eine Partition verkleinern, um Platz für %1 zu schaffen.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ersetze eine Partition</strong><br/>Ersetzt eine Partition durch %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Auf diesem Speichermedium ist %1 installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dieses Speichermedium enthält bereits ein Betriebssystem. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen wird.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Auf diesem Speichermedium sind mehrere Betriebssysteme installiert. Was möchten Sie tun?<br/>Sie können Ihre Auswahl überprüfen und bestätigen, bevor Änderungen an dem Speichermedium vorgenommen werden.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Auf diesem Speichergerät befindet sich bereits ein Betriebssystem, aber die Partitionstabelle <strong>%1</strong> unterscheidet sich von den erforderlichen <strong>%2</strong><br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Bei diesem Speichergerät ist eine seiner Partitionen <strong>eingehängt</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Dieses Speichergerät ist ein Teil eines <strong>inaktiven RAID</strong>-Geräts.
     
     
-      
+      
       No Swap
       Kein Swap
     
     
-      
+      
       Reuse Swap
       Swap wiederverwenden
     
     
-      
+      
       Swap (no Hibernate)
       Swap (ohne Ruhezustand)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (mit Ruhezustand)
     
     
-      
+      
       Swap to file
       Auslagerungsdatei verwenden
     
@@ -750,12 +750,12 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Setze Tastaturmodell auf %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Setze Tastaturbelegung auf %1/%2.
     
@@ -805,47 +805,47 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Netzwerk-Installation. (Deaktiviert: Paketlisten nicht erreichbar, prüfen Sie Ihre Netzwerk-Verbindung)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.<br/>Die Installation kann nicht fortgesetzt werden. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.<br/>Die Installation kann nicht fortgesetzt werden. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Dieser Computer erfüllt nicht alle empfohlenen Voraussetzungen für die Installation von %1.<br/>Die Installation kann fortgesetzt werden, aber es werden eventuell nicht alle Funktionen verfügbar sein.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Dieser Computer erfüllt nicht alle empfohlenen Voraussetzungen für die Installation von %1.<br/>Die Installation kann fortgesetzt werden, aber es werden eventuell nicht alle Funktionen verfügbar sein.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Dieses Programm wird Ihnen einige Fragen stellen, um %2 auf Ihrem Computer zu installieren.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Willkommen bei Calamares, dem Installationsprogramm für %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Willkommen zur Installation von %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Willkommen bei Calamares, dem Installationsprogramm für %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Willkommen zum Installationsprogramm für %1</h1>
     
@@ -940,15 +940,40 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Die Installation von %1 ist abgeschlossen.
     
     
-      
+      
       Package Selection
       Paketauswahl
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Bitte wählen Sie ein Produkt aus der Liste aus. Das ausgewählte Produkt wird installiert.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Zusammenfassung
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Dies ist eine Übersicht der Aktionen, die nach dem Starten des Installationsprozesses durchgeführt werden.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Dies ist eine Übersicht der Aktionen, die nach dem Starten des Installationsprozesses durchgeführt werden.
+    
   
   
     ContextualProcessJob
@@ -2447,6 +2472,14 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Bitte wählen Sie ein Produkt aus der Liste aus. Das ausgewählte Produkt wird installiert.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Pakete
+    
+  
   
     PackageChooserViewStep
     
@@ -2730,17 +2763,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       I&nstalliere Bootloader auf:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Sind Sie sicher, dass Sie eine neue Partitionstabelle auf %1 erstellen möchten?
     
     
-      
+      
       Can not create new partition
       Neue Partition kann nicht erstellt werden
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Die Partitionstabelle auf %1 hat bereits %2 primäre Partitionen und weitere können nicht hinzugefügt werden. Bitte entfernen Sie eine primäre Partition und fügen Sie stattdessen eine erweiterte Partition hinzu.
     
@@ -2758,107 +2791,82 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Partitionen
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Installiere %1 <strong>neben</strong> einem anderen Betriebssystem.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Lösche</strong> Festplatte und installiere %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Ersetze</strong> eine Partition durch %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Manuelle</strong> Partitionierung.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      %1 <strong>parallel</strong> zu einem anderen Betriebssystem auf der Festplatte <strong>%2</strong> (%3) installieren.
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      Festplatte <strong>%2</strong> <strong>löschen</strong> (%3) und %1 installieren.
+      
+      Current:
+      Aktuell:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      Eine Partition auf Festplatte <strong>%2</strong> (%3) durch %1 <strong>ersetzen</strong>.
+      
+      After:
+      Nachher:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Manuelle</strong> Partitionierung auf Festplatte <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Keine EFI-Systempartition konfiguriert
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Festplatte <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Aktuell:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Nachher:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Keine EFI-Systempartition konfiguriert
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Eine EFI-Systempartition wird benötigt, um %1 zu starten.<br/><br/>Um eine EFI-Systempartition einzurichten, gehen Sie zurück und wählen oder erstellen Sie ein FAT32-Dateisystem mit einer aktivierten <strong>%3</strong> Markierung sowie <strong>%2</strong> als Einhängepunkt .<br/><br/>Sie können ohne die Einrichtung einer EFI-Systempartition fortfahren, aber ihr System wird unter Umständen nicht starten können.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Eine EFI-Systempartition wird benötigt, um %1 zu starten.<br/><br/>Eine Partition mit dem Einhängepunkt <strong>%2</strong> wurde eingerichtet, jedoch wurde dort keine <strong>%3</strong> Markierung gesetzt.<br/>Um diese Markierung zu setzen, gehen Sie zurück und bearbeiten Sie die Partition.<br/><br/>Sie können ohne diese Markierung fortfahren, aber ihr System wird unter Umständen nicht starten können.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Die Markierung als EFI-Systempartition wurde nicht gesetzt
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Option zur Verwendung von GPT mit BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Eine GPT-Partitionstabelle ist die beste Option für alle Systeme. Dieses Installationsprogramm unterstützt ein solches Setup auch für BIOS-Systeme.<br/><br/>Um eine GPT-Partitionstabelle mit BIOS zu konfigurieren, gehen Sie (falls noch nicht geschehen) zurück und setzen Sie die Partitionstabelle auf GPT, als nächstes erstellen Sie eine 8 MB große, unformatierte Partition mit der Markierung <strong>bios_grub</strong> aktiviert.<br/><br/>Eine unformatierte 8 MB große Partition ist erforderlich, um %1 auf einem BIOS-System mit GPT zu starten.
     
     
-      
+      
       Boot partition not encrypted
       Bootpartition nicht verschlüsselt
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Eine separate Bootpartition wurde zusammen mit einer verschlüsselten Rootpartition erstellt, die Bootpartition ist aber unverschlüsselt.<br/><br/> Dies ist sicherheitstechnisch nicht optimal, da wichtige Systemdateien auf der unverschlüsselten Bootpartition gespeichert werden.<br/>Wenn Sie wollen, können Sie fortfahren, aber das Entschlüsseln des Dateisystems wird erst später während des Systemstarts erfolgen.<br/>Um die Bootpartition zu verschlüsseln, gehen Sie zurück und erstellen Sie diese neu, indem Sie bei der Partitionierung <strong>Verschlüsseln</strong> wählen. 
     
     
-      
+      
       has at least one disk device available.
       mindestens eine Festplatte zur Verfügung hat
     
     
-      
+      
       There are no partitions to install on.
       Keine Partitionen für die Installation verfügbar.
     
@@ -2993,7 +3001,7 @@ Ausgabe:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3319,44 +3327,16 @@ Ausgabe:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Für das beste Ergebnis stellen Sie bitte sicher, dass dieser Computer:
     
     
-      
+      
       System requirements
       Systemanforderungen
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.<br/>Die Installation kann nicht fortgesetzt werden. <a href="#details">Details...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Dieser Computer erfüllt nicht die Mindestvoraussetzungen für die Installation von %1.<br/>Die Installation kann nicht fortgesetzt werden. <a href="#details">Details...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Dieser Computer erfüllt nicht alle empfohlenen Voraussetzungen für die Installation von %1.<br/>Die Installation kann fortgesetzt werden, aber es werden eventuell nicht alle Funktionen verfügbar sein.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Dieser Computer erfüllt nicht alle empfohlenen Voraussetzungen für die Installation von %1.<br/>Die Installation kann fortgesetzt werden, aber es werden eventuell nicht alle Funktionen verfügbar sein.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Dieses Programm wird Ihnen einige Fragen stellen, um %2 auf Ihrem Computer zu installieren.
-    
-  
   
     ScanningDialog
     
@@ -3648,27 +3628,6 @@ Ausgabe:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Dies ist eine Übersicht der Aktionen, die nach dem Starten des Installationsprozesses durchgeführt werden.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Dies ist eine Übersicht der Aktionen, die nach dem Starten des Installationsprozesses durchgeführt werden.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Zusammenfassung
-    
-  
   
     TrackingInstallJob
     
@@ -4000,7 +3959,7 @@ Ausgabe:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Willkommen
     
@@ -4008,7 +3967,7 @@ Ausgabe:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Willkommen
     
@@ -4091,21 +4050,21 @@ Ausgabe:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Sprachen</h1> </br>
                     Das Regionalschema betrifft die Sprache und die Tastaturbelegung für einige Elemente der Kommandozeile. Derzeit eingestellt ist <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Regionalschemata</h1> </br>
                     Die Regionalschemata betreffen das Format der Zahlen und Daten. Derzeit eingestellt ist <strong>%1</strong>.
     
     
-      
+      
       Back
       Zurück
     
@@ -4171,6 +4130,45 @@ Ausgabe:
             <p>Dies sind beispielhafte Veröffentlichungshinweise.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4227,132 +4225,132 @@ Ausgabe:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Wählen Sie Benutzername und Passwort, um sich als Administrator anzumelden.
     
     
-      
+      
       What is your name?
       Wie ist Ihr Vor- und Nachname?
     
     
-      
+      
       Your Full Name
       Ihr vollständiger Name
     
     
-      
+      
       What name do you want to use to log in?
       Welchen Namen möchten Sie zum Anmelden benutzen?
     
     
-      
+      
       Login Name
       Anmeldename
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Falls mehrere Personen diesen Computer benutzen, können Sie nach der Installation weitere Konten hinzufügen.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Es sind nur Kleinbuchstaben, Zahlen, Unterstrich und Bindestrich erlaubt.
     
     
-      
+      
       root is not allowed as username.
       root ist als Benutzername nicht erlaubt.
     
     
-      
+      
       What is the name of this computer?
       Wie ist der Name dieses Computers?
     
     
-      
+      
       Computer Name
       Computername
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Dieser Name wird benutzt, wenn Sie den Computer im Netzwerk für andere sichtbar machen.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost ist als Computername nicht erlaubt.
     
     
-      
+      
       Choose a password to keep your account safe.
       Wählen Sie ein Passwort, um Ihr Konto zu sichern.
     
     
-      
+      
       Password
       Passwort
     
     
-      
+      
       Repeat Password
       Passwort wiederholen
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann. Ein gutes Passwort sollte eine Mischung aus Buchstaben, Zahlen sowie Sonderzeichen enthalten, mindestens acht Zeichen lang sein und regelmäßig geändert werden. 
     
     
-      
+      
       Validate passwords quality
       Passwort-Qualität überprüfen
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Wenn dieses Kontrollkästchen aktiviert ist, wird die Passwortstärke überprüft und verhindert, dass Sie ein schwaches Passwort verwenden.
     
     
-      
+      
       Log in automatically without asking for the password
       Automatisch anmelden ohne Passwortabfrage
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Es sind nur Buchstaben, Zahlen, Unterstrich und Bindestrich erlaubt, minimal zwei Zeichen.
     
     
-      
+      
       Reuse user password as root password
       Benutzerpasswort als Root-Passwort benutzen 
     
     
-      
+      
       Use the same password for the administrator account.
       Nutze das gleiche Passwort auch für das Administratorkonto.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Wählen Sie ein Root-Passwort, um Ihr Konto zu schützen.
     
     
-      
+      
       Root Password
       Root-Passwort
     
     
-      
+      
       Repeat Root Password
       Root-Passwort wiederholen
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Geben Sie das Passwort zweimal ein, damit es auf Tippfehler überprüft werden kann.
     
diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts
index 8cd2e4877a..31f1498aa1 100644
--- a/lang/calamares_el.ts
+++ b/lang/calamares_el.ts
@@ -490,12 +490,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       Εφαρμογή εγκατάστασης του %1
     
@@ -534,149 +534,149 @@ The installer will quit and all changes will be lost.
       Τύπος
     
     
-      
+      
       Select storage de&vice:
       Επιλέξτε συσκευή απ&οθήκευσης:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Τρέχον:
     
     
-      
+      
       After:
       Μετά:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Χειροκίνητη τμηματοποίηση</strong><br/>Μπορείτε να δημιουργήσετε κατατμήσεις ή να αλλάξετε το μέγεθός τους μόνοι σας.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Επιλέξτε ένα διαμέρισμα για σμίκρυνση, και μετά σύρετε το κάτω τμήμα της μπάρας για αλλαγή του μεγέθους</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Τοποθεσία προγράμματος εκκίνησης:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Επιλέξτε διαμέρισμα για την εγκατάσταση</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Πουθενά στο σύστημα δεν μπορεί να ανιχθευθεί μία κατάτμηση EFI. Παρακαλώ επιστρέψτε πίσω και χρησιμοποιήστε τη χειροκίνητη τμηματοποίηση για την εγκατάσταση του %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Η κατάτμηση συστήματος EFI στο %1 θα χρησιμοποιηθεί για την εκκίνηση του %2.
     
     
-      
+      
       EFI system partition:
       Κατάτμηση συστήματος EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Η συσκευή αποθήκευσης δεν φαίνεται να διαθέτει κάποιο λειτουργικό σύστημα. Τί θα ήθελες να κάνεις;<br/>Θα έχεις την δυνατότητα να επιβεβαιώσεις και αναθεωρήσεις τις αλλαγές πριν γίνει οποιαδήποτε αλλαγή στην συσκευή αποθήκευσης.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Διαγραφή του δίσκου</strong><br/>Αυτό θα <font color="red">διαγράψει</font> όλα τα αρχεία στην επιλεγμένη συσκευή αποθήκευσης.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Εγκατάσταση σε επαλληλία</strong><br/>Η εγκατάσταση θα συρρικνώσει μία κατάτμηση για να κάνει χώρο για το %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Αντικατάσταση μίας κατάτμησης</strong><br/>Αντικαθιστά μία κατάτμηση με το %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -744,12 +744,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Ορισμός του μοντέλου πληκτρολογίου σε %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Ορισμός της διάταξης πληκτρολογίου σε %1/%2.
     
@@ -799,47 +799,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ο υπολογιστής δεν ικανοποιεί τις ελάχιστες απαιτήσεις για την εγκατάσταση του  %1.<br/>Η εγκατάσταση δεν μπορεί να συνεχιστεί. <a href="#details">Λεπτομέριες...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Αυτός ο υπολογιστής δεν ικανοποιεί μερικές από τις συνιστώμενες απαιτήσεις για την εγκατάσταση του %1.<br/>Η εγκατάσταση μπορεί να συνεχιστεί, αλλά ορισμένες λειτουργίες μπορεί να απενεργοποιηθούν.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Το πρόγραμμα θα σας κάνει μερικές ερωτήσεις και θα ρυθμίσει το %2 στον υπολογιστή σας.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -934,15 +934,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Σύνοψη
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Αυτή είναι μια επισκόπηση του τι θα συμβεί μόλις ξεκινήσετε τη διαδικασία εγκατάστασης.
+    
   
   
     ContextualProcessJob
@@ -2439,6 +2464,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2722,17 +2755,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Θέλετε σίγουρα να δημιουργήσετε έναν νέο πίνακα κατατμήσεων στο %1;
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2750,107 +2783,82 @@ The installer will quit and all changes will be lost.
       Κατατμήσεις
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Εγκατάσταση του %1 <strong>παράλληλα με</strong> ένα άλλο λειτουργικό σύστημα στον δίσκο.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Διαγραφή</strong> του δίσκου και εγκατάσταση του %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Αντικατάσταση</strong> μιας κατάτμησης με το %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Χειροκίνητη</strong> τμηματοποίηση.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Εγκατάσταση του %1 <strong>παράλληλα με</strong> ένα άλλο λειτουργικό σύστημα στον δίσκο<strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Διαγραφή</strong> του δίσκου <strong>%2</strong> (%3) και εγκατάσταση του %1.
+      
+      Current:
+      Τρέχον:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Αντικατάσταση</strong> μιας κατάτμησης στον δίσκο <strong>%2</strong> (%3) με το %1.
+      
+      After:
+      Μετά:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Χειροκίνητη</strong> τμηματοποίηση του δίσκου <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Δίσκος <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Τρέχον:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Μετά:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2982,7 +2990,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3305,44 +3313,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Για καλύτερο αποτέλεσμα, παρακαλώ βεβαιωθείτε ότι ο υπολογιστής:
     
     
-      
+      
       System requirements
       Απαιτήσεις συστήματος
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Ο υπολογιστής δεν ικανοποιεί τις ελάχιστες απαιτήσεις για την εγκατάσταση του  %1.<br/>Η εγκατάσταση δεν μπορεί να συνεχιστεί. <a href="#details">Λεπτομέριες...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Αυτός ο υπολογιστής δεν ικανοποιεί μερικές από τις συνιστώμενες απαιτήσεις για την εγκατάσταση του %1.<br/>Η εγκατάσταση μπορεί να συνεχιστεί, αλλά ορισμένες λειτουργίες μπορεί να απενεργοποιηθούν.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Το πρόγραμμα θα σας κάνει μερικές ερωτήσεις και θα ρυθμίσει το %2 στον υπολογιστή σας.
-    
-  
   
     ScanningDialog
     
@@ -3634,27 +3614,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Αυτή είναι μια επισκόπηση του τι θα συμβεί μόλις ξεκινήσετε τη διαδικασία εγκατάστασης.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Σύνοψη
-    
-  
   
     TrackingInstallJob
     
@@ -3986,7 +3945,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Καλώς ήλθατε
     
@@ -3994,7 +3953,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Καλώς ήλθατε
     
@@ -4064,19 +4023,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4141,6 +4100,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4177,132 +4175,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Ποιο είναι το όνομά σας;
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Ποιο όνομα θα θέλατε να χρησιμοποιείτε για σύνδεση;
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Ποιο είναι το όνομά του υπολογιστή;
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Επιλέξτε ένα κωδικό για να διατηρήσετε το λογαριασμό σας ασφαλή.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Χρησιμοποιήστε τον ίδιο κωδικό πρόσβασης για τον λογαριασμό διαχειριστή.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 53882fbb06..e3260355c7 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -951,27 +951,27 @@ The installer will quit and all changes will be lost.
     
       
       Install option: <strong>%1</strong>
-      
+      Install option: <strong>%1</strong>
     
     
       
       None
-      
+      None
     
     
       
       Summary
-      Summary
+      Summary
     
     
       
       This is an overview of what will happen once you start the setup procedure.
-      This is an overview of what will happen once you start the setup procedure.
+      This is an overview of what will happen once you start the setup procedure.
     
     
       
       This is an overview of what will happen once you start the install procedure.
-      This is an overview of what will happen once you start the install procedure.
+      This is an overview of what will happen once you start the install procedure.
     
   
   
@@ -2476,7 +2476,7 @@ The installer will quit and all changes will be lost.
     
       
       Packages
-      Packages
+      Packages
     
   
   
@@ -2807,37 +2807,37 @@ The installer will quit and all changes will be lost.
     
       
       EFI system partition configured incorrectly
-      
+      EFI system partition configured incorrectly
     
     
       
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
-      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
     
     
       
       The filesystem must be mounted on <strong>%1</strong>.
-      
+      The filesystem must be mounted on <strong>%1</strong>.
     
     
       
       The filesystem must have type FAT32.
-      
+      The filesystem must have type FAT32.
     
     
       
       The filesystem must be at least %1 MiB in size.
-      
+      The filesystem must be at least %1 MiB in size.
     
     
       
       The filesystem must have flag <strong>%1</strong> set.
-      
+      The filesystem must have flag <strong>%1</strong> set.
     
     
       
       You can continue without setting up an EFI system partition but your system may fail to start.
-      
+      You can continue without setting up an EFI system partition but your system may fail to start.
     
     
       
@@ -4135,37 +4135,38 @@ Output:
       
       LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
                     Default option.
-      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
     
     
       
       LibreOffice
-      
+      LibreOffice
     
     
       
       If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
-      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
     
     
       
       No Office Suite
-      
+      No Office Suite
     
     
       
       Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
-      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
     
     
       
       Minimal Install
-      
+      Minimal Install
     
     
       
       Please select an option for your install, or use the default: LibreOffice included.
-      
+      Please select an option for your install, or use the default: LibreOffice included.
     
   
   
diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts
index bd720af70a..937e8a65b6 100644
--- a/lang/calamares_en_GB.ts
+++ b/lang/calamares_en_GB.ts
@@ -490,12 +490,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 Installer
     
@@ -534,149 +534,149 @@ The installer will quit and all changes will be lost.
       Form
     
     
-      
+      
       Select storage de&vice:
       Select storage de&vice:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Current:
     
     
-      
+      
       After:
       After:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reuse %1 as home partition for %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Boot loader location:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Select a partition to install on</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       The EFI system partition at %1 will be used for starting %2.
     
     
-      
+      
       EFI system partition:
       EFI system partition:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -744,12 +744,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Set keyboard model to %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Set keyboard layout to %1/%2.
     
@@ -799,47 +799,47 @@ The installer will quit and all changes will be lost.
       Network Installation. (Disabled: Unable to fetch package lists, check your network connection)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       This program will ask you some questions and set up %2 on your computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -934,15 +934,40 @@ The installer will quit and all changes will be lost.
       The installation of %1 is complete.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Summary
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      This is an overview of what will happen once you start the install procedure.
+    
   
   
     ContextualProcessJob
@@ -2439,6 +2464,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2722,17 +2755,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Are you sure you want to create a new partition table on %1?
     
     
-      
+      
       Can not create new partition
       Can not create new partition
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
     
@@ -2750,107 +2783,82 @@ The installer will quit and all changes will be lost.
       Partitions
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Install %1 <strong>alongside</strong> another operating system.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Erase</strong> disk and install %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Replace</strong> a partition with %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Manual</strong> partitioning.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      Current:
+      Current:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      After:
+      After:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      No EFI system partition configured
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disk <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Current:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      After:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Boot partition not encrypted
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2985,7 +2993,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3308,44 +3316,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       For best results, please ensure that this computer:
     
     
-      
+      
       System requirements
       System requirements
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      This program will ask you some questions and set up %2 on your computer.
-    
-  
   
     ScanningDialog
     
@@ -3637,27 +3617,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      This is an overview of what will happen once you start the install procedure.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Summary
-    
-  
   
     TrackingInstallJob
     
@@ -3989,7 +3948,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Welcome
     
@@ -3997,7 +3956,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Welcome
     
@@ -4067,19 +4026,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4144,6 +4103,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4180,132 +4178,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       What is your name?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       What name do you want to use to log in?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       What is the name of this computer?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Choose a password to keep your account safe.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Use the same password for the administrator account.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts
index 70bf7c1b86..546ff724a7 100644
--- a/lang/calamares_eo.ts
+++ b/lang/calamares_eo.ts
@@ -494,12 +494,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 Instalilo
     
@@ -538,149 +538,149 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       Formularo
     
     
-      
+      
       Select storage de&vice:
       Elektita &tenada aparato
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Nune:
     
     
-      
+      
       After:
       Poste:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Allokigo de la Praŝargilo:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -748,12 +748,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -803,47 +803,47 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -938,15 +938,40 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       La instalaĵo de %1 estas plenumita.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2443,6 +2468,14 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2726,17 +2759,17 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2754,107 +2787,82 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
+      
+      Current:
+      Nune:
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      
+      
+      After:
+      Poste:
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      Current:
-      Nune:
-    
-    
-      
-      After:
-      Poste:
-    
-    
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2986,7 +2994,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1(%2)
     
@@ -3309,44 +3317,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3638,27 +3618,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3990,7 +3949,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3998,7 +3957,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4068,19 +4027,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4145,6 +4104,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4181,132 +4179,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index 5e3c751d86..36e03389e1 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -491,12 +491,12 @@ Saldrá del instalador y se perderán todos los cambios.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 Instalador
     
@@ -535,149 +535,149 @@ Saldrá del instalador y se perderán todos los cambios.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       Seleccionar dispositivo de almacenamiento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Despues:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionado manual </strong><br/> Usted puede crear o cambiar el tamaño de las particiones usted mismo.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Volver a usar %1 como partición home para %2
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Seleccione una partición para reducir el tamaño, a continuación, arrastre la barra inferior para cambiar el tamaño</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Ubicación del cargador de arranque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Seleccione una partición para instalar en</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       No se puede encontrar una partición de sistema EFI en ningún lugar de este sistema. Por favor, vuelva y use el particionamiento manual para establecer %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partición de sistema EFI en %1 se usará para iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partición del sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento no parece tener un sistema operativo en él. ¿Qué quiere hacer?<br/>Podrá revisar y confirmar sus elecciones antes de que se haga cualquier cambio en el dispositivo de almacenamiento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Borrar disco</strong><br/>Esto <font color="red">borrará</font> todos los datos presentes actualmente en el dispositivo de almacenamiento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar junto al otro SO</strong><br/>El instalador reducirá la partición del SO existente para tener espacio para instalar %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Reemplazar una partición</strong><br/>Reemplazar una partición con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       %1 se encuentra instalado en este dispositivo de almacenamiento. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento parece que ya tiene un sistema operativo instalado en él. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento contiene múltiples sistemas operativos instalados en él. ¿Qué desea hacer?<br/>Podrá revisar y confirmar su elección antes de que cualquier cambio se haga efectivo en el dispositivo de almacenamiento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Sin Swap
     
     
-      
+      
       Reuse Swap
       Reusar Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sin hibernación)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (con hibernación)
     
     
-      
+      
       Swap to file
       Swap a archivo
     
@@ -745,12 +745,12 @@ Saldrá del instalador y se perderán todos los cambios.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Establecer el modelo de teclado a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Configurar la disposición de teclado a %1/%2.
     
@@ -800,47 +800,47 @@ Saldrá del instalador y se perderán todos los cambios.
       Instalación a través de la Red. (Desactivada: no se ha podido obtener una lista de paquetes, comprueba tu conexión a la red)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Este ordenador no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Este ordenador no cumple alguno de los requisitos recomendados para la instalación %1.<br/>La instalación puede continuar, pero algunas funcionalidades podrían ser deshabilitadas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       El programa le preguntará algunas cuestiones y configurará %2 en su ordenador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -935,15 +935,40 @@ Saldrá del instalador y se perderán todos los cambios.
       Se ha completado la instalación de %1.
     
     
-      
+      
       Package Selection
       Selección de paquetes
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Resumen
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Esto es una previsualización de que ocurrirá una vez que empiece la instalación.
+    
   
   
     ContextualProcessJob
@@ -2440,6 +2465,14 @@ Saldrá del instalador y se perderán todos los cambios.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paquetes
+    
+  
   
     PackageChooserViewStep
     
@@ -2723,17 +2756,17 @@ Saldrá del instalador y se perderán todos los cambios.
       Instalar gestor de arranque en:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       ¿Está seguro de querer crear una nueva tabla de particiones en %1?
     
     
-      
+      
       Can not create new partition
       No se puede crear una partición nueva
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       La tabla de particiones en %1 tiene %2 particiones primarias y no se pueden agregar más. Por favor remueva una partición primaria y agregue una partición extendida en su reemplazo.
     
@@ -2751,107 +2784,82 @@ Saldrá del instalador y se perderán todos los cambios.
       Particiones
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instalar %1 <strong>junto a</strong> otro sistema operativo.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Borrar</strong> disco e instalar %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Reemplazar</strong> una partición con %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Particionamiento <strong>manual</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instalar %1 <strong>junto a</strong> otro sistema operativo en disco <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Borrar</strong> disco <strong>%2</strong> (%3) e instalar %1.
+      
+      Current:
+      Corriente
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Reemplazar</strong> una partición en disco <strong>%2</strong> (%3) con %1.
+      
+      After:
+      Despúes:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Particionamiento <strong>manual</strong> en disco <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      No hay una partición del sistema EFI configurada
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disco <strong>%1<strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Corriente
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Despúes:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      No hay una partición del sistema EFI configurada
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      Bandera EFI no establecida en la partición del sistema
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partición de arranque no cifrada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Se estableció una partición de arranque aparte junto con una partición raíz cifrada, pero la partición de arranque no está cifrada.<br/><br/>Hay consideraciones de seguridad con esta clase de instalación, porque los ficheros de sistema importantes se mantienen en una partición no cifrada.<br/>Puede continuar si lo desea, pero el desbloqueo del sistema de ficheros ocurrirá más tarde durante el arranque del sistema.<br/>Para cifrar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Cifrar</strong> en la ventana de creación de la partición.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2986,7 +2994,7 @@ Salida:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3309,44 +3317,16 @@ Salida:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para obtener los mejores resultados, por favor asegúrese que este ordenador:
     
     
-      
+      
       System requirements
       Requisitos del sistema
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Este ordenador no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Este ordenador no cumple alguno de los requisitos recomendados para la instalación %1.<br/>La instalación puede continuar, pero algunas funcionalidades podrían ser deshabilitadas.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      El programa le preguntará algunas cuestiones y configurará %2 en su ordenador.
-    
-  
   
     ScanningDialog
     
@@ -3638,27 +3618,6 @@ Salida:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Esto es una previsualización de que ocurrirá una vez que empiece la instalación.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Resumen
-    
-  
   
     TrackingInstallJob
     
@@ -3990,7 +3949,7 @@ Salida:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Bienvenido
     
@@ -3998,7 +3957,7 @@ Salida:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Bienvenido
     
@@ -4068,19 +4027,19 @@ Salida:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4145,6 +4104,45 @@ Salida:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4181,132 +4179,132 @@ Salida:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Nombre
     
     
-      
+      
       Your Full Name
       Su nombre completo
     
     
-      
+      
       What name do you want to use to log in?
       ¿Qué nombre desea usar para ingresar?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Nombre del equipo
     
     
-      
+      
       Computer Name
       Nombre de computadora
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Elija una contraseña para mantener su cuenta segura.
     
     
-      
+      
       Password
       Contraseña
     
     
-      
+      
       Repeat Password
       Repita la contraseña
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Usar la misma contraseña para la cuenta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts
index 50402d9d83..80c2c36783 100644
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
@@ -491,12 +491,12 @@ El instalador terminará y se perderán todos los cambios.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Programa de instalación
     
     
-      
+      
       %1 Installer
       %1 Instalador
     
@@ -535,150 +535,150 @@ El instalador terminará y se perderán todos los cambios.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       Seleccionar dispositivo de almacenamiento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Después:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionado manual </strong><br/> Puede crear o cambiar el tamaño de las particiones usted mismo.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reuse %1 como partición home para %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
        <strong>Seleccione una partición para reducir el tamaño, a continuación, arrastre la barra inferior para redimencinar</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 será reducido a %2MiB y una nueva %3MiB partición se creará para %4.
     
     
-      
+      
       Boot loader location:
       Ubicación del cargador de arranque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
        <strong>Seleccione una partición para instalar</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       No se puede encontrar en el sistema una partición EFI. Por favor vuelva atrás y use el particionamiento manual para configurar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partición EFI en %1 será usada para iniciar %2.
 
     
     
-      
+      
       EFI system partition:
       Partición de sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento parece no tener un sistema operativo en el. ¿que le gustaría hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Borrar disco</strong> <br/>Esto <font color="red">borrará</font> todos los datos presentes actualmente en el dispositivo de almacenamiento seleccionado.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar junto a</strong> <br/>El instalador reducirá una partición con el fin de hacer espacio para %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Reemplazar una partición</strong> <br/>Reemplaza una partición con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento tiene %1 en el. ¿Que le gustaría hacer? <br/>Usted podrá revisar y confirmar sus elecciones antes de que cualquier cambio se realice al dispositivo de almacenamiento.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento ya tiene un sistema operativo en el. ¿Que le gustaría hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de almacenamiento tiene múltiples sistemas operativos en el. ¿Que le gustaria hacer?<br/> Usted podrá revisar y confirmar sus elecciones antes que cualquier cambio se realice al dispositivo de almacenamiento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Sin Swap
     
     
-      
+      
       Reuse Swap
       Reutilizar Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sin hibernación)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (con hibernación)
     
     
-      
+      
       Swap to file
       Swap a archivo
     
@@ -746,12 +746,12 @@ El instalador terminará y se perderán todos los cambios.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Ajustar el modelo de teclado a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Ajustar teclado a %1/%2.
     
@@ -801,47 +801,47 @@ El instalador terminará y se perderán todos los cambios.
       Instalación de Red. (Deshabilitada: No se puede acceder a la lista de paquetes, verifique su conección de red)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
        Este equipo no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
        Este equipo no cumple alguno de los requisitos recomendados para la instalación %1.<br/>La instalación puede continuar, pero algunas funcionalidades podrían ser deshabilitadas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
        El programa le hará algunas preguntas y configurará %2 en su ordenador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -936,15 +936,40 @@ El instalador terminará y se perderán todos los cambios.
       La instalación de %1 está completa.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Resumen
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Esta es una descripción general de lo que sucederá una vez que comience el procedimiento de configuración.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Esto es un resumen de lo que pasará una vez que inicie el procedimiento de instalación.
+    
   
   
     ContextualProcessJob
@@ -2441,6 +2466,14 @@ El instalador terminará y se perderán todos los cambios.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2724,17 +2757,17 @@ El instalador terminará y se perderán todos los cambios.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       ¿Está seguro de querer crear una nueva tabla de particiones en %1?
     
     
-      
+      
       Can not create new partition
       No se puede crear nueva partición
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       La tabla de partición en %1 ya tiene %2 particiones primarias, y no pueden agregarse mas. Favor remover una partición primaria y en cambio, agregue una partición extendida.
     
@@ -2752,107 +2785,82 @@ El instalador terminará y se perderán todos los cambios.
       Particiones
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-       Instalar %1 <strong>junto con</strong> otro sistema operativo.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-       <strong>Borrar</strong> el disco e instalar %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-       <strong>Reemplazar</strong> una parición con %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-       Particionamiento <strong>manual</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-       Instalar %1 <strong>junto con</strong> otro sistema operativo en el disco <strong>%2</strong>(%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Borrar</strong> el disco <strong>%2<strong> (%3) e instalar %1.
+      
+      Current:
+      Actual:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-       <strong>Reemplazar</strong> una parición en el disco <strong>%2</strong> (%3) con %1.
+      
+      After:
+      Después:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-       Particionar <strong>manualmente</strong> el disco <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Sistema de partición EFI no configurada
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disco <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Actual:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Después:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Sistema de partición EFI no configurada
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      Indicador de partición del sistema EFI no configurado
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partición de arranque no encriptada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Se creó una partición de arranque separada junto con una partición raíz cifrada, pero la partición de arranque no está encriptada.<br/><br/> Existen problemas de seguridad con este tipo de configuración, ya que los archivos importantes del sistema se guardan en una partición no encriptada. <br/>Puede continuar si lo desea, pero el desbloqueo del sistema de archivos ocurrirá más tarde durante el inicio del sistema. <br/>Para encriptar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Encriptar</strong> en la ventana de creación de la partición.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2987,7 +2995,7 @@ Salida
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3311,44 +3319,16 @@ Salida
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para mejores resultados, por favor verifique que esta computadora:
     
     
-      
+      
       System requirements
       Requisitos de sistema
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-       Este equipo no cumple los requisitos mínimos para la instalación. %1.<br/>La instalación no puede continuar. <a href="#details">Detalles...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-       Este equipo no cumple alguno de los requisitos recomendados para la instalación %1.<br/>La instalación puede continuar, pero algunas funcionalidades podrían ser deshabilitadas.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-       El programa le hará algunas preguntas y configurará %2 en su ordenador.
-    
-  
   
     ScanningDialog
     
@@ -3640,27 +3620,6 @@ Salida
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Esta es una descripción general de lo que sucederá una vez que comience el procedimiento de configuración.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Esto es un resumen de lo que pasará una vez que inicie el procedimiento de instalación.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Resumen
-    
-  
   
     TrackingInstallJob
     
@@ -3992,7 +3951,7 @@ Salida
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Bienvenido
     
@@ -4000,7 +3959,7 @@ Salida
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Bienvenido
     
@@ -4070,19 +4029,19 @@ Salida
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4147,6 +4106,45 @@ Salida
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4183,132 +4181,132 @@ Salida
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       ¿Cuál es su nombre?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       ¿Qué nombre desea usar para acceder al sistema?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       ¿Cuál es el nombre de esta computadora?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Seleccione una contraseña para mantener segura su cuenta.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Usar la misma contraseña para la cuenta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_es_PE.ts b/lang/calamares_es_PE.ts
index a91085c84c..dea7f9dd86 100644
--- a/lang/calamares_es_PE.ts
+++ b/lang/calamares_es_PE.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts
index ba98c1476d..232c42b1e1 100644
--- a/lang/calamares_es_PR.ts
+++ b/lang/calamares_es_PR.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Resumen
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Resumen
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts
index f2e99148a4..2f5752c871 100644
--- a/lang/calamares_et.ts
+++ b/lang/calamares_et.ts
@@ -490,12 +490,12 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 paigaldaja
     
@@ -534,149 +534,149 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Form
     
     
-      
+      
       Select storage de&vice:
       Vali mäluseade:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Hetkel:
     
     
-      
+      
       After:
       Pärast:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Käsitsi partitsioneerimine</strong><br/>Sa võid ise partitsioone luua või nende suurust muuta. 
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Taaskasuta %1 %2 kodupartitsioonina.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Vali vähendatav partitsioon, seejärel sikuta alumist riba suuruse muutmiseks</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Käivituslaaduri asukoht:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Vali partitsioon, kuhu paigaldada</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI süsteemipartitsiooni ei leitud sellest süsteemist. Palun mine tagasi ja kasuta käsitsi partitsioonimist, et seadistada %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI süsteemipartitsioon asukohas %1 kasutatakse %2 käivitamiseks.
     
     
-      
+      
       EFI system partition:
       EFI süsteemipartitsioon:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Sellel mäluseadmel ei paista olevat operatsioonisüsteemi peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Tühjenda ketas</strong><br/>See <font color="red">kustutab</font> kõik valitud mäluseadmel olevad andmed.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Paigalda kõrvale</strong><br/>Paigaldaja vähendab partitsiooni, et teha ruumi operatsioonisüsteemile %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Asenda partitsioon</strong><br/>Asendab partitsiooni operatsioonisüsteemiga %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Sellel mäluseadmel on peal %1. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Sellel mäluseadmel on juba operatsioonisüsteem peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Sellel mäluseadmel on mitu operatsioonisüsteemi peal. Mida soovid teha?<br/>Sa saad oma valikud üle vaadata ja kinnitada enne kui mistahes muudatus saab mäluseadmele teostatud.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -744,12 +744,12 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Sea klaviatuurimudeliks %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Sea klaviatuuripaigutuseks %1/%2.
     
@@ -799,47 +799,47 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Võrgupaigaldus. (Keelatud: paketinimistute saamine ebaõnnestus, kontrolli oma võrguühendust)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       See arvuti ei rahulda %1 paigldamiseks vajalikke minimaaltingimusi.<br/>Paigaldamine ei saa jätkuda. <a href="#details">Detailid...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       See arvuti ei rahulda mõnda %1 paigaldamiseks soovitatud tingimust.<br/>Paigaldamine võib jätkuda, ent mõned funktsioonid võivad olla keelatud.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       See programm küsib sult mõned küsimused ja seadistab %2 sinu arvutisse.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -934,15 +934,40 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       %1 paigaldus on valmis.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Kokkuvõte
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      See on ülevaade sellest mis juhtub, kui alustad paigaldusprotseduuri.
+    
   
   
     ContextualProcessJob
@@ -2439,6 +2464,14 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2722,17 +2755,17 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Paigalda käivituslaadur kohta:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Kas soovid kindlasti luua uut partitsioonitabelit kettale %1?
     
     
-      
+      
       Can not create new partition
       Uut partitsiooni ei saa luua
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Partitsioonitabel kohas %1 juba omab %2 peamist partitsiooni ning rohkem juurde ei saa lisada. Palun eemalda selle asemel üks peamine partitsioon ja lisa juurde laiendatud partitsioon. 
     
@@ -2750,107 +2783,82 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       Partitsioonid
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Paigalda %1 praeguse operatsioonisüsteemi <strong>kõrvale</strong>
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Tühjenda</strong> ketas ja paigalda %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Asenda</strong> partitsioon operatsioonisüsteemiga %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Käsitsi</strong> partitsioneerimine.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Paigalda %1 teise operatsioonisüsteemi <strong>kõrvale</strong> kettal <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Tühjenda</strong> ketas <strong>%2</strong> (%3) ja paigalda %1.
+      
+      Current:
+      Hetkel:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Asenda</strong> partitsioon kettal <strong>%2</strong> (%3) operatsioonisüsteemiga %1.
+      
+      After:
+      Pärast:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Käsitsi</strong> partitsioneerimine kettal <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      EFI süsteemipartitsiooni pole seadistatud
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Ketas <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Hetkel:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Pärast:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      EFI süsteemipartitsiooni pole seadistatud
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      EFI süsteemipartitsiooni silt pole määratud
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Käivituspartitsioon pole krüptitud
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Eraldi käivituspartitsioon seadistati koos krüptitud juurpartitsiooniga, aga käivituspartitsioon ise ei ole krüptitud.<br/><br/>Selle seadistusega kaasnevad turvaprobleemid, sest tähtsad süsteemifailid hoitakse krüptimata partitsioonil.<br/>Sa võid soovi korral jätkata, aga failisüsteemi lukust lahti tegemine toimub hiljem süsteemi käivitusel.<br/>Et krüpteerida käivituspartisiooni, mine tagasi ja taasloo see, valides <strong>Krüpteeri</strong> partitsiooni loomise aknas.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2985,7 +2993,7 @@ Väljund:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3308,44 +3316,16 @@ Väljund:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Parimate tulemuste jaoks palun veendu, et see arvuti:
     
     
-      
+      
       System requirements
       Süsteeminõudmised
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      See arvuti ei rahulda %1 paigldamiseks vajalikke minimaaltingimusi.<br/>Paigaldamine ei saa jätkuda. <a href="#details">Detailid...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      See arvuti ei rahulda mõnda %1 paigaldamiseks soovitatud tingimust.<br/>Paigaldamine võib jätkuda, ent mõned funktsioonid võivad olla keelatud.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      See programm küsib sult mõned küsimused ja seadistab %2 sinu arvutisse.
-    
-  
   
     ScanningDialog
     
@@ -3637,27 +3617,6 @@ Väljund:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      See on ülevaade sellest mis juhtub, kui alustad paigaldusprotseduuri.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Kokkuvõte
-    
-  
   
     TrackingInstallJob
     
@@ -3989,7 +3948,7 @@ Väljund:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Tervist
     
@@ -3997,7 +3956,7 @@ Väljund:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Tervist
     
@@ -4067,19 +4026,19 @@ Väljund:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4144,6 +4103,45 @@ Väljund:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4180,132 +4178,132 @@ Väljund:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Mis on su nimi?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Mis nime soovid sisselogimiseks kasutada?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Mis on selle arvuti nimi?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Vali parool, et hoida oma konto turvalisena.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Kasuta sama parooli administraatorikontole.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts
index e2db24dc6e..1eb901d324 100644
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
@@ -490,12 +490,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 Instalatzailea
     
@@ -534,149 +534,149 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       Aukeratu &biltegiratze-gailua:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Unekoa: 
     
     
-      
+      
       After:
       Ondoren:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Eskuz partizioak landu</strong><br/>Zure kasa sortu edo tamainaz alda dezakezu partizioak.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Berrerabili %1 home partizio bezala %2rentzat.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Aukeratu partizioa txikitzeko eta gero arrastatu azpiko-barra tamaina aldatzeko</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Abio kargatzaile kokapena:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>aukeratu partizioa instalatzeko</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Ezin da inon aurkitu EFI sistemako partiziorik sistema honetan. Mesedez joan atzera eta erabili eskuz partizioak lantzea %1 ezartzeko.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1eko EFI partizio sistema erabiliko da abiarazteko %2.
     
     
-      
+      
       EFI system partition:
       EFI sistema-partizioa:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Biltegiratze-gailuak badirudi ez duela sistema eragilerik. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Diskoa ezabatu</strong><br/>Honek orain dauden datu guztiak <font color="red">ezabatuko</font> ditu biltegiratze-gailutik.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalatu alboan</strong><br/>Instalatzaileak partizioa txikituko du lekua egiteko %1-(r)i.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ordeztu partizioa</strong><br/>ordezkatu partizioa %1-(e)kin.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Biltegiratze-gailuak %1 dauka. Zer egin nahiko zenuke? <br/>Zure aukerak berrikusteko eta berresteko aukera izango duzu aldaketak gauzatu aurretik biltegiratze-gailuan
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Biltegiragailu honetan badaude jadanik eragile sistema bat. Zer gustatuko litzaizuke egin?<br/>Biltegiragailuan aldaketarik egin baino lehen zure aukerak aztertu eta konfirmatu ahal izango duzu.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Biltegiragailu honetan badaude jadanik eragile sistema batzuk. Zer gustatuko litzaizuke egin?<br/>Biltegiragailuan aldaketarik egin baino lehen zure aukerak aztertu eta konfirmatu ahal izango duzu.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -744,12 +744,12 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Ezarri teklatu mota %1ra.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Ezarri teklatu diseinua %1%2ra.
     
@@ -799,47 +799,47 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Konputagailu honek ez dauzka gutxieneko eskakizunak %1 instalatzeko. <br/>Instalazioak ezin du jarraitu. <a href="#details">Xehetasunak...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Konputagailu honek ez du betetzen gomendatutako zenbait eskakizun %1 instalatzeko. <br/>Instalazioak jarraitu ahal du, baina zenbait ezaugarri desgaituko dira.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Konputagailuan %2 ezartzeko programa honek hainbat galdera egingo dizkizu.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -934,15 +934,40 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       %1 instalazioa amaitu da.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Laburpena
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2439,6 +2464,14 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2722,17 +2755,17 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Abio kargatzailea I&nstalatu bertan:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Ziur al zaude partizio-taula berri bat %1-(e)an sortu nahi duzula?
     
     
-      
+      
       Can not create new partition
       Ezin da partizio berririk sortu
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2750,107 +2783,82 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Partizioak
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
+      
+      Current:
+      Unekoa: 
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      
+      
+      After:
+      Ondoren:
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      Current:
-      Unekoa: 
-    
-    
-      
-      After:
-      Ondoren:
-    
-    
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2984,7 +2992,7 @@ Irteera:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3307,44 +3315,16 @@ Irteera:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Emaitza egokienak lortzeko, ziurtatu ordenagailu honek baduela:
     
     
-      
+      
       System requirements
       Sistemaren betebeharrak
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Konputagailu honek ez dauzka gutxieneko eskakizunak %1 instalatzeko. <br/>Instalazioak ezin du jarraitu. <a href="#details">Xehetasunak...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Konputagailu honek ez du betetzen gomendatutako zenbait eskakizun %1 instalatzeko. <br/>Instalazioak jarraitu ahal du, baina zenbait ezaugarri desgaituko dira.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Konputagailuan %2 ezartzeko programa honek hainbat galdera egingo dizkizu.
-    
-  
   
     ScanningDialog
     
@@ -3636,27 +3616,6 @@ Irteera:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Laburpena
-    
-  
   
     TrackingInstallJob
     
@@ -3988,7 +3947,7 @@ Irteera:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Ongi etorri
     
@@ -3996,7 +3955,7 @@ Irteera:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Ongi etorri
     
@@ -4066,19 +4025,19 @@ Irteera:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       Atzera
     
@@ -4143,6 +4102,45 @@ Irteera:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4179,132 +4177,132 @@ Irteera:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Zein da zure izena?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Zein izen erabili nahi duzu saioa hastean?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Zein da ordenagailu honen izena?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Aukeratu pasahitza zure kontua babesteko.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Erabili pasahitz bera administratzaile kontuan.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts
index f98c92fb32..63af012b2a 100644
--- a/lang/calamares_fa.ts
+++ b/lang/calamares_fa.ts
@@ -491,12 +491,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 برنامه راه‌اندازی
     
     
-      
+      
       %1 Installer
       نصب‌کنندهٔ %1
     
@@ -535,149 +535,149 @@ The installer will quit and all changes will be lost.
       فرم
     
     
-      
+      
       Select storage de&vice:
       انتخاب &دستگاه ذخیره‌سازی:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       فعلی:
     
     
-      
+      
       After:
       بعد از:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       شما می توانید پارتیشن بندی دستی ایجاد یا تغییر اندازه دهید .
     
     
-      
+      
       Reuse %1 as home partition for %2.
       استفاده مجدد از %1 به عنوان پارتیشن خانه برای %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>انتخاب یک پارتیشن برای کوجک کردن و ایجاد پارتیشن جدید از آن، سپس نوار دکمه را بکشید تا تغییر اندازه دهد</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 تغییر سایز خواهد داد به %2 مبی‌بایت و یک پارتیشن %3 مبی‌بایتی برای %4 ساخته خواهد شد.
     
     
-      
+      
       Boot loader location:
       مکان بالاآورنده بوت:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>یک پارتیشن را برای نصب بر روی آن، انتخاب کنید</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       پارتیشن سیستم ای.اف.آی نمی‌تواند در هیچ جایی از این سیستم یافت شود. لطفا برگردید و از پارتیشن بندی دستی استفاده کنید تا %1 را راه‌اندازی کنید.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       پارتیشن سیستم ای.اف.آی در %1 برای شروع %2 استفاده خواهد شد.
     
     
-      
+      
       EFI system partition:
       پارتیشن سیستم ای.اف.آی
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       به نظر می‌رسد در دستگاه ذخیره‌سازی هیچ سیستم‌عاملی وجود ندارد. تمایل به انجام چه کاری دارید؟<br/>شما می‌توانید انتخاب‌هایتان را قبل از اعمال هر تغییری در دستگاه ذخیره‌سازی، مرور و تأیید نمایید.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>پاک کردن دیسک</strong><br/>این کار تمام داده‌های موجود بر روی دستگاه ذخیره‌سازی انتخاب شده را <font color="red">حذف می‌کند</font>.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>نصب در امتداد</strong><br/>این نصاب از یک پارتیشن برای ساخت یک اتاق برای %1 استفاده می‌کند.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>جایگزینی یک افراز</strong><br/>افرازی را با %1 جایگزین می‌کند.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       این دستگاه ذخیره سازی٪ 1 روی خود دارد. دوست دارید چه کاری انجام دهید؟ قبل از اینکه تغییری در دستگاه ذخیره ایجاد شود ، می توانید انتخاب های خود را بررسی و تأیید کنید.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       این دستگاه ذخیره سازی از قبل یک سیستم عامل روی خود دارد. دوست دارید چه کاری انجام دهید؟ قبل از اینکه تغییری در دستگاه ذخیره ایجاد شود ، می توانید انتخاب های خود را بررسی و تأیید کنید.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       این دستگاه ذخیره سازی دارای چندین سیستم عامل است. دوست دارید چه کاری انجام دهید؟ قبل از اینکه تغییری در دستگاه ذخیره ایجاد شود ، می توانید انتخاب های خود را بررسی و تأیید کنید.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       بدون Swap
     
     
-      
+      
       Reuse Swap
       باز استفاده از مبادله
     
     
-      
+      
       Swap (no Hibernate)
       مبادله (بدون خواب‌زمستانی)
     
     
-      
+      
       Swap (with Hibernate)
       مبادله (با خواب‌زمستانی)
     
     
-      
+      
       Swap to file
       مبادله به پرونده
     
@@ -745,12 +745,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       تنظیم مدل صفحه‌کلید به %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       تنظیم چینش صفحه‌کلید به %1/%2.
     
@@ -800,47 +800,47 @@ The installer will quit and all changes will be lost.
       نصب شبکه‌ای. (از کار افتاده: ناتوان در گرفتن فهرست بسته‌ها. اتّصال شبکه‌تان را بررسی کنید)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       رایانه کمینهٔ نیازمندی‌های برپاسازی %1 را ندارد.<br/>برپاسازی نمی‌تواند ادامه یابد. <a href="#details">جزییات…</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       رایانه کمینهٔ نیازمندی‌های نصب %1 را ندارد.<br/>نصب نمی‌تواند ادامه یابد. <a href="#details">جزییات…</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       رایانه کمینهٔ نیازمندی‌های برپاسازی %1 را ندارد.<br/>برپاسازی می‌تواند ادامه یابد، ولی ممکن است برخی ویژگی‌ها از کار افتاده باشند.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       رایانه کمینهٔ نیازمندی‌های نصب %1 را ندارد.<br/>نصب می‌تواند ادامه یابد، ولی ممکن است برخی ویژگی‌ها از کار افتاده باشند.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       این برنامه تعدادی سوال از شما پرسیده و %2 را روی رایانه‌تان برپا می‌کند.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       به برنامه راه اندازی Calamares خوش آمدید برای 1٪
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>به برپاسازی %1 خوش آمدید.</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>به نصب‌کنندهٔ کالامارس برای %1 خوش آمدید.</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>به نصب‌کنندهٔ %1 خوش آمدید.</h1>
     
@@ -935,15 +935,40 @@ The installer will quit and all changes will be lost.
       نصب %1 کامل شد.
     
     
-      
+      
       Package Selection
       گزینش بسته‌ها
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       لطفاً محصولی را از لیست انتخاب کنید. محصول انتخاب شده نصب خواهد شد.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      خلاصه
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2440,6 +2465,14 @@ The installer will quit and all changes will be lost.
       لطفاً محصولی را از لیست انتخاب کنید. محصول انتخاب شده نصب خواهد شد.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      بسته‌ها
+    
+  
   
     PackageChooserViewStep
     
@@ -2723,17 +2756,17 @@ The installer will quit and all changes will be lost.
       &نصب بارکنندهٔ راه‌اندازی روی:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       مطمئنید می‌خواهید روی %1 جدول افراز جدیدی بسازید؟
     
     
-      
+      
       Can not create new partition
       نمی‌توان افراز جدید ساخت
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       جدول پارتیشن در٪ 1 از قبل دارای٪ 2 پارتیشن اصلی است و دیگر نمی توان آن را اضافه کرد. لطفاً یک پارتیشن اصلی را حذف کنید و به جای آن یک پارتیشن توسعه یافته اضافه کنید.
     
@@ -2751,107 +2784,82 @@ The installer will quit and all changes will be lost.
       افرازها
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      نصب %1 <strong>در امتداد</strong> سیستم عامل دیگر.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>پاک کردن</strong> دیسک و نصب %1.
+      
+      Current:
+      فعلی:
     
     
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>جایگزینی</strong> یک پارتیشن و با %1
+      
+      After:
+      بعد از:
     
     
-      
-      <strong>Manual</strong> partitioning.
-      <strong>پارتیشن‌بندی</strong> دستی.
+      
+      No EFI system partition configured
+      هیچ پارتیشن سیستم EFI پیکربندی نشده است
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      دیسک <strong>%1</strong> (%2)
-    
-    
-      
-      Current:
-      فعلی:
-    
-    
-      
-      After:
-      بعد از:
-    
-    
-      
-      No EFI system partition configured
-      هیچ پارتیشن سیستم EFI پیکربندی نشده است
-    
-    
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      برای راه اندازی پارتیشن سیستم EFI لازم است. برای پیکربندی یک پارتیشن سیستم EFI ، به عقب برگردید و یک سیستم فایل FAT32 را با پرچم٪ 3 فعال کنید و نقطه نصب را نصب کنید. 2. بدون تنظیم پارتیشن سیستم EFI می توانید ادامه دهید اما ممکن است سیستم شما از کار بیفتد.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      پرچم پارتیشن سیستم EFI تنظیم نشده است
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       گزینه ای برای استفاده از GPT در BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       جدول پارتیشن GPT بهترین گزینه برای همه سیستم ها است. این نصب از چنین تنظیماتی برای سیستم های BIOS نیز پشتیبانی می کند. برای پیکربندی جدول پارتیشن GPT در BIOS ، (اگر قبلاً این کار انجام نشده است) برگردید و جدول پارتیشن را روی GPT تنظیم کنید ، سپس یک پارتیشن 8 مگابایتی بدون فرمت با پرچم bios_grub ایجاد کنید. برای راه اندازی٪ 1 سیستم BIOS با GPT ، یک پارتیشن 8 مگابایتی بدون قالب لازم است.
     
     
-      
+      
       Boot partition not encrypted
       پارتیشن بوت رمزشده نیست
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       یک پارتیشن بوت جداگانه همراه با یک پارتیشن ریشه ای رمزگذاری شده راه اندازی شده است ، اما پارتیشن بوت رمزگذاری نشده است. با این نوع تنظیمات مشکلات امنیتی وجود دارد ، زیرا پرونده های مهم سیستم در یک پارتیشن رمزگذاری نشده نگهداری می شوند. در صورت تمایل می توانید ادامه دهید ، اما باز کردن قفل سیستم فایل بعداً در هنگام راه اندازی سیستم اتفاق می افتد. برای رمزگذاری پارتیشن بوت ، به عقب برگردید و آن را دوباره ایجاد کنید ، رمزگذاری را در پنجره ایجاد پارتیشن انتخاب کنید.
     
     
-      
+      
       has at least one disk device available.
       حداقل یک دستگاه دیسک در دسترس دارد.
     
     
-      
+      
       There are no partitions to install on.
       هیچ پارتیشنی برای نصب وجود ندارد
     
@@ -2983,7 +2991,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3306,44 +3314,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       برای بهترین نتیجه ، لطفا اطمینان حاصل کنید که این کامپیوتر:
     
     
-      
+      
       System requirements
       نیازمندی‌های سامانه
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      رایانه کمینهٔ نیازمندی‌های برپاسازی %1 را ندارد.<br/>برپاسازی نمی‌تواند ادامه یابد. <a href="#details">جزییات…</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      رایانه کمینهٔ نیازمندی‌های نصب %1 را ندارد.<br/>نصب نمی‌تواند ادامه یابد. <a href="#details">جزییات…</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      رایانه کمینهٔ نیازمندی‌های برپاسازی %1 را ندارد.<br/>برپاسازی می‌تواند ادامه یابد، ولی ممکن است برخی ویژگی‌ها از کار افتاده باشند.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      رایانه کمینهٔ نیازمندی‌های نصب %1 را ندارد.<br/>نصب می‌تواند ادامه یابد، ولی ممکن است برخی ویژگی‌ها از کار افتاده باشند.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      این برنامه تعدادی سوال از شما پرسیده و %2 را روی رایانه‌تان برپا می‌کند.
-    
-  
   
     ScanningDialog
     
@@ -3635,27 +3615,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      خلاصه
-    
-  
   
     TrackingInstallJob
     
@@ -3987,7 +3946,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       خوش آمدید
     
@@ -3995,7 +3954,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       خوش آمدید
     
@@ -4065,19 +4024,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       بازگشت
     
@@ -4142,6 +4101,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4179,132 +4177,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       نامتان چیست؟
     
     
-      
+      
       Your Full Name
       نام کاملتان
     
     
-      
+      
       What name do you want to use to log in?
       برای ورود می خواهید از چه نامی استفاده کنید؟
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       فقط حروف کوچک ، اعداد ، زیر خط و خط خط مجاز است.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       نام این رایانه چیست؟
     
     
-      
+      
       Computer Name
       نام رایانه
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       برای امن نگه داشتن حسابتان، گذرواژه‌ای برگزینید.
     
     
-      
+      
       Password
       گذرواژه
     
     
-      
+      
       Repeat Password
       تکرار TextLabel
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       رمز ورود یکسان را دو بار وارد کنید ، تا بتوان آن را از نظر اشتباه تایپ بررسی کرد. یک رمز ورود خوب شامل ترکیبی از حروف ، اعداد و علائم نگارشی است ، باید حداقل هشت حرف داشته باشد و باید در فواصل منظم تغییر یابد.
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       وقتی این کادر علامت گذاری شد ، بررسی قدرت رمز عبور انجام می شود و دیگر نمی توانید از رمز عبور ضعیف استفاده کنید.
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       استفاده از گذرواژهٔ یکسان برای حساب مدیر.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts
index c84a0cea21..82ed07c7c9 100644
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
@@ -94,7 +94,7 @@
       
       
       none
-      tyhjä
+      ei käytössä
     
     
       
@@ -495,12 +495,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 asennusohjelma
     
     
-      
+      
       %1 Installer
       %1 asentaja
     
@@ -539,149 +539,149 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
       Lomake
     
     
-      
+      
       Select storage de&vice:
       Valitse tallennus&laite:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Nykyinen:
     
     
-      
+      
       After:
       Jälkeen:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuaalinen osiointi </strong><br/>Voit luoda tai muuttaa osioita itse.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Käytä %1 uudelleen kotiosiona kohteelle %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Valitse supistettava osio ja säädä alarivillä kokoa vetämällä</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 supistetaan %2Mib:iin ja uusi %3MiB-osio luodaan kohteelle %4.
     
     
-      
+      
       Boot loader location:
       Käynnistyksen lataajan sijainti:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Valitse asennettava osio</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Järjestelmäosiota EFI ei löydy tästä järjestelmästä. Siirry takaisin ja käytä manuaalista osiointia, kun haluat määrittää %1
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Järjestelmäosiota EFI %1 käytetään %2 käynnistämiseen.
     
     
-      
+      
       EFI system partition:
       EFI järjestelmän osio:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tällä tallennuslaitteella ei näytä olevan käyttöjärjestelmää. Mitä haluat tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi ennen kuin tallennuslaitteeseen tehdään muutoksia.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Tyhjennä levy</strong><br/>Tämä <font color="red">poistaa</font> kaikki tiedot valitussa tallennuslaitteessa.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Asenna nykyisen rinnalle</strong><br/>Asennusohjelma supistaa osiota tehdäkseen tilaa kohteelle %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Osion korvaaminen</strong><br/>korvaa osion %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tässä tallennuslaitteessa on %1 dataa. Mitä haluat tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi ennen kuin tallennuslaitteeseen tehdään muutoksia.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tämä tallennuslaite sisältää jo käyttöjärjestelmän. Mitä haluaisit tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi, ennen kuin tallennuslaitteeseen tehdään muutoksia.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tämä tallennuslaite sisältää jo useita käyttöjärjestelmiä. Mitä haluaisit tehdä?<br/>Voit tarkistaa ja vahvistaa valintasi, ennen kuin tallennuslaitteeseen tehdään muutoksia.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Tällä kiintolevyllä on jo käyttöjärjestelmä, mutta osiotaulukko <strong>%1</strong> on erilainen kuin tarvittava <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Tähän kiintolevyyn on <strong>kiinnitetty</strong> yksi osioista.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Tämä kiintolevy on osa <strong>passiivista RAID</strong> kokoonpanoa.
     
     
-      
+      
       No Swap
       Swap ei
     
     
-      
+      
       Reuse Swap
       Swap käytä uudellen
     
     
-      
+      
       Swap (no Hibernate)
       Swap (ei lepotilaa)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (lepotilan kanssa)
     
     
-      
+      
       Swap to file
       Swap tiedostona
     
@@ -749,12 +749,12 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Aseta näppäimiston malli %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Aseta näppäimiston asetelmaksi %1/%2.
     
@@ -804,48 +804,48 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
       Verkkoasennus. (Ei käytössä: Pakettiluetteloita ei voi hakea, tarkista verkkoyhteys)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Tämä tietokone ei täytä vähimmäisvaatimuksia,  %1.<br/>Asennusta ei voi jatkaa. <a href="#details">Yksityiskohdat...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Tämä tietokone ei täytä asennuksen vähimmäisvaatimuksia,  %1.<br/>Asennus ei voi jatkua. <a href="#details">Yksityiskohdat...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Tämä tietokone ei täytä joitakin suositeltuja vaatimuksia %1.<br/>Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Tämä tietokone ei täytä joitakin suositeltuja vaatimuksia %1.
 Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Tämä ohjelma kysyy joitakin kysymyksiä %2 ja asentaa tietokoneeseen.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Tervetuloa Calamares -asennusohjelmaan %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Tervetuloa %1 asennukseen</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Tervetuloa Calamares asentajaan %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Tervetuloa %1 asentajaan</h1>
     
@@ -940,15 +940,40 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Asennus %1 on valmis.
     
     
-      
+      
       Package Selection
       Paketin valinta
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Ole hyvä ja valitse tuote luettelosta. Valittu tuote asennetaan.
     
+    
+      
+      Install option: <strong>%1</strong>
+      Asennuksen vaihtoehto: <strong>%1</strong>
+    
+    
+      
+      None
+      Ei käytössä
+    
+    
+      
+      Summary
+      Yhteenveto
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Tämä on yleiskuva siitä, mitä tapahtuu, kun asennusohjelma käynnistetään.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Tämä on yleiskuva siitä, mitä tapahtuu asennuksen aloittamisen jälkeen.
+    
   
   
     ContextualProcessJob
@@ -2447,6 +2472,14 @@ hiiren vieritystä skaalaamiseen.
       Ole hyvä ja valitse tuote luettelosta. Valittu tuote asennetaan.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paketit
+    
+  
   
     PackageChooserViewStep
     
@@ -2730,17 +2763,17 @@ hiiren vieritystä skaalaamiseen.
       A&senna käynnistyslatain:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Oletko varma, että haluat luoda uuden osion %1?
     
     
-      
+      
       Can not create new partition
       Ei voi luoda uutta osiota
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       %1 osio-taulukossa on jo %2 ensisijaista osiota, eikä sitä voi lisätä. Poista yksi ensisijainen osio ja lisää laajennettu osio.
     
@@ -2758,107 +2791,82 @@ hiiren vieritystä skaalaamiseen.
       Osiot
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Asenna toisen käyttöjärjestelmän %1 <strong>rinnalle</strong>.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Tyhjennä</strong> levy ja asenna %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Vaihda</strong> osio jolla on %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Manuaalinen</strong> osointi.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Asenna toisen käyttöjärjestelmän %1 <strong>rinnalle</strong> levylle <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Tyhjennä</strong> levy <strong>%2</strong> (%3) ja asenna %1.
+      
+      Current:
+      Nykyinen:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Korvaa</strong> levyn osio <strong>%2</strong> (%3) jolla on %1.
+      
+      After:
+      Jälkeen:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Manuaalinen</strong> osiointi levyllä <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      EFI-järjestelmäosiota ei ole määritetty
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Levy <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      EFI-järjestelmäosio on määritetty väärin
     
     
-      
-      Current:
-      Nykyinen:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      EFI-järjestelmäosio on vaatimus käynnistääksesi %1.<br/><br/>Palaa jos haluat määrittää EFI-järjestelmäosion, valitse tai luo sopiva tiedostojärjestelmä.
     
     
-      
-      After:
-      Jälkeen:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      Tiedostojärjestelmä on asennettava <strong>%1</strong>.
     
     
-      
-      No EFI system partition configured
-      EFI-järjestelmäosiota ei ole määritetty
+      
+      The filesystem must have type FAT32.
+      Tiedostojärjestelmän on oltava tyyppiä FAT32.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      EFI-järjestelmän osio on välttämätön käynnistyksessä %1.<br/><br/>Jos haluat tehdä EFI-järjestelmän osion, mene takaisin ja luo FAT32-tiedostojärjestelmä, jossa<strong>%3</strong> lippu on käytössä ja liityntäkohta. <strong>%2</strong>.<br/><br/>Voit jatkaa ilman EFI-järjestelmäosiota, mutta järjestelmä ei ehkä käynnisty.
+      
+      The filesystem must be at least %1 MiB in size.
+      Tiedostojärjestelmän on oltava kooltaan vähintään %1 MiB.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      EFI-järjestelmän osio on välttämätön käynnistyksessä %1.<br/><br/>Osio on määritetty liityntäkohdan kanssa, <strong>%2</strong> mutta sen <strong>%3</strong> lippua ei ole asetettu.<br/>Jos haluat asettaa lipun, palaa takaisin ja muokkaa osiota.<br/><br/>Voit jatkaa lippua asettamatta, mutta järjestelmä ei ehkä käynnisty.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      Tiedostojärjestelmässä on oltava <strong>%1</strong> lippu.
     
     
-      
-      EFI system partition flag not set
-      EFI-järjestelmäosion lippua ei ole asetettu
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      Voit jatkaa ilman EFI-järjestelmäosion määrittämistä, mutta järjestelmä ei ehkä käynnisty.
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS:ssa mahdollisuus käyttää GPT:tä
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT-osiotaulukko on paras vaihtoehto kaikille järjestelmille. Tämä asennusohjelma tukee asennusta myös BIOS:n järjestelmään.<br/><br/>Jos haluat määrittää GPT-osiotaulukon BIOS:ssa (jos sitä ei ole jo tehty) palaa takaisin ja aseta osiotaulukkoksi GPT. Luo seuraavaksi 8 Mb alustamaton osio <strong>bios_grub</strong> lipulla käyttöön.<br/><br/>Alustamaton 8 Mb osio on tarpeen %1:n käynnistämiseksi BIOS-järjestelmässä GPT:llä.
     
     
-      
+      
       Boot partition not encrypted
       Käynnistysosiota ei ole salattu
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Erillinen käynnistysosio perustettiin yhdessä salatun juuriosion kanssa, mutta käynnistysosio ei ole salattu.<br/><br/>Tällaisissa asetuksissa on tietoturvaongelmia, koska tärkeät järjestelmätiedostot pidetään salaamattomassa osiossa.<br/>Voit jatkaa, jos haluat, mutta tiedostojärjestelmän lukituksen avaaminen tapahtuu myöhemmin järjestelmän käynnistyksen aikana.<br/>Käynnistysosion salaamiseksi siirry takaisin ja luo se uudelleen valitsemalla <strong>Salaa</strong> osion luominen -ikkunassa. 
     
     
-      
+      
       has at least one disk device available.
       on vähintään yksi levy käytettävissä.
     
     
-      
+      
       There are no partitions to install on.
       Asennettavia osioita ei ole.
     
@@ -2993,7 +3001,7 @@ Ulostulo:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3319,45 +3327,16 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Saadaksesi parhaan lopputuloksen, tarkista että tämä tietokone:
     
     
-      
+      
       System requirements
       Järjestelmävaatimukset
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Tämä tietokone ei täytä vähimmäisvaatimuksia,  %1.<br/>Asennusta ei voi jatkaa. <a href="#details">Yksityiskohdat...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Tämä tietokone ei täytä asennuksen vähimmäisvaatimuksia,  %1.<br/>Asennus ei voi jatkua. <a href="#details">Yksityiskohdat...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Tämä tietokone ei täytä joitakin suositeltuja vaatimuksia %1.<br/>Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Tämä tietokone ei täytä joitakin suositeltuja vaatimuksia %1.
-Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Tämä ohjelma kysyy joitakin kysymyksiä %2 ja asentaa tietokoneeseen.
-    
-  
   
     ScanningDialog
     
@@ -3649,27 +3628,6 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.%L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Tämä on yleiskuva siitä, mitä tapahtuu, kun asennusohjelma käynnistetään.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Tämä on yleiskuva siitä, mitä tapahtuu asennuksen aloittamisen jälkeen.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Yhteenveto
-    
-  
   
     TrackingInstallJob
     
@@ -4001,7 +3959,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Tervetuloa
     
@@ -4009,7 +3967,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     WelcomeViewStep
     
-      
+      
       Welcome
       Tervetuloa
     
@@ -4092,21 +4050,21 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Kielet</h1> </br>
                     Järjestelmän sijaintiasetukset vaikuttaa joidenkin komentorivin käyttöliittymän elementtien kieliin ja merkistöihin. Nykyinen asetus on <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Sijainti</h1> </br>
                     Järjestelmän kieliasetus vaikuttaa numeroihin ja päivämääriin. Nykyinen asetus on <strong>%1</strong>.
     
     
-      
+      
       Back
       Takaisin
     
@@ -4172,6 +4130,46 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      LibreOffice on tehokas ja ilmainen toimistopaketti, jota käyttävät miljoonat ihmiset ympäri maailmaa. Sisältää useita sovelluksia, joka tekee siitä markkinoiden monipuolisimman avoimen lähdekoodin toimistopaketin.<br/>
+                    Oletusvalinta.
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      Jos et halua asentaa toimistopakettia, valitse "Ei toimistopakettia". Voit aina lisätä myöhemmin yhden (tai useamman) asennettuun järjestelmään tarpeen mukaan.
+    
+    
+      
+      No Office Suite
+      Ei toimistopakettia
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      Luo minimaalinen työpöydän asennus, poista kaikki ylimääräiset sovellukset ja päätät myöhemmin, mitä haluat lisätä järjestelmääsi. Tällaisessa asennuksessa ei ole esim, toimistopakettia, mediasoittimia, kuvien katseluohjelmaa tai tulostintukea. Vain työpöytä, tiedostoselain, paketinhallinta, tekstieditori ja verkkoselain.
+    
+    
+      
+      Minimal Install
+      Minimaalinen asennus
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      Valitse asennuksen vaihtoehto tai käytä oletusta: LibreOffice sisältyy toimitukseen.
+    
+  
   
     release_notes
     
@@ -4228,132 +4226,132 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Valitse käyttäjänimi kirjautumiseen ja järjestelmänvalvojan tehtävien suorittamiseen
     
     
-      
+      
       What is your name?
       Mikä on nimesi?
     
     
-      
+      
       Your Full Name
       Koko nimesi
     
     
-      
+      
       What name do you want to use to log in?
       Mitä nimeä haluat käyttää sisäänkirjautumisessa?
     
     
-      
+      
       Login Name
       Kirjautumisnimi
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Jos tätä tietokonetta käyttää useampi kuin yksi henkilö, voit luoda useita tilejä asennuksen jälkeen.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Vain pienet kirjaimet, numerot, alaviivat ja tavuviivat ovat sallittuja.
     
     
-      
+      
       root is not allowed as username.
       root ei ole sallittu käyttäjän nimeksi.
     
     
-      
+      
       What is the name of this computer?
       Mikä on tämän tietokoneen nimi?
     
     
-      
+      
       Computer Name
       Tietokoneen nimi
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Tätä nimeä käytetään, jos teet tietokoneen näkyväksi verkon muille käyttäjille.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost ei ole sallittu koneen nimeksi.
     
     
-      
+      
       Choose a password to keep your account safe.
       Valitse salasana pitääksesi tilisi turvallisena.
     
     
-      
+      
       Password
       Salasana
     
     
-      
+      
       Repeat Password
       Toista salasana
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoittamisvirheiden varalta. Hyvä salasana sisältää sekoituksen kirjaimia, numeroita ja välimerkkejä. Vähintään kahdeksan merkkiä pitkä ja se on vaihdettava säännöllisin väliajoin.
     
     
-      
+      
       Validate passwords quality
       Tarkista salasanojen laatu
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Kun tämä valintaruutu on valittu, salasanan vahvuus tarkistetaan, etkä voi käyttää heikkoa salasanaa.
     
     
-      
+      
       Log in automatically without asking for the password
       Kirjaudu automaattisesti ilman salasanaa
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Vain kirjaimet, numerot, alaviiva ja väliviiva ovat sallittuja, vähintään kaksi merkkiä.
     
     
-      
+      
       Reuse user password as root password
       Käytä käyttäjän salasanaa myös root-salasanana
     
     
-      
+      
       Use the same password for the administrator account.
       Käytä pääkäyttäjän tilillä samaa salasanaa.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Valitse root-salasana, jotta tilisi pysyy turvassa.
     
     
-      
+      
       Root Password
       Root salasana
     
     
-      
+      
       Repeat Root Password
       Toista Root salasana
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Syötä sama salasana kahdesti, jotta se voidaan tarkistaa kirjoitusvirheiden varalta.
     
diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts
index b78233af2f..d6f5729e2b 100644
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -495,12 +495,12 @@ L'installateur se fermera et les changements seront perdus.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Programme de configuration de %1
     
     
-      
+      
       %1 Installer
       Installateur %1
     
@@ -539,149 +539,149 @@ L'installateur se fermera et les changements seront perdus.
       Formulaire
     
     
-      
+      
       Select storage de&vice:
       Sélectionner le support de sto&ckage :
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actuel :
     
     
-      
+      
       After:
       Après :
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Partitionnement manuel</strong><br/>Vous pouvez créer ou redimensionner vous-même des partitions.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Réutiliser %1 comme partition home pour %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Sélectionner une partition à réduire, puis faites glisser la barre du bas pour redimensionner</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 va être réduit à %2 Mio et une nouvelle partition de %3 Mio va être créée pour %4.
     
     
-      
+      
       Boot loader location:
       Emplacement du chargeur de démarrage :
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Sélectionner une partition pour l'installation</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Une partition système EFI n'a pas pu être trouvée sur ce système. Veuillez retourner à l'étape précédente et sélectionner le partitionnement manuel pour configurer %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partition système EFI sur %1 va être utilisée pour démarrer %2.
     
     
-      
+      
       EFI system partition:
       Partition système EFI :
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ce périphérique de stockage ne semble pas contenir de système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Effacer le disque</strong><br/>Ceci va <font color="red">effacer</font> toutes les données actuellement présentes sur le périphérique de stockage sélectionné.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installer à côté</strong><br/>L'installateur va réduire une partition pour faire de la place pour %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Remplacer une partition</strong><br>Remplace une partition par %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ce périphérique de stockage contient %1. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ce périphérique de stockage contient déjà un système d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ce péiphérique de stockage contient déjà plusieurs systèmes d'exploitation. Que souhaitez-vous faire ?<br/>Vous pourrez relire et confirmer vos choix avant que les modifications soient effectuées sur le périphérique de stockage.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Le périphérique de stockage contient déjà un système d'exploitation, mais la table de partition <strong>%1</strong> est différente de celle nécessaire <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Une des partitions de ce périphérique de stockage est <strong>montée</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Ce périphérique de stockage fait partie d'une grappe <strong>RAID inactive</strong>.
     
     
-      
+      
       No Swap
       Aucun Swap
     
     
-      
+      
       Reuse Swap
       Réutiliser le Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sans hibernation)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (avec hibernation)
     
     
-      
+      
       Swap to file
       Swap dans un fichier
     
@@ -749,12 +749,12 @@ L'installateur se fermera et les changements seront perdus.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Configurer le modèle de clavier à %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Configurer la disposition clavier à %1/%2.
     
@@ -804,47 +804,47 @@ L'installateur se fermera et les changements seront perdus.
       Installation par le réseau (Désactivée : impossible de récupérer les listes de paquets, vérifier la connexion réseau)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Cet ordinateur ne satisfait pas les minimum prérequis pour configurer %1.<br/>La configuration ne peut pas continuer. <a href="#details">Détails...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Cet ordinateur ne satisfait pas les minimum prérequis pour installer %1.<br/>L'installation ne peut pas continuer. <a href="#details">Détails...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Cet ordinateur ne satisfait pas certains des prérequis recommandés pour configurer %1.<br/>La configuration peut continuer, mais certaines fonctionnalités pourraient être désactivées.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Cet ordinateur ne satisfait pas certains des prérequis recommandés pour installer %1.<br/>L'installation peut continuer, mais certaines fonctionnalités pourraient être désactivées.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ce programme va vous poser quelques questions et configurer %2 sur votre ordinateur.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Bienvenue dans le programme de configuration Calamares pour %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Bienvenue dans la configuration de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Bienvenue dans l'installateur Calamares pour %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Bienvenue dans l'installateur de %1</h1>
     
@@ -939,15 +939,40 @@ L'installateur se fermera et les changements seront perdus.
       L'installation de %1 est terminée.
     
     
-      
+      
       Package Selection
       Sélection des paquets
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Merci de sélectionner un produit de la liste. Le produit sélectionné sera installé.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Résumé
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Ceci est un aperçu de ce qui va arriver lorsque vous commencerez la configuration.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Ceci est un aperçu de ce qui va arriver lorsque vous commencerez l'installation.
+    
   
   
     ContextualProcessJob
@@ -2446,6 +2471,14 @@ L'installateur se fermera et les changements seront perdus.
       Merci de sélectionner un produit de la liste. Le produit sélectionné sera installé.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paquets
+    
+  
   
     PackageChooserViewStep
     
@@ -2729,17 +2762,17 @@ L'installateur se fermera et les changements seront perdus.
       Installer le chargeur de démarrage sur : 
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Êtes-vous sûr de vouloir créer une nouvelle table de partitionnement sur %1 ?
     
     
-      
+      
       Can not create new partition
       Impossible de créer une nouvelle partition
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       La table de partition sur %1 contient déjà %2 partitions primaires, et aucune supplémentaire ne peut être ajoutée. Veuillez supprimer une partition primaire et créer une partition étendue à la place.
     
@@ -2757,107 +2790,82 @@ L'installateur se fermera et les changements seront perdus.
       Partitions
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Installer %1 <strong>à côté</strong>d'un autre système d'exploitation.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Effacer</strong> le disque et installer %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Remplacer</strong> une partition avec %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Partitionnement <strong>manuel</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Installer %1 <strong>à côté</strong> d'un autre système d'exploitation sur le disque <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Effacer</strong> le disque <strong>%2</strong> (%3) et installer %1.
+      
+      Current:
+      Actuel :
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Remplacer</strong> une partition sur le disque <strong>%2</strong> (%3) avec %1.
+      
+      After:
+      Après :
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Partitionnement <strong>manuel</strong> sur le disque <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Aucune partition système EFI configurée
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disque <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Actuel :
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Après :
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Aucune partition système EFI configurée
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Pour configurer une partition système EFI, revenez en arrière et sélectionnez ou créez un système de fichiers FAT32 avec l'indicateur <strong>%3</strong> activé et le point de montage <strong>%2</strong>.<br/><br/>Vous pouvez continuer sans configurer de partition système EFI mais votre système peut ne pas démarrer. 
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Une partition système EFI est nécessaire pour démarrer %1.<br/><br/>Une partition a été configurée avec le point de montage <strong>%2</strong> mais son indicateur <strong>%3</strong> n'est pas défini.<br/>Pour définir l'indicateur, revenez en arrière et modifiez la partition.<br/><br/>Vous pouvez continuer sans définir l'indicateur mais votre le système peut ne pas démarrer. 
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Drapeau de partition système EFI non configuré
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Option pour utiliser GPT sur le BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Une table de partition GPT est la meilleure option pour tous les systèmes. Ce programme d'installation prend également en charge une telle configuration pour les systèmes BIOS.<br/><br/>Pour configurer une table de partition GPT sur le BIOS, (si ce n'est déjà fait) revenez en arrière et définissez la table de partition sur GPT, puis créez une partition non formatée de 8 Mo avec l'indicateur <strong>bios_grub</strong> activé.<br/><br/>Une partition de 8 Mo non formatée est nécessaire pour démarrer %1 sur un système BIOS avec GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partition d'amorçage non chiffrée.
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Une partition d'amorçage distincte a été configurée avec une partition racine chiffrée, mais la partition d'amorçage n'est pas chiffrée. <br/> <br/> Il y a des problèmes de sécurité avec ce type d'installation, car des fichiers système importants sont conservés sur une partition non chiffrée <br/> Vous pouvez continuer si vous le souhaitez, mais le déverrouillage du système de fichiers se produira plus tard au démarrage du système. <br/> Pour chiffrer la partition d'amorçage, revenez en arrière et recréez-la, en sélectionnant <strong> Chiffrer </ strong> dans la partition Fenêtre de création.
     
     
-      
+      
       has at least one disk device available.
       a au moins un disque disponible.
     
     
-      
+      
       There are no partitions to install on.
       Il n'y a pas de partition pour l'installation
     
@@ -2993,7 +3001,7 @@ Sortie
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3319,44 +3327,16 @@ Sortie
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Pour de meilleur résultats, merci de s'assurer que cet ordinateur :
     
     
-      
+      
       System requirements
       Configuration requise
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Cet ordinateur ne satisfait pas les minimum prérequis pour configurer %1.<br/>La configuration ne peut pas continuer. <a href="#details">Détails...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Cet ordinateur ne satisfait pas les minimum prérequis pour installer %1.<br/>L'installation ne peut pas continuer. <a href="#details">Détails...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Cet ordinateur ne satisfait pas certains des prérequis recommandés pour configurer %1.<br/>La configuration peut continuer, mais certaines fonctionnalités pourraient être désactivées.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Cet ordinateur ne satisfait pas certains des prérequis recommandés pour installer %1.<br/>L'installation peut continuer, mais certaines fonctionnalités pourraient être désactivées.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Ce programme va vous poser quelques questions et configurer %2 sur votre ordinateur.
-    
-  
   
     ScanningDialog
     
@@ -3648,27 +3628,6 @@ Sortie
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Ceci est un aperçu de ce qui va arriver lorsque vous commencerez la configuration.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Ceci est un aperçu de ce qui va arriver lorsque vous commencerez l'installation.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Résumé
-    
-  
   
     TrackingInstallJob
     
@@ -4000,7 +3959,7 @@ Sortie
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Bienvenue
     
@@ -4008,7 +3967,7 @@ Sortie
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Bienvenue
     
@@ -4089,21 +4048,21 @@ Sortie
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Langues</h1></br>
         Les paramètres régionaux du système affectent la langue et le jeu de caractères de certains éléments de l'interface utilisateur de la ligne de commande. Le paramètre actuel est <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Paramètres régionaux</h1></br>
         Les paramètres régionaux du système affectent le format des nombres et des dates. Le paramètre actuel est <strong>%1</strong>.
     
     
-      
+      
       Back
       Retour
     
@@ -4169,6 +4128,45 @@ Sortie
         <p>Ce sont des exemples de notes de mise à jour.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4225,132 +4223,132 @@ Sortie
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Choisir votre nom d'utilisateur et vos informations d'identification pour vous connecter et effectuer des tâches d'administration
     
     
-      
+      
       What is your name?
       Quel est votre nom ?
     
     
-      
+      
       Your Full Name
       Nom complet
     
     
-      
+      
       What name do you want to use to log in?
       Quel nom souhaitez-vous utiliser pour la connexion ?
     
     
-      
+      
       Login Name
       Identifiant
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Si plusieurs personnes utilisent cet ordinateur, vous pouvez créer plusieurs comptes après l'installation.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Seuls les minuscules, nombres, underscores et tirets sont autorisés.
     
     
-      
+      
       root is not allowed as username.
       root n'est pas autorisé en tant que nom d'utilisateur.
     
     
-      
+      
       What is the name of this computer?
       Quel est le nom de votre ordinateur ?
     
     
-      
+      
       Computer Name
       Nom de l'ordinateur
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Ce nom sera utilisé si vous rendez l'ordinateur visible aux autres sur un réseau.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost n'est pas autorisé en tant que nom d'utilisateur.
     
     
-      
+      
       Choose a password to keep your account safe.
       Veuillez saisir le mot de passe pour sécuriser votre compte.
     
     
-      
+      
       Password
       Mot de passe
     
     
-      
+      
       Repeat Password
       Répéter le mot de passe
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Saisir le même mot de passe deux fois, afin qu'il puisse être vérifié pour les erreurs de frappe. Un bon mot de passe contient un mélange de lettres, de chiffres et de ponctuation, doit comporter au moins huit caractères et doit être changé à intervalles réguliers.
     
     
-      
+      
       Validate passwords quality
       Valider la qualité des mots de passe
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quand cette case est cochée, la vérification de la puissance du mot de passe est activée et vous ne pourrez pas utiliser de mot de passe faible.
     
     
-      
+      
       Log in automatically without asking for the password
       Connectez-vous automatiquement sans demander le mot de passe
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Seuls les lettres, les chiffres, les underscores et les trait d'union sont autorisés et un minimum de deux caractères.
     
     
-      
+      
       Reuse user password as root password
       Réutiliser le mot de passe utilisateur comme mot de passe root
     
     
-      
+      
       Use the same password for the administrator account.
       Utiliser le même mot de passe pour le compte administrateur.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Choisir un mot de passe root pour protéger votre compte.
     
     
-      
+      
       Root Password
       Mot de passe root
     
     
-      
+      
       Repeat Root Password
       Répéter le mot de passe root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Entrer le même mot de passe deux fois, afin qu'il puisse être vérifié pour les erreurs de frappe.
     
diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts
index 248ed0fd18..4b1fed6c92 100644
--- a/lang/calamares_fr_CH.ts
+++ b/lang/calamares_fr_CH.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts
index c203599fe8..5030853da9 100644
--- a/lang/calamares_fur.ts
+++ b/lang/calamares_fur.ts
@@ -491,12 +491,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Program di configurazion di %1
     
     
-      
+      
       %1 Installer
       Program di instalazion di %1
     
@@ -535,149 +535,149 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Formulari
     
     
-      
+      
       Select storage de&vice:
       Selezione il &dispositîf di memorie:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Atuâl:
     
     
-      
+      
       After:
       Dopo:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Partizionament manuâl</strong><br/>Tu puedis creâ o ridimensionâ lis partizions di bessôl.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Torne dopre %1 come partizion home par %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selezione une partizion di scurtâ, dopo strissine la sbare inferiôr par ridimensionâ</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 e vignarà scurtade a %2MiB e une gnove partizion di %3MiB e vignarà creade par %4.
     
     
-      
+      
       Boot loader location:
       Ubicazion dal gjestôr di inviament:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selezione une partizion dulà lâ a instalâ</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Impussibil cjatâ une partizion di sisteme EFI. Par plasê torne indaûr e dopre un partizionament manuâl par configurâ %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partizion di sisteme EFI su %1 e vignarà doprade par inviâ %2.
     
     
-      
+      
       EFI system partition:
       Partizion di sisteme EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Al somee che chest dispositîf di memorie nol vedi parsore un sisteme operatîf. Ce desideristu fâ?<br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Scancelâ il disc</strong><br/>Chest al <font color="red">eliminarà</font> ducj i dâts presints sul dispositîf di memorie selezionât.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalâ in bande</strong><br/>Il program di instalazion al scurtarà une partizion par fâ spazi a %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Sostituî une partizion</strong><br/>Al sostituìs une partizion cun %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Chest dispositîf di memorie al à parsore %1. Ce desideristu fâ? <br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Chest dispositîf di memorie al à za parsore un sisteme operatîf. Ce desideristu fâ?<br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Chest dispositîf di memorie al à parsore plui sistemis operatîfs. Ce desideristu fâ?<br/>Tu podarâs tornâ a viodi e confermâ lis tôs sieltis prime di aplicâ cualsisei modifiche al dispositîf di memorie.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Chest dispositîf di memorie al à za un sisteme operatîf parsore, ma la tabele des partizions <strong>%1</strong> e je diferente di chê che a covente: <strong>%2</strong>.<br/> 
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Une des partizions dal dispositîf di memorie e je <strong>montade</strong>. 
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Chest dispositîf di memorie al fâs part di un dispositîf <strong>RAID inatîf</strong>.
     
     
-      
+      
       No Swap
       Cence Swap
     
     
-      
+      
       Reuse Swap
       Torne dopre Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (cence ibernazion)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (cun ibernazion)
     
     
-      
+      
       Swap to file
       Swap su file
     
@@ -745,12 +745,12 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Stabilî il model di tastiere a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Stabilî la disposizion di tastiere a %1/%2.
     
@@ -800,47 +800,47 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Instalazion di rêt. (Disabilitade: impussibil recuperâ la liste dai pachets, controlâ la conession di rêt)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Chest computer nol sodisfe i recuisîts minims pe configurazion di %1.<br/>La configurazion no pues continuâ. <a href="#details">Detais...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Chest computer nol sodisfe i recuisîts minims pe instalazion di %1.<br/>La instalazion no pues continuâ. <a href="#details">Detais...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Chest computer nol sodisfe cualchi recuisît conseât pe configurazion di %1.<br/>La configurazion e pues continuâ, ma cualchi funzionalitât e podarès vignî disabilitade.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Chest computer nol sodisfe cualchi recuisît conseât pe instalazion di %1.<br/>La instalazion e pues continuâ, ma cualchi funzionalitât e podarès vignî disabilitade.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Chest program al fasarà cualchi domande e al configurarà %2 sul computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Benvignûts sul program di configurazion Calamares par %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Benvignûts te configurazion di %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Benvignûts sul program di instalazion Calamares par %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Benvignûts tal program di instalazion di %1</h1>
     
@@ -935,15 +935,40 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       La instalazion di %1 e je completade.
     
     
-      
+      
       Package Selection
       Selezion pachets
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Sielç un prodot de liste. Il prodot selezionât al vignarà instalât.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Sintesi
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Cheste e je une panoramiche di ce che al sucedarà une volte inviade la procedure di configurazion.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Cheste e je une panoramiche di ce che al sucedarà une volte inviade la procedure di instalazion.
+    
   
   
     ContextualProcessJob
@@ -2442,6 +2467,14 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Sielç un prodot de liste. Il prodot selezionât al vignarà instalât.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Pachets
+    
+  
   
     PackageChooserViewStep
     
@@ -2725,17 +2758,17 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       I&nstale gjestôr di inviament su:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Creâ pardabon une gnove tabele des partizions su %1?
     
     
-      
+      
       Can not create new partition
       Impussibil creâ une gnove partizion
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       La tabele des partizions su %1 e à za %2 partizions primaris e no si pues zontâ altris. Gjave une partizion primarie e zonte une partizion estese al so puest.
     
@@ -2753,107 +2786,82 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Partizions
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instalâ %1 <strong>in bande</strong> a un altri sisteme operatîf.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      Scancelâ<strong> il disc e instalâ %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Sostituî</strong> une partizion cun %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Partizionament <strong>manuâl</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instalâ %1 <strong>in bande</strong> a un altri sisteme operatîf sul disc <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Scancelâ</strong> il disc <strong>%2</strong> (%3) e instalâ %1.
+      
+      Current:
+      Atuâl:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Sostituî</strong> une partizion sul disc <strong>%2</strong> (%3) cun %1.
+      
+      After:
+      Dopo:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Partizionament <strong>manuâl</strong> su disc <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Nissune partizion di sisteme EFI configurade
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disc <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Atuâl:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Dopo:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Nissune partizion di sisteme EFI configurade
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      E covente une partizion di sisteme EFI par inviâ %1.<br/><br/>Par configurâ une partizion di sisteme EFI torne indaûr e selezione o cree un filesystem FAT32 cu la opzion <strong>%3</strong> abilitade e il pont di montaç <strong>%2</strong>.<br/><br/>Si pues continuâ cence stabilî une partizion di sisteme EFI ma al è pussibil che il sisteme no si invii.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      E covente une partizion di sisteme EFI par inviâ %1.<br/><br/>Une partizion e jere configurade cul pont di montaç <strong>%2</strong> ma no je stade stabilide la opzion <strong>%3</strong>. Par configurâ chê opzion, torne indaûr e modifiche la partizion.<br/><br/>Si pues continuâ cence stabilî chê opzion, ma al è facil che il sisteme no si invii.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Opzion de partizion di sisteme EFI no stabilide
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Opzion par doprâ GPT su BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       La miôr opzion par ducj i sistemis e je une tabele des partizions GPT. Il program di instalazion al supuarte ancje chest gjenar di configurazion pai sistemis BIOS.<br/><br/>Par configurâ une tabele des partizions GPT su BIOS, (se nol è za stât fat) torne indaûr e met a GPT la tabele des partizions, dopo cree une partizion no formatade di 8MB cu la opzion <strong>bios_grup</strong> abilitade. <br/><br/>Une partizion no formatade di 8MB e je necessarie par inviâ %1 su sistemsi BIOS cun GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partizion di inviament no cifrade
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       E je stade configurade une partizion di inviament separade adun cuntune partizion lidrîs cifrade, ma la partizion di inviament no je cifrade.<br/><br/> A esistin problemis di sigurece cun chest gjenar di configurazion, par vie che i file di sisteme impuartants a vegnin tignûts intune partizion no cifrade.<br/>Tu puedis continuâ se tu lu desideris, ma il sbloc dal filesystem al sucedarà plui indenant tal inviament dal sisteme.<br/>Par cifrâ la partizion di inviament, torne indaûr e torne creile, selezionant <strong>Cifrâ</strong> tal barcon di creazion de partizion.
     
     
-      
+      
       has at least one disk device available.
       al à almancul une unitât disc disponibil.
     
     
-      
+      
       There are no partitions to install on.
       No son partizions dulà lâ a instalâ.
     
@@ -2988,7 +2996,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3314,44 +3322,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Par otignî i miôrs risultâts, siguriti che chest computer:
     
     
-      
+      
       System requirements
       Recuisîts di sisteme
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Chest computer nol sodisfe i recuisîts minims pe configurazion di %1.<br/>La configurazion no pues continuâ. <a href="#details">Detais...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Chest computer nol sodisfe i recuisîts minims pe instalazion di %1.<br/>La instalazion no pues continuâ. <a href="#details">Detais...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Chest computer nol sodisfe cualchi recuisît conseât pe configurazion di %1.<br/>La configurazion e pues continuâ, ma cualchi funzionalitât e podarès vignî disabilitade.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Chest computer nol sodisfe cualchi recuisît conseât pe instalazion di %1.<br/>La instalazion e pues continuâ, ma cualchi funzionalitât e podarès vignî disabilitade.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Chest program al fasarà cualchi domande e al configurarà %2 sul computer.
-    
-  
   
     ScanningDialog
     
@@ -3643,27 +3623,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Cheste e je une panoramiche di ce che al sucedarà une volte inviade la procedure di configurazion.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Cheste e je une panoramiche di ce che al sucedarà une volte inviade la procedure di instalazion.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Sintesi
-    
-  
   
     TrackingInstallJob
     
@@ -3995,7 +3954,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Benvignûts
     
@@ -4003,7 +3962,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Benvignûts
     
@@ -4084,21 +4043,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Lenghis</h1> </br>
                     La impostazion di localizazion dal sisteme e influence la lenghe e la cumbinazion di caratars par cualchi element de interface utent a rie di comant. La impostazion atuâl e je <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Localitâts</h1> </br>
                     La impostazions di localizazion dal sisteme e influence il formât des datis e dai numars. La impostazion atuâl e je <strong>%1</strong>.
     
     
-      
+      
       Back
       Indaûr
     
@@ -4164,6 +4123,45 @@ Output:
             <p>Chescj a son esemplis di notis di publicazion.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4220,132 +4218,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Sielç e dopre il to non utent e lis credenziâls par jentrâ e eseguî ativitâts di aministradôr
     
     
-      
+      
       What is your name?
       Ce non âstu?
     
     
-      
+      
       Your Full Name
       Il to non complet
     
     
-      
+      
       What name do you want to use to log in?
       Ce non vûstu doprâ pe autenticazion?
     
     
-      
+      
       Login Name
       Non di acès
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Se chest computer al vignarà doprât di plui personis, tu puedis creâ plui account dopo vê completade la instalazion.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       A son ametûts dome i numars, lis letaris minusculis, lis liniutis bassis e i tratuts.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Ce non aial chest computer?
     
     
-      
+      
       Computer Name
       Non dal computer
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Si doprarà chest non se tu rindis visibil a altris chest computer suntune rêt.
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Sielç une password par tignî il to account al sigûr.
     
     
-      
+      
       Password
       Password
     
     
-      
+      
       Repeat Password
       Ripeti password
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. Une buine password e contignarà un miscliç di letaris, numars e puntuazions, e sarà lungje almancul vot caratars e si scugnarà cambiâle a intervai regolârs.
     
     
-      
+      
       Validate passwords quality
       Convalidâ la cualitât des passwords
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Cuant che cheste casele e je selezionade, il control su la fuarce de password al ven fat e no si podarà doprâ une password debile.
     
     
-      
+      
       Log in automatically without asking for the password
       Jentre in automatic cence domandâ la password
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Torne dopre la password dal utent pe password di root
     
     
-      
+      
       Use the same password for the administrator account.
       Dopre la stesse password pal account di aministradôr.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Sielç une password di root par tignî il to account al sigûr.
     
     
-      
+      
       Root Password
       Password di root
     
     
-      
+      
       Repeat Root Password
       Ripeti password di root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure.
     
diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts
index ad0786b3cc..59e50f402a 100644
--- a/lang/calamares_gl.ts
+++ b/lang/calamares_gl.ts
@@ -491,12 +491,12 @@ O instalador pecharase e perderanse todos os cambios.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       Instalador de %1
     
@@ -535,149 +535,149 @@ O instalador pecharase e perderanse todos os cambios.
       Formulario
     
     
-      
+      
       Select storage de&vice:
       Seleccione o dispositivo de almacenamento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Despois:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionado manual</strong><br/> Pode crear o redimensionar particións pola súa conta.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilizar %1 como partición home para %2
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Seleccione unha partición para acurtar, logo empregue a barra para redimensionala</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Localización do cargador de arranque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Seleccione unha partición para instalar</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Non foi posible atopar unha partición de sistema de tipo EFI. Por favor, volva atrás e empregue a opción de particionado manual para crear unha en %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       A partición EFI do sistema en %1 será usada para iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partición EFI do sistema:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esta unidade de almacenamento non semella ter un sistema operativo instalado nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Borrar disco</strong><br/>Esto <font color="red">eliminará</font> todos os datos gardados na unidade de almacenamento seleccionada.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar a carón</strong><br/>O instalador encollerá a partición para facerlle sitio a %1
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Substituír a partición</strong><br/>Substitúe a partición con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       A unidade de almacenamento ten %1 nela. Que desexa facer?<br/>Poderá revisar e confirmar a súa elección antes de que se aplique algún cambio á unidade.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esta unidade de almacenamento xa ten un sistema operativo instalado nel. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Esta unidade de almacenamento ten múltiples sistemas operativos instalados nela. Que desexa facer?<br/>Poderá revisar e confirmar as súas eleccións antes de que calquera cambio sexa feito na unidade de almacenamento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -745,12 +745,12 @@ O instalador pecharase e perderanse todos os cambios.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Seleccionado modelo de teclado a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Seleccionada a disposición do teclado a %1/%2.
     
@@ -800,47 +800,47 @@ O instalador pecharase e perderanse todos os cambios.
       Installación por rede. (Desactivadas. Non se pudo recupera-la lista de pacotes, comprobe a sua conexión a rede)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Este ordenador non satisfai os requerimentos mínimos ara a instalación de %1.<br/>A instalación non pode continuar. <a href="#details">Máis información...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Este ordenador non satisfai algúns dos requisitos recomendados para instalar %1.<br/> A instalación pode continuar, pero pode que algunhas características sexan desactivadas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Este programa faralle algunhas preguntas mentres prepara %2 no seu ordenador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -935,15 +935,40 @@ O instalador pecharase e perderanse todos os cambios.
       Completouse a instalación de %1
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Resumo
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Esta é unha vista xeral do que vai acontecer cando inicie o procedemento de instalación.
+    
   
   
     ContextualProcessJob
@@ -2440,6 +2465,14 @@ O instalador pecharase e perderanse todos os cambios.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2723,17 +2756,17 @@ O instalador pecharase e perderanse todos os cambios.
       I&nstalar o cargador de arranque en:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Confirma que desexa crear unha táboa de particións nova en %1?
     
     
-      
+      
       Can not create new partition
       Non é posíbel crear a partición nova
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       A táboa de particións de %1 xa ten %2 particións primarias e non é posíbel engadir máis. Retire unha partición primaria e engada unha partición estendida.
     
@@ -2751,107 +2784,82 @@ O instalador pecharase e perderanse todos os cambios.
       Particións
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instalar %1 <strong>a carón</strong> doutro sistema operativo.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Limpar</strong> o disco e instalar %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Substituír</strong> unha partición por %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Particionamento <strong>manual</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instalar %1 <strong>a carón</strong> doutro sistema operativo no disco <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Limpar</strong> o disco <strong>%2</strong> (%3) e instalar %1.
+      
+      Current:
+      Actual:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Substituír</strong> unha partición do disco <strong>%2</strong> (%3) por %1.
+      
+      After:
+      Despois:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Particionamento <strong>manual</strong> do disco <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Non hai ningunha partición de sistema EFI configurada
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disco <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Actual:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Despois:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Non hai ningunha partición de sistema EFI configurada
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      A bandeira da partición de sistema EFI non está configurada
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       A partición de arranque non está cifrada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Configurouse unha partición de arranque separada xunto cunha partición raíz cifrada, mais a partición raíz non está cifrada.<br/><br/>Con este tipo de configuración preocupa a seguranza porque nunha partición sen cifrar grávanse ficheiros de sistema importantes.<br/>Pode continuar, se así o desexa, mais o desbloqueo do sistema de ficheiros producirase máis tarde durante o arranque do sistema.<br/>Para cifrar unha partición raíz volva atrás e créea de novo, seleccionando <strong>Cifrar</strong> na xanela de creación de particións.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2986,7 +2994,7 @@ Saída:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3309,44 +3317,16 @@ Saída:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para os mellores resultados, por favor, asegúrese que este ordenador:
     
     
-      
+      
       System requirements
       Requisitos do sistema
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Este ordenador non satisfai os requerimentos mínimos ara a instalación de %1.<br/>A instalación non pode continuar. <a href="#details">Máis información...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Este ordenador non satisfai algúns dos requisitos recomendados para instalar %1.<br/> A instalación pode continuar, pero pode que algunhas características sexan desactivadas.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Este programa faralle algunhas preguntas mentres prepara %2 no seu ordenador.
-    
-  
   
     ScanningDialog
     
@@ -3638,27 +3618,6 @@ Saída:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Esta é unha vista xeral do que vai acontecer cando inicie o procedemento de instalación.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Resumo
-    
-  
   
     TrackingInstallJob
     
@@ -3990,7 +3949,7 @@ Saída:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Benvido
     
@@ -3998,7 +3957,7 @@ Saída:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Benvido
     
@@ -4068,19 +4027,19 @@ Saída:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4145,6 +4104,45 @@ Saída:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4181,132 +4179,132 @@ Saída:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Cal é o seu nome?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Cal é o nome que quere usar para entrar?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Cal é o nome deste computador?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Escolla un contrasinal para mante-la sua conta segura.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Empregar o mesmo contrasinal para a conta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts
index 16c0b61424..7914c2ae83 100644
--- a/lang/calamares_gu.ts
+++ b/lang/calamares_gu.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index 875d188cb0..dc2baf2790 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       תכנית התקנת %1
     
     
-      
+      
       %1 Installer
       אשף התקנת %1
     
@@ -543,149 +543,149 @@ The installer will quit and all changes will be lost.
       Form
     
     
-      
+      
       Select storage de&vice:
       בחירת התקן א&חסון:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       נוכחי:
     
     
-      
+      
       After:
       לאחר:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>הגדרת מחיצות באופן ידני</strong><br/>ניתן ליצור או לשנות את גודל המחיצות בעצמך.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       שימוש ב־%1 כמחיצת הבית (home) עבור %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>ראשית יש לבחור מחיצה לכיווץ, לאחר מכן לגרור את הסרגל התחתון כדי לשנות את גודלה</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 תכווץ לכדי %2MiB ותיווצר מחיצה חדשה בגודל %3MiB עבור %4.
     
     
-      
+      
       Boot loader location:
       מיקום מנהל אתחול המערכת:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>נא לבחור מחיצה כדי להתקין עליה</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       במערכת זו לא נמצאה מחיצת מערכת EFI. נא לחזור ולהשתמש ביצירת מחיצות באופן ידני כדי להגדיר את %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       מחיצת מערכת EFI שב־%1 תשמש לטעינת %2.
     
     
-      
+      
       EFI system partition:
       מחיצת מערכת EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       לא נמצאה מערכת הפעלה על התקן אחסון זה. מה ברצונך לעשות?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>מחיקת כונן</strong><br/> פעולה זו <font color="red">תמחק</font> את כל המידע השמור על התקן האחסון הנבחר.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>התקנה לצד</strong><br/> אשף ההתקנה יכווץ מחיצה כדי לפנות מקום לטובת %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>החלפת מחיצה</strong><br/> ביצוע החלפה של המחיצה ב־%1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       בהתקן אחסון זה נמצאה %1. מה ברצונך לעשות?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       כבר קיימת מערכת הפעלה על התקן האחסון הזה. כיצד להמשיך?<br/> ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ישנן מגוון מערכות הפעלה על התקן אחסון זה. איך להמשיך? <br/>ניתן לסקור ולאשר את בחירתך לפני ששינויים יתבצעו על התקן האחסון.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       בהתקן האחסון הזה כבר יש מערכת הפעלה אך טבלת המחיצות <strong>%1</strong> שונה מהנדרשת <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       אחת המחיצות של התקן האחסון הזה <strong>מעוגנת</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       התקן אחסון זה הוא חלק מהתקן <strong>RAID בלתי פעיל</strong>.
     
     
-      
+      
       No Swap
       ללא החלפה
     
     
-      
+      
       Reuse Swap
       שימוש מחדש בהחלפה
     
     
-      
+      
       Swap (no Hibernate)
       החלפה (ללא תרדמת)
     
     
-      
+      
       Swap (with Hibernate)
       החלפה (עם תרדמת)
     
     
-      
+      
       Swap to file
       החלפה לקובץ
     
@@ -753,12 +753,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       הגדרת דגם המקלדת בתור %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       הגדרת פריסת לוח המקשים בתור %1/%2.
     
@@ -808,47 +808,47 @@ The installer will quit and all changes will be lost.
       התקנה מהרשת. (מושבתת: לא ניתן לקבל רשימות של חבילות תכנה, נא לבדוק את החיבור לרשת)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       המחשב לא עומד ברף הדרישות המזערי להתקנת %1. <br/>להתקנה אין אפשרות להמשיך. <a href="#details">פרטים…</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       המחשב לא עומד ברף דרישות המינימום להתקנת %1. <br/>ההתקנה לא יכולה להמשיך. <a href="#details"> פרטים...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       המחשב לא עומד בחלק מרף דרישות המזערי להתקנת %1.<br/> ההתקנה יכולה להמשיך, אך יתכן כי חלק מהתכונות יושבתו.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       המחשב לא עומד בחלק מרף דרישות המינימום להתקנת %1.<br/> ההתקנה יכולה להמשיך, אך יתכן כי חלק מהתכונות יושבתו.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       תכנית זו תשאל אותך מספר שאלות ותתקין את %2 על המחשב שלך.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>ברוך בואך לתכנית ההתקנה Calamares עבור %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>ברוך בואך להתקנת %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>ברוך בואך להתקנת %1 עם Calamares</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>ברוך בואך להתקנת %1</h1>
     
@@ -943,15 +943,40 @@ The installer will quit and all changes will be lost.
       ההתקנה של %1 הושלמה.
     
     
-      
+      
       Package Selection
       בחירת חבילות
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       נא לבחור במוצר מהרשימה. המוצר הנבחר יותקן.
     
+    
+      
+      Install option: <strong>%1</strong>
+      אפשרות התקנה: <strong>%1</strong>
+    
+    
+      
+      None
+      ללא
+    
+    
+      
+      Summary
+      סיכום
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      זו סקירה של מה שיקרה לאחר התחלת תהליך ההתקנה.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      להלן סקירת המאורעות שיתרחשו עם תחילת תהליך ההתקנה.
+    
   
   
     ContextualProcessJob
@@ -2468,6 +2493,14 @@ The installer will quit and all changes will be lost.
       נא לבחור במוצר מהרשימה. המוצר הנבחר יותקן.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      חבילות
+    
+  
   
     PackageChooserViewStep
     
@@ -2751,17 +2784,17 @@ The installer will quit and all changes will be lost.
       הת&קנת מנהל אתחול על:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       האם ליצור טבלת מחיצות חדשה על %1?
     
     
-      
+      
       Can not create new partition
       לא ניתן ליצור מחיצה חדשה
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       לטבלת המחיצות על %1 כבר יש %2 מחיצות עיקריות ואי אפשר להוסיף עוד כאלה. נא להסיר מחיצה עיקרית אחת ולהוסיף מחיצה מורחבת במקום.
     
@@ -2779,107 +2812,82 @@ The installer will quit and all changes will be lost.
       מחיצות
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      להתקין את %1 <strong>לצד</strong> מערכת הפעלה אחרת.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>למחוק</strong> את הכונן ולהתקין את %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>החלפת</strong> מחיצה עם %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      להגדיר מחיצות באופן <strong>ידני</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      להתקין את %1 <strong>לצד</strong> מערכת הפעלה אחרת על כונן <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>למחוק</strong> את הכונן <strong>%2</strong> (%3) ולהתקין את %1.
+      
+      Current:
+      נוכחי:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>החלפת</strong> מחיצה על כונן <strong>%2</strong> (%3) ב־%1.
+      
+      After:
+      לאחר:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      חלוקה למחיצות באופן <strong>ידני</strong> על כונן <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      לא הוגדרה מחיצת מערכת EFI
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      כונן <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      מחיצת המערכת EFI לא הוגדרה נכון
     
     
-      
-      Current:
-      נוכחי:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      מחיצת מערכת EFI נחוצה להפעלת %1. <br/><br/>כדי להפעיל מחיצת מערכת EFI, יש לחזור ולבחור או ליצור מערכת קבצים מתאימה.
     
     
-      
-      After:
-      לאחר:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      יש לעגן את מערכת הקבצים ב־<strong>%1</strong>
     
     
-      
-      No EFI system partition configured
-      לא הוגדרה מחיצת מערכת EFI
+      
+      The filesystem must have type FAT32.
+      מערכת הקבצים חייבת להיות מסוג FAT32.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      מחיצת מערכת EFI נדרשת כדי להפעיל את %1.<br/><br/> כדי להגדיר מחיצת מערכת EFI, יש לחזור ולבחור או ליצור מערכת קבצים מסוג FAT32 עם סימון <strong>%3</strong> פעיל ועם נקודת עיגון <strong>%2</strong>.<br/><br/> ניתן להמשיך ללא הגדרת מחיצת מערכת EFI אך טעינת המערכת עשויה להיכשל.
+      
+      The filesystem must be at least %1 MiB in size.
+      גודל מערכת הקבצים חייב להיות לפחות ‎%1 MIB.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      לצורך הפעלת %1 נדרשת מחיצת מערכת EFI.<br/><br/> הוגדרה מחיצה עם נקודת עיגון <strong>%2</strong> אך לא הוגדר סימון <strong>%3</strong>.<br/> כדי לסמן את המחיצה, יש לחזור ולערוך את המחיצה.<br/><br/> ניתן להמשיך ללא הוספת הסימון אך טעינת המערכת עשויה להיכשל.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      למערכת הקבצים חייב להיות מוגדר הדגלון <strong>%1</strong>.
     
     
-      
-      EFI system partition flag not set
-      לא מוגדר סימון מחיצת מערכת EFI
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      ניתן להמשיך ללא הקמת מחיצת מערכת EFI אך המערכת שלך לא תצליח להיטען.
     
     
-      
+      
       Option to use GPT on BIOS
       אפשרות להשתמש ב־GPT או ב־BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       טבלת מחיצות מסוג GPT היא האפשרות הטובה ביותר בכל המערכות. תכנית התקנה זו תומכת גם במערכות מסוג BIOS.<br/><br/>כדי להגדיר טבלת מחיצות מסוג GPT על גבי BIOS, (אם זה טרם בוצע) יש לחזור ולהגדיר את טבלת המחיצות ל־GPT, לאחר מכן יש ליצור מחיצה של 8 מ״ב ללא פירמוט עם הדגלון <strong>bios_grub</strong> פעיל.<br/><br/>מחיצה בלתי מפורמטת בגודל 8 מ״ב נחוצה לטובת הפעלת %1 על מערכת מסוג BIOS עם GPT.
     
     
-      
+      
       Boot partition not encrypted
       מחיצת האתחול (Boot) אינה מוצפנת
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       מחיצת אתחול, boot, נפרדת הוגדרה יחד עם מחיצת מערכת ההפעלה, root, מוצפנת, אך מחיצת האתחול לא הוצפנה.<br/><br/> ישנן השלכות בטיחותיות עם התצורה שהוגדרה, מכיוון שקובצי מערכת חשובים נשמרים על מחיצה לא מוצפנת.<br/>ניתן להמשיך אם זהו רצונך, אך שחרור מערכת הקבצים יתרחש מאוחר יותר כחלק מהאתחול.<br/>בכדי להצפין את מחיצת האתחול, יש לחזור וליצור אותה מחדש, על ידי בחירה ב <strong>הצפנה</strong> בחלונית יצירת המחיצה.
     
     
-      
+      
       has at least one disk device available.
       יש לפחות התקן כונן אחד זמין.
     
     
-      
+      
       There are no partitions to install on.
       אין מחיצות להתקין עליהן.
     
@@ -3014,7 +3022,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3340,44 +3348,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       לקבלת התוצאות הטובות ביותר, נא לוודא כי מחשב זה:
     
     
-      
+      
       System requirements
       דרישות מערכת
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      המחשב לא עומד ברף הדרישות המזערי להתקנת %1. <br/>להתקנה אין אפשרות להמשיך. <a href="#details">פרטים…</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      המחשב לא עומד ברף דרישות המינימום להתקנת %1. <br/>ההתקנה לא יכולה להמשיך. <a href="#details"> פרטים...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      המחשב לא עומד בחלק מרף דרישות המזערי להתקנת %1.<br/> ההתקנה יכולה להמשיך, אך יתכן כי חלק מהתכונות יושבתו.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      המחשב לא עומד בחלק מרף דרישות המינימום להתקנת %1.<br/> ההתקנה יכולה להמשיך, אך יתכן כי חלק מהתכונות יושבתו.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      תכנית זו תשאל אותך מספר שאלות ותתקין את %2 על המחשב שלך.
-    
-  
   
     ScanningDialog
     
@@ -3669,27 +3649,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      זו סקירה של מה שיקרה לאחר התחלת תהליך ההתקנה.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      להלן סקירת המאורעות שיתרחשו עם תחילת תהליך ההתקנה.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      סיכום
-    
-  
   
     TrackingInstallJob
     
@@ -4021,7 +3980,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       ברוך בואך
     
@@ -4029,7 +3988,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       ברוך בואך
     
@@ -4112,21 +4071,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>שפות</h1> </br>
                     תבנית המערכת המקומית משפיעה על השפה ועל ערכת התווים של מגוון רכיבים במנשק המשתמש. ההגדרה הנוכחית היא <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>תבניות מקומיות</h1> </br>
                     הגדרות התבנית המקומית של המערכת תשפיע על תצורת המספרים והתאריכים. ההגדרה הנוכחית היא <strong>%1</strong>.
     
     
-      
+      
       Back
       חזרה
     
@@ -4192,6 +4151,46 @@ Output:
             <p>אלו הערות מהדורה לדוגמה.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      LibreOffice היא חבילת כלים משרדיים מקיפה וחופשית, משרתת מיליוני משתמשים ברחבי העולם. היא כוללת מגוון יישומים שהופכים אותה לחבילת הכלים המשרדיים הגמישה ביותר בשוק הקוד הפתוח.<br/>
+                    אפשרות בררת המחדל.
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      אם העדפתך היא שלא להתקין חבילת כלים משרדיים, אפשר לבחור באפשרות „ללא כלים משרדיים”. תמיד ניתן להוסיף כאלה (אף יותר מסוג אחד) בהמשך לאחר שהמערכת כבר מותקנת.
+    
+    
+      
+      No Office Suite
+      ללא כלים משרדיים
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      יצירת התקנה מצומצמת לשולחן העבודה, להסיר את כל היישומים העודפים ולהחליט מאוחר יותר מה מתאים להוסיף למערכת שלך. דוגמאות למה שלא יהיה בהתקנה שכזאת, למשל: לא תהיה חבילת כלים משרדיים (Office), לא יהיו נגני מדיה, אין מציגי תמונות או תמיכה בהדפסה.  זה יהיה רק שולחן עבודה, מנהל קבצים, מנהל חבילות, עורך טקסט ודפדפן אינטרנט פשוט.
+    
+    
+      
+      Minimal Install
+      התקנה מצומצמת
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      נא לבחור אפשרות להתקנה שלך או להשתמש בבררת המחדל: LibreOffice כלול.
+    
+  
   
     release_notes
     
@@ -4248,132 +4247,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       נא לבחור את שם המשתמש ואת פרטי הגישה שלך כדי להיכנס ולבצע פעולות ניהוליות.
     
     
-      
+      
       What is your name?
       מה שמך?
     
     
-      
+      
       Your Full Name
       שמך המלא
     
     
-      
+      
       What name do you want to use to log in?
       איזה שם ברצונך שישמש אותך לכניסה?
     
     
-      
+      
       Login Name
       שם הכניסה
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       אם במחשב זה יש יותר ממשתמש אחד, ניתן ליצור מגוון חשבונות לאחר ההתקנה.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       מותר להשתמש רק באותיות קטנות, ספרות, קווים תחתיים ומינוסים.
     
     
-      
+      
       root is not allowed as username.
       אסור להשתמש ב־root כשם משתמש.
     
     
-      
+      
       What is the name of this computer?
       מהו השם של המחשב הזה?
     
     
-      
+      
       Computer Name
       שם המחשב
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       השם הזה יהיה בשימוש אם המחשב הזה יהיה גלוי לשאר הרשת.
     
     
-      
+      
       localhost is not allowed as hostname.
       אסור להשתמש ב־localhost כשם מארח.
     
     
-      
+      
       Choose a password to keep your account safe.
       נא לבחור סיסמה להגנה על חשבונך.
     
     
-      
+      
       Password
       סיסמה
     
     
-      
+      
       Repeat Password
       חזרה על הסיסמה
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       יש להקליד את אותה הסיסמה פעמיים כדי שניתן יהיה לבדוק שגיאות הקלדה. סיסמה טובה אמורה להכיל שילוב של אותיות, מספרים וסימני פיסוק, להיות באורך של שמונה תווים לפחות ויש להחליף אותה במרווחי זמן קבועים.
     
     
-      
+      
       Validate passwords quality
       אימות איכות הסיסמאות
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       כשתיבה זו מסומנת, בדיקת אורך סיסמה מתבצעת ולא תהיה לך אפשרות להשתמש בסיסמה חלשה.
     
     
-      
+      
       Log in automatically without asking for the password
       להיכנס אוטומטית מבלי לבקש סיסמה
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       מותר להשתמש באותיות, ספרות, קווים תחתונים ומינוסים, שני תווים ומעלה.
     
     
-      
+      
       Reuse user password as root password
       להשתמש בסיסמת המשתמש גם בשביל משתמש העל (root)
     
     
-      
+      
       Use the same password for the administrator account.
       להשתמש באותה הסיסמה בשביל חשבון המנהל.
     
     
-      
+      
       Choose a root password to keep your account safe.
       נא לבחור סיסמה למשתמש העל (root) כדי להגן על חשבונך.
     
     
-      
+      
       Root Password
       סיסמה למשתמש העל (root)
     
     
-      
+      
       Repeat Root Password
       נא לחזור על סיסמת משתמש העל
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       נא להקליד את הסיסמה פעמיים כדי לאפשר זיהוי של שגיאות הקלדה.
     
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index 192fd8545a..846631aa68 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -495,12 +495,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 सेटअप प्रोग्राम
     
     
-      
+      
       %1 Installer
       %1 इंस्टॉलर
     
@@ -539,149 +539,149 @@ The installer will quit and all changes will be lost.
       रूप
     
     
-      
+      
       Select storage de&vice:
       डिवाइस चुनें (&v):
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       मौजूदा :
     
     
-      
+      
       After:
       बाद में:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>मैनुअल विभाजन</strong><br/> स्वयं विभाजन बनाएँ या उनका आकार बदलें।
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %2 के होम विभाजन के लिए %1 को पुनः उपयोग करें।
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>छोटा करने के लिए विभाजन चुनें, फिर नीचे bar से उसका आकर सेट करें</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 को छोटा करके %2MiB किया जाएगा व %4 हेतु %3MiB का एक नया विभाजन बनेगा।
     
     
-      
+      
       Boot loader location:
       बूट लोडर का स्थान:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>इंस्टॉल के लिए विभाजन चुनें</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       इस सिस्टम पर कहीं भी कोई EFI सिस्टम विभाजन नहीं मिला। कृपया वापस जाएँ व %1 को सेट करने के लिए मैनुअल रूप से विभाजन करें।
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 वाले EFI सिस्टम विभाजन का उपयोग %2 को शुरू करने के लिए किया जाएगा।
     
     
-      
+      
       EFI system partition:
       EFI सिस्टम विभाजन:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       इस डिवाइस पर लगता है कि कोई ऑपरेटिंग सिस्टम नहीं है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>डिस्क का सारा डाटा हटाएँ</strong><br/>इससे चयनित डिवाइस पर मौजूद सारा डाटा <font color="red">हटा</font>हो जाएगा।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>साथ में इंस्टॉल करें</strong><br/>इंस्टॉलर %1 के लिए स्थान बनाने हेतु एक विभाजन को छोटा कर देगा।
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>विभाजन को बदलें</strong><br/>एक विभाजन को %1 से बदलें।
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       इस डिवाइस पर %1 है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       इस डिवाइस पर पहले से एक ऑपरेटिंग सिस्टम है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       इस डिवाइस पर एक से अधिक ऑपरेटिंग सिस्टम है। आप क्या करना चाहेंगे?<br/>आप डिवाइस में किसी भी बदलाव से पहले उसकी समीक्षा व पुष्टि कर सकेंगे।
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       इस संचय उपकरण पर पहले से ऑपरेटिंग सिस्टम है, परंतु <strong>%1</strong> विभाजन तालिका अपेक्षित <strong>%2</strong> से भिन्न है।<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       इस संचय उपकरण के विभाजनों में से कोई एक विभाजन <strong>माउंट</strong> है।
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       यह संचय उपकरण एक <strong>निष्क्रिय RAID</strong> उपकरण का हिस्सा है।
     
     
-      
+      
       No Swap
       कोई स्वैप नहीं
     
     
-      
+      
       Reuse Swap
       स्वैप पुनः उपयोग करें
     
     
-      
+      
       Swap (no Hibernate)
       स्वैप (हाइबरनेशन/सिस्टम सुप्त रहित)
     
     
-      
+      
       Swap (with Hibernate)
       स्वैप (हाइबरनेशन/सिस्टम सुप्त सहित)
     
     
-      
+      
       Swap to file
       स्वैप फाइल बनाएं
     
@@ -749,12 +749,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       कुंजीपटल का मॉडल %1 सेट करें।<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       कुंजीपटल का अभिन्यास %1/%2 सेट करें।
     
@@ -804,47 +804,47 @@ The installer will quit and all changes will be lost.
       नेटवर्क इंस्टॉल। (निष्क्रिय है : पैकेज सूची प्राप्त करने में असमर्थ, अपना नेटवर्क कनेक्शन जाँचें)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       यह कंप्यूटर %1 सेटअप करने की न्यूनतम आवश्यकताओं को पूरा नहीं करता।<br/>सेटअप जारी नहीं रखा जा सकता।<a href="#details">विवरण...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       यह कंप्यूटर %1 इंस्टॉल करने की न्यूनतम आवश्यकताओं को पूरा नहीं करता।<br/>इंस्टॉल जारी नहीं रखा जा सकता।<a href="#details">विवरण...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       यह कंप्यूटर %1 सेटअप करने हेतु सुझाई गई आवश्यकताओं को पूरा नहीं करता।<br/>सेटअप जारी रखा जा सकता है, लेकिन कुछ विशेषताएँ निष्क्रिय कर दी जाएँगी।
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       यह कंप्यूटर %1 इंस्टॉल करने हेतु सुझाई गई आवश्यकताओं को पूरा नहीं करता।<br/>इंस्टॉल जारी रखा जा सकता है, लेकिन कुछ विशेषताएँ निष्क्रिय कर दी जाएँगी।
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       यह प्रोग्राम प्रश्नावली के माध्यम से आपके कंप्यूटर पर %2 को सेट करेगा।
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 हेतु Calamares सेटअप में आपका स्वागत है</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 सेटअप में आपका स्वागत है</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 हेतु Calamares इंस्टॉलर में आपका स्वागत है</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 इंस्टॉलर में आपका स्वागत है</h1>
     
@@ -939,15 +939,40 @@ The installer will quit and all changes will be lost.
       %1 का इंस्टॉल पूर्ण हुआ।
     
     
-      
+      
       Package Selection
       पैकेज चयन
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       सूची में से वस्तु विशेष का चयन करें। चयनित वस्तु इंस्टॉल कर दी जाएगी।
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      सारांश
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      यह एक अवलोकन है कि सेटअप प्रक्रिया आरंभ होने के उपरांत क्या होगा।
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      यह अवलोकन है कि इंस्टॉल शुरू होने के बाद क्या होगा।
+    
   
   
     ContextualProcessJob
@@ -2446,6 +2471,14 @@ The installer will quit and all changes will be lost.
       सूची में से वस्तु विशेष का चयन करें। चयनित वस्तु इंस्टॉल कर दी जाएगी।
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      पैकेज
+    
+  
   
     PackageChooserViewStep
     
@@ -2729,17 +2762,17 @@ The installer will quit and all changes will be lost.
       बूट लोडर इंस्टॉल करें (&l) :
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       क्या आप वाकई %1 पर एक नई विभाजन तालिका बनाना चाहते हैं?
     
     
-      
+      
       Can not create new partition
       नया विभाजन बनाया नहीं जा सका
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       %1 पर विभाजन तालिका में पहले से ही %2 मुख्य विभाजन हैं व और अधिक नहीं जोड़ें जा सकते। कृपया एक मुख्य विभाजन को हटाकर उसके स्थान पर एक विस्तृत विभाजन जोड़ें।
     
@@ -2757,107 +2790,82 @@ The installer will quit and all changes will be lost.
       विभाजन
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      %1 को दूसरे ऑपरेटिंग सिस्टम <strong>के साथ</strong> इंस्टॉल करें।
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      डिस्क का सारा डाटा<strong>हटाकर</strong> कर %1 इंस्टॉल करें।
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      विभाजन को %1 से <strong>बदलें</strong>।
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>मैनुअल</strong> विभाजन।
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      डिस्क <strong>%2</strong> (%3) पर %1 को दूसरे ऑपरेटिंग सिस्टम <strong>के साथ</strong> इंस्टॉल करें।
+      
+      Current:
+      मौजूदा :
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      डिस्क <strong>%2</strong> (%3) <strong>erase</strong> कर %1 इंस्टॉल करें।
+      
+      After:
+      बाद में:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      डिस्क <strong>%2</strong> (%3) के विभाजन को %1 से <strong>बदलें</strong>।
+      
+      No EFI system partition configured
+      कोई EFI सिस्टम विभाजन विन्यस्त नहीं है
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      डिस्क <strong>%1</strong> (%2) पर <strong>मैनुअल</strong> विभाजन।
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      डिस्क <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      Current:
-      मौजूदा :
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      After:
-      बाद में:
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      No EFI system partition configured
-      कोई EFI सिस्टम विभाजन विन्यस्त नहीं है
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      %1 आरंभ करने हेतु EFI सिस्टम विभाजन ज़रूरी है।<br/><br/>EFI सिस्टम विभाजन को विन्यस्त करने के लिए, वापस जाएँ और चुनें या बनाएँ एक FAT32 फ़ाइल सिस्टम जिस पर <strong>%3</strong> flag चालू हो व माउंट पॉइंट <strong>%2</strong>हो।<br/><br/>आप बिना सेट करें भी आगे बढ़ सकते है पर सिस्टम चालू नहीं होगा।
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      %1 को शुरू करने हेतु EFI सिस्टम विभाजन ज़रूरी है।<br/><br/>विभाजन को माउंट पॉइंट <strong>%2</strong> के साथ विन्यस्त किया गया परंतु उसका <strong>%3</strong> फ्लैग सेट नहीं था।<br/> फ्लैग सेट करने के लिए, वापस जाएँ और विभाजन को edit करें।<br/><br/>आप बिना सेट करें भी आगे बढ़ सकते है पर सिस्टम चालू नहीं होगा।
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
-      EFI system partition flag not set
-      EFI सिस्टम विभाजन फ्लैग सेट नहीं है
-    
-    
-      
+      
       Option to use GPT on BIOS
       BIOS पर GPT उपयोग करने के लिए विकल्प
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT विभाजन तालिका सभी सिस्टम हेतु सबसे उत्तम विकल्प है। यह इंस्टॉलर BIOS सिस्टम के सेटअप को भी समर्थन करता है। <br/><br/>BIOS पर GPT विभाजन तालिका को विन्यस्त करने हेतु, (अगर अब तक नहीं करा है तो) वापस जाकर विभाजन तालिका GPT पर सेट करें, फिर एक 8 MB का बिना फॉर्मेट हुआ विभाजन बनाए जिस पर <strong>bios_grub</strong> का flag हो।<br/><br/>यह बिना फॉर्मेट हुआ 8 MB का विभाजन %1 को BIOS सिस्टम पर GPT के साथ शुरू करने के लिए आवश्यक है।
     
     
-      
+      
       Boot partition not encrypted
       बूट विभाजन एन्क्रिप्टेड नहीं है
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       एन्क्रिप्टेड रुट विभाजन के साथ एक अलग बूट विभाजन भी सेट किया गया था, पर बूट विभाजन एन्क्रिप्टेड नहीं था।<br/><br/> इस तरह का सेटअप सुरक्षित नहीं होता क्योंकि सिस्टम फ़ाइल एन्क्रिप्टेड विभाजन पर होती हैं।<br/>आप चाहे तो जारी रख सकते है, पर फिर फ़ाइल सिस्टम बाद में सिस्टम स्टार्टअप के दौरान अनलॉक होगा।<br/> विभाजन को एन्क्रिप्ट करने के लिए वापस जाकर उसे दोबारा बनाएँ व विभाजन निर्माण विंडो में<strong>एन्क्रिप्ट</strong> चुनें।
     
     
-      
+      
       has at least one disk device available.
       कम-से-कम एक डिस्क डिवाइस उपलब्ध हो।
     
     
-      
+      
       There are no partitions to install on.
       इंस्टॉल हेतु कोई विभाजन नहीं हैं।
     
@@ -2992,7 +3000,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3318,44 +3326,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       उत्तम परिणाम हेतु, कृपया सुनिश्चित करें कि यह कंप्यूटर :
     
     
-      
+      
       System requirements
       सिस्टम इंस्टॉल हेतु आवश्यकताएँ
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      यह कंप्यूटर %1 को सेटअप करने की न्यूनतम आवश्यकताओं को पूरा नहीं करता।<br/>सेटअप जारी नहीं रखा जा सकता।<a href="#details">विवरण...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      यह कंप्यूटर %1 को इंस्टॉल करने की न्यूनतम आवश्यकताओं को पूरा नहीं करता।<br/>इंस्टॉल जारी नहीं रखा जा सकता।<a href="#details">विवरण...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      यह कंप्यूटर %1 को सेटअप करने हेतु सुझाई गई आवश्यकताओं को पूरा नहीं करता।<br/>सेटअप जारी रखा जा सकता है, लेकिन कुछ विशेषताएँ को निष्क्रिय किया जा सकता हैं।
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      यह कंप्यूटर %1 को इंस्टॉल करने हेतु सुझाई गई आवश्यकताओं को पूरा नहीं करता।<br/>इंस्टॉल जारी रखा जा सकता है, लेकिन कुछ विशेषताएँ को निष्क्रिय किया जा सकता हैं।
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      यह प्रोग्राम एक प्रश्नावली के आधार पर आपके कंप्यूटर पर %2 को सेट करेगा।
-    
-  
   
     ScanningDialog
     
@@ -3647,27 +3627,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      यह एक अवलोकन है कि सेटअप प्रक्रिया आरंभ होने के उपरांत क्या होगा।
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      यह अवलोकन है कि इंस्टॉल शुरू होने के बाद क्या होगा।
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      सारांश
-    
-  
   
     TrackingInstallJob
     
@@ -3999,7 +3958,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       स्वागत है
     
@@ -4007,7 +3966,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       स्वागत है
     
@@ -4090,21 +4049,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>भाषाएँ</h1></br>
                  सिस्टम स्थानिकी सेटिंग कमांड लाइन के कुछ उपयोक्ता अंतरफलक तत्वों की भाषा व अक्षर सेट पर असर डालती है।<br/>मौजूदा सेटिंग <strong>%1</strong>है।
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>स्थानिकी</h1> </br>
                     सिस्टम स्थानिकी सेटिंग संख्या व दिनांक के प्रारूप को प्रभावित करती है। वर्तमान सेटिंग <strong>%1</strong> है।
     
     
-      
+      
       Back
       वापस
     
@@ -4170,6 +4129,45 @@ Output:
             <p>ये उदाहरण रिलीज़ नोट्स हैं।</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4226,132 +4224,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       लॉगिन एवं प्रशासक कार्यों हेतु उपयोक्ता नाम इत्यादि चुनें।
     
     
-      
+      
       What is your name?
       आपका नाम क्या है?
     
     
-      
+      
       Your Full Name
       आपका पूरा नाम
     
     
-      
+      
       What name do you want to use to log in?
       लॉग इन के लिए आप किस नाम का उपयोग करना चाहते हैं?
     
     
-      
+      
       Login Name
       लॉगिन नाम
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं।
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       केवल लोअरकेस अक्षर, अंक, अंडरस्कोर(_) व हाइफ़न(-) ही स्वीकार्य हैं।
     
     
-      
+      
       root is not allowed as username.
       उपयोक्ता नाम के रूप में root का उपयोग अस्वीकार्य है।
     
     
-      
+      
       What is the name of this computer?
       इस कंप्यूटर का नाम ?
     
     
-      
+      
       Computer Name
       कंप्यूटर का नाम
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       यदि आपका कंप्यूटर किसी नेटवर्क पर दृश्यमान होता है, तो यह नाम उपयोग किया जाएगा।
     
     
-      
+      
       localhost is not allowed as hostname.
       होस्ट नाम के रूप में localhost का उपयोग अस्वीकार्य है।
     
     
-      
+      
       Choose a password to keep your account safe.
       अपना अकाउंट सुरक्षित रखने के लिए पासवर्ड चुनें ।
     
     
-      
+      
       Password
       कूटशब्द
     
     
-      
+      
       Repeat Password
       कूटशब्द पुनः दर्ज करें
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       एक ही कूटशब्द दो बार दर्ज़ करें, ताकि उसे टाइप त्रुटि हेतु जाँचा जा सके। एक अच्छे कूटशब्द में अक्षर, अंक व विराम चिन्हों का मेल होता है, उसमें कम-से-कम आठ अक्षर होने चाहिए, और उसे नियमित अंतराल पर बदलते रहना चाहिए।
     
     
-      
+      
       Validate passwords quality
       कूटशब्द गुणवत्ता प्रमाणीकरण
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       यह बॉक्स टिक करने के परिणाम स्वरुप कूटशब्द-क्षमता की जाँच होगी व आप कमज़ोर कूटशब्द उपयोग नहीं कर पाएंगे।
     
     
-      
+      
       Log in automatically without asking for the password
       कूटशब्द बिना पूछे ही स्वतः लॉग इन करें
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       केवल अक्षर, अंक, अंडरस्कोर व हाइफ़न ही स्वीकार्य हैं, परन्तु केवल दो अक्षर ही ऐसे हो सकते हैं।
     
     
-      
+      
       Reuse user password as root password
       रुट कूटशब्द हेतु भी उपयोक्ता कूटशब्द उपयोग करें
     
     
-      
+      
       Use the same password for the administrator account.
       प्रबंधक अकाउंट के लिए भी यही कूटशब्द उपयोग करें।
     
     
-      
+      
       Choose a root password to keep your account safe.
       अकाउंट सुरक्षा हेतु रुट कूटशब्द चुनें।
     
     
-      
+      
       Root Password
       रुट कूटशब्द
     
     
-      
+      
       Repeat Root Password
       रुट कूटशब्द पुनः दर्ज करें
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       समान कूटशब्द दो बार दर्ज करें, ताकि टाइपिंग त्रुटि हेतु जाँच की जा सकें।
     
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index 96f14fbc25..45c496da68 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -497,12 +497,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 instalacijski program
     
     
-      
+      
       %1 Installer
       %1 Instalacijski program
     
@@ -541,149 +541,149 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Oblik
     
     
-      
+      
       Select storage de&vice:
       Odaberi uređaj za spremanje:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Trenutni:
     
     
-      
+      
       After:
       Poslije:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ručno particioniranje</strong><br/>Možete sami stvoriti ili promijeniti veličine particija.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Koristi %1 kao home particiju za %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Odaberite particiju za smanjivanje, te povlačenjem donjeg pokazivača odaberite promjenu veličine</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 će se smanjiti na %2MB i stvorit će se nova %3MB particija za %4.
     
     
-      
+      
       Boot loader location:
       Lokacija boot učitavača:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Odaberite particiju za instalaciju</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI particija ne postoji na ovom sustavu. Vratite se natrag i koristite ručno particioniranje da bi ste postavili %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI particija na %1 će se koristiti za pokretanje %2.
     
     
-      
+      
       EFI system partition:
       EFI particija:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Izgleda da na ovom disku nema operacijskog sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Obriši disk</strong><br/>To će <font color="red">obrisati</font> sve podatke na odabranom disku.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instaliraj uz postojeće</strong><br/>Instalacijski program će smanjiti particiju da bi napravio mjesto za %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Zamijeni particiju</strong><br/>Zamijenjuje particiju sa %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ovaj disk ima %1. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ovaj disk već ima operacijski sustav. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ovaj disk ima više operacijskih sustava. Što želite učiniti?<br/>Moći ćete provjeriti i potvrditi vaš odabir prije bilo kakvih promjena na disku.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Ovaj uređaj za pohranu već ima operativni sustav, ali njegova particijska tablica <strong>%1</strong> razlikuje se od potrebne <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Ovaj uređaj za pohranu ima <strong>montiranu</strong> jednu od particija.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Ovaj uređaj za pohranu je dio <strong>neaktivnog RAID</strong> uređaja.
     
     
-      
+      
       No Swap
       Bez swap-a
     
     
-      
+      
       Reuse Swap
       Iskoristi postojeći swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (bez hibernacije)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (sa hibernacijom)
     
     
-      
+      
       Swap to file
       Swap datoteka
     
@@ -751,12 +751,12 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Postavi model tipkovnice na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Postavi raspored tipkovnice na %1%2.
     
@@ -806,47 +806,47 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Mrežna instalacija. (Onemogućeno: Ne mogu dohvatiti listu paketa, provjerite da li ste spojeni na mrežu)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Ovo računalo ne zadovoljava minimalne zahtjeve za instalaciju %1.<br/>Instalacija se ne može nastaviti.<a href="#details">Detalji...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ovo računalo ne zadovoljava minimalne uvijete za instalaciju %1.<br/>Instalacija se ne može nastaviti.<a href="#details">Detalji...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.<br/>Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.<br/>Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ovaj program će vam postaviti neka pitanja i instalirati %2 na vaše računalo.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Dobrodošli u Calamares instalacijski program za %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Dobrodošli u %1 instalacijski program</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Dobrodošli u Calamares instalacijski program za %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Dobrodošli u %1 instalacijski program</h1>
     
@@ -941,15 +941,40 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Instalacija %1 je završena.
     
     
-      
+      
       Package Selection
       Odabir paketa
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Molimo odaberite proizvod s popisa. Izabrani proizvod će biti instaliran.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Sažetak
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Ovo je prikaz događaja koji će uslijediti jednom kad počne instalacijska procedura.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Ovo je prikaz događaja koji će uslijediti jednom kad počne instalacijska procedura.
+    
   
   
     ContextualProcessJob
@@ -2457,6 +2482,14 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
       Molimo odaberite proizvod s popisa. Izabrani proizvod će biti instaliran.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paketi
+    
+  
   
     PackageChooserViewStep
     
@@ -2740,17 +2773,17 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
       I&nstaliraj boot učitavač na:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Jeste li sigurni da želite stvoriti novu particijsku tablicu na %1?
     
     
-      
+      
       Can not create new partition
       Ne mogu stvoriti novu particiju
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Particijska tablica %1 već ima %2 primarne particije i nove se više ne mogu dodati. Molimo vas da uklonite jednu primarnu particiju i umjesto nje dodate proširenu particiju.
     
@@ -2768,107 +2801,82 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
       Particije
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instaliraj %1 <strong>uz postojeći</strong> operacijski sustav.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Obriši</strong> disk i instaliraj %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Zamijeni</strong> particiju s %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Ručno</strong> particioniranje.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instaliraj %1 <strong>uz postojeći</strong> operacijski sustav na disku <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Obriši</strong> disk <strong>%2</strong> (%3) i instaliraj %1.
+      
+      Current:
+      Trenutni:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Zamijeni</strong> particiju na disku <strong>%2</strong> (%3) s %1.
+      
+      After:
+      Poslije:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Ručno</strong> particioniram disk <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      EFI particija nije konfigurirana
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disk <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Trenutni:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Poslije:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      EFI particija nije konfigurirana
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      EFI particija je potrebna za pokretanje %1.<br/><br/>Da bi ste konfigurirali EFI particiju, idite natrag i odaberite ili stvorite FAT32 datotečni sustav s omogućenom <strong>%3</strong> oznakom i točkom montiranja <strong>%2</strong>.<br/><br/>Možete nastaviti bez postavljanja EFI particije, ali vaš sustav se možda neće moći pokrenuti.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      EFI particija je potrebna za pokretanje %1.<br/><br/>Particija je konfigurirana s točkom montiranja <strong>%2</strong>, ali njezina <strong>%3</strong> oznaka nije postavljena.<br/>Za postavljanje oznake, vratite se i uredite postavke particije.<br/><br/>Možete nastaviti bez postavljanja oznake, ali vaš sustav se možda neće moći pokrenuti.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Oznaka EFI particije nije postavljena
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Mogućnost korištenja GPT-a na BIOS-u
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT tablica particija je najbolja opcija za sve sustave. Ovaj instalacijski program podržava takvo postavljanje i za BIOS sustave. <br/><br/>Da biste konfigurirali GPT particijsku tablicu za BIOS sustave, (ako to već nije učinjeno) vratite se natrag i postavite particijsku tablicu na GPT, a zatim stvorite neformatiranu particiju od 8 MB s omogućenom zastavicom <strong>bios_grub</strong>. <br/><br/>Neformirana particija od 8 MB potrebna je za pokretanje %1 na BIOS sustavu s GPT-om.
     
     
-      
+      
       Boot partition not encrypted
       Boot particija nije kriptirana
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Odvojena boot particija je postavljena zajedno s kriptiranom root particijom, ali boot particija nije kriptirana.<br/><br/>Zabrinuti smo za vašu sigurnost jer su važne datoteke sustava na nekriptiranoj particiji.<br/>Možete nastaviti ako želite, ali datotečni sustav će se otključati kasnije tijekom pokretanja sustava.<br/>Da bi ste kriptirali boot particiju, vratite se natrag i napravite ju, odabirom opcije <strong>Kriptiraj</strong> u prozoru za stvaranje prarticije.
     
     
-      
+      
       has at least one disk device available.
       ima barem jedan disk dostupan.
     
     
-      
+      
       There are no partitions to install on.
       Ne postoje particije na koje bi se instalirao sustav.
     
@@ -3003,7 +3011,7 @@ Izlaz:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3329,44 +3337,16 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Za najbolje rezultate, pobrinite se da ovo računalo:
     
     
-      
+      
       System requirements
       Zahtjevi sustava
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Ovo računalo ne zadovoljava minimalne zahtjeve za instalaciju %1.<br/>Instalacija se ne može nastaviti.<a href="#details">Detalji...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Ovo računalo ne zadovoljava minimalne uvijete za instalaciju %1.<br/>Instalacija se ne može nastaviti.<a href="#details">Detalji...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.<br/>Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Računalo ne zadovoljava neke od preporučenih uvjeta za instalaciju %1.<br/>Instalacija se može nastaviti, ali neke značajke možda neće biti dostupne.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Ovaj program će vam postaviti neka pitanja i instalirati %2 na vaše računalo.
-    
-  
   
     ScanningDialog
     
@@ -3658,27 +3638,6 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Ovo je prikaz događaja koji će uslijediti jednom kad počne instalacijska procedura.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Ovo je prikaz događaja koji će uslijediti jednom kad počne instalacijska procedura.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Sažetak
-    
-  
   
     TrackingInstallJob
     
@@ -4010,7 +3969,7 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Dobrodošli
     
@@ -4018,7 +3977,7 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Dobrodošli
     
@@ -4101,21 +4060,21 @@ Liberating Software.
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Postavke jezika</h1></br>
 Jezične postavke sustava utječu na skup jezika i znakova za neke elemente korisničkog sučelja naredbenog retka. Trenutne postavke su <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Postavke regije</h1></br>
 Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <strong>%1</strong>.
     
     
-      
+      
       Back
       Natrag
     
@@ -4181,6 +4140,45 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str
             <p> Ovo su primjeri bilješki izdanja.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4236,132 +4234,132 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Odaberite svoje korisničko ime i vjerodajnice za prijavu i izvršavanje administracijskih zadataka
     
     
-      
+      
       What is your name?
       Koje je tvoje ime?
     
     
-      
+      
       Your Full Name
       Vaše puno ime
     
     
-      
+      
       What name do you want to use to log in?
       Koje ime želite koristiti za prijavu?
     
     
-      
+      
       Login Name
       Korisničko ime
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Ako će više korisnika koristiti ovo računalo, nakon instalacije možete otvoriti više računa.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Dopuštena su samo mala slova, brojevi, donja crta i crtica.
     
     
-      
+      
       root is not allowed as username.
       root nije dozvoljeno korisničko ime.
     
     
-      
+      
       What is the name of this computer?
       Koje je ime ovog računala?
     
     
-      
+      
       Computer Name
       Ime računala
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Ovo će se ime upotrebljavati ako računalo učinite vidljivim drugima na mreži.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost nije dozvoljeno ime računala.
     
     
-      
+      
       Choose a password to keep your account safe.
       Odaberite lozinku da bi račun bio siguran.
     
     
-      
+      
       Password
       Lozinka
     
     
-      
+      
       Repeat Password
       Ponovite lozinku
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Dvaput unesite istu lozinku kako biste je mogli provjeriti ima li pogrešaka u tipkanju. Dobra lozinka sadržavat će mješavinu slova, brojeva i interpunkcije, treba imati najmanje osam znakova i treba je mijenjati u redovitim intervalima.
     
     
-      
+      
       Validate passwords quality
       Provjerite kvalitetu lozinki
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Kad je ovaj okvir potvrđen, bit će napravljena provjera jakosti lozinke te nećete moći koristiti slabu lozinku.
     
     
-      
+      
       Log in automatically without asking for the password
       Automatska prijava bez traženja lozinke
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Dopuštena su samo slova, brojevi, donja crta i crtica i to kao najmanje dva znaka
     
     
-      
+      
       Reuse user password as root password
       Upotrijebite lozinku korisnika kao root lozinku
     
     
-      
+      
       Use the same password for the administrator account.
       Koristi istu lozinku za administratorski račun.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Odaberite root lozinku da biste zaštitili svoj račun.
     
     
-      
+      
       Root Password
       Root lozinka
     
     
-      
+      
       Repeat Root Password
       Ponovite root lozinku
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Dvaput unesite istu lozinku kako biste mogli provjeriti ima li pogrešaka u tipkanju.
     
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index fb59f8d120..5756073f56 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -491,12 +491,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Program telepítése
     
     
-      
+      
       %1 Installer
       %1 Telepítő
     
@@ -535,149 +535,149 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.
       Adatlap
     
     
-      
+      
       Select storage de&vice:
       Válassz tároló eszközt:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Aktuális:
     
     
-      
+      
       After:
       Utána:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuális partícionálás</strong><br/>Létrehozhat vagy átméretezhet partíciókat.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 partíció használata mint home partíció a %2 -n
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Válaszd ki a partíciót amit zsugorítani akarsz és egérrel méretezd át.</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 zsugorítva lesz %2MiB -re és új %3MiB partíció lesz létrehozva itt %4.
     
     
-      
+      
       Boot loader location:
       Rendszerbetöltő helye:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Válaszd ki a telepítésre szánt partíciót </strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nem található EFI partíció a rendszeren. Menj vissza a manuális partícionáláshoz és állíts be %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       A %1 EFI rendszer partíció lesz használva %2 indításához.
     
     
-      
+      
       EFI system partition:
       EFI rendszerpartíció:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Úgy tűnik ezen a tárolóeszközön nincs operációs rendszer. Mit szeretnél csinálni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Lemez törlése</strong><br/>Ez <font color="red">törölni</font> fogja a lemezen levő összes adatot.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Meglévő mellé telepíteni</strong><br/>A telepítő zsugorítani fogja a partíciót, hogy elférjen a %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>A partíció lecserélése</strong> a következővel: %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ezen a tárolóeszközön %1 található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ez a tárolóeszköz már tartalmaz egy operációs rendszert. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       A tárolóeszközön több operációs rendszer található. Mit szeretnél tenni?<br/>Lehetőséged lesz átnézni és megerősíteni a választásod mielőtt bármilyen változtatás történik a tárolóeszközön.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Swap nélkül
     
     
-      
+      
       Reuse Swap
       Swap újrahasználata
     
     
-      
+      
       Swap (no Hibernate)
       Swap (nincs hibernálás)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (hibernálással)
     
     
-      
+      
       Swap to file
       Swap fájlba
     
@@ -745,12 +745,12 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Billentyűzet típus beállítása %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Billentyűzet kiosztás beállítása %1/%2.
     
@@ -800,48 +800,48 @@ Minden változtatás elveszik, ha kilépsz a telepítőből.
       Hálózati telepítés. (Kikapcsolva: A csomagokat nem lehet letölteni, ellenőrizd a hálózati kapcsolatot)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez. <br/>A telepítés nem folytatható. <a href="#details">Részletek...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/>
 Telepítés nem folytatható. <a href="#details">Részletek...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Ez a számítógép nem felel meg néhány követelménynek a %1 telepítéséhez. <br/>A telepítés folytatható de előfordulhat néhány képesség nem lesz elérhető.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/>Telepítés folytatható de néhány tulajdonság valószínűleg nem lesz elérhető.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ez a program fel fog tenni néhány kérdést és %2 -t telepíti a számítógépre.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -936,15 +936,40 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>A %1 telepítése elkészült.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Összefoglalás
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Összefoglaló arról mi fog történni a telepítés során.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Ez áttekintése annak, hogy mi fog történni, ha megkezded a telepítést.
+    
   
   
     ContextualProcessJob
@@ -2441,6 +2466,14 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2724,17 +2757,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Rendszerbetöltő &telepítése ide:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Biztos vagy benne, hogy létrehozol egy új partíciós táblát itt %1 ?
     
     
-      
+      
       Can not create new partition
       Nem hozható létre új partíció
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       A(z) %1 lemezen lévő partíciós táblában már %2 elsődleges partíció van, és több nem adható hozzá. Helyette távolítson el egy elsődleges partíciót, és adjon hozzá egy kiterjesztett partíciót.
     
@@ -2752,107 +2785,82 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Partíciók
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      %1 telepítése más operációs rendszer <strong>mellé</strong> .
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Lemez törlés</strong>és %1 telepítés.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>A partíció lecserélése</strong> a következővel: %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Kézi</strong> partícionálás.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      %1 telepítése más operációs rendszer <strong>mellé</strong> a <strong>%2</strong> (%3) lemezen.
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>%2 lemez törlése</strong> (%3) és %1 telepítés.
+      
+      Current:
+      Aktuális:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>A partíció lecserélése</strong> a <strong>%2</strong> lemezen(%3) a következővel: %1.
+      
+      After:
+      Utána:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Kézi</strong> telepítés a <strong>%1</strong> (%2) lemezen.
+      
+      No EFI system partition configured
+      Nincs EFI rendszer partíció beállítva
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Lemez <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Aktuális:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Utána:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Nincs EFI rendszer partíció beállítva
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      EFI partíciós zászló nincs beállítva
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Indító partíció nincs titkosítva
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Egy külön indító partíció lett beállítva egy titkosított root partícióval, de az indító partíció nincs titkosítva.br/><br/>Biztonsági aggályok merülnek fel ilyen beállítás mellet, mert fontos fájlok nem titkosított partíción vannak tárolva. <br/>Ha szeretnéd, folytathatod így, de a fájlrendszer zárolása meg fog történni az indítás után. <br/> Az indító partíció titkosításához lépj vissza és az újra létrehozáskor válaszd a <strong>Titkosít</strong> opciót.
     
     
-      
+      
       has at least one disk device available.
       legalább egy lemez eszköz elérhető.
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2987,7 +2995,7 @@ Kimenet:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3310,45 +3318,16 @@ Kimenet:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       A legjobb eredményért győződjünk meg, hogy ez a számítógép:
     
     
-      
+      
       System requirements
       Rendszer követelmények
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez. <br/>A telepítés nem folytatható. <a href="#details">Részletek...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/>
-Telepítés nem folytatható. <a href="#details">Részletek...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Ez a számítógép nem felel meg néhány követelménynek a %1 telepítéséhez. <br/>A telepítés folytatható de előfordulhat néhány képesség nem lesz elérhető.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Ez a számítógép nem felel meg a minimum követelményeknek a %1 telepítéséhez.<br/>Telepítés folytatható de néhány tulajdonság valószínűleg nem lesz elérhető.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Ez a program fel fog tenni néhány kérdést és %2 -t telepíti a számítógépre.
-    
-  
   
     ScanningDialog
     
@@ -3640,27 +3619,6 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>%L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Összefoglaló arról mi fog történni a telepítés során.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Ez áttekintése annak, hogy mi fog történni, ha megkezded a telepítést.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Összefoglalás
-    
-  
   
     TrackingInstallJob
     
@@ -3993,7 +3951,7 @@ Calamares hiba %1.
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Üdvözlet
     
@@ -4001,7 +3959,7 @@ Calamares hiba %1.
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Üdvözlet
     
@@ -4071,19 +4029,19 @@ Calamares hiba %1.
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4148,6 +4106,45 @@ Calamares hiba %1.
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4184,132 +4181,132 @@ Calamares hiba %1.
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Mi a neved?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Milyen felhasználónévvel szeretnél bejelentkezni?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Mi legyen a számítógép neve?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Adj meg jelszót a felhasználói fiókod védelmére.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Ugyanaz a jelszó használata az adminisztrátor felhasználóhoz.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts
index 4ed8df54f1..a0e651d887 100644
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@@ -488,12 +488,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       Installer %1
     
@@ -532,149 +532,149 @@ Instalasi akan ditutup dan semua perubahan akan hilang.
       Isian
     
     
-      
+      
       Select storage de&vice:
       Pilih perangkat penyimpanan:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Saat ini:
     
     
-      
+      
       After:
       Setelah:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Pemartisian manual</strong><br/>Anda bisa membuat atau mengubah ukuran partisi.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Gunakan kembali %1 sebagai partisi home untuk %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Pilih sebuah partisi untuk diiris, kemudian seret bilah di bawah untuk mengubah ukuran</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Lokasi Boot loader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Pilih sebuah partisi untuk memasang</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Sebuah partisi sistem EFI tidak ditemukan pada sistem ini. Silakan kembali dan gunakan pemartisian manual untuk mengeset %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Partisi sistem EFI di %1 akan digunakan untuk memulai %2.
     
     
-      
+      
       EFI system partition:
       Partisi sistem EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Tampaknya media penyimpanan ini tidak mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Hapus disk</strong><br/>Aksi ini akan <font color="red">menghapus</font> semua berkas yang ada pada media penyimpanan terpilih.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instal berdampingan dengan</strong><br/>Installer akan mengiris sebuah partisi untuk memberi ruang bagi %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ganti sebuah partisi</strong><br/> Ganti partisi dengan %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Media penyimpanan ini mengandung %1. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Media penyimpanan ini telah mengandung sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Media penyimpanan ini telah mengandung beberapa sistem operasi. Apa yang hendak Anda lakukan?<br/>Anda dapat menelaah dan mengkonfirmasi pilihan Anda sebelum dilakukan perubahan pada media penyimpanan.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Perngkat penyimpanan ini sudah terdapat sistem operasi, tetapi tabel partisi <strong>%1</strong>berbeda dari yang dibutuhkan <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Perangkat penyimpanan ini terdapat partisi yang <strong>terpasang</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Perangkat penyimpanan ini merupakan bagian dari sebuah <strong>perangkat RAID yang tidak aktif</strong>.
     
     
-      
+      
       No Swap
       Tidak pakai SWAP
     
     
-      
+      
       Reuse Swap
       Gunakan kembali SWAP
     
     
-      
+      
       Swap (no Hibernate)
       Swap (tanpa hibernasi)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (dengan hibernasi)
     
     
-      
+      
       Swap to file
       Swap ke file
     
@@ -742,12 +742,12 @@ Instalasi akan ditutup dan semua perubahan akan hilang.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Setel model papan ketik ke %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Setel tata letak papan ketik ke %1/%2.
     
@@ -797,48 +797,48 @@ Instalasi akan ditutup dan semua perubahan akan hilang.
       Instalasi Jaringan. (Dinonfungsikan: Tak mampu menarik daftar paket, periksa sambungan jaringanmu)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Komputer ini tidak memenuhi syarat minimum untuk memasang %1.<br/>Instalasi tidak dapat dilanjutkan. <a href="#details">Lebih rinci...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Komputer ini tidak memenuhi beberapa syarat yang dianjurkan untuk memasang %1.
 Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Program ini akan mengajukan beberapa pertanyaan dan menyetel %2 pada komputer Anda.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Selamat datang ke program Calamares untuk %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Instalasi %1 telah lengkap.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Ikhtisar
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Berikut adalah tinjauan mengenai yang akan terjadi setelah Anda memulai prosedur instalasi.
+    
   
   
     ContextualProcessJob
@@ -2429,6 +2454,14 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2712,17 +2745,17 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.I&nstal boot loader di:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Apakah Anda yakin ingin membuat tabel partisi baru pada %1?
     
     
-      
+      
       Can not create new partition
       Tidak bisa menciptakan partisi baru.
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Partisi tabel pada %1 sudah memiliki %2 partisi primer, dan tidak ada lagi yang bisa ditambahkan. Silakan hapus salah satu partisi primer dan tambahkan sebuah partisi extended, sebagai gantinya.
     
@@ -2740,107 +2773,82 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Partisi
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instal %1 <strong>berdampingan</strong> dengan sistem operasi lain.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Hapus</strong> diska dan instal %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Ganti</strong> partisi dengan %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Partisi <strong>manual</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instal %1 <strong>berdampingan</strong> dengan sistem operasi lain di disk <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Hapus</strong> diska <strong>%2</strong> (%3) dan instal %1.
+      
+      Current:
+      Saat ini:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Ganti</strong> partisi pada diska <strong>%2</strong> (%3) dengan %1.
+      
+      After:
+      Sesudah:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Partisi Manual</strong> pada diska <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Tiada partisi sistem EFI terkonfigurasi
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disk <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Saat ini:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Sesudah:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Tiada partisi sistem EFI terkonfigurasi
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      Bendera partisi sistem EFI tidak disetel
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partisi boot tidak dienkripsi
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Sebuah partisi tersendiri telah terset bersama dengan sebuah partisi root terenkripsi, tapi partisi boot tidak terenkripsi.<br/><br/>Ada kekhawatiran keamanan dengan jenis setup ini, karena file sistem penting tetap pada partisi tak terenkripsi.<br/>Kamu bisa melanjutkan jika kamu menghendaki, tapi filesystem unlocking akan terjadi nanti selama memulai sistem.<br/>Untuk mengenkripsi partisi boot, pergi mundur dan menciptakannya ulang, memilih <strong>Encrypt</strong> di jendela penciptaan partisi.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2975,7 +2983,7 @@ Keluaran:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3298,46 +3306,16 @@ Keluaran:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Untuk hasil terbaik, mohon pastikan bahwa komputer ini:
     
     
-      
+      
       System requirements
       Kebutuhan sistem
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Komputer ini tidak memenuhi syarat minimum untuk memasang %1.
-Installer tidak dapat dilanjutkan. <a href="
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Komputer ini tidak memenuhi beberapa syarat yang dianjurkan untuk memasang %1.
-Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Program ini akan mengajukan beberapa pertanyaan dan menyetel %2 pada komputer Anda.
-    
-  
   
     ScanningDialog
     
@@ -3629,27 +3607,6 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.%L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Berikut adalah tinjauan mengenai yang akan terjadi setelah Anda memulai prosedur instalasi.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Ikhtisar
-    
-  
   
     TrackingInstallJob
     
@@ -3981,7 +3938,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Selamat Datang
     
@@ -3989,7 +3946,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     WelcomeViewStep
     
-      
+      
       Welcome
       Selamat Datang
     
@@ -4070,19 +4027,19 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4147,6 +4104,45 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4183,132 +4179,132 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Siapa nama Anda?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Nama apa yang ingin Anda gunakan untuk log in?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Apakah nama dari komputer ini?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Pilih sebuah kata sandi untuk menjaga keamanan akun Anda.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Gunakan sandi yang sama untuk akun administrator.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_id_ID.ts b/lang/calamares_id_ID.ts
index 74887f1ff0..3897762722 100644
--- a/lang/calamares_id_ID.ts
+++ b/lang/calamares_id_ID.ts
@@ -487,12 +487,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -531,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -741,12 +741,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -796,47 +796,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -931,15 +931,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2427,6 +2452,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2710,17 +2743,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2738,107 +2771,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,7 +2978,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3293,44 +3301,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3622,27 +3602,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3974,7 +3933,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3982,7 +3941,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4052,19 +4011,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4129,6 +4088,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4165,132 +4163,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts
index 9685fcb6ee..7a66ab148e 100644
--- a/lang/calamares_ie.ts
+++ b/lang/calamares_ie.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Configiration de %1
     
     
-      
+      
       %1 Installer
       Installator de %1
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       Redimensionar un gruppe de tomes
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Pos:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Localisation del bootloader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       Partition de sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Sin swap
     
     
-      
+      
       Reuse Swap
       Reusar un swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sin hivernation)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (con hivernation)
     
     
-      
+      
       Swap to file
       Swap in un file
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Benevenit al configurator Calamares por %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Benevenit al configurator de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Benevenit al installator Calamares por %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Benevenit al installator de %1</h1>
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       Li installation de %1 es completat.
     
     
-      
+      
       Package Selection
       Selection de paccages
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Resume
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paccages
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       I&nstallar li bootloader sur:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       Partitiones
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
+      
+      Current:
+      Actual:
     
     
-      
-      <strong>Manual</strong> partitioning.
-      
+      
+      After:
+      Pos:
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      
+      
+      No EFI system partition configured
+      Null partition del sistema EFI es configurat
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      Current:
-      Actual:
-    
-    
-      
-      After:
-      Pos:
-    
-    
-      
-      No EFI system partition configured
-      Null partition del sistema EFI es configurat
-    
-    
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       Ne existe disponibil partitiones por installation.
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Resume
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Benevenit
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Benevenit
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       Retro
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts
index fabd28221c..f6a98f94a9 100644
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
@@ -490,12 +490,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 uppsetningarforrit
     
@@ -534,149 +534,149 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Eyðublað
     
     
-      
+      
       Select storage de&vice:
       Veldu geymslu tæ&ki:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Núverandi:
     
     
-      
+      
       After:
       Eftir:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Handvirk disksneiðing</strong><br/>Þú getur búið til eða breytt stærð disksneiða sjálft.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Endurnota %1 sem heimasvæðis disksneið fyrir %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Veldu disksneið til að minnka, dragðu síðan botnstikuna til að breyta stærðinni</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Staðsetning ræsistjóra
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Veldu disksneið til að setja upp á </strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       EFI kerfisdisksneið er hvergi að finna á þessu kerfi. Farðu til baka og notaðu handvirka skiptingu til að setja upp %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI kerfisdisksneið á %1 mun verða notuð til að ræsa %2.
     
     
-      
+      
       EFI system partition:
       EFI kerfisdisksneið:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Eyða disk</strong><br/>Þetta mun <font color="red">eyða</font> öllum gögnum á þessu valdna geymslu tæki.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Setja upp samhliða</strong><br/>Uppsetningarforritið mun minnka disksneið til að búa til pláss fyrir %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Skipta út disksneið</strong><br/>Skiptir disksneið út með %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Þetta geymslu tæki hefur %1 á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Þetta geymslu tæki hefur stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Þetta geymslu tæki hefur mörg stýrikerfi á sér. Hvað viltu gera?<br/>Þú verður að vera fær um að yfirfara og staðfesta val þitt áður en breytingar eru gerðar til geymslu tæki.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -744,12 +744,12 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -799,47 +799,47 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur ekki haldið áfram. <a href="#details">Upplýsingar...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur haldið áfram, en sumir eiginleikar gætu verið óvirk.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Þetta forrit mun spyrja þig nokkurra spurninga og setja upp %2 á tölvunni þinni.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -934,15 +934,40 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Uppsetningu á %1 er lokið.
     
     
-      
+      
       Package Selection
       Valdir pakkar
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Yfirlit
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Þetta er yfirlit yfir það sem mun gerast þegar þú byrjar að setja upp aðferð.
+    
   
   
     ContextualProcessJob
@@ -2439,6 +2464,14 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Pakkar
+    
+  
   
     PackageChooserViewStep
     
@@ -2722,17 +2755,17 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Ertu viss um að þú viljir búa til nýja disksneið á %1?
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2750,107 +2783,82 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Disksneiðar
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Setja upp %1 <strong>ásamt</strong> ásamt öðru stýrikerfi.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Eyða</strong> disk og setja upp %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Skipta út</strong> disksneið með %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Handvirk</strong> disksneiðaskipting.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Uppsetning %1 <strong>með</strong> öðru stýrikerfi á disk <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Eyða</strong> disk <strong>%2</strong> (%3) og setja upp %1.
+      
+      Current:
+      Núverandi:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Skipta út</strong> disksneið á diski <strong>%2</strong> (%3) með %1.
+      
+      After:
+      Eftir:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Handvirk</strong> disksneiðaskipting á diski <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Ekkert EFI kerfisdisksneið stillt
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Diskur <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Núverandi:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Eftir:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Ekkert EFI kerfisdisksneið stillt
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2982,7 +2990,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3305,44 +3313,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Fyrir bestu niðurstöður, skaltu tryggja að þessi tölva:
     
     
-      
+      
       System requirements
       Kerfiskröfur
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur ekki haldið áfram. <a href="#details">Upplýsingar...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Þessi tölva uppfyllir ekki lágmarkskröfur um uppsetningu %1.<br/>Uppsetningin getur haldið áfram, en sumir eiginleikar gætu verið óvirk.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Þetta forrit mun spyrja þig nokkurra spurninga og setja upp %2 á tölvunni þinni.
-    
-  
   
     ScanningDialog
     
@@ -3634,27 +3614,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Þetta er yfirlit yfir það sem mun gerast þegar þú byrjar að setja upp aðferð.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Yfirlit
-    
-  
   
     TrackingInstallJob
     
@@ -3986,7 +3945,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Velkomin(n)
     
@@ -3994,7 +3953,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Velkomin(n)
     
@@ -4064,19 +4023,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4141,6 +4100,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4177,132 +4175,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Hvað heitir þú?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Hvaða nafn vilt þú vilt nota til að skrá þig inn?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Hvað er nafnið á þessari tölvu?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Veldu lykilorð til að halda reikningnum þínum öruggum.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Nota sama lykilorð fyrir kerfisstjóra reikning.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts
index c0ec8a7dc1..f1768c33dc 100644
--- a/lang/calamares_it_IT.ts
+++ b/lang/calamares_it_IT.ts
@@ -490,12 +490,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Programma d'installazione
     
     
-      
+      
       %1 Installer
       %1 Programma di installazione
     
@@ -534,149 +534,149 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Modulo
     
     
-      
+      
       Select storage de&vice:
       Selezionare un dispositivo di me&moria:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Corrente:
     
     
-      
+      
       After:
       Dopo:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Partizionamento manuale</strong><br/>Si possono creare o ridimensionare le partizioni manualmente.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Riutilizzare %1 come partizione home per &2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selezionare una partizione da ridurre, trascina la barra inferiore per ridimensionare</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 sarà ridotta a %2MiB ed una nuova partizione di %3MiB sarà creata per %4
     
     
-      
+      
       Boot loader location:
       Posizionamento del boot loader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selezionare la partizione sulla quale si vuole installare</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Impossibile trovare una partizione EFI di sistema. Si prega di tornare indietro ed effettuare un partizionamento manuale per configurare %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       La partizione EFI di sistema su %1 sarà usata per avviare %2.
     
     
-      
+      
       EFI system partition:
       Partizione EFI di sistema:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Questo dispositivo di memoria non sembra contenere alcun sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Cancellare disco</strong><br/>Questo <font color="red">cancellerà</font> tutti i dati attualmente presenti sul dispositivo di memoria.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installare a fianco</strong><br/>Il programma di installazione ridurrà una partizione per dare spazio a %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Sostituire una partizione</strong><br/>Sostituisce una partizione con %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Questo dispositivo di memoria ha %1. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Questo dispositivo di memoria contenere già un sistema operativo. Come si vuole procedere?<br/>Si potranno comunque rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Questo dispositivo di memoria contenere diversi sistemi operativi. Come si vuole procedere?<br/>Comunque si potranno rivedere e confermare le scelte prima di apportare i cambiamenti al dispositivo.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       No Swap
     
     
-      
+      
       Reuse Swap
       Riutilizza Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (senza ibernazione)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (con ibernazione)
     
     
-      
+      
       Swap to file
       Swap su file
     
@@ -744,12 +744,12 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Impostare il modello di tastiera a %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Impostare il layout della tastiera a %1/%2.
     
@@ -799,47 +799,47 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Installazione di rete. (Disabilitata: impossibile recuperare le liste dei pacchetti, controllare la connessione di rete)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Questo computer non soddisfa i requisiti minimi per la configurazione di %1.<br/>La configurazione non può continuare. <a href="#details">Dettagli...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Questo computer non soddisfa i requisiti minimi per installare %1. <br/>L'installazione non può continuare. <a href="#details">Dettagli...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Questo computer non soddisfa alcuni requisiti raccomandati per la configurazione di %1.<br/>La configurazione può continuare ma alcune funzionalità potrebbero essere disabilitate.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Questo computer non soddisfa alcuni requisiti consigliati per l'installazione di %1.<br/>L'installazione può continuare ma alcune funzionalità potrebbero non essere disponibili.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Questo programma chiederà alcune informazioni e configurerà %2 sul computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       Benvenuto nel programma di installazione Calamares di %1
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       Benvenuto nell'installazione di %1
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       Benvenuto nel programma di installazione Calamares di %1
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       Benvenuto nel programma di installazione di %1
     
@@ -934,15 +934,40 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       L'installazione di %1 è completata.
     
     
-      
+      
       Package Selection
       Selezione del Pacchetto
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Si prega di scegliere un prodotto dalla lista. Il prodotto selezionato verrà installato.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Riepilogo
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Questa è una panoramica di quello che succederà una volta avviata la procedura di configurazione.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Una panoramica delle modifiche che saranno effettuate una volta avviata la procedura di installazione.
+    
   
   
     ContextualProcessJob
@@ -2439,6 +2464,14 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Si prega di scegliere un prodotto dalla lista. Il prodotto selezionato verrà installato.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Pacchetti
+    
+  
   
     PackageChooserViewStep
     
@@ -2722,17 +2755,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       I&nstalla boot loader su:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Si è sicuri di voler creare una nuova tabella delle partizioni su %1?
     
     
-      
+      
       Can not create new partition
       Impossibile creare nuova partizione
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       La tabella delle partizioni su %1 contiene già %2 partizioni primarie, non se ne possono aggiungere altre. Rimuovere una partizione primaria e aggiungere una partizione estesa invece.
     
@@ -2750,107 +2783,82 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Partizioni
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Installare %1 <strong>a fianco</strong> di un altro sistema operativo.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Cancellare</strong> il disco e installare %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Sostituire</strong> una partizione con %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Partizionamento <strong>manuale</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Installare %1 <strong>a fianco</strong> di un altro sistema operativo sul disco<strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Cancellare</strong> il disco <strong>%2</strong> (%3) e installa %1.
+      
+      Current:
+      Corrente:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Sostituire</strong> una partizione sul disco <strong>%2</strong> (%3) con %1.
+      
+      After:
+      Dopo:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Partizionamento <strong>manuale</strong> sul disco <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Nessuna partizione EFI di sistema è configurata
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disco <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Corrente:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Dopo:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Nessuna partizione EFI di sistema è configurata
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Una partizione EFI è necessaria per avviare %1.<br/><br/> Per configurare una partizione EFI, tornare indietro e selezionare o creare un filesystem FAT32 con il parametro<strong>%3</strong>abilitato e punto di montaggio <strong>%2</strong>. <br/><br/>Si può continuare senza impostare una partizione EFI ma il sistema potrebbe non avviarsi correttamente.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Una partizione EFI è necessaria per avviare %1.<br/><br/> Una partizione è stata configurata con punto di montaggio <strong>%2</strong> ma il suo parametro <strong>%3</strong> non è impostato.<br/>Per impostare il flag, tornare indietro e modificare la partizione.<br/><br/>Si può continuare senza impostare il parametro ma il sistema potrebbe non avviarsi correttamente.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Il flag della partizione EFI di sistema non è impostato.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Opzione per usare GPT su BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Una tabella partizioni GPT è la migliore opzione per tutti i sistemi. Comunque il programma d'installazione supporta anche la tabella di tipo BIOS. <br/><br/>Per configurare una tabella partizioni GPT su BIOS (se non già configurata) tornare indietro e impostare la tabella partizioni a GPT e creare una partizione non formattata di 8 MB con opzione <strong>bios_grub</strong> abilitata.<br/><br/>Una partizione non formattata di 8 MB è necessaria per avviare %1 su un sistema BIOS con GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partizione di avvio non criptata
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       E' stata configurata una partizione di avvio non criptata assieme ad una partizione root criptata. <br/><br/>Ci sono problemi di sicurezza con questo tipo di configurazione perchè dei file di sistema importanti sono tenuti su una partizione non criptata.<br/>Si può continuare se lo si desidera ma dopo ci sarà lo sblocco del file system, durante l'avvio del sistema.<br/>Per criptare la partizione di avvio, tornare indietro e ricrearla, selezionando <strong>Criptare</strong> nella finestra di creazione della partizione.
     
     
-      
+      
       has at least one disk device available.
       ha almeno un'unità disco disponibile.
     
     
-      
+      
       There are no partitions to install on.
       Non ci sono partizioni su cui installare.
     
@@ -2985,7 +2993,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3308,44 +3316,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Per ottenere prestazioni ottimali, assicurarsi che questo computer:
     
     
-      
+      
       System requirements
       Requisiti di sistema
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Questo computer non soddisfa i requisiti minimi per l'installazione di %1.<br/>L'installazione non può continuare. <a href="#details">Dettagli...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Questo computer non soddisfa i requisiti minimi per installare %1. <br/>L'installazione non può proseguire. <a href="#details">Dettagli...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Questo computer non soddisfa alcuni requisiti raccomandati per l'installazione di %1.<br/>L'installazione può continuare, ma alcune funzionalità potrebbero essere disabilitate.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Questo computer non soddisfa alcuni requisiti consigliati per l'installazione di %1. <br/>L'installazione può proseguire ma alcune funzionalità potrebbero non essere disponibili.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Questo programma chiederà alcune informazioni e configurerà %2 sul computer.
-    
-  
   
     ScanningDialog
     
@@ -3637,27 +3617,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Questa è una panoramica di quello che succederà una volta avviata la procedura di configurazione.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Una panoramica delle modifiche che saranno effettuate una volta avviata la procedura di installazione.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Riepilogo
-    
-  
   
     TrackingInstallJob
     
@@ -3989,7 +3948,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Benvenuti
     
@@ -3997,7 +3956,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Benvenuti
     
@@ -4067,19 +4026,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       Indietro
     
@@ -4145,6 +4104,45 @@ Output:
             <p>Questo è un esempio di note di rilascio.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4201,132 +4199,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Qual è il tuo nome?
     
     
-      
+      
       Your Full Name
       Nome Completo
     
     
-      
+      
       What name do you want to use to log in?
       Quale nome usare per l'autenticazione?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Solo lettere minuscole, numeri, trattini e trattini bassi sono permessi.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Qual è il nome di questo computer?
     
     
-      
+      
       Computer Name
       Nome Computer
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Scegliere una password per rendere sicuro il tuo account.
     
     
-      
+      
       Password
       Password
     
     
-      
+      
       Repeat Password
       Ripetere Password
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quando questa casella è selezionata, la robustezza della password viene verificata e non sarà possibile utilizzare password deboli.
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Usare la stessa password per l'account amministratore.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index 741d07e21d..aa1dbb733a 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -493,12 +493,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 セットアッププログラム
     
     
-      
+      
       %1 Installer
       %1 インストーラー
     
@@ -537,149 +537,149 @@ The installer will quit and all changes will be lost.
       フォーム
     
     
-      
+      
       Select storage de&vice:
       ストレージデバイスを選択 (&V):
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       現在:
     
     
-      
+      
       After:
       後:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>手動パーティション</strong><br/>パーティションを自分で作成またはサイズ変更することができます。
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %1 を %2 のホームパーティションとして再利用する
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>縮小するパーティションを選択し、下のバーをドラッグしてサイズを変更して下さい</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 は %2MiB に縮小され、%4 に新しい %3MiB のパーティションが作成されます。
     
     
-      
+      
       Boot loader location:
       ブートローダーの場所:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>インストールするパーティションの選択</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       システムにEFIシステムパーティションが存在しません。%1 のセットアップのため、元に戻り、手動パーティショニングを使用してください。
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 の EFI システム パーティションは、%2 の起動に使用されます。
     
     
-      
+      
       EFI system partition:
       EFI システムパーティション:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       このストレージデバイスにはオペレーティングシステムが存在しないようです。何を行いますか？<br/>ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>ディスクの消去</strong><br/>選択したストレージデバイス上のデータがすべて <font color="red">削除</font>されます。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>共存してインストール</strong><br/>インストーラは %1 用の空きスペースを確保するため、パーティションを縮小します。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>パーティションの置換</strong><br/>パーティションを %1 に置き換えます。
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       このストレージデバイスには %1  が存在します。何を行いますか？<br/>ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       このストレージデバイスにはすでにオペレーティングシステムが存在します。何を行いますか？<br/>ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       このストレージデバイスには複数のオペレーティングシステムが存在します。何を行いますか？<br />ストレージデバイスに対する変更を行う前に、変更点をレビューし、確認することができます。
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       このストレージデバイスにはすでにオペレーティングシステムがインストールされていますが、パーティションテーブル <strong>%1</strong> は必要な <strong>%2</strong> とは異なります。<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       このストレージデバイスにはパーティションの1つが<strong>マウントされています</strong>。
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       このストレージデバイスは<strong>非アクティブなRAID</strong>デバイスの一部です。
     
     
-      
+      
       No Swap
       スワップを使用しない
     
     
-      
+      
       Reuse Swap
       スワップを再利用
     
     
-      
+      
       Swap (no Hibernate)
       スワップ(ハイバーネートなし)
     
     
-      
+      
       Swap (with Hibernate)
       スワップ(ハイバーネート)
     
     
-      
+      
       Swap to file
       ファイルにスワップ
     
@@ -747,12 +747,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       キーボードのモデルを %1 に設定する。<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       キーボードのレイアウトを %1/%2 に設定する。
     
@@ -802,47 +802,47 @@ The installer will quit and all changes will be lost.
       ネットワークインストール。(無効: パッケージリストを取得できません。ネットワーク接続を確認してください。)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       このコンピュータは %1 をセットアップするための最低要件を満たしていません。<br/>セットアップは続行できません。 <a href="#details">詳細...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       このコンピュータは %1 をインストールするための最低要件を満たしていません。<br/>インストールは続行できません。<a href="#details">詳細...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       このコンピュータは、 %1 をセットアップするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       このコンピュータは、 %1 をインストールするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       このプログラムはあなたにいくつか質問をして、コンピュータに %2 を設定します。
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 のCalamaresセットアッププログラムへようこそ</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 のセットアップへようこそ</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 のCalamaresインストーラーへようこそ</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 インストーラーへようこそ</h1>
     
@@ -938,15 +938,40 @@ The installer will quit and all changes will be lost.
       %1 のインストールは完了です。
     
     
-      
+      
       Package Selection
       パッケージの選択
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       リストから製品を選んでください。選択した製品がインストールされます。
     
+    
+      
+      Install option: <strong>%1</strong>
+      インストールオプション: <strong>%1</strong>
+    
+    
+      
+      None
+      なし
+    
+    
+      
+      Summary
+      要約
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      これはセットアップを開始した時に起こることの概要です。
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      これはインストールを開始した時に起こることの概要です。
+    
   
   
     ContextualProcessJob
@@ -2437,6 +2462,14 @@ The installer will quit and all changes will be lost.
       リストから製品を選んでください。選択した製品がインストールされます。
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      パッケージ
+    
+  
   
     PackageChooserViewStep
     
@@ -2720,17 +2753,17 @@ The installer will quit and all changes will be lost.
       ブートローダーインストール先:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       %1 に新しいパーティションテーブルを作成します。よろしいですか？
     
     
-      
+      
       Can not create new partition
       新しいパーティションを作成できません
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       %1 のパーティションテーブルにはすでに %2 個のプライマリパーティションがあり、これ以上追加できません。代わりに1つのプライマリパーティションを削除し、拡張パーティションを追加してください。
     
@@ -2748,107 +2781,82 @@ The installer will quit and all changes will be lost.
       パーティション
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      他のオペレーティングシステムに<strong>共存して</strong> %1 をインストール。
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      ディスクを<strong>消去</strong>し %1 をインストール。
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      パーティションを %1 に<strong>置き換える</strong>。
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>手動</strong>パーティショニング。
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      ディスク <strong>%2</strong> (%3) 上ののオペレーティングシステムと<strong>共存</strong>して %1 をインストール。
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-       ディスク <strong>%2</strong> (%3) を<strong>消去して</strong> %1 をインストール。
+      
+      Current:
+      現在:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      ディスク <strong>%2</strong> (%3) のパーティションを %1 に<strong>置き換える</strong>。
+      
+      After:
+      変更後:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      ディスク <strong>%1</strong> (%2) に <strong>手動で</strong>パーティショニングする。
+      
+      No EFI system partition configured
+      EFI システムパーティションが設定されていません
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      ディスク <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      EFI システムパーティションが正しく設定されていません
     
     
-      
-      Current:
-      現在:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      %1 を起動するには EFI システムパーティションが必要です。<br/><br/>EFI システムパーティションを設定するには、戻って適切なファイルシステムを選択または作成してください。
     
     
-      
-      After:
-      変更後:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      ファイルシステムは <strong>%1</strong> にマウントする必要があります。
     
     
-      
-      No EFI system partition configured
-      EFI システムパーティションが設定されていません
+      
+      The filesystem must have type FAT32.
+      ファイルシステムのタイプは FAT32 にする必要があります。
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      %1 を起動するには EFI システムパーティションが必要です。<br/> <br/>EFI システムパーティションを設定するには、戻って、<strong>%3</strong> フラグを有効にした FAT32 ファイルシステムを選択または作成し、マウントポイントを <strong>%2</strong> にします。<br/><br/>EFI システムパーティションを設定せずに続行すると、システムが起動しない場合があります。 
+      
+      The filesystem must be at least %1 MiB in size.
+      ファイルシステムのサイズは最低でも %1 MiB である必要があります。
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      %1 を起動するには EFI システムパーティションが必要です。<br/><br/>パーティションはマウントポイント <strong>%2</strong> に設定されましたが、<strong>%3</strong> フラグが設定されていません。フラグを設定するには、戻ってパーティションを編集してください。フラグを設定せずに続行すると、システムが起動しない場合があります。
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      ファイルシステムにはフラグ <strong>%1</strong> を設定する必要があります。 
     
     
-      
-      EFI system partition flag not set
-      EFI システムパーティションのフラグが設定されていません
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      EFI システムパーティションを設定しなくても続行できますが、システムが起動しない場合があります。
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS で GPT を使用するためのオプション
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT パーティションテーブルは、すべてのシステムに最適なオプションです。このインストーラーは、BIOS システムのこのようなセットアップもサポートしています。<br/><br/>BIOS で GPT パーティションテーブルを設定するには（まだ行っていない場合）、前に戻ってパーティションテーブルを GPT に設定し、<strong>bios_grub</strong> フラグを有効にして 8 MB の未フォーマットのパーティションを作成します。GPT に設定した BIOS システムで %1 を起動するには、未フォーマットの 8 MB パーティションが必要です。
     
     
-      
+      
       Boot partition not encrypted
       ブートパーティションが暗号化されていません
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されます。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong> (暗号化) を選択してください。
     
     
-      
+      
       has at least one disk device available.
       は少なくとも1つのディスクデバイスを利用可能です。
     
     
-      
+      
       There are no partitions to install on.
       インストールするパーティションがありません。
     
@@ -2983,7 +2991,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3309,44 +3317,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       良好な結果を得るために、このコンピュータについて以下の項目を確認してください：
     
     
-      
+      
       System requirements
       システム要件
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      このコンピュータは %1 をセットアップするための最低要件を満たしていません。<br/>セットアップは続行できません。 <a href="#details">詳細...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      このコンピュータは %1 をインストールするための最低要件を満たしていません。<br/>インストールは続行できません。<a href="#details">詳細...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      このコンピュータは、 %1 をセットアップするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      このコンピュータは、 %1 をインストールするための推奨条件をいくつか満たしていません。<br/>インストールは続行しますが、一部の機能が無効になる場合があります。
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      このプログラムはあなたにいくつか質問をして、コンピュータに %2 を設定します。
-    
-  
   
     ScanningDialog
     
@@ -3638,27 +3618,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      これはセットアップを開始した時に起こることの概要です。
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      これはインストールを開始した時に起こることの概要です。
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      要約
-    
-  
   
     TrackingInstallJob
     
@@ -3990,7 +3949,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       ようこそ
     
@@ -3998,7 +3957,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       ようこそ
     
@@ -4081,21 +4040,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>言語</h1> </br>
 システムロケールの設定は、一部のコマンドラインユーザーインターフェイスの言語と文字セットに影響します。現在の設定は <strong>%1</strong> です。
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>ロケール</h1> </br>
                     システムのロケール設定は、数値と日付の形式に影響を及ぼします。現在の設定は <strong>%1</strong> です。
     
     
-      
+      
       Back
       戻る
     
@@ -4161,6 +4120,46 @@ Output:
             <p>これらはリリースノートの例です。</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      LibreOffice は強力かつフリーなオフィススイートで、世界中の何百万人もの人々に使用されています。これには市場で最も用途が広いフリーかつオープンソースのアプリケーションが含まれています。<br/>
+                    デフォルトオプション。
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      オフィススイートをインストールしたくない場合は、「オフィススイートなし」を選択するだけです。必要になれば、後からいつでも1つ（もしくはそれ以上を）システムに追加できます。
+    
+    
+      
+      No Office Suite
+      オフィススイートなし
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      最小限のデスクトップインストールを作成し、余分なアプリケーションをすべて削除して、システムに追加するものを後で決定します。このようなインストールで含まれないものの例は、オフィススイート、メディアプレーヤー、画像ビューア、印刷サポートです。デスクトップはファイルブラウザー、パッケージマネージャー、テキストエディター、シンプルなウェブブラウザーになります。
+    
+    
+      
+      Minimal Install
+      最小インストール
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      インストールのオプションを選択するか、デフォルト（LibreOffice が含まれます）を使用してください。
+    
+  
   
     release_notes
     
@@ -4217,132 +4216,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       ログインして管理者タスクを実行するには、ユーザー名と資格情報を選択してください
     
     
-      
+      
       What is your name?
       あなたの名前は何ですか？
     
     
-      
+      
       Your Full Name
       あなたのフルネーム
     
     
-      
+      
       What name do you want to use to log in?
       ログイン時に使用する名前は何ですか？
     
     
-      
+      
       Login Name
       ログイン名
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       複数のユーザーがこのコンピュータを使用する場合は、インストール後に複数のアカウントを作成できます。
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       使用できるのはアルファベットの小文字と数字と _ と -  だけです。
     
     
-      
+      
       root is not allowed as username.
       root はユーザー名として許可されていません。
     
     
-      
+      
       What is the name of this computer?
       このコンピュータの名前は何ですか？
     
     
-      
+      
       Computer Name
       コンピュータの名前
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       この名前は、コンピューターをネットワーク上の他のユーザーに表示する場合に使用されます。
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost はユーザー名として許可されていません。
     
     
-      
+      
       Choose a password to keep your account safe.
       アカウントを安全に使うため、パスワードを選択してください
     
     
-      
+      
       Password
       パスワード
     
     
-      
+      
       Repeat Password
       パスワードを再度入力
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       同じパスワードを2回入力して、入力エラーをチェックできるようにします。適切なパスワードは文字、数字、句読点が混在する8文字以上のもので、定期的に変更する必要があります。
     
     
-      
+      
       Validate passwords quality
       パスワードの品質を検証する
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       このボックスをオンにするとパスワードの強度チェックが行われ、弱いパスワードを使用できなくなります。
     
     
-      
+      
       Log in automatically without asking for the password
       パスワードを要求せずに自動的にログインする
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       使用できるのはアルファベットと数字と _ と - で、2文字以上必要です。
     
     
-      
+      
       Reuse user password as root password
       rootパスワードとしてユーザーパスワードを再利用する
     
     
-      
+      
       Use the same password for the administrator account.
       管理者アカウントと同じパスワードを使用する。
     
     
-      
+      
       Choose a root password to keep your account safe.
       アカウントを安全に保つために、rootパスワードを選択してください。
     
     
-      
+      
       Root Password
       rootパスワード
     
     
-      
+      
       Repeat Root Password
       rootパスワードを再入力
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       同じパスワードを2回入力して、入力エラーをチェックできるようにします。
     
diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts
index 957573b585..fec656ab9a 100644
--- a/lang/calamares_kk.ts
+++ b/lang/calamares_kk.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       EFI жүйелік бөлімі:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Қош келдіңіз
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Қош келдіңіз
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts
index 261b97b4e6..f666153afa 100644
--- a/lang/calamares_kn.ts
+++ b/lang/calamares_kn.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       ಪ್ರಸಕ್ತ:
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      
+      
+      Current:
+      ಪ್ರಸಕ್ತ:
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
-      ಪ್ರಸಕ್ತ:
-    
-    
-      
-      After:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts
index 695ccfc42c..151a230ec6 100644
--- a/lang/calamares_ko.ts
+++ b/lang/calamares_ko.ts
@@ -493,12 +493,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 설치 프로그램
     
     
-      
+      
       %1 Installer
       %1 설치 관리자
     
@@ -537,149 +537,149 @@ The installer will quit and all changes will be lost.
       형식
     
     
-      
+      
       Select storage de&vice:
       저장 장치 선택 (&v)
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       현재:
     
     
-      
+      
       After:
       이후:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>수동 파티션 작업</strong><br/>직접 파티션을 만들거나 크기를 조정할 수 있습니다.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %2의 홈 파티션으로 %1을 재사용합니다.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>축소할 파티션을 선택한 다음 하단 막대를 끌어 크기를 조정합니다.</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1이 %2MiB로 축소되고 %4에 대해 새 %3MiB 파티션이 생성됩니다.
     
     
-      
+      
       Boot loader location:
       부트 로더 위치 :
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>설치할 파티션을 선택합니다.</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       이 시스템에서는 EFI 시스템 파티션을 찾을 수 없습니다. 돌아가서 수동 파티션 작업을 사용하여 %1을 설정하세요.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1의 EFI 시스템 파티션은 %2의 시작으로 사용될 것입니다.
     
     
-      
+      
       EFI system partition:
       EFI 시스템 파티션:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       이 저장 장치에는 운영 체제가없는 것 같습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>디스크 지우기</strong><br/>그러면 선택한 저장 장치에 현재 있는 모든 데이터가 <font color="red">삭제</font>됩니다.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>함께 설치</strong><br/>설치 관리자가 파티션을 축소하여 %1 공간을 확보합니다.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>파티션 바꾸기</strong><br/>파티션을 %1로 바꿉니다.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       이 저장 장치에 %1이 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       이 저장 장치에는 이미 운영 체제가 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       이 저장 장치에는 여러 개의 운영 체제가 있습니다. 무엇을하고 싶으십니까?<br/>저장 장치를 변경하기 전에 선택 사항을 검토하고 확인할 수 있습니다.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       이 스토리지 장치에는 이미 운영 체제가 설치되어 있으나 <strong>%1</strong> 파티션 테이블이 필요로 하는 <strong>%2</strong>와 다릅니다.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       이 스토리지 장치는 하나 이상의 <strong>마운트된</strong> 파티션을 갖고 있습니다.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       이 스토리지 장치는 <strong>비활성화된 RAID</strong> 장치의 일부입니다.
     
     
-      
+      
       No Swap
       스왑 없음
     
     
-      
+      
       Reuse Swap
       스왑 재사용
     
     
-      
+      
       Swap (no Hibernate)
       스왑 (최대 절전모드 아님)
     
     
-      
+      
       Swap (with Hibernate)
       스왑 (최대 절전모드 사용)
     
     
-      
+      
       Swap to file
       파일로 스왑
     
@@ -747,12 +747,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       키보드 모델을 %1로 설정합니다.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       키보드 레이아웃을 %1/%2로 설정합니다.
     
@@ -802,47 +802,47 @@ The installer will quit and all changes will be lost.
       네트워크 설치. (불가: 패키지 목록을 가져올 수 없습니다. 네트워크 연결을 확인해주세요)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       이 컴퓨터는 %1 설치를 위한 최소 요구 사항을 충족하지 않습니다.<br/>설치를 계속할 수 없습니다.<a href="#details">세부 정보...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       이 컴퓨터는 %1 설치를 위한 최소 요구 사항을 충족하지 않습니다.<br/>설치를 계속할 수 없습니다. <a href="#details">세부 사항입니다...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       이 컴퓨터는 %1 설치를 위한 권장 요구 사항 중 일부를 충족하지 않습니다.<br/>설치를 계속할 수는 있지만 일부 기능을 사용하지 않도록 설정할 수도 있습니다.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       이 컴퓨터는 %1 설치를 위한 권장 요구 사항 중 일부를 충족하지 않습니다.<br/>설치를 계속할 수 있지만 일부 기능을 사용하지 않도록 설정할 수 있습니다.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       이 프로그램은 몇 가지 질문을 하고 컴퓨터에 %2을 설정합니다.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1> 깔라마레스 설치 프로그램 %1에 오신 것을 환영합니다</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 설치에 오신 것을 환영합니다</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>깔라마레스 설치 관리자 %1에 오신 것을 환영합니다</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 설치 관리자에 오신 것을 환영합니다</h1>
     
@@ -937,15 +937,40 @@ The installer will quit and all changes will be lost.
       %1의 설치가 완료되었습니다.
     
     
-      
+      
       Package Selection
       패키지 선택
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       목록에서 제품을 선택하십시오. 선택한 제품이 설치됩니다.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      요약
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      설치 절차를 시작하면 어떻게 되는지 간략히 설명합니다.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      설치 절차를 시작하면 어떻게 되는지 간략히 설명합니다.
+    
   
   
     ContextualProcessJob
@@ -2435,6 +2460,14 @@ The installer will quit and all changes will be lost.
       목록에서 제품을 선택하십시오. 선택한 제품이 설치됩니다.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      패키지
+    
+  
   
     PackageChooserViewStep
     
@@ -2718,17 +2751,17 @@ The installer will quit and all changes will be lost.
       부트로더 설치 위치 (&l) :
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       %1에 새 파티션 테이블을 생성하시겠습니까?
     
     
-      
+      
       Can not create new partition
       새로운 파티션을 만들 수 없습니다
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       %1의 파티션 테이블에는 이미 %2 기본 파티션이 있으므로 더 이상 추가할 수 없습니다. 대신 기본 파티션 하나를 제거하고 확장 파티션을 추가하세요.
     
@@ -2746,107 +2779,82 @@ The installer will quit and all changes will be lost.
       파티션
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      %1을 다른 운영 체제와 <strong>함께</strong> 설치합니다.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      디스크를 <strong>지우고</strong> %1을 설치합니다.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      파티션을 %1로 <strong>바꿉니다</strong>.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>수동</strong> 파티션 작업
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      디스크 <strong>%2</strong> (%3)에 다른 운영 체제와 <strong>함께</strong> %1을 설치합니다.
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      디스크 <strong>%2</strong> (%3)를 <strong>지우고</strong> %1을 설치합니다.
+      
+      Current:
+      현재:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      디스크 <strong>%2</strong> (%3)의 파티션을 %1로 <strong>바꿉니다</strong>.
+      
+      After:
+      이후:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      디스크 <strong>%1</strong> (%2) 의 <strong>수동</strong> 파티션 작업입니다.
+      
+      No EFI system partition configured
+      EFI 시스템 파티션이 설정되지 않았습니다
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      디스크 <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      현재:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      이후:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      EFI 시스템 파티션이 설정되지 않았습니다
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      %1을(를) 시작하려면 EFI 시스템 파티션이 필요합니다.<br/><br/>EFI 시스템 파티션을 구성하려면 돌아가서 <strong>%3</strong> 플래그가 활성화된 FAT32 파일 시스템을 선택하거나 만들고 <strong>%2</strong> 지점을 마운트합니다.<br/><br/>EFI 시스템 파티션을 설정하지 않고 계속할 수 있지만 시스템을 시작하지 못할 수 있습니다.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      %1을(를) 시작하려면 EFI 시스템 파티션이 필요합니다.<br/><br/>파티션이 <strong>%2</strong> 마운트 지점으로 구성되었지만 <strong>%3</strong> 플래그가 설정되지 않았습니다.<br/>플래그를 설정하려면 뒤로 돌아가서 파티션을 편집하십시오.<br/><br/>플래그를 설정하지 않고 계속할 수 있지만 시스템을 시작하지 못할 수 있습니다.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      EFI 시스템 파티션 플래그가 설정되지 않았습니다
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS에서 GPT를 사용하는 옵션
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT 파티션 테이블은 모든 시스템에 가장 적합한 옵션입니다. 이 설치 프로그램은 BIOS 시스템에 대한 이러한 설정도 지원합니다.<br/><br/>BIOS에서 GPT 파티션 테이블을 구성하려면(아직 구성되지 않은 경우) 돌아가서 파티션 테이블을 GPT로 설정한 다음, <strong>bios_grub</strong> 플래그가 사용하도록 설정된 8MB의 포맷되지 않은 파티션을 생성합니다.<br/><br/>GPT가 있는 BIOS 시스템에서 %1을 시작하려면 포맷되지 않은 8MB 파티션이 필요합니다.
     
     
-      
+      
       Boot partition not encrypted
       부트 파티션이 암호화되지 않았습니다
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       암호화된 루트 파티션과 함께 별도의 부팅 파티션이 설정되었지만 부팅 파티션은 암호화되지 않았습니다.<br/><br/>중요한 시스템 파일은 암호화되지 않은 파티션에 보관되기 때문에 이러한 설정과 관련하여 보안 문제가 있습니다.<br/>원하는 경우 계속할 수 있지만 나중에 시스템을 시작하는 동안 파일 시스템 잠금이 해제됩니다.<br/>부팅 파티션을 암호화하려면 돌아가서 다시 생성하여 파티션 생성 창에서 <strong>암호화</strong>를 선택합니다.
     
     
-      
+      
       has at least one disk device available.
       하나 이상의 디스크 장치를 사용할 수 있습니다.
     
     
-      
+      
       There are no partitions to install on.
       설치를 위한 파티션이 없습니다.
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3307,44 +3315,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       최상의 결과를 얻으려면 이 컴퓨터가 다음 사항을 충족해야 합니다.
     
     
-      
+      
       System requirements
       시스템 요구 사항
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      이 컴퓨터는 %1 설치를 위한 최소 요구 사항을 충족하지 않습니다.<br/>설치를 계속할 수 없습니다.<a href="#details">세부 정보...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      이 컴퓨터는 %1 설치를 위한 최소 요구 사항을 충족하지 않습니다.<br/>설치를 계속할 수 없습니다. <a href="#details">세부 사항입니다...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      이 컴퓨터는 %1 설치를 위한 권장 요구 사항 중 일부를 충족하지 않습니다.<br/>설치를 계속할 수는 있지만 일부 기능을 사용하지 않도록 설정할 수도 있습니다.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      이 컴퓨터는 %1 설치를 위한 권장 요구 사항 중 일부를 충족하지 않습니다.<br/>설치를 계속할 수 있지만 일부 기능을 사용하지 않도록 설정할 수 있습니다.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      이 프로그램은 몇 가지 질문을 하고 컴퓨터에 %2을 설정합니다.
-    
-  
   
     ScanningDialog
     
@@ -3636,27 +3616,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      설치 절차를 시작하면 어떻게 되는지 간략히 설명합니다.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      설치 절차를 시작하면 어떻게 되는지 간략히 설명합니다.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      요약
-    
-  
   
     TrackingInstallJob
     
@@ -3988,7 +3947,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       환영합니다
     
@@ -3996,7 +3955,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       환영합니다
     
@@ -4079,21 +4038,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>언어</h1> </br>
                     시스템 로케일 설정은 일부 명령줄 사용자 인터페이스 요소에 대한 언어 및 문자 집합에 영향을 줍니다. 현재 설정은 <strong>%1</strong>입니다.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>로케일</h1> </br>
                     시스템 로케일 설정은 숫자 및 날짜 형식에 영향을 줍니다. 현재 설정은 <strong>%1</strong>입니다.
     
     
-      
+      
       Back
       뒤로
     
@@ -4159,6 +4118,45 @@ Output:
             <p>릴리즈 노트의 예제입니다.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4215,132 +4213,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       로그인 및 관리자 작업을 수행하려면 사용자 이름과 자격 증명을 선택하세요
     
     
-      
+      
       What is your name?
       이름이 무엇인가요?
     
     
-      
+      
       Your Full Name
       전체 이름
     
     
-      
+      
       What name do you want to use to log in?
       로그인할 때 사용할 이름은 무엇인가요?
     
     
-      
+      
       Login Name
       로그인 이름
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       다수의 사용자가 이 컴퓨터를 사용하는 경우, 설치를 마친 후에 여러 계정을 만들 수 있습니다.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       소문자, 숫자, 밑줄 및 하이픈만 허용됩니다.
     
     
-      
+      
       root is not allowed as username.
       루트는 사용자 이름으로 허용되지 않습니다.
     
     
-      
+      
       What is the name of this computer?
       이 컴퓨터의 이름은 무엇인가요?
     
     
-      
+      
       Computer Name
       컴퓨터 이름
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       이 이름은 네트워크의 다른 사용자가 이 컴퓨터를 볼 수 있게 하는 경우에 사용됩니다.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost는 호스트 이름으로 허용되지 않습니다.
     
     
-      
+      
       Choose a password to keep your account safe.
       사용자 계정의 보안을 유지하기 위한 암호를 선택하세요.
     
     
-      
+      
       Password
       비밀번호
     
     
-      
+      
       Repeat Password
       비밀번호 반복
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       입력 오류를 확인할 수 있도록 동일한 암호를 두 번 입력합니다. 올바른 암호에는 문자, 숫자 및 구두점이 혼합되어 있으며 길이는 8자 이상이어야 하며 정기적으로 변경해야 합니다.
     
     
-      
+      
       Validate passwords quality
       암호 품질 검증
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       이 확인란을 선택하면 비밀번호 강도 검사가 수행되며 불충분한 비밀번호를 사용할 수 없습니다.
     
     
-      
+      
       Log in automatically without asking for the password
       암호를 묻지 않고 자동으로 로그인합니다
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       문자, 숫자, 밑줄 및 하이픈만 허용되며, 최소 2자 이상이어야 합니다.
     
     
-      
+      
       Reuse user password as root password
       사용자 암호를 루트 암호로 재사용합니다
     
     
-      
+      
       Use the same password for the administrator account.
       관리자 계정에 대해 같은 암호를 사용합니다.
     
     
-      
+      
       Choose a root password to keep your account safe.
       당신의 계정을 안전하게 보호하기 위해서 루트 암호를 선택하세요.
     
     
-      
+      
       Root Password
       루트 암호
     
     
-      
+      
       Repeat Root Password
       루트 암호 확인
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       입력 오류를 확인하기 위해서 동일한 암호를 두번 입력해주세요.
     
diff --git a/lang/calamares_ko_KR.ts b/lang/calamares_ko_KR.ts
index d82a46fa02..d18a06425a 100644
--- a/lang/calamares_ko_KR.ts
+++ b/lang/calamares_ko_KR.ts
@@ -487,12 +487,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -531,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -741,12 +741,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -796,47 +796,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -931,15 +931,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2427,6 +2452,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2710,17 +2743,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2738,107 +2771,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,7 +2978,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3293,44 +3301,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3622,27 +3602,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3974,7 +3933,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3982,7 +3941,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4052,19 +4011,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4129,6 +4088,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4165,132 +4163,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts
index 5dedf63f17..b82c6b42cb 100644
--- a/lang/calamares_lo.ts
+++ b/lang/calamares_lo.ts
@@ -487,12 +487,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -531,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -741,12 +741,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -796,47 +796,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -931,15 +931,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2427,6 +2452,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2710,17 +2743,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2738,107 +2771,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,7 +2978,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3293,44 +3301,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3622,27 +3602,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3974,7 +3933,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3982,7 +3941,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4052,19 +4011,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4129,6 +4088,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4165,132 +4163,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index 88b7ecc974..ad87dcf96c 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -499,12 +499,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 sąrankos programa
     
     
-      
+      
       %1 Installer
       %1 diegimo programa
     
@@ -543,149 +543,149 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Forma
     
     
-      
+      
       Select storage de&vice:
       Pasirinkite atminties įr&enginį:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Dabartinis:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Rankinis skaidymas</strong><br/>Galite patys kurti ar keisti skaidinių dydžius.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Pakartotinai naudoti %1 kaip namų skaidinį, skirtą %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Pasirinkite, kurį skaidinį sumažinti, o tuomet vilkite juostą, kad pakeistumėte skaidinio dydį</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 bus sumažintas iki %2MiB ir naujas %3MiB skaidinys bus sukurtas sistemai %4.
     
     
-      
+      
       Boot loader location:
       Paleidyklės vieta:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Pasirinkite kuriame skaidinyje įdiegti</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Šioje sistemoje niekur nepavyko rasti EFI skaidinio. Prašome grįžti ir naudoti rankinį skaidymą, kad nustatytumėte %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %2 paleidimui bus naudojamas EFI sistemos skaidinys, esantis ties %1.
     
     
-      
+      
       EFI system partition:
       EFI sistemos skaidinys:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Atrodo, kad šiame įrenginyje nėra operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Ištrinti diską</strong><br/>Tai <font color="red">ištrins</font> visus, pasirinktame atminties įrenginyje, esančius duomenis.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Įdiegti šalia</strong><br/>Diegimo programa sumažins skaidinį, kad atlaisvintų vietą sistemai %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Pakeisti skaidinį</strong><br/>Pakeičia skaidinį ir įrašo %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Šiame atminties įrenginyje jau yra %1. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Šiame atminties įrenginyje jau yra operacinė sistema. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Šiame atminties įrenginyje jau yra kelios operacinės sistemos. Ką norėtumėte daryti?<br/>Prieš atliekant bet kokius pakeitimus atminties įrenginyje, jūs galėsite apžvelgti ir patvirtinti savo pasirinkimus.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Šiame atminties įrenginyje jau yra operacinė sistema, bet skaidinių lentelė <strong>%1</strong> yra kitokia nei reikiama <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Vienas iš šio atminties įrenginio skaidinių yra <strong>prijungtas</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Šis atminties įrenginys yra <strong>neaktyvaus RAID</strong> įrenginio dalis.
     
     
-      
+      
       No Swap
       Be sukeitimų skaidinio
     
     
-      
+      
       Reuse Swap
       Iš naujo naudoti sukeitimų skaidinį
     
     
-      
+      
       Swap (no Hibernate)
       Sukeitimų skaidinys (be užmigdymo)
     
     
-      
+      
       Swap (with Hibernate)
       Sukeitimų skaidinys (su užmigdymu)
     
     
-      
+      
       Swap to file
       Sukeitimų failas
     
@@ -753,12 +753,12 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Nustatyti klaviatūros modelį kaip %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Nustatyti klaviatūros išdėstymą kaip %1/%2.
     
@@ -808,47 +808,47 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Tinklo diegimas. (Išjungta: Nepavyksta gauti paketų sąrašus, patikrinkite savo tinklo ryšį)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Šis kompiuteris netenkina minimalių %1 nustatymo reikalavimų.<br/>Sąranka negali būti tęsiama. <a href="#details">Išsamiau...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Šis kompiuteris netenkina minimalių %1 diegimo reikalavimų.<br/>Diegimas negali būti tęsiamas. <a href="#details">Išsamiau...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Šis kompiuteris netenkina kai kurių %1 nustatymui rekomenduojamų reikalavimų.<br/>Sąranką galima tęsti, tačiau kai kurios funkcijos gali būti išjungtos.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Šis kompiuteris netenkina kai kurių %1 diegimui rekomenduojamų reikalavimų.<br/>Diegimą galima tęsti, tačiau kai kurios funkcijos gali būti išjungtos.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Programa užduos kelis klausimus ir padės įsidiegti %2.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       </h1>Jus sveikina Calamares sąrankos programa, skirta %1 sistemai.</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Jus sveikina %1 sąranka</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Jus sveikina Calamares diegimo programa, skirta %1 sistemai</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Jus sveikina %1 diegimo programa</h1>
     
@@ -943,15 +943,40 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       %1 diegimas yra užbaigtas.
     
     
-      
+      
       Package Selection
       Paketų pasirinkimas
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Pasirinkite iš sąrašo produktą. Pasirinktas produktas bus įdiegtas.
     
+    
+      
+      Install option: <strong>%1</strong>
+      Diegimo parinktis: <strong>%1</strong>
+    
+    
+      
+      None
+      Nėra
+    
+    
+      
+      Summary
+      Suvestinė
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Tai yra apžvalga to, kas įvyks, prasidėjus sąrankos procedūrai.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Tai yra apžvalga to, kas įvyks, prasidėjus diegimo procedūrai.
+    
   
   
     ContextualProcessJob
@@ -2468,6 +2493,14 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Pasirinkite iš sąrašo produktą. Pasirinktas produktas bus įdiegtas.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paketai
+    
+  
   
     PackageChooserViewStep
     
@@ -2751,17 +2784,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Į&diegti paleidyklę skaidinyje:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Ar tikrai %1 norite sukurti naują skaidinių lentelę?
     
     
-      
+      
       Can not create new partition
       Nepavyksta sukurti naują skaidinį
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Skaidinių lentelėje ties %1 jau yra %2 pirminiai skaidiniai ir daugiau nebegali būti pridėta. Pašalinkite vieną pirminį skaidinį ir vietoj jo, pridėkite išplėstą skaidinį.
     
@@ -2779,107 +2812,82 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Skaidiniai
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Diegti %1 <strong>šalia</strong> kitos operacinės sistemos.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Ištrinti</strong> diską ir diegti %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Pakeisti</strong> skaidinį, įrašant %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Rankinis</strong> skaidymas.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Įdiegti %1 <strong>šalia</strong> kitos operacinės sistemos diske <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Ištrinti</strong> diską <strong>%2</strong> (%3) ir diegti %1.
+      
+      Current:
+      Dabartinis:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Pakeisti</strong> skaidinį diske <strong>%2</strong> (%3), įrašant %1.
+      
+      After:
+      Po:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Rankinis</strong> skaidymas diske <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Nėra sukonfigūruoto EFI sistemos skaidinio
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Diskas <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      Neteisingai sukonfigūruotas EFI sistemos skaidinys
     
     
-      
-      Current:
-      Dabartinis:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      %1 paleidimui yra reikalingas EFI sistemos skaidinys.<br/><br/>Norėdami konfigūruoti EFI sistemos skaidinį, grįžkite atgal ir pasirinkite arba sukurkite tinkamą failų sistemą.
     
     
-      
-      After:
-      Po:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      Failų sistema privalo būti prijungta ties <strong>%1</strong>.
     
     
-      
-      No EFI system partition configured
-      Nėra sukonfigūruoto EFI sistemos skaidinio
+      
+      The filesystem must have type FAT32.
+      Failų sistema privalo būti FAT32 tipo.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      EFI sistemos skaidinys yra būtinas, norint paleisti %1.<br/><br/>Norėdami sukonfigūruoti EFI sistemos skaidinį, grįžkite atgal ir pasirinkite arba sukurkite FAT32 failų sistemą su įjungta <strong>%3</strong> vėliavėle ir <strong>%2</strong> prijungimo tašku.<br/><br/>Jūs galite tęsti ir nenustatę EFI sistemos skaidinio, tačiau tokiu atveju, gali nepavykti paleisti jūsų sistemos.
+      
+      The filesystem must be at least %1 MiB in size.
+      Failų sistema privalo būti bent %1 MiB dydžio.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      EFI sistemos skaidinys yra būtinas, norint paleisti %1.<br/><br/>Skaidinys buvo sukonfigūruotas su prijungimo tašku <strong>%2</strong>, tačiau jo <strong>%3</strong> vėliavėlė yra nenustatyta.<br/>Norėdami nustatyti vėliavėlę, grįžkite atgal ir taisykite skaidinį.<br/><br/>Jūs galite tęsti ir nenustatę vėliavėlės, tačiau tokiu atveju, gali nepavykti paleisti jūsų sistemos.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      Failų sistema privalo turėti nustatytą <strong>%1</strong> vėliavėlę.
     
     
-      
-      EFI system partition flag not set
-      Nenustatyta EFI sistemos skaidinio vėliavėlė
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      Galite tęsti nenustatę EFI sistemos skaidinio, bet jūsų sistema gali nepasileisti.
     
     
-      
+      
       Option to use GPT on BIOS
       Parinktis naudoti GPT per BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT skaidinių lentelė yra geriausias variantas visoms sistemoms. Ši diegimo programa palaiko tokią sąranką taip pat ir BIOS sistemoms.<br/><br/>Norėdami konfigūruoti GPT skaidinių lentelę BIOS sistemoje, (jei dar nesate to padarę) grįžkite atgal ir nustatykite skaidinių lentelę į GPT, toliau, sukurkite 8 MB neformatuotą skaidinį su įjungta <strong>bios_grub</strong> vėliavėle.<br/><br/>Neformatuotas 8 MB skaidinys yra būtinas, norint paleisti %1 BIOS sistemoje su GPT.
     
     
-      
+      
       Boot partition not encrypted
       Paleidimo skaidinys nėra užšifruotas
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Kartu su užšifruotu šaknies skaidiniu, buvo nustatytas atskiras paleidimo skaidinys, tačiau paleidimo skaidinys nėra užšifruotas.<br/><br/>Dėl tokios sąrankos iškyla tam tikrų saugumo klausimų, kadangi svarbūs sisteminiai failai yra laikomi neužšifruotame skaidinyje.<br/>Jeigu norite, galite tęsti, tačiau failų sistemos atrakinimas įvyks vėliau, sistemos paleidimo metu.<br/>Norėdami užšifruoti paleidimo skaidinį, grįžkite atgal ir sukurkite jį iš naujo bei skaidinių kūrimo lange pažymėkite parinktį <strong>Užšifruoti</strong>.
     
     
-      
+      
       has at least one disk device available.
       turi bent vieną prieinamą disko įrenginį.
     
     
-      
+      
       There are no partitions to install on.
       Nėra skaidinių į kuriuos diegti.
     
@@ -3014,7 +3022,7 @@ Išvestis:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3340,44 +3348,16 @@ Išvestis:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Norėdami pasiekti geriausių rezultatų, įsitikinkite kad šis kompiuteris:
     
     
-      
+      
       System requirements
       Sistemos reikalavimai
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Šis kompiuteris netenkina minimalių %1 nustatymo reikalavimų.<br/>Sąranka negali būti tęsiama. <a href="#details">Išsamiau...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Šis kompiuteris netenkina minimalių %1 diegimo reikalavimų.<br/>Diegimas negali būti tęsiamas. <a href="#details">Išsamiau...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Šis kompiuteris netenkina kai kurių %1 nustatymui rekomenduojamų reikalavimų.<br/>Sąranką galima tęsti, tačiau kai kurios funkcijos gali būti išjungtos.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Šis kompiuteris netenkina kai kurių %1 diegimui rekomenduojamų reikalavimų.<br/>Diegimą galima tęsti, tačiau kai kurios funkcijos gali būti išjungtos.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Programa užduos kelis klausimus ir padės įsidiegti %2.
-    
-  
   
     ScanningDialog
     
@@ -3669,27 +3649,6 @@ Išvestis:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Tai yra apžvalga to, kas įvyks, prasidėjus sąrankos procedūrai.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Tai yra apžvalga to, kas įvyks, prasidėjus diegimo procedūrai.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Suvestinė
-    
-  
   
     TrackingInstallJob
     
@@ -4021,7 +3980,7 @@ Išvestis:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Pasisveikinimas
     
@@ -4029,7 +3988,7 @@ Išvestis:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Pasisveikinimas
     
@@ -4112,21 +4071,21 @@ Išvestis:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Kalbos</h1> </br>
                     Sistemos lokalės nustatymas įtakoja, kai kurių komandų eilutės naudotojo sąsajos elementų, kalbos ir simbolių rinkinį. Dabar yra nustatyta <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Lokalės</h1> </br>
                     Sistemos lokalės nustatymas įtakoja skaičių ir datų formatą. Dabar yra nustatyta <strong>%1</strong>.
     
     
-      
+      
       Back
       Atgal
     
@@ -4192,6 +4151,46 @@ Išvestis:
             <p>Tai yra pavyzdinė laidos informacija.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      LibreOffice yra galingas ir laisvasis raštinės programų paketas, naudojamas milijonų žmonių visame pasaulyje. Į jį įeina kelios programos, kurios padaro jį labiausiai universaliu laisvuoju ir atvirojo kodo raštinės programų paketu rinkoje.<br/>
+                    Numatytoji parinktis.
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      Jei nenorite diegti raštinės programų paketo, tiesiog pasirinkite „Be raštinės programų paketo“. Atsiradus poreikiui vėliau visada galite pridėti vieną (ar daugiau) raštinės programų paketą į savo įdiegtą sistemą.
+    
+    
+      
+      No Office Suite
+      Be raštinės programų paketo
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      Sukurti minimalų darbalaukio diegimą, pašalinti visas papildomas programas ir vėliau spręsti, ką pridėti į savo sistemą. Kaip pavyzdys, į tokį diegimą nebus įtrauktas raštinės programų paketas, medijos leistuvės, paveikslų žiūryklė ir spausdinimo palaikymas. Bus tik darbalaukis, failų naršyklė, paketų tvarkytuvė, tekstų redaktorius ir paprasta saityno naršyklė.
+    
+    
+      
+      Minimal Install
+      Minimalus diegimas
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      Pasirinkite diegimo parinktį arba naudokite numatytąją: į ją įtrauktas LibreOffice.
+    
+  
   
     release_notes
     
@@ -4248,132 +4247,132 @@ Išvestis:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Pasirinkite naudotojo vardą ir prisijungimo duomenis, kad galėtumėte prisijungti ir atlikti administravimo užduotis
     
     
-      
+      
       What is your name?
       Koks jūsų vardas?
     
     
-      
+      
       Your Full Name
       Jūsų visas vardas
     
     
-      
+      
       What name do you want to use to log in?
       Kokį vardą norite naudoti prisijungimui?
     
     
-      
+      
       Login Name
       Prisijungimo vardas
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Jei šiuo kompiuteriu naudosis keli žmonės, po diegimo galėsite sukurti papildomas paskyras.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Yra leidžiamos tik mažosios raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai.
     
     
-      
+      
       root is not allowed as username.
       root neleidžiama naudoti kaip naudotojo vardą.
     
     
-      
+      
       What is the name of this computer?
       Koks šio kompiuterio vardas?
     
     
-      
+      
       Computer Name
       Kompiuterio vardas
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Šis vardas bus naudojamas, jeigu padarysite savo kompiuterį matomą kitiems naudotojams tinkle.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost neleidžiama naudoti kaip naudotojo vardą.
     
     
-      
+      
       Choose a password to keep your account safe.
       Apsaugokite savo paskyrą slaptažodžiu
     
     
-      
+      
       Password
       Slaptažodis
     
     
-      
+      
       Repeat Password
       Pakartokite slaptažodį
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus. Stiprus slaptažodis yra raidžių, skaičių ir punktuacijos ženklų mišinys, jis turi būti mažiausiai aštuonių simbolių, be to, turėtų būti reguliariai keičiamas.
     
     
-      
+      
       Validate passwords quality
       Tikrinti slaptažodžių kokybę
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Pažymėjus šį langelį, bus atliekamas slaptažodžio stiprumo tikrinimas ir negalėsite naudoti silpną slaptažodį.
     
     
-      
+      
       Log in automatically without asking for the password
       Prisijungti automatiškai, neklausiant slaptažodžio
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Yra leidžiamos tik raidės, skaitmenys, pabraukimo brūkšniai ir brūkšneliai, mažiausiai du simboliai.
     
     
-      
+      
       Reuse user password as root password
       Naudotojo slaptažodį naudoti pakartotinai kaip pagrindinio naudotojo (root) slaptažodį
     
     
-      
+      
       Use the same password for the administrator account.
       Naudoti tokį patį slaptažodį administratoriaus paskyrai.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Pasirinkite pagrindinio naudotojo (root) slaptažodį, kad apsaugotumėte savo paskyrą.
     
     
-      
+      
       Root Password
       Pagrindinio naudotojo (Root) slaptažodis
     
     
-      
+      
       Repeat Root Password
       Pakartokite pagrindinio naudotojo (Root) slaptažodį
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus.
     
diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts
index dc4ed67ec0..334a442110 100644
--- a/lang/calamares_lv.ts
+++ b/lang/calamares_lv.ts
@@ -491,12 +491,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -535,149 +535,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -745,12 +745,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -800,47 +800,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -935,15 +935,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2449,6 +2474,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2732,17 +2765,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2760,107 +2793,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2992,7 +3000,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3315,44 +3323,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3644,27 +3624,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3996,7 +3955,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -4004,7 +3963,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4074,19 +4033,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4151,6 +4110,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4187,132 +4185,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts
index 37bd8c4aee..80d1bf42cc 100644
--- a/lang/calamares_mk.ts
+++ b/lang/calamares_mk.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts
index f2f7a0885a..ad3b8efe76 100644
--- a/lang/calamares_ml.ts
+++ b/lang/calamares_ml.ts
@@ -491,12 +491,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 സജ്ജീകരണപ്രയോഗം
     
     
-      
+      
       %1 Installer
       %1 ഇൻസ്റ്റാളർ
     
@@ -535,149 +535,149 @@ The installer will quit and all changes will be lost.
       ഫോം
     
     
-      
+      
       Select storage de&vice:
       സംഭരണിയ്ക്കുള്ള ഉപകരണം തിരഞ്ഞെടുക്കൂ:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       നിലവിലുള്ളത്:
     
     
-      
+      
       After:
       ശേഷം:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>സ്വമേധയാ ഉള്ള പാർട്ടീഷനിങ്</strong><br/>നിങ്ങൾക്ക് സ്വയം പാർട്ടീഷനുകൾ സൃഷ്ടിക്കാനോ വലുപ്പം മാറ്റാനോ കഴിയും.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       %2 നുള്ള ഹോം പാർട്ടീഷനായി %1 വീണ്ടും ഉപയോഗിക്കൂ.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>ചുരുക്കുന്നതിന് ഒരു പാർട്ടീഷൻ തിരഞ്ഞെടുക്കുക, എന്നിട്ട് വലുപ്പം മാറ്റാൻ ചുവടെയുള്ള ബാർ വലിക്കുക.
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 %2MiB ആയി ചുരുങ്ങുകയും %4 ന് ഒരു പുതിയ %3MiB പാർട്ടീഷൻ സൃഷ്ടിക്കുകയും ചെയ്യും.
     
     
-      
+      
       Boot loader location:
       ബൂട്ട് ലോഡറിന്റെ സ്ഥാനം:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>ഇൻസ്റ്റാൾ ചെയ്യാനായി ഒരു പാർട്ടീഷൻ തിരഞ്ഞെടുക്കുക</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       ഈ സിസ്റ്റത്തിൽ എവിടെയും ഒരു ഇ.എഫ്.ഐ സിസ്റ്റം പാർട്ടീഷൻ കണ്ടെത്താനായില്ല. %1 സജ്ജീകരിക്കുന്നതിന് ദയവായി തിരികെ പോയി മാനുവൽ പാർട്ടീഷനിംഗ് ഉപയോഗിക്കുക.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 ലെ ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ %2 ആരംഭിക്കുന്നതിന് ഉപയോഗിക്കും.
     
     
-      
+      
       EFI system partition:
       ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ഈ ഡറ്റോറേജ്‌ ഉപകരണത്തിൽ ഒരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റം ഉണ്ടെന്ന് തോന്നുന്നില്ല. നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങൾക്ക് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും കഴിയും. 
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>ഡിസ്ക് മായ്ക്കൂ</strong><br/>ഈ പ്രവൃത്തി തെരെഞ്ഞെടുത്ത സ്റ്റോറേജ് ഉപകരണത്തിലെ എല്ലാ ഡാറ്റയും <font color="red">മായ്‌ച്ച്കളയും</font>.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>ഇതിനൊപ്പം ഇൻസ്റ്റാൾ ചെയ്യുക</strong><br/>%1 ന് ഇടം നൽകുന്നതിന് ഇൻസ്റ്റാളർ ഒരു പാർട്ടീഷൻ ചുരുക്കും.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>ഒരു പാർട്ടീഷൻ പുനഃസ്ഥാപിക്കുക</strong><br/>ഒരു പാർട്ടീഷന് %1 ഉപയോഗിച്ച് പുനഃസ്ഥാപിക്കുന്നു.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ഈ സ്റ്റോറേജ് ഉപകരണത്തിൽ %1 ഉണ്ട്.നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും നിങ്ങൾക്ക് കഴിയും.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ഈ സ്റ്റോറേജ് ഉപകരണത്തിൽ ഇതിനകം ഒരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റം ഉണ്ട്. നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങൾക്ക് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും കഴിയും. 
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ഈ സ്റ്റോറേജ് ഉപകരണത്തിൽ ഒന്നിലധികം ഓപ്പറേറ്റിംഗ് സിസ്റ്റങ്ങളുണ്ട്. നിങ്ങൾ എന്താണ് ചെയ്യാൻ ആഗ്രഹിക്കുന്നത്?<br/>സ്റ്റോറേജ് ഉപകരണത്തിൽ എന്തെങ്കിലും മാറ്റം വരുത്തുന്നതിനുമുമ്പ് നിങ്ങൾക്ക് നിങ്ങളുടെ ചോയ്‌സുകൾ അവലോകനം ചെയ്യാനും സ്ഥിരീകരിക്കാനും കഴിയും. 
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       സ്വാപ്പ് വേണ്ട
     
     
-      
+      
       Reuse Swap
       സ്വാപ്പ് വീണ്ടും ഉപയോഗിക്കൂ
     
     
-      
+      
       Swap (no Hibernate)
       സ്വാപ്പ് (ഹൈബർനേഷൻ ഇല്ല)
     
     
-      
+      
       Swap (with Hibernate)
       സ്വാപ്പ് (ഹൈബർനേഷനോട് കൂടി)
     
     
-      
+      
       Swap to file
       ഫയലിലേക്ക് സ്വാപ്പ് ചെയ്യുക
     
@@ -745,12 +745,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       കീബോർഡ് മോഡൽ %1 എന്നതായി ക്രമീകരിക്കുക.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       കീബോർഡ് വിന്യാസം %1%2 എന്നതായി ക്രമീകരിക്കുക.
     
@@ -800,47 +800,47 @@ The installer will quit and all changes will be lost.
       നെറ്റ്‌വർക്ക് ഇൻസ്റ്റാളേഷൻ. (അപ്രാപ്‌തമാക്കി: പാക്കേജ് ലിസ്റ്റുകൾ നേടാനായില്ല, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ പരിശോധിക്കുക)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       %1 സജ്ജീകരിക്കുന്നതിനുള്ള ഏറ്റവും കുറഞ്ഞ ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>സജ്ജീകരണം തുടരാനാവില്ല. <a href="#details">വിവരങ്ങൾ...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       %1 ഇൻസ്റ്റാൾ ചെയ്യുന്നതിനുള്ള ഏറ്റവും കുറഞ്ഞ ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>ഇൻസ്റ്റളേഷൻ തുടരാനാവില്ല. <a href="#details">വിവരങ്ങൾ...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       %1 സജ്ജീകരിക്കുന്നതിനുള്ള ചില ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>സജ്ജീകരണം തുടരാം, പക്ഷേ ചില സവിശേഷതകൾ നിഷ്ക്രിയമായിരിക്കാം.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       %1 ഇൻസ്റ്റാൾ ചെയ്യാൻ ശുപാർശ ചെയ്യപ്പെട്ടിട്ടുള്ള ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>ഇൻസ്റ്റളേഷൻ തുടരാം, പക്ഷേ ചില സവിശേഷതകൾ നിഷ്ക്രിയമായിരിക്കാം.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       ഈ പ്രക്രിയ താങ്കളോട് ചില ചോദ്യങ്ങൾ ചോദിക്കുകയും %2 താങ്കളുടെ കമ്പ്യൂട്ടറിൽ സജ്ജീകരിക്കുകയും ചെയ്യും.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -935,15 +935,40 @@ The installer will quit and all changes will be lost.
       %1 ന്റെ ഇൻസ്റ്റാളേഷൻ പൂർത്തിയായി.
     
     
-      
+      
       Package Selection
       പാക്കേജ് തിരഞ്ഞെടുക്കൽ
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       പട്ടികയിൽ നിന്നും ഒരു ഉത്പന്നം തിരഞ്ഞെടുക്കുക. തിരഞ്ഞെടുത്ത ഉത്പന്നം ഇൻസ്റ്റാൾ ചെയ്യപ്പെടുക.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      ചുരുക്കം
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      താങ്കൾ സജ്ജീകരണപ്രക്രിയ ആരംഭിച്ചതിനുശേഷം എന്ത് സംഭവിക്കും എന്നതിന്റെ അവലോകനമാണിത്.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      നിങ്ങൾ ഇൻസ്റ്റാൾ നടപടിക്രമങ്ങൾ ആരംഭിച്ചുകഴിഞ്ഞാൽ എന്ത് സംഭവിക്കും എന്നതിന്റെ ഒരു അവലോകനമാണിത്.
+    
   
   
     ContextualProcessJob
@@ -2440,6 +2465,14 @@ The installer will quit and all changes will be lost.
       പട്ടികയിൽ നിന്നും ഒരു ഉത്പന്നം തിരഞ്ഞെടുക്കുക. തിരഞ്ഞെടുത്ത ഉത്പന്നം ഇൻസ്റ്റാൾ ചെയ്യപ്പെടുക.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      പാക്കേജുകൾ
+    
+  
   
     PackageChooserViewStep
     
@@ -2723,17 +2756,17 @@ The installer will quit and all changes will be lost.
       ബൂട്ട്ലോഡർ ഇവിടെ ഇൻസ്റ്റാൾ ചെയ്യുക (&n):
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       %1ൽ ഒരു പുതിയ പാർട്ടീഷൻ ടേബിൾ നിർമ്മിക്കണമെന്ന് താങ്കൾക്കുറപ്പാണോ?
     
     
-      
+      
       Can not create new partition
       പുതിയ പാർട്ടീഷൻ നിർമ്മിക്കാനായില്ല
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       %1 ലെ പാർട്ടീഷൻ പട്ടികയിൽ ഇതിനകം %2 പ്രാഥമിക പാർട്ടീഷനുകൾ ഉണ്ട്,ഇനി ഒന്നും ചേർക്കാൻ കഴിയില്ല. പകരം ഒരു പ്രാഥമിക പാർട്ടീഷൻ നീക്കംചെയ്‌ത് എക്സ്ടെൻഡഡ്‌ പാർട്ടീഷൻ ചേർക്കുക.
     
@@ -2751,107 +2784,82 @@ The installer will quit and all changes will be lost.
       പാർട്ടീഷനുകൾ
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      മറ്റൊരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റത്തിനൊപ്പം %1 ഇൻസ്റ്റാൾ ചെയ്യുക.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      ഡിസ്ക് <strong>മായ്ക്കുക</strong>എന്നിട്ട് %1 ഇൻസ്റ്റാൾ ചെയ്യുക.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      ഒരു പാർട്ടീഷൻ %1 ഉപയോഗിച്ച് <strong>പുനഃസ്ഥാപിക്കുക.</strong>
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>സ്വമേധയാ</strong> ഉള്ള പാർട്ടീഷനിങ്.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      %2 (%3) ഡിസ്കിൽ മറ്റൊരു ഓപ്പറേറ്റിംഗ് സിസ്റ്റത്തിനൊപ്പം %1 ഇൻസ്റ്റാൾ ചെയ്യുക.
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      ഡിസ്ക് <strong>%2</strong> (%3) <strong>മായ്‌ച്ച് </strong> %1 ഇൻസ്റ്റാൾ ചെയ്യുക.
+      
+      Current:
+      നിലവിലുള്ളത്:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>%2</strong> (%3) ഡിസ്കിലെ ഒരു പാർട്ടീഷൻ %1 ഉപയോഗിച്ച്  <strong>മാറ്റിസ്ഥാപിക്കുക</strong>.
+      
+      After:
+      ശേഷം:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>%1 </strong>(%2) ഡിസ്കിലെ <strong>സ്വമേധയാ</strong> പാർട്ടീഷനിംഗ്.
+      
+      No EFI system partition configured
+      ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷനൊന്നും ക്രമീകരിച്ചിട്ടില്ല
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      ഡിസ്ക് <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      നിലവിലുള്ളത്:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      ശേഷം:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷനൊന്നും ക്രമീകരിച്ചിട്ടില്ല
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷൻ ഫ്ലാഗ് ക്രമീകരിച്ചിട്ടില്ല
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യപ്പെട്ടിട്ടില്ല
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       എൻക്രിപ്റ്റ് ചെയ്ത ഒരു റൂട്ട് പാർട്ടീഷനോടൊപ്പം ഒരു വേർപെടുത്തിയ ബൂട്ട് പാർട്ടീഷനും ക്രമീകരിക്കപ്പെട്ടിരുന്നു, എന്നാൽ ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യപ്പെട്ടതല്ല.<br/><br/>ഇത്തരം സജ്ജീകരണത്തിന്റെ സുരക്ഷ ഉത്കണ്ഠാജനകമാണ്, എന്തെന്നാൽ പ്രധാനപ്പെട്ട സിസ്റ്റം ഫയലുകൾ ഒരു എൻക്രിപ്റ്റ് ചെയ്യപ്പെടാത്ത പാർട്ടീഷനിലാണ് സൂക്ഷിച്ചിട്ടുള്ളത്.<br/> താങ്കൾക്ക് വേണമെങ്കിൽ തുടരാം, പക്ഷേ ഫയൽ സിസ്റ്റം തുറക്കൽ സിസ്റ്റം ആരംഭപ്രക്രിയയിൽ വൈകിയേ സംഭവിക്കൂ.<br/>ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യാനായി, തിരിച്ചു പോയി പാർട്ടീഷൻ നിർമ്മാണ ജാലകത്തിൽ <strong>എൻക്രിപ്റ്റ്</strong> തിരഞ്ഞെടുത്തുകൊണ്ട് അത് വീണ്ടും നിർമ്മിക്കുക.
     
     
-      
+      
       has at least one disk device available.
       ഒരു ഡിസ്ക് ഡിവൈസെങ്കിലും ലഭ്യമാണ്.
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2986,7 +2994,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3309,44 +3317,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       മികച്ച ഫലങ്ങൾക്കായി ഈ കമ്പ്യൂട്ടർ താഴെപ്പറയുന്നവ നിറവേറ്റുന്നു എന്നുറപ്പുവരുത്തുക:
     
     
-      
+      
       System requirements
       സിസ്റ്റം ആവശ്യകതകൾ
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      %1 സജ്ജീകരിക്കുന്നതിനുള്ള ഏറ്റവും കുറഞ്ഞ ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>സജ്ജീകരണം തുടരാനാവില്ല. <a href="#details">വിവരങ്ങൾ...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      %1 ഇൻസ്റ്റാൾ ചെയ്യുന്നതിനുള്ള ഏറ്റവും കുറഞ്ഞ ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>ഇൻസ്റ്റളേഷൻ തുടരാനാവില്ല. <a href="#details">വിവരങ്ങൾ...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      %1 സജ്ജീകരിക്കുന്നതിനുള്ള ചില ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>സജ്ജീകരണം തുടരാം, പക്ഷേ ചില സവിശേഷതകൾ നിഷ്ക്രിയമായിരിക്കാം.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      %1 ഇൻസ്റ്റാൾ ചെയ്യാൻ ശുപാർശ ചെയ്യപ്പെട്ടിട്ടുള്ള ആവശ്യങ്ങൾ ഈ കമ്പ്യൂട്ടർ നിറവേറ്റുന്നില്ല.<br/>ഇൻസ്റ്റളേഷൻ തുടരാം, പക്ഷേ ചില സവിശേഷതകൾ നിഷ്ക്രിയമായിരിക്കാം.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      ഈ പ്രക്രിയ താങ്കളോട് ചില ചോദ്യങ്ങൾ ചോദിക്കുകയും %2 താങ്കളുടെ കമ്പ്യൂട്ടറിൽ സജ്ജീകരിക്കുകയും ചെയ്യും.
-    
-  
   
     ScanningDialog
     
@@ -3638,27 +3618,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      താങ്കൾ സജ്ജീകരണപ്രക്രിയ ആരംഭിച്ചതിനുശേഷം എന്ത് സംഭവിക്കും എന്നതിന്റെ അവലോകനമാണിത്.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      നിങ്ങൾ ഇൻസ്റ്റാൾ നടപടിക്രമങ്ങൾ ആരംഭിച്ചുകഴിഞ്ഞാൽ എന്ത് സംഭവിക്കും എന്നതിന്റെ ഒരു അവലോകനമാണിത്.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      ചുരുക്കം
-    
-  
   
     TrackingInstallJob
     
@@ -3990,7 +3949,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       സ്വാഗതം
     
@@ -3998,7 +3957,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       സ്വാഗതം
     
@@ -4068,19 +4027,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       പുറകോട്ട്
     
@@ -4145,6 +4104,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4181,132 +4179,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       നിങ്ങളുടെ പേരെന്താണ് ?
     
     
-      
+      
       Your Full Name
       താങ്കളുടെ മുഴുവൻ പേരു്
     
     
-      
+      
       What name do you want to use to log in?
       ലോഗിൻ ചെയ്യാൻ നിങ്ങൾ ഏത് നാമം ഉപയോഗിക്കാനാണു ആഗ്രഹിക്കുന്നത്?
     
     
-      
+      
       Login Name
       പ്രവേശന നാമം
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       ചെറിയ അക്ഷരങ്ങൾ, അക്കങ്ങൾ, അണ്ടർസ്കോർ, ഹൈഫൺ എന്നിവയേ അനുവദിച്ചിട്ടുള്ളൂ.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       ഈ കമ്പ്യൂട്ടറിന്റെ നാമം എന്താണ് ?
     
     
-      
+      
       Computer Name
       കമ്പ്യൂട്ടറിന്റെ പേര്
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost അനുവദനീയമായ ഒരു ഹോസ്റ്റ്‌നെയിം അല്ല.
     
     
-      
+      
       Choose a password to keep your account safe.
       നിങ്ങളുടെ അക്കൗണ്ട് സുരക്ഷിതമായി സൂക്ഷിക്കാൻ ഒരു രഹസ്യവാക്ക് തിരഞ്ഞെടുക്കുക.
     
     
-      
+      
       Password
       രഹസ്യവാക്ക്
     
     
-      
+      
       Repeat Password
       രഹസ്യവാക്ക് വീണ്ടും
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       രഹസ്യവാക്കിന്റെ ഗുണനിലവാരം ഉറപ്പുവരുത്തുക
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       ഈ കള്ളി തിരഞ്ഞെടുക്കുമ്പോൾ, രഹസ്യവാക്കിന്റെ ബലപരിശോധന നടപ്പിലാക്കുകയും, ആയതിനാൽ താങ്കൾക്ക് ദുർബലമായ ഒരു രഹസ്യവാക്ക് ഉപയോഗിക്കാൻ സാധിക്കാതെ വരുകയും ചെയ്യും.
     
     
-      
+      
       Log in automatically without asking for the password
       രഹസ്യവാക്ക് ചോദിക്കാതെ സ്വയം പ്രവേശിക്കുക
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       അക്ഷരങ്ങൾ, അക്കങ്ങൾ, ഹൈഫൻ, അണ്ടർസ്കോർ എന്നിവ മാത്രമേ അനുവദിക്കപ്പെട്ടിട്ടുള്ളൂ, കുറഞ്ഞത് രണ്ടെണ്ണമെങ്കിലും.
     
     
-      
+      
       Reuse user password as root password
       ഉപയോക്തൃ രഹസ്യവാക്ക് റൂട്ട് രഹസ്യവാക്കായി പുനരുപയോഗിക്കുക
     
     
-      
+      
       Use the same password for the administrator account.
       അഡ്മിനിസ്ട്രേറ്റർ അക്കൗണ്ടിനും ഇതേ രഹസ്യവാക്ക് ഉപയോഗിക്കുക.
     
     
-      
+      
       Choose a root password to keep your account safe.
       താങ്കളുടെ അക്കൗണ്ട് സുരക്ഷിതമാക്കാൻ ഒരു റൂട്ട് രഹസ്യവാക്ക് തിരഞ്ഞെടുക്കുക.
     
     
-      
+      
       Root Password
       റൂട്ട് രഹസ്യവാക്ക്
     
     
-      
+      
       Repeat Root Password
       റൂട്ട് രഹസ്യവാക്ക് വീണ്ടും
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       ടൈപ്പിങ്ങ് പിഴവുകളില്ല എന്നുറപ്പിക്കുന്നതിനായി ഒരേ രഹസ്യവാക്ക് രണ്ട് തവണ നൽകുക.
     
diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts
index 5d3e3f247c..c58aa46eb0 100644
--- a/lang/calamares_mr.ts
+++ b/lang/calamares_mr.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 अधिष्ठापक
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       स्वरुप
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       सद्या :
     
     
-      
+      
       After:
       नंतर :
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      सारांश
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
+      
+      Current:
+      सद्या :
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      
+      
+      After:
+      नंतर :
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      Current:
-      सद्या :
-    
-    
-      
-      After:
-      नंतर :
-    
-    
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       प्रणालीची आवशक्यता
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      सारांश
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       स्वागत
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       स्वागत
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts
index cc8eb5faa7..4e4fc585cc 100644
--- a/lang/calamares_nb.ts
+++ b/lang/calamares_nb.ts
@@ -490,12 +490,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 Installasjonsprogram
     
@@ -534,149 +534,149 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Form
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuell partisjonering</strong><br/>Du kan opprette eller endre størrelse på partisjoner selv.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -744,12 +744,12 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Sett tastaturmodell til %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Sett tastaturoppsett til %1/%2.
     
@@ -799,47 +799,47 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Denne datamaskinen oppfyller ikke minimumskravene for installering %1.<br/> Installeringen kan ikke fortsette. <a href="#details">Detaljer..</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -934,15 +934,40 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.Installasjonen av %1 er fullført.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Oppsummering
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2439,6 +2464,14 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2722,17 +2755,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2750,107 +2783,82 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2982,7 +2990,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3305,44 +3313,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       Systemkrav
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Denne datamaskinen oppfyller ikke minimumskravene for installering %1.<br/> Installeringen kan ikke fortsette. <a href="#details">Detaljer..</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3634,27 +3614,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Oppsummering
-    
-  
   
     TrackingInstallJob
     
@@ -3986,7 +3945,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Velkommen
     
@@ -3994,7 +3953,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Velkommen
     
@@ -4064,19 +4023,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4141,6 +4100,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4177,132 +4175,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Hva heter du?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Hvilket navn vil du bruke for å logge inn?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ne.ts b/lang/calamares_ne.ts
index a8bf13fc84..1e704c4a56 100644
--- a/lang/calamares_ne.ts
+++ b/lang/calamares_ne.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts
index e6aa4a9a9b..63ce77baf5 100644
--- a/lang/calamares_ne_NP.ts
+++ b/lang/calamares_ne_NP.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       फारम
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       बूट लोडरको स्थान
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       swap छैन
     
     
-      
+      
       Reuse Swap
       swap पुनः प्रयोग गर्नुहोस
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       %1 को लागि Calamares Setup Programमा स्वागत छ । 
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       %1 को Setupमा स्वागत छ । 
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       %1 को लागि Calamares Installerमा स्वागत छ । 
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       %1 को Installerमा स्वागत छ । 
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts
index ba5e57f00b..38023c4748 100644
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
@@ -495,12 +495,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Voorbereidingsprogramma
     
     
-      
+      
       %1 Installer
       %1 Installatieprogramma
     
@@ -539,149 +539,149 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Formulier
     
     
-      
+      
       Select storage de&vice:
       Selecteer &opslagmedium:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Huidig:
     
     
-      
+      
       After:
       Na:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Handmatig partitioneren</strong><br/>Je maakt of wijzigt zelf de partities.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Hergebruik %1 als home-partitie voor %2
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selecteer een partitie om te verkleinen, en sleep vervolgens de onderste balk om het formaat te wijzigen</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 zal verkleind worden tot %2MiB en een nieuwe %3MiB partitie zal worden aangemaakt voor %4.
     
     
-      
+      
       Boot loader location:
       Bootloader locatie:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selecteer een partitie om op te installeren</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Er werd geen EFI systeempartitie gevonden op dit systeem. Gelieve terug te gaan en manueel te partitioneren om %1 in te stellen.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       De EFI systeempartitie op %1 zal gebruikt worden om %2 te starten.
     
     
-      
+      
       EFI system partition:
       EFI systeempartitie:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dit opslagmedium lijkt geen besturingssysteem te bevatten. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Wis schijf</strong><br/>Dit zal alle huidige gegevens op de geselecteerd opslagmedium <font color="red">verwijderen</font>.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installeer ernaast</strong><br/>Het installatieprogramma zal een partitie verkleinen om plaats te maken voor %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Vervang een partitie</strong><br/>Vervangt een partitie met %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dit opslagmedium bevat %1. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dit opslagmedium bevat reeds een besturingssysteem. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Dit opslagmedium bevat meerdere besturingssystemen. Wat wil je doen?<br/>Je zal jouw keuzes kunnen nazien en bevestigen voordat er iets aan het opslagmedium wordt veranderd.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Dit opslagmedium bevat al een besturingssysteem, maar de partitietabel <strong>%1</strong> is anders dan het benodigde <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Dit opslagmedium heeft een van de partities <strong>gemount</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Dit opslagmedium maakt deel uit van een <strong>inactieve RAID</strong> apparaat.
     
     
-      
+      
       No Swap
       Geen wisselgeheugen
     
     
-      
+      
       Reuse Swap
       Wisselgeheugen hergebruiken
     
     
-      
+      
       Swap (no Hibernate)
       Wisselgeheugen (geen Sluimerstand)
     
     
-      
+      
       Swap (with Hibernate)
       Wisselgeheugen ( met Sluimerstand)
     
     
-      
+      
       Swap to file
       Wisselgeheugen naar bestand
     
@@ -749,12 +749,12 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Instellen toetsenbord model naar %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Instellen toetsenbord lay-out naar %1/%2.
     
@@ -804,47 +804,47 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Netwerkinstallatie. (Uitgeschakeld: kon de pakketlijsten niet binnenhalen, controleer de netwerkconnectie)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Deze computer voldoet niet aan de minimumvereisten om %1 te installeren.<br/>De voorbereiding kan niet doorgaan. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Deze computer voldoet niet aan de minimumvereisten om %1 te installeren.<br/>De installatie kan niet doorgaan. <a href="#details">Details...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Deze computer voldoet niet aan enkele van de aanbevolen specificaties om %1 voor te bereiden.<br/>De installatie kan doorgaan, maar sommige functies kunnen uitgeschakeld zijn.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Deze computer voldoet niet aan enkele van de aanbevolen specificaties om %1 te installeren.<br/>De installatie kan doorgaan, maar sommige functies kunnen uitgeschakeld zijn.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Dit programma stelt je enkele vragen en installeert %2 op jouw computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Welkom in het Calamares voorbereidingsprogramma voor %1.</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Welkom in het %1 voorbereidingsprogramma.</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Welkom in het Calamares installatieprogramma voor %1.</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Welkom in het %1 installatieprogramma.</h1>
     
@@ -939,15 +939,40 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       De installatie van %1 is afgerond.
     
     
-      
+      
       Package Selection
       Pakketselectie
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Kies een product van de lijst. Het geselecteerde product zal worden geïnstalleerd.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Samenvatting
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Dit is een overzicht van wat zal gebeuren wanneer je de installatieprocedure start.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Dit is een overzicht van wat zal gebeuren wanneer je de installatieprocedure start.
+    
   
   
     ContextualProcessJob
@@ -2444,6 +2469,14 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Kies een product van de lijst. Het geselecteerde product zal worden geïnstalleerd.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Pakketten
+    
+  
   
     PackageChooserViewStep
     
@@ -2727,17 +2760,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       I&nstalleer bootloader op:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Weet u zeker dat u een nieuwe partitie tabel wil maken op %1?
     
     
-      
+      
       Can not create new partition
       Kan de nieuwe partitie niet aanmaken
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       De partitietabel op %1 bevat al %2 primaire partities en er kunnen geen nieuwe worden aangemaakt. In plaats hiervan kan één primaire partitie verwijderen en een uitgebreide partitie toevoegen.
     
@@ -2755,107 +2788,82 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Partities
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Installeer %1 <strong>naast</strong> een ander besturingssysteem.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Wis</strong> schijf en installeer %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Vervang</strong> een partitie met %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Handmatig</strong> partitioneren.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Installeer %1 <strong>naast</strong> een ander besturingssysteem op schijf <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Wis</strong> schijf <strong>%2</strong> (%3) en installeer %1.
+      
+      Current:
+      Huidig:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Vervang</strong> een partitie op schijf <strong>%2</strong> (%3) met %1.
+      
+      After:
+      Na:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Handmatig</strong> partitioneren van schijf <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Geen EFI systeempartitie geconfigureerd
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Schijf <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Huidig:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Na:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Geen EFI systeempartitie geconfigureerd
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Een EFI systeempartitie is vereist om %1 te starten.<br/><br/>Om een EFI systeempartitie in te stellen, ga terug en selecteer of maak een FAT32 bestandssysteem met de <strong>%3</strong>-vlag aangevinkt en aankoppelpunt <strong>%2</strong>.<br/><br/>Je kan verdergaan zonder een EFI systeempartitie, maar mogelijk start je systeem dan niet op.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Een EFI systeempartitie is vereist om %1 op te starten.<br/><br/>Een partitie is ingesteld met aankoppelpunt <strong>%2</strong>, maar de de <strong>%3</strong>-vlag is niet aangevinkt.<br/>Om deze vlag aan te vinken, ga terug en pas de partitie aan.<br/><br/>Je kan verdergaan zonder deze vlag, maar mogelijk start je systeem dan niet op.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      EFI-systeem partitievlag niet ingesteld.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Optie om GPT te gebruiken in BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Een GPT-partitie is de beste optie voor alle systemen. Dit installatieprogramma ondersteund ook zulke installatie voor BIOS systemen.<br/><br/>Om een GPT-partitie te configureren, (als dit nog niet gedaan is) ga terug en stel de partitietavel in als GPT en maak daarna een 8 MB ongeformateerde partitie aan met de <strong>bios_grub</strong>-vlag ingesteld.<br/><br/>Een ongeformateerde 8 MB partitie is nodig om %1 te starten op BIOS-systemen met GPT. 
     
     
-      
+      
       Boot partition not encrypted
       Bootpartitie niet versleuteld
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Een aparte bootpartitie was ingesteld samen met een versleutelde rootpartitie, maar de bootpartitie zelf is niet versleuteld.<br/><br/>Dit is niet volledig veilig, aangezien belangrijke systeembestanden bewaard worden op een niet-versleutelde partitie.<br/>Je kan doorgaan als je wil, maar het ontgrendelen van bestandssystemen zal tijdens het opstarten later plaatsvinden.<br/>Om de bootpartitie toch te versleutelen: keer terug en maak de bootpartitie opnieuw, waarbij je <strong>Versleutelen</strong> aanvinkt in het venster partitie aanmaken. 
     
     
-      
+      
       has at least one disk device available.
       tenminste één schijfapparaat beschikbaar.
     
     
-      
+      
       There are no partitions to install on.
       Er zijn geen partities om op te installeren.
     
@@ -2990,7 +2998,7 @@ Uitvoer:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3314,44 +3322,16 @@ De installatie kan niet doorgaan.
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Voor de beste resultaten is het aangeraden dat deze computer:
     
     
-      
+      
       System requirements
       Systeemvereisten
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Deze computer voldoet niet aan de minimumvereisten om %1 te installeren.<br/>De installatie kan niet doorgaan. <a href="#details">Details...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Deze computer voldoet niet aan de minimumvereisten om %1 te installeren.<br/>De installatie kan niet doorgaan. <a href="#details">Details...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Deze computer voldoet niet aan enkele van de aanbevolen specificaties om %1 te installeren.<br/>De installatie kan doorgaan, maar sommige functies kunnen uitgeschakeld zijn.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Deze computer voldoet niet aan enkele van de aanbevolen specificaties om %1 te installeren.<br/>De installatie kan doorgaan, maar sommige functies kunnen uitgeschakeld zijn.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Dit programma stelt je enkele vragen en installeert %2 op jouw computer.
-    
-  
   
     ScanningDialog
     
@@ -3643,27 +3623,6 @@ De installatie kan niet doorgaan.
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Dit is een overzicht van wat zal gebeuren wanneer je de installatieprocedure start.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Dit is een overzicht van wat zal gebeuren wanneer je de installatieprocedure start.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Samenvatting
-    
-  
   
     TrackingInstallJob
     
@@ -3995,7 +3954,7 @@ De installatie kan niet doorgaan.
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Welkom
     
@@ -4003,7 +3962,7 @@ De installatie kan niet doorgaan.
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Welkom
     
@@ -4075,21 +4034,21 @@ Dit logboek is ook gekopieerd naar /var/log/installation.log van het doelsysteem
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Talen</h1></br>
 De taalinstellingen bepalen de taal en karakterset voor sommige opdrachtsregelelementen. De huidige instelling is <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Tijdinstellingen</h1></br>
 De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige instelling is <strong>%1</strong>.
     
     
-      
+      
       Back
       Terug
     
@@ -4155,6 +4114,45 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
 <p>Dit zijn voorbeeld release-opmerkingen.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4210,132 +4208,132 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Kies je gebruikersnaam en wachtwoord om in te loggen en administratieve taken uit te voeren
     
     
-      
+      
       What is your name?
       Wat is je naam?
     
     
-      
+      
       Your Full Name
       Volledige naam
     
     
-      
+      
       What name do you want to use to log in?
       Welke naam wil je gebruiken om in te loggen?
     
     
-      
+      
       Login Name
       Inlognaam
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Als meer dan één persoon deze computer zal gebruiken, kan je meerdere accounts aanmaken na installatie.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Alleen kleine letters, nummerse en (laag) streepjes zijn toegestaan.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Wat is de naam van deze computer?
     
     
-      
+      
       Computer Name
       Computer Naam
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Deze naam zal worden gebruikt als u de computer zichtbaar maakt voor anderen op een netwerk.
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Kies een wachtwoord om uw account veilig te houden.
     
     
-      
+      
       Password
       Wachtwoord
     
     
-      
+      
       Repeat Password
       Herhaal wachtwoord
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten. Een goed wachtwoord bevat een combinatie van letters, cijfers en leestekens, is ten minste acht tekens lang, en zou regelmatig moeten worden gewijzigd.
     
     
-      
+      
       Validate passwords quality
       Controleer wachtwoorden op gelijkheid
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Wanneer dit vakje is aangevinkt, wachtwoordssterkte zal worden gecontroleerd en je zal geen zwak wachtwoord kunnen gebruiken.
     
     
-      
+      
       Log in automatically without asking for the password
       Automatisch aanmelden zonder wachtwoord te vragen
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Hergebruik gebruikerswachtwoord als root (administratie) wachtwoord.
     
     
-      
+      
       Use the same password for the administrator account.
       Gebruik hetzelfde wachtwoord voor het administratoraccount.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Kies een root (administratie) wachtwoord om je account veilig te houden.
     
     
-      
+      
       Root Password
       Root (Administratie) Wachtwoord
     
     
-      
+      
       Repeat Root Password
       Herhaal Root Wachtwoord
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Voer hetzelfde wachtwoord twee keer in, zodat het gecontroleerd kan worden op tikfouten.
     
diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts
index 866f23eb52..2c436d5c55 100644
--- a/lang/calamares_pl.ts
+++ b/lang/calamares_pl.ts
@@ -494,12 +494,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       Instalator %1
     
@@ -538,149 +538,149 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Formularz
     
     
-      
+      
       Select storage de&vice:
       &Wybierz urządzenie przechowywania:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Bieżący:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ręczne partycjonowanie</strong><br/>Możesz samodzielnie utworzyć lub zmienić rozmiar istniejących partycji.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Użyj ponownie %1 jako partycji domowej dla %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Wybierz partycję do zmniejszenia, a następnie przeciągnij dolny pasek, aby zmienić jej rozmiar</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Położenie programu rozruchowego:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Wybierz partycję, na której przeprowadzona będzie instalacja</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nigdzie w tym systemie nie można odnaleźć partycji systemowej EFI. Prosimy się cofnąć i użyć ręcznego partycjonowania dysku do ustawienia %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Partycja systemowa EFI na %1 będzie użyta do uruchamiania %2.
     
     
-      
+      
       EFI system partition:
       Partycja systemowa EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       To urządzenie pamięci masowej prawdopodobnie nie posiada żadnego systemu operacyjnego. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Wyczyść dysk</strong><br/>Ta operacja <font color="red">usunie</font> wszystkie dane obecnie znajdujące się na wybranym urządzeniu przechowywania.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Zainstaluj obok siebie</strong><br/>Instalator zmniejszy partycję, aby zrobić miejsce dla %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Zastąp partycję</strong><br/>Zastępowanie partycji poprzez %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       To urządzenie pamięci masowej posiada %1. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       To urządzenie pamięci masowej posiada już system operacyjny. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       To urządzenie pamięci masowej posiada kilka systemów operacyjnych. Co chcesz zrobić?<br/>Będziesz miał możliwość przejrzenia oraz zatwierdzenia swoich ustawień przed wykonaniem jakichkolwiek zmian na tym urządzeniu.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Brak przestrzeni wymiany
     
     
-      
+      
       Reuse Swap
       Użyj ponownie przestrzeni wymiany
     
     
-      
+      
       Swap (no Hibernate)
       Przestrzeń wymiany (bez hibernacji)
     
     
-      
+      
       Swap (with Hibernate)
       Przestrzeń wymiany (z hibernacją)
     
     
-      
+      
       Swap to file
       Przestrzeń wymiany do pliku
     
@@ -748,12 +748,12 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Ustaw model klawiatury na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Ustaw model klawiatury na %1/%2.
     
@@ -803,47 +803,47 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Instalacja sieciowa. (Wyłączona: Nie można pobrać listy pakietów, sprawdź swoje połączenie z siecią)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ten komputer nie spełnia minimalnych wymagań, niezbędnych do instalacji %1.<br/>Instalacja nie może być kontynuowana. <a href="#details">Szczegóły...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Ten komputer nie spełnia wszystkich, zalecanych do instalacji %1 wymagań.<br/>Instalacja może być kontynuowana, ale niektóre opcje mogą być niedostępne.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ten program zada Ci garść pytań i ustawi %2 na Twoim komputerze.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -938,15 +938,40 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Instalacja %1 ukończyła się pomyślnie.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Podsumowanie
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      To jest podsumowanie czynności, które zostaną wykonane po rozpoczęciu przez Ciebie instalacji.
+    
   
   
     ContextualProcessJob
@@ -2461,6 +2486,14 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2744,17 +2777,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Zainstaluj program rozruchowy 
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Czy na pewno chcesz utworzyć nową tablicę partycji na %1?
     
     
-      
+      
       Can not create new partition
       Nie można utworzyć nowej partycji
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Tablica partycji na %1 ma już %2 podstawowych partycji i więcej nie może już być dodanych. Prosimy o usunięcie jednej partycji systemowej i dodanie zamiast niej partycji rozszerzonej.
     
@@ -2772,107 +2805,82 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Partycje
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Zainstaluj %1 <strong>obok</strong> innego systemu operacyjnego.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Wyczyść</strong> dysk i zainstaluj %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Zastąp</strong> partycję poprzez %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Ręczne</strong> partycjonowanie.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Zainstaluj %1 <strong>obok</strong> innego systemu operacyjnego na dysku <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Wyczyść</strong> dysk <strong>%2</strong> (%3) i zainstaluj %1.
+      
+      Current:
+      Bieżący:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Zastąp</strong> partycję na dysku <strong>%2</strong> (%3) poprzez %1.
+      
+      After:
+      Po:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Ręczne</strong> partycjonowanie na dysku <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Nie skonfigurowano partycji systemowej EFI
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Dysk <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Bieżący:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Po:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Nie skonfigurowano partycji systemowej EFI
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      Flaga partycji systemowej EFI nie została ustawiona
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Niezaszyfrowana partycja rozruchowa
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Oddzielna partycja rozruchowa została skonfigurowana razem z zaszyfrowaną partycją roota, ale partycja rozruchowa nie jest szyfrowana.<br/><br/>Nie jest to najbezpieczniejsze rozwiązanie, ponieważ ważne pliki systemowe znajdują się na niezaszyfrowanej partycji.<br/>Możesz kontynuować, ale odblokowywanie systemu nastąpi później, w trakcie uruchamiania.<br/>Aby zaszyfrować partycję rozruchową, wróć i utwórz ją ponownie zaznaczając opcję <strong>Szyfruj</strong> w oknie tworzenia partycji.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3007,7 +3015,7 @@ Wyjście:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3331,44 +3339,16 @@ i nie uruchomi się
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Dla osiągnięcia najlepszych rezultatów upewnij się, że ten komputer:
     
     
-      
+      
       System requirements
       Wymagania systemowe
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Ten komputer nie spełnia minimalnych wymagań, niezbędnych do instalacji %1.<br/>Instalacja nie może być kontynuowana. <a href="#details">Szczegóły...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Ten komputer nie spełnia wszystkich, zalecanych do instalacji %1 wymagań.<br/>Instalacja może być kontynuowana, ale niektóre opcje mogą być niedostępne.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Ten program zada Ci garść pytań i ustawi %2 na Twoim komputerze.
-    
-  
   
     ScanningDialog
     
@@ -3660,27 +3640,6 @@ i nie uruchomi się
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      To jest podsumowanie czynności, które zostaną wykonane po rozpoczęciu przez Ciebie instalacji.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Podsumowanie
-    
-  
   
     TrackingInstallJob
     
@@ -4012,7 +3971,7 @@ i nie uruchomi się
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Witamy
     
@@ -4020,7 +3979,7 @@ i nie uruchomi się
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Witamy
     
@@ -4090,19 +4049,19 @@ i nie uruchomi się
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4167,6 +4126,45 @@ i nie uruchomi się
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4203,132 +4201,132 @@ i nie uruchomi się
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Jak się nazywasz?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Jakiego imienia chcesz używać do logowania się?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Jaka jest nazwa tego komputera?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Wybierz hasło, aby chronić swoje konto.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Użyj tego samego hasła dla konta administratora.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index 4bf0ac14da..b5a504adf8 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -495,12 +495,12 @@ O instalador será fechado e todas as alterações serão perdidas.
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Programa de configuração %1
     
     
-      
+      
       %1 Installer
       Instalador %1
     
@@ -539,149 +539,149 @@ O instalador será fechado e todas as alterações serão perdidas.Formulário
     
     
-      
+      
       Select storage de&vice:
       Selecione o dispositivo de armazenamento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Atual:
     
     
-      
+      
       After:
       Depois:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionamento manual</strong><br/>Você pode criar ou redimensionar partições.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilizar %1 como partição home para %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selecione uma partição para reduzir, então arraste a barra de baixo para redimensionar</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 será reduzida para %2MiB e uma nova partição de %3MiB será criada para %4.
     
     
-      
+      
       Boot loader location:
       Local do gerenciador de inicialização:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selecione uma partição para instalação</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Uma partição de sistema EFI não pôde ser encontrada neste dispositivo. Por favor, volte e use o particionamento manual para gerenciar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       A partição de sistema EFI em %1 será utilizada para iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partição de sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Parece que não há um sistema operacional neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Apagar disco</strong><br/>Isto <font color="red">excluirá</font> todos os dados no dispositivo de armazenamento selecionado.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar lado a lado</strong><br/>O instalador reduzirá uma partição para liberar espaço para %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Substituir uma partição</strong><br/>Substitui uma partição com %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento possui %1 nele. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Já há um sistema operacional neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Há diversos sistemas operacionais neste dispositivo de armazenamento. O que você gostaria de fazer?<br/>Você poderá revisar e confirmar suas opções antes que as alterações sejam feitas no dispositivo de armazenamento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       O dispositivo de armazenamento já possui um sistema operacional, mas a tabela de partições <strong>%1</strong> é diferente da necessária <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       O dispositivo de armazenamento tem uma de suas partições <strong>montada</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       O dispositivo de armazenamento é parte de um dispositivo <strong>RAID inativo</strong>.
     
     
-      
+      
       No Swap
       Sem swap
     
     
-      
+      
       Reuse Swap
       Reutilizar swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sem hibernação)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (com hibernação)
     
     
-      
+      
       Swap to file
       Swap em arquivo
     
@@ -749,12 +749,12 @@ O instalador será fechado e todas as alterações serão perdidas.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Definir o modelo de teclado para %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Definir o layout do teclado para %1/%2.
     
@@ -804,47 +804,47 @@ O instalador será fechado e todas as alterações serão perdidas.Instalação pela Rede. (Desabilitada: Não foi possível adquirir lista de pacotes, verifique sua conexão com a internet)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Este computador não satisfaz os requisitos mínimos para instalar %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas alguns recursos podem ser desativados.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Este computador não satisfaz alguns dos requisitos recomendados para instalar %1.<br/>A instalação pode continuar, mas alguns recursos podem ser desativados.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Este programa irá fazer-lhe algumas perguntas e configurar %2 no computador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Bem-vindo ao programa de configuração Calamares para %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Bem-vindo à configuração de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Bem-vindo ao instalador Calamares para %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Bem-vindo ao instalador de %1</h1>
     
@@ -939,15 +939,40 @@ O instalador será fechado e todas as alterações serão perdidas.A instalação do %1 está completa.
     
     
-      
+      
       Package Selection
       Seleção de Pacote
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Por favor, escolha um produto da lista. O produto selecionado será instalado.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Resumo
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Esta é uma visão geral do que acontecerá quando você iniciar o procedimento de configuração.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Este é um resumo do que acontecerá assim que o processo de instalação for iniciado.
+    
   
   
     ContextualProcessJob
@@ -2446,6 +2471,14 @@ O instalador será fechado e todas as alterações serão perdidas.Por favor, escolha um produto da lista. O produto selecionado será instalado.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Pacotes
+    
+  
   
     PackageChooserViewStep
     
@@ -2729,17 +2762,17 @@ O instalador será fechado e todas as alterações serão perdidas.I&nstalar gerenciador de inicialização em:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Você tem certeza de que deseja criar uma nova tabela de partições em %1?
     
     
-      
+      
       Can not create new partition
       Não foi possível criar uma nova partição
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       A tabela de partições %1 já tem %2 partições primárias, e nenhuma a mais pode ser adicionada. Por favor, remova uma partição primária e adicione uma partição estendida no lugar.
     
@@ -2757,107 +2790,82 @@ O instalador será fechado e todas as alterações serão perdidas.Partições
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instalar %1 <strong>ao lado de</strong> outro sistema operacional.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Apagar</strong> disco e instalar %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Substituir</strong> uma partição com %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Particionamento <strong>manual</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instalar %1 <strong>ao lado de</strong> outro sistema operacional no disco <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Apagar</strong> disco <strong>%2</strong> (%3) e instalar %1.
+      
+      Current:
+      Atualmente:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Substituir</strong> uma partição no disco <strong>%2</strong> (%3) com %1.
+      
+      After:
+      Depois:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Particionamento <strong>manual</strong> no disco <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Nenhuma partição de sistema EFI configurada
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disco <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Atualmente:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Depois:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Nenhuma partição de sistema EFI configurada
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte e selecione ou crie um sistema de arquivos FAT32 com o marcador <strong>%3</strong> ativado e o ponto de montagem <strong>%2</strong>.<br/><br/>Você pode continuar sem definir uma partição de sistema EFI, mas seu sistema poderá falhar ao iniciar.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Uma partição de sistema EFI é necessária para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas o marcador <strong>%3</strong> não foi definido.<br/>Para definir o marcador, volte e edite a partição.<br/><br/>Você pode continuar sem definir o marcador, mas seu sistema poderá falhar ao iniciar.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Marcador da partição de sistema EFI não definido
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Opção para usar GPT no BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Uma tabela de partições GPT é a melhor opção para todos os sistemas. Este instalador suporta tal configuração para sistemas BIOS também.<br/><br/>Para configurar uma tabela de partições GPT no BIOS, (caso não tenha sido feito ainda) volte e defina a tabela de partições como GPT, depois crie uma partição sem formatação de 8 MB com o marcador <strong>bios_grub</strong> ativado.<br/><br/>Uma partição não formatada de 8 MB é necessária para iniciar %1 num sistema BIOS com o GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partição de inicialização não criptografada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Uma partição de inicialização separada foi configurada juntamente com uma partição raiz criptografada, mas a partição de inicialização não é criptografada.<br/><br/>Há preocupações de segurança quanto a esse tipo de configuração, porque arquivos de sistema importantes são mantidos em uma partição não criptografada.<br/>Você pode continuar se quiser, mas o desbloqueio do sistema de arquivos acontecerá mais tarde durante a inicialização do sistema.<br/>Para criptografar a partição de inicialização, volte e recrie-a, selecionando <strong>Criptografar</strong>  na janela de criação da partição.
     
     
-      
+      
       has at least one disk device available.
       tem pelo menos um dispositivo de disco disponível.
     
     
-      
+      
       There are no partitions to install on.
       Não há partições para instalar.
     
@@ -2992,7 +3000,7 @@ Saída:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3318,44 +3326,16 @@ Saída:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para melhores resultados, por favor, certifique-se de que este computador:
     
     
-      
+      
       System requirements
       Requisitos do sistema
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Este computador não satisfaz os requisitos mínimos para instalar %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas alguns recursos podem ser desativados.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Este computador não satisfaz alguns dos requisitos recomendados para instalar %1.<br/>A instalação pode continuar, mas alguns recursos podem ser desativados.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Este programa irá fazer-lhe algumas perguntas e configurar %2 no computador.
-    
-  
   
     ScanningDialog
     
@@ -3647,27 +3627,6 @@ Saída:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Esta é uma visão geral do que acontecerá quando você iniciar o procedimento de configuração.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Este é um resumo do que acontecerá assim que o processo de instalação for iniciado.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Resumo
-    
-  
   
     TrackingInstallJob
     
@@ -3999,7 +3958,7 @@ Saída:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Bem-vindo
     
@@ -4007,7 +3966,7 @@ Saída:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Bem-vindo
     
@@ -4090,21 +4049,21 @@ Saída:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Idiomas</h1> </br>
                     A configuração de localidade do sistema afeta o idioma e o conjunto de caracteres para algumas linhas de comando e elementos da interface do usuário. A configuração atual é <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Localização</h1> </br>
                     A configuração de localização do sistema afeta os formatos de números e datas. A configuração atual é <strong>%1</strong>.
     
     
-      
+      
       Back
       Voltar
     
@@ -4170,6 +4129,45 @@ Saída:
             <p>Estes são exemplos de notas.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4226,132 +4224,132 @@ Saída:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Escolha seu nome de usuário e credenciais para fazer login e executar tarefas de administrador
     
     
-      
+      
       What is your name?
       Qual é o seu nome?
     
     
-      
+      
       Your Full Name
       Seu nome completo
     
     
-      
+      
       What name do you want to use to log in?
       Qual nome você quer usar para entrar?
     
     
-      
+      
       Login Name
       Nome do Login
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Se mais de uma pessoa for usar este computador, você poderá criar múltiplas contas após a instalação.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       É permitido apenas letras minúsculas, números, sublinhado e hífen.
     
     
-      
+      
       root is not allowed as username.
       root não é permitido como um nome de usuário.
     
     
-      
+      
       What is the name of this computer?
       Qual é o nome deste computador?
     
     
-      
+      
       Computer Name
       Nome do computador
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Este nome será usado se você fizer o computador ficar visível para outros numa rede.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost não é permitido como hostname.
     
     
-      
+      
       Choose a password to keep your account safe.
       Escolha uma senha para manter a sua conta segura.
     
     
-      
+      
       Password
       Senha
     
     
-      
+      
       Repeat Password
       Repita a senha
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres, e deve ser alterada em intervalos regulares.
     
     
-      
+      
       Validate passwords quality
       Validar qualidade das senhas
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quando esta caixa estiver marcada, será feita a verificação da força da senha e você não poderá usar uma senha fraca.
     
     
-      
+      
       Log in automatically without asking for the password
       Entrar automaticamente sem perguntar pela senha
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       São permitidos apenas letras, números, sublinhado e hífen, com no mínimo dois caracteres.
     
     
-      
+      
       Reuse user password as root password
       Reutilizar a senha de usuário como senha de root
     
     
-      
+      
       Use the same password for the administrator account.
       Usar a mesma senha para a conta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Escolha uma senha de root para manter sua conta segura.
     
     
-      
+      
       Root Password
       Senha de Root
     
     
-      
+      
       Repeat Root Password
       Repita a Senha de Root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação.
     
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index 50a7853918..d2b2bb3338 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -495,12 +495,12 @@ O instalador será encerrado e todas as alterações serão perdidas.
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Programa de Instalação
     
     
-      
+      
       %1 Installer
       %1 Instalador
     
@@ -539,149 +539,149 @@ O instalador será encerrado e todas as alterações serão perdidas.Formulário
     
     
-      
+      
       Select storage de&vice:
       Selecione o dis&positivo de armazenamento:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Atual:
     
     
-      
+      
       After:
       Depois:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Particionamento manual</strong><br/>Pode criar ou redimensionar partições manualmente.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilizar %1 como partição home para %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selecione uma partição para encolher, depois arraste a barra de fundo para redimensionar</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 será encolhida para %2MiB e uma nova %3MiB partição será criada para %4.
     
     
-      
+      
       Boot loader location:
       Localização do carregador de arranque:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selecione uma partição para instalar</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Nenhuma partição de sistema EFI foi encontrada neste sistema. Por favor volte atrás e use o particionamento manual para configurar %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       A partição de sistema EFI em %1 será usada para iniciar %2.
     
     
-      
+      
       EFI system partition:
       Partição de sistema EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento aparenta não ter um sistema operativo. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Apagar disco</strong><br/>Isto irá <font color="red">apagar</font> todos os dados atualmente apresentados no dispositivo de armazenamento selecionado.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalar paralelamente</strong><br/>O instalador irá encolher a partição para arranjar espaço para %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Substituir a partição</strong><br/>Substitui a partição com %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento tem %1 nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento já tem um sistema operativo nele. O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Este dispositivo de armazenamento tem múltiplos sistemas operativos nele, O que quer fazer?<br/>Poderá rever e confirmar as suas escolhas antes de qualquer alteração ser feita no dispositivo de armazenamento.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       O dispositivo de armazenamento já possui um sistema operativo, mas a tabela de partições <strong>%1</strong> é diferente da necessária <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       O dispositivo de armazenamento tem uma das suas partições <strong>montada</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       O dispositivo de armazenamento é parte de um dispositivo <strong>RAID inativo</strong>.
     
     
-      
+      
       No Swap
       Sem Swap
     
     
-      
+      
       Reuse Swap
       Reutilizar Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (sem Hibernação)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (com Hibernação)
     
     
-      
+      
       Swap to file
       Swap para ficheiro
     
@@ -749,12 +749,12 @@ O instalador será encerrado e todas as alterações serão perdidas.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Definir o modelo do teclado para %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Definir esquema do teclado para %1/%2.
     
@@ -804,47 +804,47 @@ O instalador será encerrado e todas as alterações serão perdidas.Instalação de rede. (Desativada: Incapaz de buscar listas de pacotes, verifique a sua ligação de rede)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Este computador não satisfaz os requisitos mínimos para instalar o %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas algumas funcionalidades podem ser desativadas.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Este computador não satisfaz alguns dos requisitos recomendados para instalar o %1.<br/>A instalação pode continuar, mas algumas funcionalidades poderão ser desativadas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Este programa vai fazer-lhe algumas perguntas e configurar o %2 no seu computador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Bem-vindo ao programa de configuração do Calamares para %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Bem-vindo à configuração de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Bem-vindo ao instalador do Calamares para %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Bem-vindo ao instalador do %1</h1>
     
@@ -939,15 +939,40 @@ O instalador será encerrado e todas as alterações serão perdidas.A instalação de %1 está completa.
     
     
-      
+      
       Package Selection
       Seleção de pacote
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Por favor, escolha um produto da lista. O produto selecionado será instalado.
     
+    
+      
+      Install option: <strong>%1</strong>
+      Instalar opção: <strong>%1</strong>
+    
+    
+      
+      None
+      Nenhum
+    
+    
+      
+      Summary
+      Resumo
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Isto é uma visão geral do que acontecerá assim que iniciar o procedimento de configuração.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Isto é uma visão geral do que acontecerá assim que iniciar o procedimento de instalação.
+    
   
   
     ContextualProcessJob
@@ -2446,6 +2471,14 @@ O instalador será encerrado e todas as alterações serão perdidas.Por favor, escolha um produto da lista. O produto selecionado será instalado.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Pacotes
+    
+  
   
     PackageChooserViewStep
     
@@ -2729,17 +2762,17 @@ O instalador será encerrado e todas as alterações serão perdidas.I&nstalar carregador de arranque em:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Tem certeza de que deseja criar uma nova tabela de partições em %1?
     
     
-      
+      
       Can not create new partition
       Não é possível criar nova partição
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       A tabela de partições em %1 já tem %2 partições primárias, e não podem ser adicionadas mais. Em vez disso, por favor remova uma partição primária e adicione uma partição estendida.
     
@@ -2757,107 +2790,82 @@ O instalador será encerrado e todas as alterações serão perdidas.Partições
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instalar %1 <strong>paralelamente</strong> a outro sistema operativo.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Apagar</strong> disco e instalar %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Substituir</strong> a partição com %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Particionamento <strong>Manual</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instalar %1 <strong>paralelamente</strong> a outro sistema operativo no disco <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Apagar</strong> disco <strong>%2</strong> (%3) e instalar %1.
+      
+      Current:
+      Atual:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Substituir</strong> a partição no disco <strong>%2</strong> (%3) com %1.
+      
+      After:
+      Depois:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Particionamento <strong>Manual</strong> no disco <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Nenhuma partição de sistema EFI configurada
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disco <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      Partição de sistema EFI configurada incorretamente
     
     
-      
-      Current:
-      Atual:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      Uma partição de sistema EFI é necessária para iniciar o %1. <br/><br/>Para configurar uma partição de sistema EFI, volte atrás e selecione ou crie um sistema de ficheiros adequado.
     
     
-      
-      After:
-      Depois:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      O sistema de ficheiros deve ser montado em <strong>%1</strong>.
     
     
-      
-      No EFI system partition configured
-      Nenhuma partição de sistema EFI configurada
+      
+      The filesystem must have type FAT32.
+      O sistema de ficheiros deve ter o tipo FAT32.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      É necessário uma partição de sistema EFI para iniciar %1.<br/><br/>Para configurar uma partição de sistema EFI, volte atrás e faça a seleção ou crie um sistema de ficheiros FAT32 com a flag <strong>%3</strong> ativada e o ponto de montagem <strong>%2</strong>.<br/><br/>Pode continuar sem definir uma partição de sistema EFI, mas o seu sistema poderá falhar ao iniciar.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      É necessário uma partição de sistema EFI para iniciar %1.<br/><br/>Uma partição foi configurada com o ponto de montagem <strong>%2</strong>, mas não foi definida a flag <strong>%3</strong>.<br/>Para definir a flag, volte atrás e edite a partição.<br/><br/>Pode continuar sem definir a flag, mas o seu sistema poderá falhar ao iniciar.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      flag não definida da partição de sistema EFI
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Opção para utilizar GPT no BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Uma tabela de partições GPT é a melhor opção para todos os sistemas. Este instalador suporta tal configuração para sistemas BIOS também.<br/><br/>Para configurar uma tabela de partições GPT no BIOS, (caso não tenha sido feito ainda) volte atrás e defina a tabela de partições como GPT, depois crie uma partição sem formatação de 8 MB com o marcador <strong>bios_grub</strong> ativado.<br/><br/>Uma partição não formatada de 8 MB é necessária para iniciar %1 num sistema BIOS com o GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partição de arranque não encriptada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Foi preparada uma partição de arranque separada juntamente com uma partição root encriptada, mas a partição de arranque não está encriptada.<br/><br/>Existem preocupações de segurança com este tipo de configuração, por causa de importantes ficheiros de sistema serem guardados numa partição não encriptada.<br/>Se desejar pode continuar, mas o destrancar do sistema de ficheiros irá ocorrer mais tarde durante o arranque do sistema.<br/>Para encriptar a partição de arranque, volte atrás e recrie-a, e selecione <strong>Encriptar</strong> na janela de criação de partições.
     
     
-      
+      
       has at least one disk device available.
       tem pelo menos um dispositivo de disco disponível.
     
     
-      
+      
       There are no partitions to install on.
       Não há partições para instalar.
     
@@ -2992,7 +3000,7 @@ Saída de Dados:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3318,44 +3326,16 @@ Saída de Dados:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Para melhores resultados, por favor certifique-se que este computador:
     
     
-      
+      
       System requirements
       Requisitos de sistema
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Este computador não satisfaz os requisitos mínimos para configurar %1.<br/>A configuração não pode continuar. <a href="#details">Detalhes...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Este computador não satisfaz os requisitos mínimos para instalar %1.<br/>A instalação não pode continuar. <a href="#details">Detalhes...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Este computador não satisfaz alguns dos requisitos recomendados para configurar %1.<br/>A configuração pode continuar, mas algumas funcionalidades podem ser desativadas.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Este computador não satisfaz alguns dos requisitos recomendados para instalar %1.<br/>A instalação pode continuar, mas algumas funcionalidades poderão ser desativadas.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Este programa vai fazer-lhe algumas perguntas e configurar o %2 no seu computador.
-    
-  
   
     ScanningDialog
     
@@ -3647,27 +3627,6 @@ Saída de Dados:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Isto é uma visão geral do que acontecerá assim que iniciar o procedimento de configuração.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Isto é uma visão geral do que acontecerá assim que iniciar o procedimento de instalação.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Resumo
-    
-  
   
     TrackingInstallJob
     
@@ -3999,7 +3958,7 @@ Saída de Dados:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Bem-vindo
     
@@ -4007,7 +3966,7 @@ Saída de Dados:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Bem-vindo
     
@@ -4090,21 +4049,21 @@ Saída de Dados:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Idiomas</h1> </br>
                     A definição de localização do sistema afeta o idioma e o conjunto de caracteres para alguns elementos da interface de utilizador de linha de comando. A definição atual é <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Localização</h1> </br>
                     A definição de localização do sistema afeta os formatos de números e datas. A definição atual é <strong>%1</strong>.
     
     
-      
+      
       Back
       Voltar
     
@@ -4170,6 +4129,45 @@ Saída de Dados:
             <p>Estes são exemplos de notas de lançamento.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4226,132 +4224,132 @@ Saída de Dados:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Escolha o seu nome de utilizador e credenciais para iniciar sessão e executar tarefas de administrador
     
     
-      
+      
       What is your name?
       Qual é o seu nome?
     
     
-      
+      
       Your Full Name
       O seu nome completo
     
     
-      
+      
       What name do you want to use to log in?
       Que nome deseja usar para iniciar a sessão?
     
     
-      
+      
       Login Name
       Nome de utilizador
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Se mais do que uma pessoa utilizar este computador, poderá criar várias contas após a instalação.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Apenas letras minúsculas, números, underscore e hífen são permitidos.
     
     
-      
+      
       root is not allowed as username.
       root não é permitido como nome de utilizador.
     
     
-      
+      
       What is the name of this computer?
       Qual o nome deste computador?
     
     
-      
+      
       Computer Name
       Nome do computador
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Este nome será utilizado se tornar o computador visível a outros numa rede.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost não é permitido como "hostname".
     
     
-      
+      
       Choose a password to keep your account safe.
       Escolha uma palavra-passe para manter a sua conta segura.
     
     
-      
+      
       Password
       Palavra-passe
     
     
-      
+      
       Repeat Password
       Repita a palavra-passe
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita. Uma boa palavra-passe conterá uma mistura de letras, números e pontuação, deve ter pelo menos oito caracteres, e deve ser alterada a intervalos regulares.
     
     
-      
+      
       Validate passwords quality
       Validar qualidade das palavras-passe
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Quando esta caixa é assinalada, a verificação da força da palavra-passe é feita e não será possível utilizar uma palavra-passe fraca.
     
     
-      
+      
       Log in automatically without asking for the password
       Iniciar sessão automaticamente sem pedir a palavra-passe
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Reutilizar palavra-passe de utilizador como palavra-passe de root
     
     
-      
+      
       Use the same password for the administrator account.
       Usar a mesma palavra-passe para a conta de administrador.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Escolha uma palavra-passe de root para manter a sua conta segura.
     
     
-      
+      
       Root Password
       Palavra-passe de root
     
     
-      
+      
       Repeat Root Password
       Repetir palavra-passe de root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Introduzir a mesma palavra-passe duas vezes, para que possa ser verificada a existência de erros de escrita.
     
diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts
index 6a232aeb77..42109ffb81 100644
--- a/lang/calamares_ro.ts
+++ b/lang/calamares_ro.ts
@@ -492,12 +492,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       Program de instalare %1
     
@@ -536,149 +536,149 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Formular
     
     
-      
+      
       Select storage de&vice:
       Selectează dispoziti&vul de stocare:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       După:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Partiționare manuală</strong><br/>Puteți crea sau redimensiona partițiile.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Reutilizează %1 ca partiție home pentru %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Selectează o partiție de micșorat, apoi trageți bara din jos pentru a redimensiona</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Locație boot loader:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Selectează o partiție pe care să se instaleze</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       O partiție de sistem EFI nu poate fi găsită nicăieri în acest sistem. Vă rugăm să reveniți și să partiționați manual pentru a seta %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Partiția de sistem EFI de la %1 va fi folosită pentru a porni %2.
     
     
-      
+      
       EFI system partition:
       Partiție de sistem EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Acest dispozitiv de stocare nu pare să aibă un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Șterge discul</strong><br/>Aceasta va <font color="red">șterge</font> toate datele prezente pe dispozitivul de stocare selectat.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instalează laolaltă</strong><br/>Instalatorul va micșora o partiție pentru a face loc pentru %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Înlocuiește o partiție</strong><br/>Înlocuiește o partiție cu %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Acest dispozitiv de stocare are %1. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte să fie realizate schimbări pe dispozitivul de stocare.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Acest dispozitiv de stocare are deja un sistem de operare instalat. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de se realiza schimbări pe dispozitivul de stocare.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Acest dispozitiv de stocare are mai multe sisteme de operare instalate. Ce doriți să faceți?<br/>Veți putea revedea și confirma alegerile făcute înainte de a se realiza schimbări pe dispozitivul de stocare.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -746,12 +746,12 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Setează modelul tastaturii la %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Setează aranjamentul de tastatură la %1/%2.
     
@@ -801,47 +801,47 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Instalarea rețelei. (Dezactivat: Nu se pot obține listele de pachete, verificați conexiunea la rețea)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Acest calculator nu satisface cerințele minimale pentru instalarea %1.<br/>Instalarea nu poate continua. <a href="#details">Detalii...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Acest calculator nu satisface unele din cerințele recomandate pentru instalarea %1.<br/>Instalarea poate continua, dar unele funcții ar putea fi dezactivate.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Acest program vă va pune mai multe întrebări și va seta %2 pe calculatorul dumneavoastră.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -936,15 +936,40 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Instalarea este %1 completă.
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Sumar
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Acesta este un rezumat a ce se va întâmpla după ce începeți procedura de instalare.
+    
   
   
     ContextualProcessJob
@@ -2453,6 +2478,14 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2736,17 +2769,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Sigur doriți să creați o nouă tabelă de partiție pe %1?
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2764,107 +2797,82 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Partiții
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instalează %1 <strong>laolaltă</strong> cu un alt sistem de operare.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Șterge</strong> discul și instalează %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Înlocuiește</strong> o partiție cu %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Partiționare <strong>manuală</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instalează %1 <strong>laolaltă</strong> cu un alt sistem de operare pe discul <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Șterge</strong> discul <strong>%2</strong> (%3) și instalează %1.
+      
+      Current:
+      Actual:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Înlocuiește</strong> o partiție pe discul <strong>%2</strong> (%3) cu %1.
+      
+      After:
+      După:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Partiționare <strong>manuală</strong> a discului <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Nicio partiție de sistem EFI nu a fost configurată
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Discul <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Actual:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      După:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Nicio partiție de sistem EFI nu a fost configurată
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
-      Flag-ul de partiție de sistem pentru EFI nu a fost setat
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partiția de boot nu este criptată
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       A fost creată o partiție de boot împreună cu o partiție root criptată, dar partiția de boot nu este criptată.<br/><br/>Sunt potențiale probleme de securitate cu un astfel de aranjament deoarece importante fișiere de sistem sunt păstrate pe o partiție necriptată.<br/>Puteți continua dacă doriți, dar descuierea sistemului se va petrece mai târziu în timpul pornirii.<br/>Pentru a cripta partiția de boot, reveniți și recreați-o, alegând opțiunea <strong>Criptează</strong> din fereastra de creare de partiții.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2999,7 +3007,7 @@ Output
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3322,44 +3330,16 @@ Output
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Pentru rezultate optime, asigurați-vă că acest calculator:
     
     
-      
+      
       System requirements
       Cerințe de sistem
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Acest calculator nu satisface cerințele minimale pentru instalarea %1.<br/>Instalarea nu poate continua. <a href="#details">Detalii...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Acest calculator nu satisface unele din cerințele recomandate pentru instalarea %1.<br/>Instalarea poate continua, dar unele funcții ar putea fi dezactivate.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Acest program vă va pune mai multe întrebări și va seta %2 pe calculatorul dumneavoastră.
-    
-  
   
     ScanningDialog
     
@@ -3651,27 +3631,6 @@ Output
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Acesta este un rezumat a ce se va întâmpla după ce începeți procedura de instalare.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Sumar
-    
-  
   
     TrackingInstallJob
     
@@ -4003,7 +3962,7 @@ Output
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Bine ați venit
     
@@ -4011,7 +3970,7 @@ Output
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Bine ați venit
     
@@ -4081,19 +4040,19 @@ Output
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4158,6 +4117,45 @@ Output
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4194,132 +4192,132 @@ Output
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Cum vă numiți?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Ce nume doriți să utilizați pentru logare?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Care este numele calculatorului?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Alegeți o parolă pentru a menține contul în siguranță.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       Folosește aceeași parolă pentru contul de administrator.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index a1d34b9bbb..f94a148162 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -494,12 +494,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Программа установки %1
     
     
-      
+      
       %1 Installer
       Программа установки %1
     
@@ -538,149 +538,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Выбрать устройство &хранения:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Текущий:
     
     
-      
+      
       After:
       После:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ручная разметка</strong><br/>Вы можете самостоятельно создавать разделы или изменять их размеры.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Использовать %1 как домашний раздел для %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Выберите раздел для уменьшения, затем двигайте ползунок, изменяя размер</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 будет уменьшен до %2MB и новый раздел %3MB будет создан для %4.
     
     
-      
+      
       Boot loader location:
       Расположение загрузчика:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Выберите раздел для установки</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Не найдено системного раздела EFI. Пожалуйста, вернитесь назад и выполните ручную разметку %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Системный раздел EFI на %1 будет использован для запуска %2.
     
     
-      
+      
       EFI system partition:
       Системный раздел EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Видимо, на этом устройстве нет операционной системы. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Стереть диск</strong><br/>Это <font color="red">удалит</font> все данные, которые сейчас находятся на выбранном устройстве.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Установить рядом</strong><br/>Программа установки уменьшит раздел, чтобы освободить место для %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Заменить раздел</strong><br/>Меняет раздел на %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На этом устройстве есть %1. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На этом устройстве уже есть операционная система. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На этом устройстве есть несколько операционных систем. Что Вы хотите сделать?<br/>Вы сможете изменить или подтвердить свой выбор до того, как на устройстве будут сделаны какие-либо изменения.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       Без раздела подкачки
     
     
-      
+      
       Reuse Swap
       Использовать существующий раздел подкачки
     
     
-      
+      
       Swap (no Hibernate)
       Swap (без Гибернации)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (с Гибернацией)
     
     
-      
+      
       Swap to file
       Файл подкачки
     
@@ -748,12 +748,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Установить модель клавиатуры на %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Установить раскладку клавиатуры на %1/%2.
     
@@ -803,47 +803,47 @@ The installer will quit and all changes will be lost.
       Установка по сети. (Отключено: не удается получить список пакетов, проверьте сетевое подключение)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Невозможно продолжить установку. <a href="#details">Подробнее...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Невозможно продолжить установку. <a href="#details">Подробнее...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Эта программа задаст вам несколько вопросов и поможет установить %2 на ваш компьютер.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Добро пожаловать в программу установки Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Добро пожаловать в программу установки %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Добро пожаловать в программу установки Calamares для %1 .</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Добро пожаловать в программу установки %1 .</h1>
     
@@ -938,15 +938,40 @@ The installer will quit and all changes will be lost.
       Установка %1 завершена.
     
     
-      
+      
       Package Selection
       Выбор пакета
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Пожалуйста, выберите продукт из списка. Выбранный продукт будет установлен.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Сводка
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Это обзор изменений, которые будут применены при запуске процедуры установки.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Это обзор изменений, которые будут применены при запуске процедуры установки.
+    
   
   
     ContextualProcessJob
@@ -2461,6 +2486,14 @@ The installer will quit and all changes will be lost.
       Пожалуйста, выберите продукт из списка. Выбранный продукт будет установлен.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Пакеты
+    
+  
   
     PackageChooserViewStep
     
@@ -2744,17 +2777,17 @@ The installer will quit and all changes will be lost.
       Уст&ановить загрузчик в:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Вы уверены, что хотите создать новую таблицу разделов на %1?
     
     
-      
+      
       Can not create new partition
       Не удалось создать новый раздел
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       В таблице разделов на %1 уже %2 первичных разделов, больше добавить нельзя. Удалите один из первичных разделов и добавьте расширенный раздел.
     
@@ -2772,107 +2805,82 @@ The installer will quit and all changes will be lost.
       Разделы
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Установить %1 <strong>параллельно</strong> к другой операционной системе.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Очистить</strong> диск и установить %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Заменить</strong> раздел на %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Ручная</strong> разметка.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Установить %1 <strong>параллельно</strong> к другой операционной системе на диске <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Очистить</strong> диск <strong>%2</strong> (%3) и установить %1.
+      
+      Current:
+      Текущий:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Заменить</strong> раздел на диске <strong>%2</strong> (%3) на %1.
+      
+      After:
+      После:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Ручная</strong> разметка диска <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Нет настроенного системного раздела EFI
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Диск <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Текущий:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      После:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Нет настроенного системного раздела EFI
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Для запуска %1 необходим системный раздел EFI.<br/><br/>Чтобы его настроить, вернитесь и выберите или создайте раздел FAT32 с установленным флагом <strong>%3</strong> и точкой монтирования <strong>%2</strong>.<br/><br/>Можно продолжить и без настройки системного раздела EFI, но ваша система может не загрузиться.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Для запуска %1 необходим системный раздел EFI.<br/><br/>Был настроен раздел с точкой монтирования <strong>%2</strong>, но у него отсутствует флаг <strong>%3</strong>.<br/>Чтобы установить флаг, вернитесь и отредактируйте раздел.<br/><br/>Можно продолжить и без установки флага, но ваша система может не загрузиться.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Не установлен флаг системного раздела EFI
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Возможность для использования GPT в BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Таблица разделов GPT - наилучший вариант для всех систем. Этот установщик позволяет использовать таблицу разделов GPT для систем с BIOS. <br/> <br/> Чтобы установить таблицу разделов как GPT (если это еще не сделано) вернитесь назад и создайте таблицу разделов GPT, затем создайте 8 МБ Не форматированный раздел с включенным флагом <strong> bios-grub</strong> </ strong>. <br/> <br/> Не форматированный раздел в 8 МБ необходим для запуска %1 на системе с BIOS и таблицей разделов GPT.
     
     
-      
+      
       Boot partition not encrypted
       Загрузочный раздел не зашифрован
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Включено шифрование корневого раздела, но использован отдельный загрузочный раздел без шифрования.<br/><br/>При такой конфигурации возникают проблемы с безопасностью, потому что важные системные файлы хранятся на разделе без шифрования.<br/>Если хотите, можете продолжить, но файловая система будет разблокирована позднее во время загрузки системы.<br/>Чтобы включить шифрование загрузочного раздела, вернитесь назад и снова создайте его, отметив <strong>Шифровать</strong> в окне создания раздела.
     
     
-      
+      
       has at least one disk device available.
       имеет как минимум одно доступное дисковое устройство.
     
     
-      
+      
       There are no partitions to install on.
       Нет разделов для установки.
     
@@ -3007,7 +3015,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3331,44 +3339,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Для наилучших результатов, убедитесь, что этот компьютер:
     
     
-      
+      
       System requirements
       Системные требования
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Невозможно продолжить установку. <a href="#details">Подробнее...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Этот компьютер не соответствует минимальным требованиям для установки %1.<br/>Невозможно продолжить установку. <a href="#details">Подробнее...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Этот компьютер соответствует не всем рекомендуемым требованиям для установки %1.<br/>Можно продолжить установку, но некоторые возможности могут быть недоступны.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Эта программа задаст вам несколько вопросов и поможет установить %2 на ваш компьютер.
-    
-  
   
     ScanningDialog
     
@@ -3660,27 +3640,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Это обзор изменений, которые будут применены при запуске процедуры установки.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Это обзор изменений, которые будут применены при запуске процедуры установки.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Итог
-    
-  
   
     TrackingInstallJob
     
@@ -4012,7 +3971,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Добро пожаловать
     
@@ -4020,7 +3979,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Добро пожаловать
     
@@ -4090,19 +4049,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       Назад
     
@@ -4168,6 +4127,45 @@ Output:
             <p>Это пример заметок о выпуске..</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4204,132 +4202,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Как Вас зовут?
     
     
-      
+      
       Your Full Name
       Ваше полное имя
     
     
-      
+      
       What name do you want to use to log in?
       Какое имя Вы хотите использовать для входа?
     
     
-      
+      
       Login Name
       Имя пользователя
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Если этот компьютер используется несколькими людьми, Вы сможете создать соответствующие учетные записи сразу после установки.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Допускаются только строчные буквы, числа, символы подчёркивания и дефисы.
     
     
-      
+      
       root is not allowed as username.
       root не допускается в качестве имени пользователя.
     
     
-      
+      
       What is the name of this computer?
       Какое имя у компьютера?
     
     
-      
+      
       Computer Name
       Имя компьютера
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost не допускается в качестве имени пользователя.
     
     
-      
+      
       Choose a password to keep your account safe.
       Выберите пароль для защиты вашей учетной записи.
     
     
-      
+      
       Password
       Пароль
     
     
-      
+      
       Repeat Password
       Повторите пароль
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Когда этот флажок установлен, выполняется проверка надежности пароля, и вы не сможете использовать слабый пароль.
     
     
-      
+      
       Log in automatically without asking for the password
       Входить автоматически, не спрашивая пароль
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Использовать пароль пользователя как пароль суперпользователя
     
     
-      
+      
       Use the same password for the administrator account.
       Использовать тот же пароль для аккаунта администратора.
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       Пароль суперпользователя
     
     
-      
+      
       Repeat Root Password
       Повторите пароль от root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Введите пароль повторно, чтобы не допустить ошибок при вводе
     
diff --git a/lang/calamares_ru_RU.ts b/lang/calamares_ru_RU.ts
index 54b71d4a53..f556cdf737 100644
--- a/lang/calamares_ru_RU.ts
+++ b/lang/calamares_ru_RU.ts
@@ -493,12 +493,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -537,149 +537,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -747,12 +747,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -802,47 +802,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -937,15 +937,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2460,6 +2485,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2743,17 +2776,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2771,107 +2804,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3003,7 +3011,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3326,44 +3334,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3655,27 +3635,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -4007,7 +3966,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -4015,7 +3974,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4085,19 +4044,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4162,6 +4121,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4198,132 +4196,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts
index 7783b17b10..2858bcbd2c 100644
--- a/lang/calamares_si.ts
+++ b/lang/calamares_si.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       වත්මන්:
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      
+      
+      Current:
+      වත්මන්:
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
-      වත්මන්:
-    
-    
-      
-      After:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index 840a9415a1..6c074662e4 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -495,12 +495,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Inštalačný program distribúcie %1
     
     
-      
+      
       %1 Installer
       Inštalátor distribúcie %1
     
@@ -539,150 +539,150 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Forma
     
     
-      
+      
       Select storage de&vice:
       Vyberte úložné &zariadenie:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Teraz:
     
     
-      
+      
       After:
       Potom:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ručné rozdelenie oddielov</strong><br/>Môžete vytvoriť alebo zmeniť veľkosť oddielov podľa seba.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Opakované použitie oddielu %1 ako domovského pre distribúciu %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Vyberte oddiel na zmenšenie a potom potiahnutím spodného pruhu zmeňte veľkosť</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       Oddiel %1 bude zmenšený na %2MiB a nový %3MiB oddiel bude vytvorený pre distribúciu %4.
     
     
-      
+      
       Boot loader location:
       Umiestnenie zavádzača:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Vyberte oddiel, na ktorý sa má inštalovať</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Oddiel systému EFI sa nedá v tomto počítači nájsť. Prosím, prejdite späť a použite ručné rozdelenie oddielov na inštaláciu distribúcie %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Oddie lsystému EFI na %1 bude použitý na spustenie distribúcie %2.
     
     
-      
+      
       EFI system partition:
       Oddiel systému EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Zdá sa, že toto úložné zariadenie neobsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Vymazanie disku</strong><br/>Týmto sa <font color="red">odstránia</font> všetky údaje momentálne sa nachádzajúce na vybranom úložnom zariadení.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Inštalácia popri súčasnom systéme</strong><br/>Inštalátor zmenší oddiel a uvoľní miesto pre distribúciu %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Nahradenie oddielu</strong><br/>Nahradí oddiel distribúciou %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Toto úložné zariadenie obsahuje operačný systém %1. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Toto úložné zariadenie už obsahuje operačný systém. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Toto úložné zariadenie obsahuje viacero operačných systémov. Čo by ste chceli urobiť?<br/>Budete môcť skontrolovať a potvrdiť vaše voľby pred uplatnením akejkoľvek zmeny na úložnom zariadení.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Toto úložné zariadenie už obsahuje operačný systém, ale tabuľka oddielov <strong>%1</strong> sa líši od požadovanej <strong>%2</strong>.
 <br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Toto úložné zariadenie má jeden zo svojich oddielov <strong>pripojený</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Toto úložné zariadenie je súčasťou zariadenia s <strong>neaktívnym RAIDom</strong>.
     
     
-      
+      
       No Swap
       Bez odkladacieho priestoru
     
     
-      
+      
       Reuse Swap
       Znovu použiť odkladací priestor
     
     
-      
+      
       Swap (no Hibernate)
       Odkladací priestor (bez hibernácie)
     
     
-      
+      
       Swap (with Hibernate)
       Odkladací priestor (s hibernáciou)
     
     
-      
+      
       Swap to file
       Odkladací priestor v súbore
     
@@ -750,12 +750,12 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Nastavenie modelu klávesnice na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Nastavenie rozloženia klávesnice na %1/%2.
     
@@ -805,47 +805,47 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Sieťová inštalácia. (Zakázaná: Nie je možné získať zoznamy balíkov. Skontrolujte vaše sieťové pripojenie.)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Tento počítač nespĺňa minimálne požiadavky pre inštaláciu distribúcie %1.<br/>Inštalácia nemôže pokračovať. <a href="#details">Podrobnosti...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Tento počítač nespĺňa minimálne požiadavky pre inštaláciu distribúcie %1.<br/>Inštalácia nemôže pokračovať. <a href="#details">Podrobnosti...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Tento počítač nespĺňa niektoré z odporúčaných požiadaviek pre inštaláciu distribúcie %1.<br/>Inštalácia môže pokračovať, ale niektoré funkcie môžu byť zakázané.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Tento počítač nespĺňa niektoré z odporúčaných požiadaviek pre inštaláciu distribúcie %1.<br/>Inštalácia môže pokračovať, ale niektoré funkcie môžu byť zakázané.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Tento program vám položí niekoľko otázok a nainštaluje distribúciu %2 do vášho počítača.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Vitajte v inštalačnom programe Calamares pre distribúciu %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Vitajte pri inštalácii distribúcie %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Vitajte v aplikácii Calamares, inštalátore distribúcie %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Vitajte v inštalátore distribúcie %1</h1>
     
@@ -940,15 +940,40 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Inštalácia distribúcie %1s je dokončená.
     
     
-      
+      
       Package Selection
       Výber balíkov
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Prosím, vyberte produkt zo zoznamu. Vybraný produkt bude nainštalovaný.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Súhrn
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Toto je prehľad toho, čo sa stane, keď spustíte inštaláciu.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Toto je prehľad toho, čo sa stane, keď spustíte inštaláciu.
+    
   
   
     ContextualProcessJob
@@ -2464,6 +2489,14 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Prosím, vyberte produkt zo zoznamu. Vybraný produkt bude nainštalovaný.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Balíky
+    
+  
   
     PackageChooserViewStep
     
@@ -2747,17 +2780,17 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Nai&nštalovať zavádzač na:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Naozaj chcete vytvoriť novú tabuľku oddielov na zariadení %1?
     
     
-      
+      
       Can not create new partition
       Nedá sa vytvoriť nový oddiel
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Tabuľka oddielov na %1 už obsahuje primárne oddiely %2 a nie je možné pridávať žiadne ďalšie. Odstráňte jeden primárny oddiel a namiesto toho pridajte rozšírenú oblasť.
     
@@ -2775,107 +2808,82 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Oddiely
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Inštalácia distribúcie %1 <strong>popri</strong> inom operačnom systéme.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Vymazanie</strong> disku a inštalácia distribúcie %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Nahradenie</strong> oddielu distribúciou %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Ručné</strong> rozdelenie oddielov.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Inštalácia distribúcie %1 <strong>popri</strong> inom operačnom systéme na disku <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Vymazanie</strong> disku <strong>%2</strong> (%3) a inštalácia distribúcie %1.
+      
+      Current:
+      Teraz:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Nahradenie</strong> oddielu na disku <strong>%2</strong> (%3) distribúciou %1.
+      
+      After:
+      Potom:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Ručné</strong> rozdelenie oddielov na disku <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Nie je nastavený žiadny oddiel systému EFI
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disk <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Teraz:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Potom:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Nie je nastavený žiadny oddiel systému EFI
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Oddiel systému EFI je potrebný pre spustenie distribúcie %1.<br/><br/>Na nastavenie oddielu systému EFI prejdite späť a vyberte, alebo vytvorte systém súborov FAT32 s povoleným príznakom <strong>%3</strong> a bod pripojenia <strong>%2</strong>.<br/><br/>Môžete pokračovať bez nastavenia oddielu systému EFI, ale váš systém môže pri spustení zlyhať.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Oddiel systému EFI je potrebný pre spustenie distribúcie %1.<br/><br/>Oddiel bol nastavený s bodom pripojenia <strong>%2</strong>, ale nemá nastavený príznak <strong>%3</strong>.<br/>Na nastavenie príznaku prejdite späť a upravte oddiel.<br/><br/>Môžete pokračovať bez nastavenia príznaku, ale váš systém môže pri spustení zlyhať.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Príznak oddielu systému EFI nie je nastavený
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Voľba na použitie tabuľky GPT s BIOSom
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Tabuľka oddielov GPT je najlepšou voľbou pre všetky systémy. Inštalátor podporuje taktiež inštaláciu pre systémy s BIOSom.<br/><br/>Pre nastavenie tabuľky oddielov GPT s BIOSom, (ak ste tak už neučinili) prejdite späť a nastavte tabuľku oddielov na GPT, a potom vytvorte nenaformátovaný oddiel o veľkosti 8 MB s povoleným príznakom <strong>bios_grub</strong>.<br/><br/>Nenaformátovaný oddiel o veľkosti 8 MB je potrebný na spustenie distribúcie %1 na systéme s BIOSom a tabuľkou GPT.
     
     
-      
+      
       Boot partition not encrypted
       Zavádzací oddiel nie je zašifrovaný
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Spolu so zašifrovaným koreňovým oddielom bol nainštalovaný oddelený zavádzací oddiel, ktorý ale nie je zašifrovaný.<br/><br/>S týmto typom inštalácie je ohrozená bezpečnosť, pretože dôležité systémové súbory sú uchovávané na nezašifrovanom oddieli.<br/>Ak si to želáte, môžete pokračovať, ale neskôr, počas spúšťania systému sa vykoná odomknutie systému súborov.<br/>Na zašifrovanie zavádzacieho oddielu prejdite späť a vytvorte ju znovu vybraním voľby <strong>Zašifrovať</strong> v okne vytvárania oddielu.
     
     
-      
+      
       has at least one disk device available.
       má dostupné aspoň jedno diskové zariadenie.
     
     
-      
+      
       There are no partitions to install on.
       Neexistujú žiadne oddiely, na ktoré je možné vykonať inštaláciu.
     
@@ -3010,7 +3018,7 @@ Výstup:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3336,44 +3344,16 @@ Výstup:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Pre čo najlepší výsledok, sa prosím, uistite, že tento počítač:
     
     
-      
+      
       System requirements
       Systémové požiadavky
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Tento počítač nespĺňa minimálne požiadavky pre inštaláciu distribúcie %1.<br/>Inštalácia nemôže pokračovať. <a href="#details">Podrobnosti...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Tento počítač nespĺňa minimálne požiadavky pre inštaláciu distribúcie %1.<br/>Inštalácia nemôže pokračovať. <a href="#details">Podrobnosti...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Tento počítač nespĺňa niektoré z odporúčaných požiadaviek pre inštaláciu distribúcie %1.<br/>Inštalácia môže pokračovať, ale niektoré funkcie môžu byť zakázané.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Tento počítač nespĺňa niektoré z odporúčaných požiadaviek pre inštaláciu distribúcie %1.<br/>Inštalácia môže pokračovať, ale niektoré funkcie môžu byť zakázané.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Tento program vám položí niekoľko otázok a nainštaluje distribúciu %2 do vášho počítača.
-    
-  
   
     ScanningDialog
     
@@ -3665,27 +3645,6 @@ Výstup:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Toto je prehľad toho, čo sa stane, keď spustíte inštaláciu.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Toto je prehľad toho, čo sa stane, keď spustíte inštaláciu.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Súhrn
-    
-  
   
     TrackingInstallJob
     
@@ -4017,7 +3976,7 @@ Výstup:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Uvítanie
     
@@ -4025,7 +3984,7 @@ Výstup:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Uvítanie
     
@@ -4106,21 +4065,21 @@ Výstup:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Jazyky</h1> </br>
                     Miestne nastavenie systému ovplyvní jazyk a znakovú sadu pre niektoré prvky používateľského rozhrania príkazového riadku. Aktuálne nastavenie je <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Miestne nastavenie</h1> </br>
                     Miestne nastavenie systému ovplyvní formát čísel a dátumov. Aktuálne nastavenie je <strong>%1</strong>.
     
     
-      
+      
       Back
       Späť
     
@@ -4186,6 +4145,45 @@ Výstup:
             <p>Toto sú vzorové poznámky k vydaniu.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4222,132 +4220,132 @@ Výstup:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Vyberte vaše používateľské meno a poverenia na prihlásenie a vykonávanie administrátorských úloh
     
     
-      
+      
       What is your name?
       Aké je vaše meno?
     
     
-      
+      
       Your Full Name
       Vaše celé meno
     
     
-      
+      
       What name do you want to use to log in?
       Aké meno chcete použiť na prihlásenie?
     
     
-      
+      
       Login Name
       Prihlasovacie meno
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Ak bude tento počítač používať viac ako jedna osoba, môžete po inštalácii vytvoriť viacero účtov.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Sú povolené iba malé písmená, číslice, podtržníky a pomlčky.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Aký je názov tohto počítača?
     
     
-      
+      
       Computer Name
       Názov počítača
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Tento názov bude použitý, keď zviditeľníte počítač ostatným v sieti.
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Zvoľte heslo pre zachovanie vášho účtu v bezpečí.
     
     
-      
+      
       Password
       Heslo
     
     
-      
+      
       Repeat Password
       Zopakovanie hesla
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom. Dobré heslo by malo obsahovať mix písmen, čísel a diakritiky, malo by mať dĺžku aspoň osem znakov a malo by byť pravidelne menené.
     
     
-      
+      
       Validate passwords quality
       Overiť kvalitu hesiel
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Keď je zaškrtnuté toto políčko, kontrola kvality hesla bude ukončená a nebudete môcť použiť slabé heslo.
     
     
-      
+      
       Log in automatically without asking for the password
       Prihlásiť automaticky bez pýtania hesla
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Znovu použiť používateľské heslo ako heslo správcu
     
     
-      
+      
       Use the same password for the administrator account.
       Použiť rovnaké heslo pre účet správcu.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Zvoľte heslo správcu pre zachovanie vášho účtu v bezpečí.
     
     
-      
+      
       Root Password
       Heslo správcu
     
     
-      
+      
       Repeat Root Password
       Zopakovanie hesla správcu
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom.
     
diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts
index e615f6fc62..a22f9b56ee 100644
--- a/lang/calamares_sl.ts
+++ b/lang/calamares_sl.ts
@@ -494,12 +494,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 Namestilnik
     
@@ -538,149 +538,149 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       Oblika
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       Potem:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -748,12 +748,12 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Nastavi model tipkovnice na %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Nastavi razporeditev tipkovnice na %1/%2.
     
@@ -803,47 +803,47 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -938,15 +938,40 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Povzetek
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2461,6 +2486,14 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2744,17 +2777,17 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Ali ste prepričani, da želite ustvariti novo razpredelnico razdelkov na %1?
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2772,107 +2805,82 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       Razdelki
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      
+      
+      After:
+      Potem:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
-      Potem:
-    
-    
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3004,7 +3012,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3327,44 +3335,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Za najboljše rezultate se prepričajte, da vaš računalnik izpolnjuje naslednje zahteve:
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3656,27 +3636,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Povzetek
-    
-  
   
     TrackingInstallJob
     
@@ -4008,7 +3967,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Dobrodošli
     
@@ -4016,7 +3975,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Dobrodošli
     
@@ -4086,19 +4045,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4163,6 +4122,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4199,132 +4197,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Vaše ime?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Katero ime želite uporabiti za prijavljanje?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Ime računalnika?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Izberite geslo za zaščito vašega računa.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts
index a21db2c686..815017f67c 100644
--- a/lang/calamares_sq.ts
+++ b/lang/calamares_sq.ts
@@ -495,12 +495,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Programi i Rregullimit të %1
     
     
-      
+      
       %1 Installer
       Instalues %1
     
@@ -539,149 +539,149 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Formular
     
     
-      
+      
       Select storage de&vice:
       Përzgjidhni &pajisje depozitimi:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       E tanishmja:
     
     
-      
+      
       After:
       Më Pas:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Pjesëzim dorazi</strong><br/>Pjesët mund t’i krijoni dhe ripërmasoni ju vetë.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Ripërdore %1 si pjesën shtëpi për %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Përzgjidhni një pjesë që të zvogëlohet, mandej tërhiqni shtyllën e poshtme që ta ripërmasoni</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 do të zvogëlohet në %2MiB dhe për %4 do të krijohet një pjesë e re %3MiB.
     
     
-      
+      
       Boot loader location:
       Vendndodhje ngarkuesi nisjesh:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Përzgjidhni një pjesë ku të instalohet</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Në këtë sistem s’gjendet gjëkundi një pjesë EFI sistemi. Ju lutemi, kthehuni mbrapsht dhe përdorni pjesëtimin dorazi që të rregulloni %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Për nisjen e %2 do të përdoret pjesa EFI e sistemit te %1.
     
     
-      
+      
       EFI system partition:
       Pjesë EFI sistemi:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Kjo pajisje depozitimi përmban %1 në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Fshije diskun</strong><br/>Kështu do të <font color=\"red\">fshihen</font> krejt të dhënat të pranishme tani në pajisjen e përzgjedhur.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Instaloje në krah të tij</strong><br/>Instaluesi do të zvogëlojë një pjesë për të bërë vend për %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Zëvendëso një pjesë</strong><br/>Zëvendëson një pjesë me %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Kjo pajisje depozitimi përmban %1 në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Kjo pajisje depozitimi ka tashmë një sistem operativ në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Kjo pajisje depozitimi ka disa sisteme operativë në të. Ç’do të donit të bënit?<br/>Do të jeni në gjendje të rishqyrtoni dhe ripohoni zgjedhjet tuaja, para se te pajisja e depozitimit të bëhet çfarëdo ndryshimi.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Kjo pajisje depozitimi ka tashmë një sistem operativ në të, por tabela e saj e pjesëve <strong>%1</strong> është e ndryshme nga ajo e duhura <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Kjo pajisje depozitimi ka një nga pjesët e saj <strong>të montuar</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Kjo pajisje depozitimi është pjesë e një pajisje <strong>RAID jo aktive</strong> device.
     
     
-      
+      
       No Swap
       Pa Swap
     
     
-      
+      
       Reuse Swap
       Ripërdor Swap-in
     
     
-      
+      
       Swap (no Hibernate)
       Swap (pa Hibernate)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (me Hibernate)
     
     
-      
+      
       Swap to file
       Swap në kartelë
     
@@ -749,12 +749,12 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Si model tastiere do të caktohet %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Si model tastiere do të caktohet %1%2.
     
@@ -804,47 +804,47 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Instalim Nga Rrjeti. (U çaktivizua: S’arrihet të sillen lista paketash, kontrolloni lidhjen tuaj në rrjet)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Ky kompjuter s’i plotëson kërkesat minimum për rregullimin e %1.<br/>Rregullimi s’mund të vazhdojë. <a href=\"#details\">Hollësi…</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ky kompjuter s’i plotëson kërkesat minimum për instalimin e %1.<br/>Instalimi s’mund të vazhdojë. <a href=\"#details\">Hollësi…</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Ky kompjuter s’i plotëson disa nga domosdoshmëritë e rekomanduara për rregullimin e %1.<br/>Rregullimi mund të vazhdojë, por disa veçori mund të përfundojnë të çaktivizuara.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Ky kompjuter s’i plotëson disa nga domosdoshmëritë e rekomanduara për instalimin e %1.<br/>Instalimi mund të vazhdojë, por disa veçori mund të përfundojnë të çaktivizuara.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ky program do t’ju bëjë disa pyetje dhe do të rregullojë %2 në kompjuterin tuaj.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Mirë se vini te programi i ujdisjes së Calamares për</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Mirë se vini te udjisja e %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Mirë se vini te instaluesi Calamares për %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Mirë se vini te instaluesi i %1</h1>
     
@@ -939,15 +939,40 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Instalimi i %1 u plotësua.
     
     
-      
+      
       Package Selection
       Përzgjedhje Pakete
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Ju lutemi, zgjidhni prej listës një produkt. Produkti i përzgjedhur do të instalohet.
     
+    
+      
+      Install option: <strong>%1</strong>
+      Mundësi instalimi: <strong>%1</strong>
+    
+    
+      
+      None
+      Asnjë
+    
+    
+      
+      Summary
+      Përmbledhje
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Kjo është një përmbledhje e asaj që do të ndodhë sapo të nisni procedurën e rregullimit.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Kjo është një përmbledhje e asaj që do të ndodhë sapo të nisni procedurën e instalimit.
+    
   
   
     ContextualProcessJob
@@ -2444,6 +2469,14 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Ju lutemi, zgjidhni prej listës një produkt. Produkti i përzgjedhur do të instalohet.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paketa
+    
+  
   
     PackageChooserViewStep
     
@@ -2727,17 +2760,17 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       &Instalo ngarkues nisjesh në:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Jeni i sigurt se doni të krijoni një tabelë të re pjesësh në %1?
     
     
-      
+      
       Can not create new partition
       S’krijohet dot pjesë e re
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Tabela e pjesëtimit te %1 ka tashmë %2 pjesë parësore, dhe s’mund të shtohen të tjera. Ju lutemi, në vend të kësaj, hiqni një pjesë parësore dhe shtoni një pjesë të zgjeruar.
     
@@ -2755,107 +2788,82 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Pjesë
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Instalojeni %1 <strong>në krah</strong> të një tjetër sistemi operativ.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Fshije</strong> diskun dhe instalo %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Zëvendësojeni</strong> një pjesë me %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Pjesëtim <strong>dorazi</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Instaloje %1 <strong>në krah</strong> të një tjetri sistemi operativ në diskun <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Fshije</strong> diskun <strong>%2</strong> (%3) dhe instalo %1.
+      
+      Current:
+      E tanishmja:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Zëvendëso</strong> një pjesë te disku <strong>%2</strong> (%3) me %1.
+      
+      After:
+      Më Pas:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Pjesëtim <strong>dorazi</strong> në diskun <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      S’ka të formësuar pjesë sistemi EFI
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disku <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      Pjesë EFI sistemi e formësuar pasaktësisht
     
     
-      
-      Current:
-      E tanishmja:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      Që të niset %1, është e nevojshme një pjesë EFI sistemi.<br/><br/>Që të formësoni një pjesë sistemi EFI, kthehuni nbrapsht dhe përzgjidhni ose krijoni një sistem të përshtatshëm kartelash.
     
     
-      
-      After:
-      Më Pas:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      Sistemi i kartelave duhet të montohet te <strong>%1</strong>.
     
     
-      
-      No EFI system partition configured
-      S’ka të formësuar pjesë sistemi EFI
+      
+      The filesystem must have type FAT32.
+      Sistemi i kartelave duhet të jetë i llojit FAT32.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Një pjesë EFI sistemi është e nevojshme për nisjen e %1.<br/><br/>Që të formësoni një pjesë EFI sistemi, kthehuni mbrapsht dhe përzgjidhni ose krijoni një sistem kartelash FAT32 me parametrin <strong>%3</strong> të aktivizuar dhe me pikë montimi <strong>%2</strong>.<br/><br/>Mund të vazhdoni pa ujdisur një pjesë EFI sistemi, por nisja nën sistemi juaj mund të dështojë.
+      
+      The filesystem must be at least %1 MiB in size.
+      Sistemi i kartelave duhet të jetë të paktën %1 MiB i madh.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Një pjesë EFI sistemi është e nevojshme për nisjen e %1.<br/><br/>Qe formësuar një pikë montimi <strong>%2</strong>, por parametri <strong>%3</strong> për të s’është ujdisur.<br/>Për të ujdisur parametrin, kthehuni mbrapsht dhe përpunoni pjesën.<br/><br/>Mund të vazhdoni pa ujdisur një pjesë EFI sistemi, por nisja nën sistemin tuaj mund të dështojë.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      Sistemi i kartelave duhet të ketë të përzgjedhur parametrin <strong>%1</strong>.
     
     
-      
-      EFI system partition flag not set
-      S’i është vënë parametër pjese EFI sistemi
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      Mund të vazhdoni pa ujdisur një pjesë EFI sistemi, por sistemi juaj mund të mos arrijë të niset.
     
     
-      
+      
       Option to use GPT on BIOS
       Mundësi për përdorim GTP-je në BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Një tabelë pjesësh GPT është mundësia më e mirë për krejt sistemet. Ky instalues mbulon gjithashtu një ujdisje të tillë edhe për sisteme BIOS.<br/><br/>Që të formësoni një tabelë pjesësh GPT në BIOS, (nëse s’është bërë ende) kthehuni dhe ujdiseni tabelën e pjesëve si  GPT, më pas krijoni një ndarje të paformatuar 8 MB me shenjën <strong>bios_grub</strong> të aktivizuar.<br/><br/>Një pjesë e paformatuar 8 MB është e nevojshme për të nisur %1 në një sistem BIOS me GPT.
     
     
-      
+      
       Boot partition not encrypted
       Pjesë nisjesh e pafshehtëzuar
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Tok me pjesën e fshehtëzuar <em>root</em> qe rregulluar edhe një pjesë <em>boot</em> veçmas, por pjesa <em>boot</em> s’është e fshehtëzuar.<br/><br/>Ka preokupime mbi sigurinë e këtij lloj rregullimi, ngaqë kartela të rëndësishme sistemi mbahen në një pjesë të pafshehtëzuar.<br/>Mund të vazhdoni, nëse doni, por shkyçja e sistemit të kartelave do të ndodhë më vonë, gjatë nisjes së sistemit.<br/>Që të fshehtëzoni pjesën <em>boot</em>, kthehuni mbrapsht dhe rikrijojeni, duke përzgjedhur te skena e krijimit të pjesës <strong>Fshehtëzoje</strong>.
     
     
-      
+      
       has at least one disk device available.
       ka të paktën një pajisje disku për përdorim.
     
     
-      
+      
       There are no partitions to install on.
       S’ka pjesë ku të instalohet.
     
@@ -2990,7 +2998,7 @@ Përfundim:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3316,44 +3324,16 @@ Përfundim:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Për përfundime më të mira, ju lutemi, garantoni që ky kompjuter:
     
     
-      
+      
       System requirements
       Sistem i domosdoshëm
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Ky kompjuter s’i plotëson kërkesat minimum për rregullimin e %1.<br/>Rregullimi s’mund të vazhdojë. <a href=\"#details\">Hollësi…</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Ky kompjuter s’i plotëson kërkesat minimum për instalimin e %1.<br/>Instalimi s’mund të vazhdojë. <a href=\"#details\">Hollësi…</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Ky kompjuter s’i plotëson disa nga domosdoshmëritë e rekomanduara për rregullimin e %1.<br/>Rregullimi mund të vazhdojë, por disa veçori mund të përfundojnë të çaktivizuara.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Ky kompjuter s’i plotëson disa nga domosdoshmëritë e rekomanduara për instalimin e %1.<br/>Instalimi mund të vazhdojë, por disa veçori mund të përfundojnë të çaktivizuara.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Ky program do t’ju bëjë disa pyetje dhe do të rregullojë %2 në kompjuterin tuaj.
-    
-  
   
     ScanningDialog
     
@@ -3645,27 +3625,6 @@ Përfundim:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Kjo është një përmbledhje e asaj që do të ndodhë sapo të nisni procedurën e rregullimit.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Kjo është një përmbledhje e asaj që do të ndodhë sapo të nisni procedurën e instalimit.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Përmbledhje
-    
-  
   
     TrackingInstallJob
     
@@ -3997,7 +3956,7 @@ Përfundim:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Mirë se vini
     
@@ -4005,7 +3964,7 @@ Përfundim:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Mirë se vini
     
@@ -4088,21 +4047,21 @@ Përfundim:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Gjuhë</h1> </br>
                     Vlera për vendoren e sistemit prek gjuhën dhe shkronjat e përdorura për disa elementë të ndërfaqes rresh urdhrash të përdoruesit. Vlera e tanishme është <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Vendore</h1> </br>
                     Rregullimi i vendores së sistemit prek formatin e numrave dhe datave. Rregullimi i tanishëm është <strong>%1</strong>.
     
     
-      
+      
       Back
       Mbrapsht
     
@@ -4168,6 +4127,46 @@ Përfundim:
             <p>Ky është një shembull shënimesh hedhjeje në qarkullim.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      LibreOffice është një suitë zyrash e lirë dhe e fuqishme, e përdorur nga miliona vetë anembanë rruzullit. Përfshin disa aplikacione, që e bëjnë suitën e Lirë dhe me Burim të Hapët më të zhdërvjellët në treg për zyra.<br/>
+                    Mundësi parazgjedhje.
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      Nëse s’doni të instalohet një suitë zyre, thjesht përzgjidhni Pa Suitë Zyre. Mundeni përherë të shtoni një të tillë (ose disa) më vonë, në sistemin tuaj të instaluar, kur të jetë e nevojshme.
+    
+    
+      
+      No Office Suite
+      Pa Suitë Zyre
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      Krijoni një instalim minimal Desktopi, hiqni krejt aplikacionet ekstra dhe vendosni më vonë se ç’doni të shtoni në sistemin tuaj. Shembuj se çfarë s’do të jenë në një instalim të tillë, s’do të ketë Suitë Zyre, as lojtës mediash, as parës figurash apo mbulim shtypësish.  Do të jetë thjesht një mjedis desktop, shfletues kartelash, përgjegjës paketash, përpunues tekstesh dhe një shfletues elementar interneti.
+    
+    
+      
+      Minimal Install
+      Instalim Minimal
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      Ju lutemi, përzgjidhni një mundësi për instalimin tuaj, ose përdorni parazgjedhjen: me përfshirje të LibreOffice-it.
+    
+  
   
     release_notes
     
@@ -4224,132 +4223,132 @@ Përfundim:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Zgjidhni emrin tuaj të përdoruesit dhe kredencialet për të bërë hyrje dhe kryer veprime përgjegjësi
     
     
-      
+      
       What is your name?
       Cili është emri juaj?
     
     
-      
+      
       Your Full Name
       Emri Juaj i Plotë
     
     
-      
+      
       What name do you want to use to log in?
       Ç’emër doni të përdorni për t’u futur?
     
     
-      
+      
       Login Name
       Emër Hyrjeje
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Nëse këtë kompjuter do ta përdorë më shumë se një person, mund të krijoni llogari të shumta pas instalimit.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Lejohen vetëm shkronja të vogla, numra, nënvijë dhe vijë ndarëse.
     
     
-      
+      
       root is not allowed as username.
       “root” nuk lejohet si emër përdoruesi.
     
     
-      
+      
       What is the name of this computer?
       Cili është emri i këtij kompjuteri?
     
     
-      
+      
       Computer Name
       Emër Kompjuteri
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Ky emër do të përdoret nëse e bëni kompjuterin të dukshëm për të tjerët në një rrjet.
     
     
-      
+      
       localhost is not allowed as hostname.
       “localhost” s’lejohet si strehëemër.
     
     
-      
+      
       Choose a password to keep your account safe.
       Zgjidhni një fjalëkalim për ta mbajtur llogarinë tuaj të parrezikuar.
     
     
-      
+      
       Password
       Fjalëkalim
     
     
-      
+      
       Repeat Password
       Ripërsëritni Fjalëkalimin
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Jepeni të njëjtin fjalëkalim dy herë, që të kontrollohet për gabime shkrimi. Një fjalëkalim i mirë do të përmbante një përzierje shkronjash, numrash dhe shenjash pikësimi, do të duhej të ishte të paktën tetë shenja i gjatë, dhe do të duhej të ndryshohej periodikisht.
     
     
-      
+      
       Validate passwords quality
       Vlerëso cilësi fjalëkalimi
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Kur i vihet shenjë kësaj kutize, bëhet kontroll fortësie fjalëkalimi dhe s’do të jeni në gjendje të përdorni një fjalëkalim të dobët.
     
     
-      
+      
       Log in automatically without asking for the password
       Kryej hyrje vetvetiu, pa kërkuar fjalëkalimin.
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Lejohen vetëm shkronja, numra, nënvijë dhe vijë ndarëse. minimumi dy shenja.
     
     
-      
+      
       Reuse user password as root password
       Ripërdor fjalëkalim përdoruesi si fjalëkalim përdoruesi rrënjë
     
     
-      
+      
       Use the same password for the administrator account.
       Përdor të njëjtin fjalëkalim për llogarinë e përgjegjësit.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Që ta mbani llogarinë tuaj të parrezik, zgjidhni një fjalëkalim rrënje 
     
     
-      
+      
       Root Password
       Fjalëkalim Rrënje
     
     
-      
+      
       Repeat Root Password
       Përsëritni Fjalëkalim Rrënje
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Jepeni të njëjtin fjalëkalim dy herë, që të mund të kontrollohet për gabime shkrimi.
     
diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts
index 18c03de1fe..7a2886ee68 100644
--- a/lang/calamares_sr.ts
+++ b/lang/calamares_sr.ts
@@ -492,12 +492,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 инсталер
     
@@ -536,149 +536,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Изаберите у&ређај за смештање:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Тренутно:
     
     
-      
+      
       After:
       После:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Ручно партиционисање</strong><br/>Сами можете креирати или мењати партције.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       Подизни учитавач на:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -746,12 +746,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -801,47 +801,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -936,15 +936,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Сажетак
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2450,6 +2475,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2733,17 +2766,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2761,107 +2794,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
+      
+      Current:
+      Тренутно:
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      
+      
+      After:
+      После:
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      Current:
-      Тренутно:
-    
-    
-      
-      After:
-      После:
-    
-    
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2993,7 +3001,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3316,44 +3324,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       За најбоље резултате обезбедите да овај рачунар:
     
     
-      
+      
       System requirements
       Системски захтеви
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3645,27 +3625,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Сажетак
-    
-  
   
     TrackingInstallJob
     
@@ -3997,7 +3956,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Добродошли
     
@@ -4005,7 +3964,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Добродошли
     
@@ -4075,19 +4034,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4152,6 +4111,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4188,132 +4186,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Како се зовете?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Како ћете звати ваш рачунар?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Изаберите лозинку да обезбедите свој налог.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts
index 118bab6ea0..5ea152d690 100644
--- a/lang/calamares_sr@latin.ts
+++ b/lang/calamares_sr@latin.ts
@@ -492,12 +492,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       %1 Instaler
     
@@ -536,149 +536,149 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       Poslije:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -746,12 +746,12 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -801,47 +801,47 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -936,15 +936,40 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Izveštaj
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2450,6 +2475,14 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2733,17 +2766,17 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2761,107 +2794,82 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       Particije
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      
+      
+      After:
+      Poslije:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
-      Poslije:
-    
-    
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2993,7 +3001,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3316,44 +3324,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Za najbolje rezultate, uvjetite se da li ovaj računar:
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3645,27 +3625,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Izveštaj
-    
-  
   
     TrackingInstallJob
     
@@ -3997,7 +3956,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Dobrodošli
     
@@ -4005,7 +3964,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Dobrodošli
     
@@ -4075,19 +4034,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4152,6 +4111,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4188,132 +4186,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       Kako se zovete?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       Koje ime želite koristiti da se prijavite?
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Kako želite nazvati ovaj računar?
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Odaberite lozinku da biste zaštitili Vaš korisnički nalog.
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 6b6b7462d9..63c9cef84c 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -494,12 +494,12 @@ Alla ändringar kommer att gå förlorade.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Installationsprogram
     
     
-      
+      
       %1 Installer
       %1-installationsprogram
     
@@ -538,149 +538,149 @@ Alla ändringar kommer att gå förlorade.
       Formulär
     
     
-      
+      
       Select storage de&vice:
       Välj lagringsenhet:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Nuvarande:
     
     
-      
+      
       After:
       Efter:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Manuell partitionering</strong><br/>Du kan själv skapa och ändra storlek på partitionerna.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Återanvänd %1 som hempartition för %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Välj en partition att minska, sen dra i nedre fältet för att ändra storlek</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 kommer att förminskas till %2MiB och en ny %3MiB partition kommer att skapas för %4.
     
     
-      
+      
       Boot loader location:
       Sökväg till starthanterare:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Välj en partition att installera på</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Ingen EFI-partition kunde inte hittas på systemet. Gå tillbaka och partitionera din lagringsenhet manuellt för att ställa in %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       EFI-partitionen %1 kommer att användas för att starta %2.
     
     
-      
+      
       EFI system partition:
       EFI-partition:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Denna lagringsenhet ser inte ut att ha ett operativsystem installerat. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringseneheten.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Rensa lagringsenhet</strong><br/>Detta kommer <font color="red">radera</font> all existerande data på den valda lagringsenheten.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Installera på sidan om</strong><br/>Installationshanteraren kommer krympa en partition för att göra utrymme för %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ersätt en partition</strong><br/>Ersätter en partition med %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Denna lagringsenhet har %1 på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring görs på lagringsenheten.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Denna lagringsenhet har redan ett operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Denna lagringsenhet har flera operativsystem på sig. Vad vill du göra?<br/>Du kommer kunna granska och bekräfta dina val innan någon ändring sker på lagringsenheten.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Denna lagringsenhet har redan ett operativsystem installerat på sig, men partitionstabellen <strong>%1</strong> skiljer sig från den som behövs <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Denna lagringsenhet har en av dess partitioner <strong>monterad</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Denna lagringsenhet är en del av en <strong>inaktiv RAID</strong>enhet.    
     
     
-      
+      
       No Swap
       Ingen Swap
     
     
-      
+      
       Reuse Swap
       Återanvänd Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap (utan viloläge)
     
     
-      
+      
       Swap (with Hibernate)
       Swap (med viloläge)
     
     
-      
+      
       Swap to file
       Använd en fil som växlingsenhet
     
@@ -748,12 +748,12 @@ Alla ändringar kommer att gå förlorade.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Sätt tangenbordsmodell till %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Sätt tangentbordslayout till %1/%2.
     
@@ -803,47 +803,47 @@ Alla ändringar kommer att gå förlorade.
       Nätverksinstallation. (Inaktiverad: Kan inte hämta paketlistor, kontrollera nätverksanslutningen)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Datorn uppfyller inte minimikraven för inställning av %1.<br/>Inga inställningar kan inte göras. <a href="#details">Detaljer...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Denna dator uppfyller inte minimikraven för att installera %1.<br/>Installationen kan inte fortsätta. <a href="#details">Detaljer...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Några av kraven för inställning av %1 uppfylls inte av datorn.<br/>Inställningarna kan ändå göras men vissa funktioner kommer kanske inte att kunna användas.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Denna dator uppfyller inte alla rekommenderade krav för att installera %1.<br/>Installationen kan fortsätta, men alla alternativ och funktioner kanske inte kan användas.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Detta program kommer att ställa dig några frågor och installera %2 på din dator.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Välkommen till Calamares installationsprogram för %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Välkommen till %1 installation</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Välkommen till Calamares installationsprogram för %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Välkommen till %1-installeraren</h1>
     
@@ -938,15 +938,40 @@ Alla ändringar kommer att gå förlorade.
       Installationen av %1 är klar.
     
     
-      
+      
       Package Selection
       Paketval
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Välj en produkt från listan. Den valda produkten kommer att installeras.
     
+    
+      
+      Install option: <strong>%1</strong>
+      Installations alternativ: <strong>%1</strong>
+    
+    
+      
+      None
+      Ingen
+    
+    
+      
+      Summary
+      Översikt
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Detta är en översikt över vad som kommer hända när du startar installationsprocessen.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Detta är en överblick av vad som kommer att ske när du startar installationsprocessen.
+    
   
   
     ContextualProcessJob
@@ -2446,6 +2471,14 @@ Sök på kartan genom att dra
       Välj en produkt från listan. Den valda produkten kommer att installeras.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paket
+    
+  
   
     PackageChooserViewStep
     
@@ -2729,17 +2762,17 @@ Sök på kartan genom att dra
       Installera uppstartshanterare på:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Är du säker på att du vill skapa en ny partitionstabell på %1?
     
     
-      
+      
       Can not create new partition
       Kan inte skapa ny partition
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Partitionstabellen på %1 har redan %2 primära partitioner och inga fler kan läggas till. Var god ta bort en primär partition och lägg till en utökad partition istället.
     
@@ -2757,107 +2790,82 @@ Sök på kartan genom att dra
       Partitioner
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Installera %1 <strong>bredvid</strong> ett annat operativsystem.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Rensa</strong> disken och installera %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Ersätt</strong> en partition med %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Manuell</strong> partitionering.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Installera %1 <strong>bredvid</strong> ett annat operativsystem på disken <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Rensa</strong> disken <strong>%2</strong> (%3) och installera %1.
+      
+      Current:
+      Nuvarande:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Ersätt</strong> en partition på disken <strong>%2</strong> (%3) med %1.
+      
+      After:
+      Efter:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Manuell</strong> partitionering på disken <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Ingen EFI system partition konfigurerad
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disk <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      EFI-systempartitionen felaktigt konfigurerad
     
     
-      
-      Current:
-      Nuvarande:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      En EFI-systempartition krävs för att starta %1 <br/><br/>För att konfigurera en EFI-systempartition, gå tillbaka och välj eller skapa ett lämpligt filsystem.
     
     
-      
-      After:
-      Efter:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      Filsystemet måste vara monterat på <strong>%1</strong>.
     
     
-      
-      No EFI system partition configured
-      Ingen EFI system partition konfigurerad
+      
+      The filesystem must have type FAT32.
+      Filsystemet måste vara av typ FAT32.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      En EFI-systempartition krävs för att starta %1. <br/><br/> För att konfigurera en EFI-systempartition, gå tillbaka och välj eller skapa ett FAT32-filsystem med <strong>%3</strong>-flaggan satt och monteringspunkt <strong>%2</strong>. <br/><br/>Du kan fortsätta utan att ställa in en EFI-systempartition, men ditt system kanske misslyckas med att starta.
+      
+      The filesystem must be at least %1 MiB in size.
+      Filsystemet måste vara minst %1 MiB i storlek.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      En EFI-systempartition krävs för att starta %1. <br/><br/>En partition är konfigurerad med monteringspunkt <strong>%2</strong>, men dess <strong>%3</strong>-flagga är inte satt.<br/>För att sätta flaggan, gå tillbaka och redigera partitionen.<br/><br/>Du kan fortsätta utan att sätta flaggan, men ditt system kanske misslyckas med att starta
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      Filsystemet måste ha flagga <strong>%1</strong> satt.
     
     
-      
-      EFI system partition flag not set
-      EFI system partitionsflagga inte satt
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      Du kan fortsätta utan att ställa in en EFI-systempartition men ditt system kanske inte startar.
     
     
-      
+      
       Option to use GPT on BIOS
       Alternativ för att använda GPT på BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       En GPT-partitionstabell är det bästa alternativet för alla system. Detta installationsprogram stödjer det för system med BIOS också.<br/><br/>För att konfigurera en GPT-partitionstabell på BIOS (om det inte redan är gjort), gå tillbaka och sätt partitionstabell till GPT, skapa sedan en oformaterad partition på 8MB med <strong>bios_grub</strong>-flaggan satt.<br/><br/>En oformaterad partition på 8MB är nödvändig för att starta %1 på ett BIOS-system med GPT.
     
     
-      
+      
       Boot partition not encrypted
       Boot partition inte krypterad
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       En separat uppstartspartition skapades tillsammans med den krypterade rootpartitionen, men uppstartspartitionen är inte krypterad.<br/><br/>Det finns säkerhetsproblem med den här inställningen, eftersom viktiga systemfiler sparas på en okrypterad partition.<br/>Du kan fortsätta om du vill, men upplåsning av filsystemet kommer hända senare under uppstart av systemet.<br/>För att kryptera uppstartspartitionen, gå tillbaka och återskapa den, och välj <strong>Kryptera</strong> i fönstret när du skapar partitionen.
     
     
-      
+      
       has at least one disk device available.
       har åtminstone en diskenhet tillgänglig.
     
     
-      
+      
       There are no partitions to install on.
       Det finns inga partitioner att installera på.
     
@@ -2992,7 +3000,7 @@ Utdata:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3318,44 +3326,16 @@ Installationen kan inte fortsätta.</p>
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       För bästa resultat, vänligen se till att datorn:
     
     
-      
+      
       System requirements
       Systemkrav
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Datorn uppfyller inte minimikraven för inställning av %1.<br/>Inga inställningar kan inte göras. <a href="#details">Detaljer...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Denna dator uppfyller inte minimikraven för att installera %1.<br/>Installationen kan inte fortsätta. <a href="#details">Detaljer...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Några av kraven för inställning av %1 uppfylls inte av datorn.<br/>Inställningarna kan ändå göras men vissa funktioner kommer kanske inte att kunna användas.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Denna dator uppfyller inte alla rekommenderade krav för att installera %1.<br/>Installationen kan fortsätta, men alla alternativ och funktioner kanske inte kan användas.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Detta program kommer att ställa dig några frågor och installera %2 på din dator.
-    
-  
   
     ScanningDialog
     
@@ -3647,27 +3627,6 @@ Installationen kan inte fortsätta.</p>
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Detta är en översikt över vad som kommer hända när du startar installationsprocessen.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Detta är en överblick av vad som kommer att ske när du startar installationsprocessen.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Översikt
-    
-  
   
     TrackingInstallJob
     
@@ -3999,7 +3958,7 @@ Installationen kan inte fortsätta.</p>
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Välkommen
     
@@ -4007,7 +3966,7 @@ Installationen kan inte fortsätta.</p>
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Välkommen
     
@@ -4090,21 +4049,21 @@ Installationen kan inte fortsätta.</p>
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Språk</h1> </br>
 Systemspråket påverkar vilket språk och teckenuppsättning somliga kommandoradsprogram använder. Den nuvarande inställningen är <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Nationella inställningar</h1> </br>
 Systems nationella inställningar påverkar nummer och datumformat. Den nuvarande inställningen är <strong>%3</strong>.
     
     
-      
+      
       Back
       Bakåt
     
@@ -4170,6 +4129,46 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
             <p>Detta är exempel versionsinformation.
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      LibreOffice är ett kraftfull och gratis Office paket, som används av miljontals människor runt om i världen. Det innehåller flera program som gör det till de mest mångsidiga Office paketet som är gratis och öppen källkod på marknaden.<br/>
+                    Standard alternativ.
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      Om du inte vill installera ett office paket, bara välj Inget Office paket. Du kan alltid lägga till ett (eller mer) senare på ditt installerade system om behovet uppstår.
+    
+    
+      
+      No Office Suite
+      Inget Office paket
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      Skapa en minimal skrivbordsinstallation, ta bort alla extra program och välj senare på vad du vill lägga till i ditt system. Exempel på vad som inte kommer att finnas på en sådan installation, det kommer inte att finnas något Office paket, inga mediaspelare, ingen bildvisare eller utskriftsstöd. Det kommer bara att finnas en skrivbordsmiljö, filbläddrare, pakethanterare, textredigerare och enkel webbläsare.
+    
+    
+      
+      Minimal Install
+      Minimal installation
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      Välj ett alternativ för din installation, eller använd standard: LibreOffice ingår.
+    
+  
   
     release_notes
     
@@ -4226,132 +4225,132 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Välj ditt användarnamn och inloggningsuppgifter för att logga in och utföra admin-uppgifter
     
     
-      
+      
       What is your name?
       Vad heter du?
     
     
-      
+      
       Your Full Name
       Ditt Fullständiga namn 
     
     
-      
+      
       What name do you want to use to log in?
       Vilket namn vill du använda för att logga in?
     
     
-      
+      
       Login Name
       Inloggningsnamn
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Om mer än en person skall använda datorn så kan du skapa flera användarkonton efter installationen. 
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Endast små bokstäver, nummer, understreck och bindestreck är tillåtet.
     
     
-      
+      
       root is not allowed as username.
       root är inte tillåtet som användarnamn.
     
     
-      
+      
       What is the name of this computer?
       Vad är namnet på datorn?
     
     
-      
+      
       Computer Name
       Datornamn
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Detta namn kommer användas om du gör datorn synlig för andra i ett nätverk.
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost är inte tillåtet som värdnamn.
     
     
-      
+      
       Choose a password to keep your account safe.
       Välj ett lösenord för att hålla ditt konto säkert.
     
     
-      
+      
       Password
       Lösenord
     
     
-      
+      
       Repeat Password
       Repetera Lösenord
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel. Ett bra lösenord innehåller en blandning av bokstäver, nummer och interpunktion, bör vara minst åtta tecken långt, och bör ändras regelbundet.
     
     
-      
+      
       Validate passwords quality
       Validera lösenords kvalite
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       När den här rutan är förkryssad kommer kontroll av lösenordsstyrka att genomföras, och du kommer inte kunna använda ett svagt lösenord.
     
     
-      
+      
       Log in automatically without asking for the password
       Logga in automatiskt utan att fråga efter ett lösenord.
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Endast bokstäver, nummer, understreck och bindestreck är tillåtet, minst två tecken.
     
     
-      
+      
       Reuse user password as root password
       Återanvänd användarlösenord som root lösenord
     
     
-      
+      
       Use the same password for the administrator account.
       Använd samma lösenord för administratörskontot.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Välj ett root lösenord för att hålla ditt konto säkert.
     
     
-      
+      
       Root Password
       Root Lösenord
     
     
-      
+      
       Repeat Root Password
       Repetera Root Lösenord
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Ange samma lösenord två gånger, så att det kan kontrolleras för stavfel.
     
diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts
index 51255dd5f9..2c95a3e054 100644
--- a/lang/calamares_te.ts
+++ b/lang/calamares_te.ts
@@ -491,12 +491,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -535,149 +535,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -745,12 +745,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -800,47 +800,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -935,15 +935,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2440,6 +2465,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2723,17 +2756,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2751,107 +2784,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2983,7 +2991,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3306,44 +3314,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3635,27 +3615,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3987,7 +3946,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3995,7 +3954,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4065,19 +4024,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4142,6 +4101,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4178,132 +4176,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       మీ పేరు ఏమిటి ?
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       ప్రవేశించడానికి ఈ పేరుని ఉపయోగిస్తారు 
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       మీ ఖాతా ను భద్రపరుచుకోవడానికి ఒక మంత్రమును ఎంచుకోండి 
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts
index 9c0f534cb9..545605aeb7 100644
--- a/lang/calamares_tg.ts
+++ b/lang/calamares_tg.ts
@@ -491,12 +491,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Барномаи танзимкунии %1
     
     
-      
+      
       %1 Installer
       Насбкунандаи %1
     
@@ -535,149 +535,149 @@ The installer will quit and all changes will be lost.
       Шакл
     
     
-      
+      
       Select storage de&vice:
       Интихоби дастгоҳи &захирагоҳ:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Танзимоти ҷорӣ:
     
     
-      
+      
       After:
       Баъд аз тағйир:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Қисмбандии диск ба таври дастӣ</strong><br/>Шумо худатон метавонед қисмҳои дискро эҷод кунед ё андозаи онҳоро иваз намоед.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Дубора истифода бурдани %1 ҳамчун диски асосӣ барои %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Қисми дискеро, ки мехоҳед хурдтар кунед, интихоб намоед, пас лавҳаи поёнро барои ивази андоза кашед</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 то андозаи %2MiB хурдтар мешавад ва қисми диски нав бо андозаи %3MiB барои %4 эҷод карда мешавад.
     
     
-      
+      
       Boot loader location:
       Ҷойгиршавии боркунандаи роҳандозӣ:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Қисми дискеро барои насб интихоб намоед</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Қисми диски низомии EFI дар дохили низоми ҷорӣ ёфт нашуд. Лутфан, ба қафо гузаред ва барои танзим кардани %1 аз имкони қисмбандии диск ба таври дастӣ истифода баред.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Қисми диски низомии EFI дар %1 барои оғоз кардани %2 истифода бурда мешавад.
     
     
-      
+      
       EFI system partition:
       Қисми диски низомии:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Чунин менамояд, ки ин захирагоҳ низоми амалкунандаро дар бар намегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Пок кардани диск</strong><br/>Ин амал ҳамаи иттилооти ҷориро дар дастгоҳи захирагоҳи интихобшуда <font color="red">нест мекунад</font>.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Насбкунии паҳлуӣ</strong><br/>Насбкунанда барои %1 фазоро омода карда, қисми дискеро хурдтар мекунад.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Ивазкунии қисми диск</strong><br/>Қисми дисекро бо %1 иваз мекунад.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ин захирагоҳ %1-ро дар бар мегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ин захирагоҳ аллакай низоми амалкунандаро дар бар мегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Ин захирагоҳ якчанд низоми амалкунандаро дар бар мегирад. Шумо чӣ кор кардан мехоҳед?<br/>Шумо метавонед пеш аз татбиқ кардани тағйирот ба дастгоҳи захирагоҳ интихоби худро аз назар гузаронед ва тасдиқ кунед.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Ин дастгоҳи захирагоҳ аллакай дорои низоми амалкунанда мебошад, аммо ҷадвали қисми диски <strong>%1</strong> аз диски лозимии <strong>%2</strong> фарқ мекунад.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Яке аз қисмҳои диски ин дастгоҳи захирагоҳ <strong>васлшуда</strong> мебошад.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Ин дастгоҳи захирагоҳ қисми дасгоҳи <strong>RAID-и ғайрифаъол</strong> мебошад.
     
     
-      
+      
       No Swap
       Бе мубодила
     
     
-      
+      
       Reuse Swap
       Истифодаи муҷаддади мубодила
     
     
-      
+      
       Swap (no Hibernate)
       Мубодила (бе реҷаи Нигаҳдорӣ)
     
     
-      
+      
       Swap (with Hibernate)
       Мубодила (бо реҷаи Нигаҳдорӣ)
     
     
-      
+      
       Swap to file
       Мубодила ба файл
     
@@ -745,12 +745,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Намунаи клавиатура ба %1 танзим карда мешавад.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Тарҳбандии клавиатура ба %1 %1/%2 танзим карда мешавад.
     
@@ -800,47 +800,47 @@ The installer will quit and all changes will be lost.
       Насбкунии шабака. (Ғайрифаъол: Рӯйхати қуттиҳо гирифта намешавад. Пайвасти шабакаро тафтиш кунед)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Ин компютер ба талаботи камтарин барои танзимкунии %1 ҷавобгӯ намебошад.<br/>Танзимот идома дода намешавад. <a href="#details">Тафсилот...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Ин компютер ба талаботи камтарин барои насбкунии %1 ҷавобгӯ намебошад.<br/>Насбкунӣ идома дода намешавад. <a href="#details">Тафсилот...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Ин компютер ба баъзеи талаботи тавсияшуда барои танзимкунии %1 ҷавобгӯ намебошад.<br/>Танзимот идома дода мешавад, аммо баъзеи хусусиятҳо ғайрифаъол карда мешаванд.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Ин компютер ба баъзеи талаботи тавсияшуда барои насбкунии %1 ҷавобгӯ намебошад.<br/>Насбкунӣ идома дода мешавад, аммо баъзеи хусусиятҳо ғайрифаъол карда мешаванд.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ин барнома аз Шумо якчанд савол мепурсад ва %2-ро дар компютери шумо танзим мекунад.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Хуш омадед ба барномаи танзимкунии Calamares барои %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Хуш омадед ба танзимкунии %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Хуш омадед ба насбкунандаи Calamares барои %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Хуш омадед ба насбкунандаи %1</h1>
     
@@ -935,15 +935,40 @@ The installer will quit and all changes will be lost.
       Насбкунии %1 ба анҷом расид.
     
     
-      
+      
       Package Selection
       Интихоби бастаҳо
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Лутфан, маҳсулеро аз рӯйхат интихоб намоед. Маҳсули интихобшуда насб карда мешавад.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Ҷамъбаст
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Дар ин ҷамъбаст шумо мебинед, ки чӣ мешавад пас аз он ки шумо раванди танзимкуниро оғоз мекунед.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Дар ин ҷамъбаст шумо мебинед, ки чӣ мешавад пас аз он ки шумо раванди насбкуниро оғоз мекунед.
+    
   
   
     ContextualProcessJob
@@ -2442,6 +2467,14 @@ The installer will quit and all changes will be lost.
       Лутфан, маҳсулеро аз рӯйхат интихоб намоед. Маҳсули интихобшуда насб карда мешавад.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Бастаҳо
+    
+  
   
     PackageChooserViewStep
     
@@ -2725,17 +2758,17 @@ The installer will quit and all changes will be lost.
       &Насб кардани боркунандаи роҳандозӣ дар:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Шумо мутмаин ҳастед, ки мехоҳед ҷадвали қисми диски навро дар %1 эҷод намоед?
     
     
-      
+      
       Can not create new partition
       Қисми диски нав эҷод карда намешавад
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Ҷадвали қисми диск дар %1 аллакай %2 қисми диски асосиро дар бар мегирад ва қисмҳои бештар илова карда намешаванд. Лутфан, як қисми диски асосиро нест кунед ва ба ҷояш қисми диски афзударо илова намоед.
     
@@ -2753,107 +2786,82 @@ The installer will quit and all changes will be lost.
       Қисмҳои диск
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Низоми %1 <strong>ҳамроҳи</strong> низоми амалкунандаи дигар насб карда мешавад.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Пок кардани</strong> диск ва насб кардани %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Иваз кардани</strong> қисми диск бо %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Ба таври дастӣ</strong> эҷод кардани қисмҳои диск.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Низоми %1 <strong>ҳамроҳи</strong> низоми амалкунандаи дигар дар диски <strong>%2</strong> (%3) насб карда мешавад.
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Пок кардани</strong> диски <strong>%2</strong> (%3) ва насб кардани %1.
+      
+      Current:
+      Танзимоти ҷорӣ:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Иваз кардани</strong> қисми диск дар диски <strong>%2</strong> (%3) бо %1.
+      
+      After:
+      Баъд аз тағйир:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>Ба таври дастӣ</strong> эҷод кардани қисмҳои диск дар диски <strong>%1</strong> (%2).
+      
+      No EFI system partition configured
+      Ягон қисми диски низомии EFI танзим нашуд
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Диски <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Танзимоти ҷорӣ:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Баъд аз тағйир:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Ягон қисми диски низомии EFI танзим нашуд
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Қисми диски низомии EFI барои оғоз кардани %1 лозим аст.<br/><br/>Барои танзим кардани қисми диски низомии EFI, ба қафо гузаред ва низоми файлии FAT32-ро бо нишони фаъолшудаи <strong>%3</strong> ва нуқтаи васли <strong>%2</strong> интихоб кунед ё эҷод намоед.<br/><br/>Шумо метавонед бе танзимкунии қисми диски низомии EFI идома диҳед, аммо низоми шумо метавонад оғоз карда нашавад.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Қисми диски низомии EFI барои оғоз кардани %1 лозим аст.<br/><br/>Қисми диск бо нуқтаи васли <strong>%2</strong> танзим карда шуд, аммо нишони он бо имкони <strong>%3</strong> танзим карда нашуд.<br/>Барои танзим кардани нишон ба қафо гузаред ва қисми дискро таҳрир кунед.<br/><br/>Шумо метавонед бе танзимкунии нишон идома диҳед, аммо низоми шумо метавонад оғоз карда нашавад.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Нишони қисми диск дар низоми EFI танзим карда нашуд
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Имкони истифодаи GPT дар BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Ҷадвали қисми диски GPT барои ҳамаи низомҳо интихоби беҳтарин мебошад. Насбкунандаи ҷорӣ инчунин барои низомҳои BIOS чунин танзимро дастгирӣ менамояд.<br/><br/>Барои танзим кардани ҷадвали қисми диски GPT дар BIOS, (агар то ҳол танзим накарда бошед) як қадам ба қафо гузаред ва ҷадвали қисми дискро ба GPT танзим кунед, пас қисми диски шаклбандинашударо бо ҳаҷми 8 МБ бо нишони фаъолшудаи <strong>bios_grub</strong> эҷод намоед.<br/><br/>Қисми диски шаклбандинашуда бо ҳаҷми 8 МБ барои оғоз кардани %1 дар низоми BIOS бо GPT лозим аст.
     
     
-      
+      
       Boot partition not encrypted
       Қисми диски роҳандозӣ рамзгузорӣ нашудааст
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Қисми диски роҳандозии алоҳида дар як ҷой бо қисми диски реша (root)-и рамзгузоришуда танзим карда шуд, аммо қисми диски роҳандозӣ рамзгузорӣ нашудааст.<br/><br/>Барои ҳамин навъи танзимкунӣ масъалаи амниятӣ аҳамият дорад, зеро ки файлҳои низомии муҳим дар қисми диски рамзгузоринашуда нигоҳ дошта мешаванд.<br/>Агар шумо хоҳед, метавонед идома диҳед, аммо қулфкушоии низоми файлӣ дертар ҳангоми оғози кори низом иҷро карда мешавад.<br/>Барои рамзгзорӣ кардани қисми диски роҳандозӣ ба қафо гузаред ва бо интихоби тугмаи <strong>Рамзгузорӣ</strong> дар равзанаи эҷодкунии қисми диск онро аз нав эҷод намоед.
     
     
-      
+      
       has at least one disk device available.
       ақаллан як дастгоҳи диск дастрас аст.
     
     
-      
+      
       There are no partitions to install on.
       Ягон қисми диск барои насб вуҷуд надорад.
     
@@ -2988,7 +2996,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3314,44 +3322,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Барои натиҷаҳои беҳтарин, мутмаин шавед, ки дар ин компютер:
     
     
-      
+      
       System requirements
       Талаботи низом
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Ин компютер ба талаботи камтарин барои танзимкунии %1 ҷавобгӯ намебошад.<br/>Танзимот идома дода намешавад. <a href="#details">Тафсилот...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Ин компютер ба талаботи камтарин барои насбкунии %1 ҷавобгӯ намебошад..<br/>Насбкунӣ идома дода намешавад. <a href="#details">Тафсилот...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Ин компютер ба баъзеи талаботи тавсияшуда барои насбкунии %1 ҷавобгӯ намебошад.<br/>Танзимот идома дода мешавад, аммо баъзеи хусусиятҳо ғайрифаъол карда мешаванд.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Ин компютер ба баъзеи талаботи тавсияшуда барои насбкунии %1 ҷавобгӯ намебошад.<br/>Насбкунӣ идома дода мешавад, аммо баъзеи хусусиятҳо ғайрифаъол карда мешаванд.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Ин барнома аз Шумо якчанд савол мепурсад ва %2-ро дар компютери шумо танзим мекунад.
-    
-  
   
     ScanningDialog
     
@@ -3643,27 +3623,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Дар ин ҷамъбаст шумо мебинед, ки чӣ мешавад пас аз он ки шумо раванди танзимкуниро оғоз мекунед.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Дар ин ҷамъбаст шумо мебинед, ки чӣ мешавад пас аз он ки шумо раванди насбкуниро оғоз мекунед.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Ҷамъбаст
-    
-  
   
     TrackingInstallJob
     
@@ -3995,7 +3954,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Хуш омадед
     
@@ -4003,7 +3962,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Хуш омадед
     
@@ -4084,21 +4043,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Забонҳо</h1> </br>
                     Танзими маҳаллигардонии низом ба забон ва маҷмӯаи аломатҳо барои баъзеи унсурҳои интерфейси корбарӣ дар сатри фармондиҳӣ таъсир мерасонад. Танзими ҷорӣ: <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Маҳаллигардонӣ</h1> </br>
                     Танзими маҳаллигардонии низом ба забон ва маҷмӯаи аломатҳо барои баъзеи унсурҳои интерфейси корбарӣ дар сатри фармондиҳӣ таъсир мерасонад. Танзими ҷорӣ: <strong>%1</strong>.
     
     
-      
+      
       Back
       Ба қафо
     
@@ -4164,6 +4123,45 @@ Output:
             <p>Матни намунавии қайдҳои нашр.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4220,132 +4218,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Барои ворид шудан ба низом ва иҷро кардани вазифаҳои маъмурӣ, номи корбар ва маълумоти корбариро муайян кунед.
     
     
-      
+      
       What is your name?
       Номи шумо чист?
     
     
-      
+      
       Your Full Name
       Номи пурраи шумо
     
     
-      
+      
       What name do you want to use to log in?
       Кадом номро барои ворид шудан ба низом истифода мебаред?
     
     
-      
+      
       Login Name
       Номи корбар
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Шумо метавонед танҳо ҳарфҳои хурд, рақамҳо, зерхат ва нимтиреро истифода баред.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Номи ин компютер чист?
     
     
-      
+      
       Computer Name
       Номи компютери шумо
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Ин ном истифода мешавад, агар шумо компютери худро барои дигарон дар шабака намоён кунед.
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаеро интихоб намоед.
     
     
-      
+      
       Password
       Ниҳонвожаро ворид намоед
     
     
-      
+      
       Repeat Password
       Ниҳонвожаро тасдиқ намоед
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. Ниҳонвожаи хуб бояд дар омезиш калимаҳо, рақамҳо ва аломатҳои китобатиро дар бар гирад, ақаллан аз ҳашт аломат иборат шавад ва мунтазам иваз карда шавад.
     
     
-      
+      
       Validate passwords quality
       Санҷиши сифати ниҳонвожаҳо
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Агар шумо ин имконро интихоб кунед, қувваи ниҳонвожа тафтиш карда мешавад ва шумо ниҳонвожаи заифро истифода карда наметавонед.
     
     
-      
+      
       Log in automatically without asking for the password
       Ба таври худкор бе дархости ниҳонвожа ворид карда шавад
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Ниҳонвожаи корбар ҳам барои ниҳонвожаи root истифода карда шавад
     
     
-      
+      
       Use the same password for the administrator account.
       Ниҳонвожаи ягона барои ҳисоби маъмурӣ истифода бурда шавад.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаи root-ро интихоб намоед.
     
     
-      
+      
       Root Password
       Ниҳонвожаи root
     
     
-      
+      
       Repeat Root Password
       Ниҳонвожаи root-ро тасдиқ намоед
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад.
     
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index 4525b3415a..6455fcf7ac 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -488,12 +488,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       ตัวติดตั้ง %1
     
@@ -532,149 +532,149 @@ The installer will quit and all changes will be lost.
       ฟอร์ม
     
     
-      
+      
       Select storage de&vice:
       เลือกอุปก&รณ์จัดเก็บ:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       ปัจจุบัน:
     
     
-      
+      
       After:
       หลัง:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>กำหนดพาร์ทิชันด้วยตนเอง</strong><br/>คุณสามารถสร้างหรือเปลี่ยนขนาดของพาร์ทิชันได้ด้วยตนเอง
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>เลือกพาร์ทิชันที่จะลดขนาด แล้วลากแถบด้านล่างเพื่อปรับขนาด</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       ที่อยู่บูตโหลดเดอร์:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>เลือกพาร์ทิชันที่จะติดตั้ง</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       ไม่พบพาร์ทิชันสำหรับระบบ EFI อยู่ที่ไหนเลยในระบบนี้ กรุณากลับไปเลือกใช้การแบ่งพาร์ทิชันด้วยตนเอง เพื่อติดตั้ง %1
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       พาร์ทิชันสำหรับระบบ EFI ที่ %1 จะถูกใช้เพื่อเริ่มต้น %2
     
     
-      
+      
       EFI system partition:
       พาร์ทิชันสำหรับระบบ EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       ดูเหมือนว่าอุปกรณ์จัดเก็บข้อมูลนี้ไม่มีระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>ล้างดิสก์</strong><br/>การกระทำนี้จะ<font color="red">ลบ</font>ข้อมูลทั้งหมดที่อยู่บนอุปกรณ์จัดเก็บข้อมูลที่เลือก
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>ติดตั้งควบคู่กับระบบปฏิบัติการเดิม</strong><br/>ตัวติดตั้งจะลดเนื้อที่พาร์ทิชันเพื่อให้มีเนื้อที่สำหรับ %1
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>แทนที่พาร์ทิชัน</strong><br/>แทนที่พาร์ทิชันด้วย %1
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       อุปกรณ์จัดเก็บข้อมูลนี้มีระบบปฏิบัติการ %1 อยู่ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       อุปกรณ์จัดเก็บข้อมูลนี้มีระบบปฏิบัติการอยู่แล้ว คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       อุปกรณ์จัดเก็บข้อมูลนี้มีหลายระบบปฏิบัติการ คุณต้องการทำอย่างไร?<br/>คุณจะสามารถทบทวนและยืนยันตัวเลือกของคุณก่อนที่จะกระทำการเปลี่ยนแปลงไปยังอุปกรณ์จัดเก็บข้อมูลของคุณ
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -742,19 +742,19 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       ตั้งค่าโมเดลแป้นพิมพ์เป็น %1<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       ตั้งค่าแบบแป้นพิมพ์เป็น %1/%2
     
     
       
       Set timezone to %1/%2.
-      
+      ตั้งค่าโซนเวลาเป็น %1/%2
     
     
       
@@ -797,47 +797,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       คอมพิวเตอร์เครื่องนี้มีความต้องการไม่เพียงพอที่จะตั้งค่า %1<br/>ไม่สามารถทำการตั้งค่าต่อไปได้ <a href="#details">รายละเอียด...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       คอมพิวเตอร์เครื่องนี้มีความต้องการไม่เพียงพอที่จะติดตั้ง %1<br/>ไม่สามารถทำการติดตั้งต่อไปได้ <a href="#details">รายละเอียด...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       คอมพิวเตอร์มีความต้องการไม่เพียงพอที่จะติดตั้ง %1<br/>สามารถทำการติดตั้งต่อไปได้ แต่ฟีเจอร์บางอย่างจะถูกปิดไว้
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       โปรแกรมนี้จะถามคำถามต่าง ๆ เพื่อติดตั้ง %2 ลงในคอมพิวเตอร์ของคุณ
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>ยินดีต้อนรับสู่ตัวตั้งค่า %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>ยินดีต้อนรับสู่ตัวติดตั้ง Calamares สำหรับ %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>ยินดีต้อนรับสู่ตัวติดตั้ง %1</h1>
     
@@ -932,15 +932,40 @@ The installer will quit and all changes will be lost.
       การติดตั้ง %1 เสร็จสิ้น
     
     
-      
+      
       Package Selection
       เลือกแพ็กเกจ
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       เลือกผลิตภัณฑ์จากรายการ ผลิตภัณฑ์ที่เลือกไว้จะถูกติดตั้ง
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      สาระสำคัญ
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2428,6 +2453,14 @@ The installer will quit and all changes will be lost.
       เลือกผลิตภัณฑ์จากรายการ ผลิตภัณฑ์ที่เลือกไว้จะถูกติดตั้ง
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      แพ็กเกจ
+    
+  
   
     PackageChooserViewStep
     
@@ -2711,17 +2744,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       คุณแน่ใจว่าจะสร้างตารางพาร์ทิชันใหม่บน %1?
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2739,107 +2772,82 @@ The installer will quit and all changes will be lost.
       พาร์ทิชัน
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      ติดตั้ง %1 <strong>ควบคู่</strong>กับระบบปฏิบัติการเดิม
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
+      
+      Current:
+      ปัจจุบัน:
     
     
-      
-      <strong>Manual</strong> partitioning.
-      
+      
+      After:
+      หลัง:
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      ดิสก์ <strong>%1</strong> (%2)
-    
-    
-      
-      Current:
-      ปัจจุบัน:
-    
-    
-      
-      After:
-      หลัง:
-    
-    
-      
-      No EFI system partition configured
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      EFI system partition flag not set
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2971,7 +2979,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3294,44 +3302,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       สำหรับผลลัพธ์ที่ดีขึ้น โปรดตรวจสอบให้แน่ใจว่าคอมพิวเตอร์เครื่องนี้:
     
     
-      
+      
       System requirements
       ความต้องการของระบบ
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      คอมพิวเตอร์เครื่องนี้มีความต้องการไม่เพียงพอที่จะตั้งค่า %1<br/>ไม่สามารถทำการตั้งค่าต่อไปได้ <a href="#details">รายละเอียด...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      ขณะที่กำลังติดตั้ง ตัวติดตั้งฟ้องว่า คอมพิวเตอร์นี้มีความต้องการไม่เพียงพอที่จะติดตั้ง %1.<br/>ไม่สามารถทำการติดตั้งต่อไปได้ <a href="#details">รายละเอียด...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      คอมพิวเตอร์มีความต้องการไม่เพียงพอที่จะติดตั้ง %1<br/>สามารถทำการติดตั้งต่อไปได้ แต่ฟีเจอร์บางอย่างจะถูกปิดไว้
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      โปรแกรมนี้จะถามคำถามต่าง ๆ เพื่อติดตั้ง %2 ลงในคอมพิวเตอร์ของคุณ
-    
-  
   
     ScanningDialog
     
@@ -3623,27 +3603,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      สาระสำคัญ
-    
-  
   
     TrackingInstallJob
     
@@ -3975,7 +3934,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       ยินดีต้อนรับ
     
@@ -3983,7 +3942,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       ยินดีต้อนรับ
     
@@ -4053,19 +4012,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       ย้อนกลับ
     
@@ -4130,6 +4089,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4166,132 +4164,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       ชื่อของคุณคืออะไร?
     
     
-      
+      
       Your Full Name
       ชื่อเต็มของคุณ
     
     
-      
+      
       What name do you want to use to log in?
       ใส่ชื่อที่คุณต้องการใช้ในการเข้าสู่ระบบ
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       คอมพิวเตอร์เครื่องนี้ชื่ออะไร?
     
     
-      
+      
       Computer Name
       ชื่อคอมพิวเตอร์
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       เลือกรหัสผ่านเพื่อรักษาบัญชีผู้ใช้ของคุณให้ปลอดภัย
     
     
-      
+      
       Password
       รหัสผ่าน
     
     
-      
+      
       Repeat Password
       กรอกรหัสผ่านซ้ำ
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts
index f1c3c7d0ab..ce058f5178 100644
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@@ -495,12 +495,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Kurulum Uygulaması
     
     
-      
+      
       %1 Installer
       %1 Yükleniyor
     
@@ -539,150 +539,150 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.
       Biçim
     
     
-      
+      
       Select storage de&vice:
       Depolama ay&gıtı seç:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Geçerli:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Elle bölümleme</strong><br/>Bölümler oluşturabilir ve boyutlandırabilirsiniz.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
 %2 ev bölümü olarak %1 yeniden kullanılsın.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Küçültmek için bir bölüm seçip alttaki çubuğu sürükleyerek boyutlandır</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1, %2MB'a küçülecek ve %4 için yeni bir %3MB disk bölümü oluşturulacak.
     
     
-      
+      
       Boot loader location:
       Önyükleyici konumu:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Yükleyeceğin disk bölümünü seç</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Bu sistemde EFI disk bölümü bulunamadı. Lütfen geri dönün ve %1 kurmak için gelişmiş kurulum seçeneğini kullanın.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 EFI sistem bölümü %2 başlatmak için kullanılacaktır.
     
     
-      
+      
       EFI system partition:
       EFI sistem bölümü:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu depolama aygıtı üzerinde yüklü herhangi bir işletim sistemi tespit etmedik. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Diski sil</strong><br/>Seçili depolama bölümündeki mevcut veriler şu anda <font color="red">silinecektir.</font>
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Yanına yükleyin</strong><br/>Sistem yükleyici disk bölümünü küçülterek %1 için yer açacak.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Varolan bir disk bölümüne kur</strong><br/>Varolan bir disk bölümü üzerine %1 kur.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu depolama aygıtı üzerinde %1 vardır. Ne yapmak istersiniz?<br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu depolama aygıtı üzerinde bir işletim sistemi yüklü. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Bu depolama aygıtı üzerinde birden fazla işletim sistemi var. Ne yapmak istersiniz? <br/>Yaptığınız değişiklikler disk bölümü üzerine uygulanmadan önce gözden geçirme fırsatınız olacak.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Bu depolama aygıtının üzerinde zaten bir işletim sistemi var, ancak <strong>%1</strong> bölüm tablosu, gerekli <strong>%2</strong>'den farklı. <br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Bu depolama aygıtının disk bölümlerinden biri <strong>bağlı</strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Bu depolama aygıtı, <strong>etkin olmayan bir RAID</strong> cihazının parçasıdır.
     
     
-      
+      
       No Swap
       Takas alanı yok
     
     
-      
+      
       Reuse Swap
       Yeniden takas alanı
     
     
-      
+      
       Swap (no Hibernate)
       Takas Alanı (uyku modu yok)
     
     
-      
+      
       Swap (with Hibernate)
       Takas Alanı (uyku moduyla)
     
     
-      
+      
       Swap to file
       Takas alanı dosyası
     
@@ -750,12 +750,12 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       %1 Klavye düzeni olarak seçildi.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Alt klavye türevi olarak %1/%2 seçildi.
     
@@ -805,49 +805,49 @@ Yükleyiciden çıkınca tüm değişiklikler kaybedilecek.
       Ağ Üzerinden Kurulum. (Devre Dışı: Paket listeleri alınamıyor, ağ bağlantısını kontrol ediniz)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Bu bilgisayar %1 kurulumu için minimum gereksinimleri karşılamıyor.<br/>Kurulum devam etmeyecek. <a href="#details">Detaylar...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Bu bilgisayara %1 yüklemek için asgari gereksinimler karşılanamadı.
 Kurulum devam edemiyor. <a href="#detaylar">Detaylar...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Bu bilgisayar %1 kurulumu için önerilen gereksinimlerin bazılarına uymuyor. Kurulum devam edebilirsiniz ancak bazı özellikler devre dışı bırakılabilir.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Bu bilgisayara %1 yüklemek için önerilen gereksinimlerin bazıları karşılanamadı.<br/>
 Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Bu program size bazı sorular soracak ve bilgisayarınıza %2 kuracak.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 için Calamares kurulum programına hoş geldiniz</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 kurulumuna hoşgeldiniz</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 Calamares Sistem Yükleyiciye Hoşgeldiniz</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 Sistem Yükleyiciye Hoşgeldiniz</h1>
     
@@ -942,15 +942,40 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.Kurulum %1 oranında tamamlandı.
     
     
-      
+      
       Package Selection
       Paket seçimi
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Lütfen listeden bir ürün seçin. Seçilen ürün yüklenecek.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Kurulum Özeti
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Bu, kurulum prosedürü başlatıldıktan sonra ne gibi değişiklikler dair olacağına genel bir bakış.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Yükleme işlemleri başladıktan sonra yapılacak işlere genel bir bakış.
+    
   
   
     ContextualProcessJob
@@ -2450,6 +2475,14 @@ Sistem güç kaynağına bağlı değil.
       Lütfen listeden bir ürün seçin. Seçilen ürün yüklenecek.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Paketler
+    
+  
   
     PackageChooserViewStep
     
@@ -2733,17 +2766,17 @@ Sistem güç kaynağına bağlı değil.
       Ö&nyükleyiciyi şuraya kurun:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       %1 tablosunda yeni bölüm oluşturmaya devam etmek istiyor musunuz?
     
     
-      
+      
       Can not create new partition
       Yeni disk bölümü oluşturulamıyor
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       %1 üzerindeki disk bölümü tablosu zaten %2 birincil disk bölümüne sahip ve artık eklenemiyor. Lütfen bir birincil disk bölümü kaldırın ve bunun yerine uzatılmış bir disk bölümü ekleyin.
     
@@ -2761,108 +2794,83 @@ Sistem güç kaynağına bağlı değil.
       Disk Bölümleme
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Diğer işletim sisteminin <strong>yanına</strong> %1 yükle.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      Diski <strong>sil</strong> ve %1 yükle.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      %1 ile disk bölümünün üzerine <strong>yaz</strong>.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>Manuel</strong> bölümleme.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      <strong>%2</strong> (%3) diskindeki diğer işletim sisteminin <strong>yanına</strong> %1 yükle.
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>%2</strong> (%3) diski <strong>sil</strong> ve %1 yükle.
+      
+      Current:
+      Geçerli:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>%2</strong> (%3) disk bölümünün %1 ile <strong>üzerine yaz</strong>.
+      
+      After:
+      Sonra:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      <strong>%1</strong> (%2) disk bölümünü <strong>manuel</strong> bölümle.
+      
+      No EFI system partition configured
+      EFI sistem bölümü yapılandırılmamış
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Disk <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Geçerli:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Sonra:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      EFI sistem bölümü yapılandırılmamış
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      %1 başlatmak için bir EFI sistem disk bölümü gereklidir.<br/><br/>Bir EFI sistem disk bölümü yapılandırmak için geri dönün ve <strong>%3</strong> bayrağı etkin ve  <strong>%2</strong>bağlama noktası ile bir FAT32 dosya sistemi seçin veya oluşturun.<br/><br/>Bir EFI sistem disk bölümü kurmadan devam edebilirsiniz, ancak sisteminiz başlatılamayabilir.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      %1 başlatmak için bir EFI sistem disk bölümü gereklidir.<br/><br/>Bir disk bölümü bağlama noktası <strong>%2</strong> olarak yapılandırıldı fakat <strong>%3</strong>bayrağı ayarlanmadı.<br/>Bayrağı ayarlamak için, geri dönün ve disk bölümü düzenleyin.<br/><br/>Sen bayrağı ayarlamadan devam edebilirsin fakat işletim sistemi başlatılamayabilir.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      EFI sistem bölümü bayrağı ayarlanmadı
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS'ta GPT kullanma seçeneği
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT disk bölümü tablosu tüm sistemler için en iyi seçenektir. Bu yükleyici klasik BIOS sistemler için de böyle bir kurulumu destekler. <br/><br/>Klasik BIOS sistemlerde disk bölümü tablosu GPT tipinde yapılandırmak için (daha önce yapılmadıysa) geri gidin ve disk bölümü tablosu GPT olarak ayarlayın ve ardından <strong>bios_grub</strong> bayrağı ile etiketlenmiş 8 MB biçimlendirilmemiş bir disk bölümü oluşturun.<br/> <br/>GPT disk yapısı ile kurulan klasik BIOS sistemi %1 başlatmak için biçimlendirilmemiş 8 MB bir disk bölümü gereklidir.
     
     
-      
+      
       Boot partition not encrypted
       Önyükleme yani boot diski şifrelenmedi
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Ayrı bir önyükleme yani boot disk bölümü, şifrenmiş bir kök bölüm ile birlikte ayarlandı, fakat önyükleme bölümü şifrelenmedi.<br/><br/>Bu tip kurulumun güvenlik endişeleri vardır, çünkü önemli sistem dosyaları şifrelenmemiş bir bölümde saklanır.<br/>İsterseniz kuruluma devam edebilirsiniz, fakat dosya sistemi kilidi daha sonra sistem başlatılırken açılacak.<br/>
 Önyükleme bölümünü şifrelemek için geri dönün ve bölüm oluşturma penceresinde <strong>Şifreleme</strong>seçeneği ile yeniden oluşturun.
     
     
-      
+      
       has at least one disk device available.
       Mevcut en az bir disk aygıtı var.
     
     
-      
+      
       There are no partitions to install on.
       Kurulacak disk bölümü yok.
     
@@ -2997,7 +3005,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3323,46 +3331,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       En iyi sonucu elde etmek için bilgisayarınızın aşağıdaki gereksinimleri karşıladığından emin olunuz:
     
     
-      
+      
       System requirements
       Sistem gereksinimleri
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Bu bilgisayar %1 kurulumu için minimum gereksinimleri karşılamıyor.<br/>Kurulum devam etmeyecek. <a href="#details">Detaylar...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Bu bilgisayara %1 yüklemek için minimum gereksinimler karşılanamadı.
-Kurulum devam edemiyor. <a href="#detaylar">Detaylar...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Bu bilgisayar %1 kurulumu için önerilen gereksinimlerin bazılarına uymuyor. Kurulum devam edebilirsiniz ancak bazı özellikler devre dışı bırakılabilir.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Bu bilgisayara %1 yüklemek için önerilen gereksinimlerin bazıları karşılanamadı.<br/>
-Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Bu program size bazı sorular soracak ve bilgisayarınıza %2 kuracak.
-    
-  
   
     ScanningDialog
     
@@ -3654,27 +3632,6 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.%L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Bu, kurulum prosedürü başlatıldıktan sonra ne gibi değişiklikler dair olacağına genel bir bakış.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Yükleme işlemleri başladıktan sonra yapılacak işlere genel bir bakış.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Kurulum Bilgileri
-    
-  
   
     TrackingInstallJob
     
@@ -4006,7 +3963,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Hoşgeldiniz
     
@@ -4014,7 +3971,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.
     WelcomeViewStep
     
-      
+      
       Welcome
       Hoşgeldiniz
     
@@ -4097,21 +4054,21 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Dil</h1> </br>
                     Sistem yerel ayarı, bazı komut satırı kullanıcı arabirimi öğelerinin dilini ve karakter kümesini etkiler. Geçerli ayar <strong>%1</strong>'dir
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Yerelleştirme</h1> </br>
                     Sistem yerel ayarı, sayıları ve tarih biçimini etkiler. Geçerli yerel ayarı <strong>%1</strong>.
     
     
-      
+      
       Back
       Geri
     
@@ -4177,6 +4134,45 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4233,132 +4229,132 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir.
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Oturum açmak ve yönetici görevlerini gerçekleştirmek için kullanıcı adınızı ve kimlik bilgilerinizi seçin
     
     
-      
+      
       What is your name?
       Adınız nedir?
     
     
-      
+      
       Your Full Name
       Tam Adınız
     
     
-      
+      
       What name do you want to use to log in?
       Giriş için hangi adı kullanmak istersiniz?
     
     
-      
+      
       Login Name
       Kullanıcı adı
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Bu bilgisayarı birden fazla kişi kullanacaksa, kurulumdan sonra birden fazla hesap oluşturabilirsiniz.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Sadece küçük harflere, sayılara, alt çizgi ve kısa çizgilere izin verilir.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Bu bilgisayarın adı nedir?
     
     
-      
+      
       Computer Name
       Bilgisayar Adı
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Bilgisayarı ağ üzerinde herkese görünür yaparsanız bu ad kullanılacaktır.
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Hesabınızın güvenliğini sağlamak için bir parola belirleyiniz.
     
     
-      
+      
       Password
       Şifre
     
     
-      
+      
       Repeat Password
       Şifreyi Tekrarla
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin. İyi bir şifre, harflerin, sayıların ve noktalama işaretlerinin bir karışımını içerecektir, en az sekiz karakter uzunluğunda olmalı ve düzenli aralıklarla değiştirilmelidir.
     
     
-      
+      
       Validate passwords quality
       Parola kalitesini doğrulayın
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Bu kutu işaretlendiğinde parola gücü kontrolü yapılır ve zayıf bir parola kullanamazsınız.
     
     
-      
+      
       Log in automatically without asking for the password
       Parola sormadan otomatik olarak oturum açın
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Kullanıcı şifresini yetkili kök şifre olarak kullan
     
     
-      
+      
       Use the same password for the administrator account.
       Yönetici ile kullanıcı aynı şifreyi kullansın.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Hesabınızı güvende tutmak için bir kök şifre seçin.
     
     
-      
+      
       Root Password
       Kök Şifre
     
     
-      
+      
       Repeat Root Password
       Kök Şifresini Tekrarla
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Yazım hataları açısından kontrol edilebilmesi için aynı parolayı iki kez girin.
     
diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts
index a59c3c2ece..5ce140eae8 100644
--- a/lang/calamares_uk.ts
+++ b/lang/calamares_uk.ts
@@ -499,12 +499,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       Програма для налаштовування %1
     
     
-      
+      
       %1 Installer
       Засіб встановлення %1
     
@@ -543,149 +543,149 @@ The installer will quit and all changes will be lost.
       Форма
     
     
-      
+      
       Select storage de&vice:
       Обрати &пристрій зберігання:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Зараз:
     
     
-      
+      
       After:
       Після:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>Розподілення вручну</strong><br/>Ви можете створити або змінити розмір розділів власноруч.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Використати %1 як домашній розділ (home) для %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>Оберіть розділ для зменшення, потім тягніть повзунок, щоб змінити розмір</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 буде стиснуто до %2 МіБ. Натомість буде створено розділ розміром %3 МіБ для %4.
     
     
-      
+      
       Boot loader location:
       Розташування завантажувача:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>Оберіть розділ, на який встановити</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       В цій системі не знайдено жодного системного розділу EFI. Щоб встановити %1, будь ласка, поверніться та оберіть розподілення вручну.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Системний розділ EFI %1 буде використано для встановлення %2.
     
     
-      
+      
       EFI system partition:
       Системний розділ EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Цей пристрій зберігання, схоже, не має жодної операційної системи. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>Очистити диск</strong><br/>Це <font color="red">знищить</font> всі данні, присутні на обраному пристрої зберігання.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>Встановити поруч</strong><br/>Засіб встановлення зменшить розмір розділу, щоб вивільнити простір для %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>Замінити розділ</strong><br/>Замінити розділу на %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На цьому пристрої зберігання є %1. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На цьому пристрої зберігання вже є операційна система. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       На цьому пристрої зберігання вже є декілька операційних систем. Що ви бажаєте зробити?<br/>У вас буде можливість переглянути та підтвердити все, що ви обрали перед тим, як будуть зроблені будь-які зміни на пристрої зберігання.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       На пристрої для зберігання даних може бути інша операційна система, але його таблиця розділів <strong>%1</strong> не є потрібною — <strong>%2</strong>.<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       На цьому пристрої для зберігання даних <strong>змонтовано</strong> один із його розділів.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Цей пристрій для зберігання даних є частиною пристрою <strong>неактивного RAID</strong>.
     
     
-      
+      
       No Swap
       Без резервної пам'яті
     
     
-      
+      
       Reuse Swap
       Повторно використати резервну пам'ять
     
     
-      
+      
       Swap (no Hibernate)
       Резервна пам'ять (без присипляння)
     
     
-      
+      
       Swap (with Hibernate)
       Резервна пам'ять (із присиплянням)
     
     
-      
+      
       Swap to file
       Резервна пам'ять у файлі
     
@@ -753,12 +753,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Встановити модель клавіатури як %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Встановити розкладку клавіатури як %1/%2.
     
@@ -808,47 +808,47 @@ The installer will quit and all changes will be lost.
       Встановлення через мережу. (Вимкнено: Неможливо отримати список пакетів, перевірте ваше підключення до мережі)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Цей комп'ютер не задовольняє мінімальні вимоги для налаштовування %1.<br/>Налаштовування неможливо продовжити. <a href="#details">Докладніше...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Цей комп'ютер не задовольняє мінімальні вимоги для встановлення %1.<br/>Встановлення неможливо продовжити. <a href="#details">Докладніше...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Цей комп'ютер не задовольняє рекомендовані вимоги щодо налаштовування %1. Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Цей комп'ютер не задовольняє рекомендовані вимоги для встановлення %1.<br/>Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Ця програма поставить кілька питань та встановить %2 на ваш комп'ютер.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Вітаємо у програмі налаштовування Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Вітаємо у програмі для налаштовування %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Ласкаво просимо до засобу встановлення Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Ласкаво просимо до засобу встановлення %1</h1>
     
@@ -943,15 +943,40 @@ The installer will quit and all changes will be lost.
       Встановлення %1 завершено.
     
     
-      
+      
       Package Selection
       Вибір пакетів
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Будь ласка, виберіть продукт зі списку. Буде встановлено вибраний продукт.
     
+    
+      
+      Install option: <strong>%1</strong>
+      Варіант встановлення: <strong>%1</strong>
+    
+    
+      
+      None
+      Немає
+    
+    
+      
+      Summary
+      Огляд
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Це огляд того, що трапиться коли ви почнете процедуру налаштовування.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Це огляд того, що трапиться коли ви почнете процедуру встановлення.
+    
   
   
     ContextualProcessJob
@@ -2469,6 +2494,14 @@ The installer will quit and all changes will be lost.
       Будь ласка, виберіть продукт зі списку. Буде встановлено вибраний продукт.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Пакунки
+    
+  
   
     PackageChooserViewStep
     
@@ -2752,17 +2785,17 @@ The installer will quit and all changes will be lost.
       Місце вст&ановлення завантажувача:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Ви впевнені, що бажаєте створити нову таблицю розділів на %1?
     
     
-      
+      
       Can not create new partition
       Не вдалося створити новий розділ
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Таблиця розділів на %1 вже містить %2 основних розділи. Додавання основних розділів неможливе. Будь ласка, вилучіть один основний розділ або додайте замість нього розширений розділ.
     
@@ -2780,107 +2813,82 @@ The installer will quit and all changes will be lost.
       Розділи
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Встановити %1 <strong>поруч</strong> з іншою операційною системою.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>Очистити</strong> диск та встановити %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>Замінити</strong> розділ на %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Розподіл диска <strong>вручну</strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Встановити %1 <strong>поруч</strong> з іншою операційною системою на диск <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>Очистити</strong> диск <strong>%2</strong> (%3) та встановити %1.
+      
+      Current:
+      Зараз:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong>Замінити</strong> розділ на диску <strong>%2</strong> (%3) на %1.
+      
+      After:
+      Після:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Розподіл диска <strong>%1</strong> (%2) <strong>вручну</strong>.
+      
+      No EFI system partition configured
+      Не налаштовано жодного системного розділу EFI
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Диск <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      Системний розділ EFI налаштовано неправильно
     
     
-      
-      Current:
-      Зараз:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      Для запуску %1 потрібен системний розділ EFI.<br/><br/>Щоб налаштувати системний розділ EFI, поверніться до попередніх пунктів і виберіть створення відповідної файлової системи.
     
     
-      
-      After:
-      Після:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      Файлову систему має бути змоновано до <strong>%1</strong>.
     
     
-      
-      No EFI system partition configured
-      Не налаштовано жодного системного розділу EFI
+      
+      The filesystem must have type FAT32.
+      Файлова система має належати до типу FAT32.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Щоб запустити %1, потрібен системний розділ EFI.<br/><br/>Щоб налаштувати системний розділ EFI, поверніться і виберіть або створіть файлову систему FAT32 з увімкненим параметром <strong>%3</strong> та точкою монтування <strong>%2</strong>.<br/><br/>Ви можете продовжити, не налаштовуючи системний розділ EFI, але тоді у вашої системи можуть виникнути проблеми із запуском.
+      
+      The filesystem must be at least %1 MiB in size.
+      Розмір файлової системи має бути не меншим за %1 МіБ.
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Для запуску %1 потрібен системний розділ EFI.<br/><br/>Розділ налаштовано з точкою підключення <strong>%2</strong>, але опція <strong>%3</strong> не встановлено.<br/>Щоб встановити опцію, поверніться та відредагуйте розділ.<br/><br/>Ви можете продовжити не налаштовуючи цю опцію, але ваша система може не запускатись.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      Для файлової системи має бути встановлено прапорець <strong>%1</strong>.
     
     
-      
-      EFI system partition flag not set
-      Опцію системного розділу EFI не встановлено
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      Ви можете продовжити без встановлення системного розділу EFI, але це може призвести до неможливості запуску вашої операційної системи.
     
     
-      
+      
       Option to use GPT on BIOS
       Варіант із використанням GPT на BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Таблиця розділів GPT є найкращим варіантом для усіх систем. У цьому засобі встановлення передбачено підтримку відповідних налаштувань і для систем BIOS.<br/><br/>Щоб скористатися таблицею розділів GPT у системі з BIOS, (якщо цього ще не було зроблено) поверніться назад і встановіть для таблиці розділів значення GPT, далі створіть неформатований розділ розміром 8 МБ з увімкненим прапорцем <strong>bios_grub</strong>.<br/><br/>Неформатований розділ розміром 8 МБ потрібен для запуску %1 на системі з BIOS за допомогою GPT.
     
     
-      
+      
       Boot partition not encrypted
       Завантажувальний розділ незашифрований
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Було налаштовано окремий завантажувальний розділ поряд із зашифрованим кореневим розділом, але завантажувальний розділ незашифрований.<br/><br/>Існують проблеми з безпекою такого типу, оскільки важливі системні файли зберігаються на незашифрованому розділі.<br/>Ви можете продовжувати, якщо бажаєте, але розблокування файлової системи відбудеться пізніше під час запуску системи.<br/>Щоб зашифрувати завантажувальний розділ, поверніться і створіть його знов, обравши <strong>Зашифрувати</strong> у вікні створення розділів.
     
     
-      
+      
       has at least one disk device available.
       має принаймні один доступний дисковий пристрій.
     
     
-      
+      
       There are no partitions to install on.
       Немає розділів для встановлення.
     
@@ -3015,7 +3023,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3341,44 +3349,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Щоб отримати найкращий результат, будь ласка, переконайтеся, що цей комп'ютер:
     
     
-      
+      
       System requirements
       Вимоги до системи
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Цей комп'ютер не задовольняє мінімальні вимоги для налаштовування %1.<br/>Налаштовування неможливо продовжити. <a href="#details">Докладніше...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Цей комп'ютер не задовольняє мінімальні вимоги для встановлення %1.<br/>Встановлення неможливо продовжити. <a href="#details">Докладніше...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Цей комп'ютер не задовольняє рекомендовані вимоги щодо налаштовування %1. Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Цей комп'ютер не задовольняє рекомендовані вимоги для встановлення %1.<br/>Встановлення можна продовжити, але деякі можливості можуть виявитися недоступними.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Ця програма поставить кілька питань та встановить %2 на ваш комп'ютер.
-    
-  
   
     ScanningDialog
     
@@ -3670,27 +3650,6 @@ Output:
       %L1 з %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Це огляд того, що трапиться коли ви почнете процедуру налаштовування.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Це огляд того, що трапиться коли ви почнете процедуру встановлення.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Огляд
-    
-  
   
     TrackingInstallJob
     
@@ -4022,7 +3981,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Вітаємо
     
@@ -4030,7 +3989,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Вітаємо
     
@@ -4112,21 +4071,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Мови</h1></br>
 Налаштування системної локалі впливає на мову та набір символів для деяких елементів інтерфейсу командного рядка. Зараз встановлено значення локалі <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Локалі</h1></br>
 Налаштування системної локалі впливає на показ чисел та формат дат. Зараз встановлено значення локалі <strong>%1</strong>.
     
     
-      
+      
       Back
       Назад
     
@@ -4192,6 +4151,46 @@ Output:
             <p>Це приклад нотаток щодо випуску.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      LibreOffice — потужний і вільний комплект офісних програм, яким користуються мільйони людей з усього світу. До нього включено декілька програм, які роблять його найгнучкішим на ринку вільним комплектом офісних програм із відкритим кодом.<br/>
+                    Типовий варіант.
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      Якщо вам не потрібен комплект офісних програм, просто виберіть «Без офісного комплекту». Ви завжди зможете додати до вже встановленої системи якийсь комплект (або декілька комплектів), якщо у цьому виникне потреба.
+    
+    
+      
+      No Office Suite
+      Без офісного комплекту
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      Створити мінімалістичну робочу станцію, вилучити усі зайві програми і вирішити згодом, що саме слід додати до системи. Прикладами того, чого може не бути у такій системі, є комплект офісних програм, програвачів мультимедійних даних, програм для перегляду зображень або друку на папері. Це буде лише сама стільниця, програма для роботи з файлами, програма для керування пакунками та проста програма для перегляду інтернету.
+    
+    
+      
+      Minimal Install
+      Мінімальне встановлення
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      Будь ласка, виберіть варіант для встановлення або скористайтеся типовим: LibreOffice включено.
+    
+  
   
     release_notes
     
@@ -4248,132 +4247,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Виберіть ім'я користувача та реєстраційні дані для виконання адміністративних завдань у системі
     
     
-      
+      
       What is your name?
       Ваше ім'я?
     
     
-      
+      
       Your Full Name
       Ваше ім'я повністю
     
     
-      
+      
       What name do you want to use to log in?
       Яке ім'я ви бажаєте використовувати для входу?
     
     
-      
+      
       Login Name
       Запис для входу
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Якщо за цим комп'ютером працюватимуть декілька користувачів, ви можете створити декілька облікових записів після встановлення.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Можна використовувати лише латинські літери нижнього регістру, цифри, символи підкреслювання та дефіси.
     
     
-      
+      
       root is not allowed as username.
       Не можна використовувати ім'я користувача «root».
     
     
-      
+      
       What is the name of this computer?
       Назва цього комп'ютера?
     
     
-      
+      
       Computer Name
       Назва комп'ютера
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Цю назву буде використано, якщо ви зробите комп'ютер видимим іншим у мережі.
     
     
-      
+      
       localhost is not allowed as hostname.
       «localhost» не можна використовувати як назву вузла.
     
     
-      
+      
       Choose a password to keep your account safe.
       Оберіть пароль, щоб тримати ваш обліковий рахунок у безпеці.
     
     
-      
+      
       Password
       Пароль
     
     
-      
+      
       Repeat Password
       Повторіть пароль
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Введіть один й той самий пароль двічі, для перевірки щодо помилок введення. Надійному паролю слід містити суміш літер, чисел та розділових знаків, бути довжиною хоча б вісім символів та регулярно змінюватись.
     
     
-      
+      
       Validate passwords quality
       Перевіряти якість паролів
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Якщо позначено цей пункт, буде виконано перевірку складності пароля. Ви не зможете скористатися надто простим паролем.
     
     
-      
+      
       Log in automatically without asking for the password
       Входити автоматично без пароля
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       Можна використовувати лише латинські літери, цифри, символи підкреслювання та дефіси; не менше двох символів.
     
     
-      
+      
       Reuse user password as root password
       Використати пароль користувача як пароль root
     
     
-      
+      
       Use the same password for the administrator account.
       Використовувати той самий пароль і для облікового рахунку адміністратора.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Виберіть пароль root для захисту вашого облікового запису.
     
     
-      
+      
       Root Password
       Пароль root
     
     
-      
+      
       Repeat Root Password
       Повторіть пароль root
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Введіть один й той самий пароль двічі, щоб убезпечитися від помилок при введенні.
     
diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts
index 46230aa0aa..a86dd94cc2 100644
--- a/lang/calamares_ur.ts
+++ b/lang/calamares_ur.ts
@@ -489,12 +489,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -533,149 +533,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -743,12 +743,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -798,47 +798,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -933,15 +933,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2438,6 +2463,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2721,17 +2754,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2749,107 +2782,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3304,44 +3312,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3633,27 +3613,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3985,7 +3944,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       خوش آمدید
     
@@ -3993,7 +3952,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       خوش آمدید
     
@@ -4063,19 +4022,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       واپس
     
@@ -4140,6 +4099,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4176,132 +4174,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts
index 3de7eccc4a..ae70f3f376 100644
--- a/lang/calamares_uz.ts
+++ b/lang/calamares_uz.ts
@@ -487,12 +487,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -531,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -741,12 +741,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -796,47 +796,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -931,15 +931,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2427,6 +2452,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2710,17 +2743,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2738,107 +2771,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,7 +2978,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3293,44 +3301,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3622,27 +3602,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3974,7 +3933,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3982,7 +3941,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4052,19 +4011,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4129,6 +4088,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4165,132 +4163,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts
index a0ff6ab6ea..7c3b412581 100644
--- a/lang/calamares_vi.ts
+++ b/lang/calamares_vi.ts
@@ -489,12 +489,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 Thiết lập chương trình
     
     
-      
+      
       %1 Installer
       %1 cài đặt hệ điều hành
     
@@ -533,149 +533,149 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Biểu mẫu
     
     
-      
+      
       Select storage de&vice:
       &Chọn thiết bị lưu trữ:
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       Hiện tại:
     
     
-      
+      
       After:
       Sau khi cài đặt:
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong> Phân vùng thủ công </strong> <br/> Bạn có thể tự tạo hoặc thay đổi kích thước phân vùng.
     
     
-      
+      
       Reuse %1 as home partition for %2.
       Sử dụng lại %1 làm phân vùng chính cho %2.
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong> Chọn một phân vùng để thu nhỏ, sau đó kéo thanh dưới cùng để thay đổi kích thước </strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 sẽ được thu nhỏ thành %2MiB và phân vùng %3MiB mới sẽ được tạo cho %4.
     
     
-      
+      
       Boot loader location:
       Vị trí bộ tải khởi động:
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong> Chọn phân vùng để cài đặt </strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       Không thể tìm thấy phân vùng hệ thống EFI ở bất kỳ đâu trên hệ thống này. Vui lòng quay lại và sử dụng phân vùng thủ công để thiết lập %1.
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       Phân vùng hệ thống EFI tại %1 sẽ được sử dụng để bắt đầu %2.
     
     
-      
+      
       EFI system partition:
       Phân vùng hệ thống EFI:
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Thiết bị lưu trữ này dường như không có hệ điều hành trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem xét và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong> Xóa đĩa </strong> <br/> Thao tác này sẽ <font color = "red"> xóa </font> tất cả dữ liệu hiện có trên thiết bị lưu trữ đã chọn.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong> Cài đặt cùng với </strong> <br/> Trình cài đặt sẽ thu nhỏ phân vùng để nhường chỗ cho %1.
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong> Thay thế phân vùng </strong> <br/> Thay thế phân vùng bằng %1.
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Thiết bị lưu trữ này có %1 trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Thiết bị lưu trữ này đã có hệ điều hành trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       Thiết bị lưu trữ này có nhiều hệ điều hành trên đó. Bạn muốn làm gì? <br/> Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       Thiết bị lưu trữ này đã có sẵn hệ điều hành, nhưng bảng phân vùng <strong> %1 </strong> khác với bảng <strong> %2 </strong> cần thiết. <br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       Thiết bị lưu trữ này có một trong các phân vùng được <strong> gắn kết </strong>.
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       Thiết bị lưu trữ này là một phần của thiết bị <strong> RAID không hoạt động </strong>.
     
     
-      
+      
       No Swap
       Không hoán đổi
     
     
-      
+      
       Reuse Swap
       Sử dụng lại Hoán đổi
     
     
-      
+      
       Swap (no Hibernate)
       Hoán đổi (không ngủ đông)
     
     
-      
+      
       Swap (with Hibernate)
       Hoán đổi (ngủ đông)
     
     
-      
+      
       Swap to file
       Hoán đổi sang tệp
     
@@ -743,12 +743,12 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       Thiệt lập bàn phím kiểu %1.<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       Thiết lập bố cục bàn phím thành %1/%2.
     
@@ -798,47 +798,47 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Cài đặt mạng. (Tắt: Không thể lấy được danh sách gói ứng dụng, kiểm tra kết nối mạng)
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       Máy tính này không đạt đủ yêu cấu tối thiểu để thiết lập %1.<br/>Không thể tiếp tục thiết lập. <a href="#details">Chi tiết...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       Máy tính này không đạt đủ yêu cấu tối thiểu để cài đặt %1.<br/>Không thể tiếp tục cài đặt. <a href="#details">Chi tiết...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       Máy tính này không đạt đủ yêu cấu khuyến nghị để thiết lập %1.<br/>Thiết lập có thể tiếp tục, nhưng một số tính năng có thể sẽ bị tắt.
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       Máy tính này không đạt đủ yêu cấu khuyến nghị để cài đặt %1.<br/>Cài đặt có thể tiếp tục, nhưng một số tính năng có thể sẽ bị tắt.
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       Chương trình này sẽ hỏi bạn vài câu hỏi và thiết lập %2 trên máy tính của bạn.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Chào mừng đến với chương trình Calamares để thiết lập %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Chào mừng đến với thiết lập %1 </h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Chào mừng đến với chương trình Calamares để cài đặt %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Chào mừng đến với bộ cài đặt %1 </h1>
     
@@ -933,15 +933,40 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Cài đặt của %1 đã xong.
     
     
-      
+      
       Package Selection
       Lựa chọn gói
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       Vui lòng chọn một sản phẩm từ danh sách. Sản phẩm đã chọn sẽ được cài đặt.
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      Tổng quan
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      Đây là tổng quan về những gì sẽ xảy ra khi bạn bắt đầu quy trình thiết lập.
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      Đây là tổng quan về những gì sẽ xảy ra khi bạn bắt đầu quy trình cài đặt.
+    
   
   
     ContextualProcessJob
@@ -2431,6 +2456,14 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Vui lòng chọn một sản phẩm từ danh sách. Sản phẩm đã chọn sẽ được cài đặt.
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      Gói
+    
+  
   
     PackageChooserViewStep
     
@@ -2714,17 +2747,17 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       &Cài đặt bộ tải khởi động trên:
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       Bạn có chắc chắn muốn tạo một bảng phân vùng mới trên %1 không?
     
     
-      
+      
       Can not create new partition
       Không thể tạo phân vùng mới
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       Bảng phân vùng trên %1 đã có %2 phân vùng chính và không thể thêm được nữa. Vui lòng xóa một phân vùng chính và thêm một phân vùng mở rộng, thay vào đó.
     
@@ -2742,107 +2775,82 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Phân vùng
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      Cài đặt %1 <strong> cùng với </strong> hệ điều hành khác.
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong> Xóa </strong> đĩa và cài đặt %1.
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      <strong>thay thế</strong> một phân vùng với %1.
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      Phân vùng <strong> thủ công </strong>.
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      Cài đặt %1 <strong> cùng với </strong> hệ điều hành khác trên đĩa <strong>%2</strong> (%3).
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong> Xóa </strong> đĩa <strong>%2 </strong> (%3) và cài đặt %1.
+      
+      Current:
+      Hiện tại:
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      <strong> Thay thế </strong> phân vùng trên đĩa <strong>%2 </strong> (%3) bằng %1.
+      
+      After:
+      Sau:
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      Phân vùng <strong> thủ công </strong> trên đĩa <strong>%1 </strong> (%2).
+      
+      No EFI system partition configured
+      Không có hệ thống phân vùng EFI được cài đặt
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      Đĩa <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      Hiện tại:
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      Sau:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      Không có hệ thống phân vùng EFI được cài đặt
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      Cần có phân vùng hệ thống EFI để khởi động %1. <br/> <br/> Để định cấu hình phân vùng hệ thống EFI, hãy quay lại và chọn hoặc tạo hệ thống tệp FAT32 với cờ <strong> %3 </strong> được bật và gắn kết point <strong> %2 </strong>. <br/> <br/> Bạn có thể tiếp tục mà không cần thiết lập phân vùng hệ thống EFI nhưng hệ thống của bạn có thể không khởi động được.
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      Một phân vùng hệ thống EFI là cần thiết để bắt đầu %1. <br/> <br/> Một phân vùng đã được định cấu hình với điểm gắn kết <strong> %2 </strong> nhưng cờ <strong> %3 </strong> của nó không được đặt . <br/> Để đặt cờ, hãy quay lại và chỉnh sửa phân vùng. <br/> <br/> Bạn có thể tiếp tục mà không cần đặt cờ nhưng hệ thống của bạn có thể không khởi động được.
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      Cờ phân vùng hệ thống EFI chưa được đặt
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       Lựa chọn dùng GPT trên BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Bảng phân vùng GPT là lựa chọn tốt nhất cho tất cả các hệ thống. Trình cài đặt này cũng hỗ trợ thiết lập như vậy cho các hệ thống BIOS. <br/> <br/> Để định cấu hình bảng phân vùng GPT trên BIOS, (nếu chưa thực hiện xong) hãy quay lại và đặt bảng phân vùng thành GPT, tiếp theo tạo 8 MB phân vùng chưa định dạng với cờ <strong> bios_grub </strong> được bật. <br/> <br/> Cần có phân vùng 8 MB chưa được định dạng để khởi động %1 trên hệ thống BIOS có GPT.
     
     
-      
+      
       Boot partition not encrypted
       Phân vùng khởi động không được mã hóa
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Một phân vùng khởi động riêng biệt đã được thiết lập cùng với một phân vùng gốc được mã hóa, nhưng phân vùng khởi động không được mã hóa. <br/> <br/> Có những lo ngại về bảo mật với loại thiết lập này, vì các tệp hệ thống quan trọng được lưu giữ trên một phân vùng không được mã hóa . <br/> Bạn có thể tiếp tục nếu muốn, nhưng việc mở khóa hệ thống tệp sẽ diễn ra sau trong quá trình khởi động hệ thống. <br/> Để mã hóa phân vùng khởi động, hãy quay lại và tạo lại nó, chọn <strong> Mã hóa </strong> trong phân vùng cửa sổ tạo.
     
     
-      
+      
       has at least one disk device available.
       có sẵn ít nhất một thiết bị đĩa.
     
     
-      
+      
       There are no partitions to install on.
       Không có phân vùng để cài đặt.
     
@@ -2977,7 +2985,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3303,44 +3311,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       Để có kết quả tốt nhất, hãy đảm bảo rằng máy tính này:
     
     
-      
+      
       System requirements
       Yêu cầu hệ thống
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Máy tính này không đáp ứng các yêu cầu tối thiểu để thiết lập %1. <br/> Không thể tiếp tục thiết lập. <a href="#details"> Chi tiết ... </a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      Máy tính này không đáp ứng các yêu cầu tối thiểu để cài đặt %1. <br/> Không thể tiếp tục cài đặt. <a href="#details"> Chi tiết ... </a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      Máy tính này không đáp ứng một số yêu cầu được khuyến nghị để thiết lập %1. <br/> Quá trình thiết lập có thể tiếp tục nhưng một số tính năng có thể bị tắt.
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      Máy tính này không đáp ứng một số yêu cầu được khuyến nghị để cài đặt %1. <br/> Quá trình cài đặt có thể tiếp tục, nhưng một số tính năng có thể bị tắt.
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      Chương trình này sẽ hỏi bạn một số câu hỏi và thiết lập %2 trên máy tính của bạn.
-    
-  
   
     ScanningDialog
     
@@ -3632,27 +3612,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      Đây là tổng quan về những gì sẽ xảy ra khi bạn bắt đầu quy trình thiết lập.
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      Đây là tổng quan về những gì sẽ xảy ra khi bạn bắt đầu quy trình cài đặt.
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      Tổng quan
-    
-  
   
     TrackingInstallJob
     
@@ -3984,7 +3943,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       Chào mừng
     
@@ -3992,7 +3951,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       Chào mừng
     
@@ -4072,21 +4031,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>Ngôn ngữ</h1> </br>
                     Cài đặt ngôn ngữ hệ thống ảnh hưởng đến ngôn ngữ và bộ ký tự cho một số thành phần giao diện người dùng dòng lệnh. Cài đặt hiện tại là <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>Địa phương</h1> </br>
                     Cài đặt ngôn ngữ hệ thống ảnh hưởng đến số và định dạng ngày tháng. Cài đặt hiện tại là <strong>%1</strong>.
     
     
-      
+      
       Back
       Trở lại
     
@@ -4152,6 +4111,45 @@ Output:
             <p>Đây là ghi chú phát hành mẫu.</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4208,132 +4206,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       Chọn tên bạn và chứng chỉ để đăng nhập và thực hiện các tác vụ quản trị
     
     
-      
+      
       What is your name?
       Hãy cho Vigo biết tên đầy đủ của bạn?
     
     
-      
+      
       Your Full Name
       Tên đầy đủ
     
     
-      
+      
       What name do you want to use to log in?
       Bạn muốn dùng tên nào để đăng nhập máy tính?
     
     
-      
+      
       Login Name
       Tên đăng nhập
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       Tạo nhiều tài khoản sau khi cài đặt nếu có nhiều người dùng chung.
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       Chỉ cho phép các chữ cái viết thường, số, gạch dưới và gạch nối.
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       Tên của máy tính này là?
     
     
-      
+      
       Computer Name
       Tên máy tính
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       Tên này sẽ hiển thị khi bạn kết nối vào một mạng.
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       Chọn mật khẩu để giữ máy tính an toàn.
     
     
-      
+      
       Password
       Mật khẩu
     
     
-      
+      
       Repeat Password
       Lặp lại mật khẩu
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       Nhập lại mật khẩu hai lần để kiểm tra. Một mật khẩu tốt phải có ít nhất 8 ký tự và bao gồm chữ, số, ký hiệu đặc biệt. Nên được thay đổi thường xuyên.
     
     
-      
+      
       Validate passwords quality
       Xác thực chất lượng mật khẩu
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       Khi tích chọn, bạn có thể chọn mật khẩu yếu.
     
     
-      
+      
       Log in automatically without asking for the password
       Tự động đăng nhập không hỏi mật khẩu
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       Dùng lại mật khẩu người dùng như mật khẩu quản trị
     
     
-      
+      
       Use the same password for the administrator account.
       Dùng cùng một mật khẩu cho tài khoản quản trị.
     
     
-      
+      
       Choose a root password to keep your account safe.
       Chọn mật khẩu quản trị để giữ máy tính an toàn.
     
     
-      
+      
       Root Password
       Mật khẩu quản trị
     
     
-      
+      
       Repeat Root Password
       Lặp lại mật khẩu quản trị
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       Nhập lại mật khẩu hai lần để kiểm tra.
     
diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts
index 9d71a3bef9..b9a8ae8154 100644
--- a/lang/calamares_zh.ts
+++ b/lang/calamares_zh.ts
@@ -487,12 +487,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -531,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -741,12 +741,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -796,47 +796,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -931,15 +931,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2427,6 +2452,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2710,17 +2743,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2738,107 +2771,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,7 +2978,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3293,44 +3301,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3622,27 +3602,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3974,7 +3933,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3982,7 +3941,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4052,19 +4011,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4129,6 +4088,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4165,132 +4163,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index a2a9757eb4..941b934903 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -494,12 +494,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 安装程序
     
     
-      
+      
       %1 Installer
       %1 安装程序
     
@@ -538,149 +538,149 @@ The installer will quit and all changes will be lost.
       表单
     
     
-      
+      
       Select storage de&vice:
       选择存储器(&V)：
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       当前：
     
     
-      
+      
       After:
       之后：
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>手动分区</strong><br/>您可以自行创建或重新调整分区大小。
     
     
-      
+      
       Reuse %1 as home partition for %2.
       重复使用 %1 作为 %2 的 home 分区。
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>选择要缩小的分区，然后拖动底栏改变大小</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 将会缩减未 %2MiB，然后为 %4 创建一个 %3MiB 分区。
     
     
-      
+      
       Boot loader location:
       引导程序位置：
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>选择要安装到的分区</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       在此系统上找不到任何 EFI 系统分区。请后退到上一步并使用手动分区配置 %1。
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       %1 处的 EFI 系统分区将被用来启动 %2。
     
     
-      
+      
       EFI system partition:
       EFI 系统分区：
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       这个存储器上似乎还没有操作系统。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>抹除磁盘</strong><br/>这将会<font color="red">删除</font>目前选定的存储器上所有的数据。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>并存安装</strong><br/>安装程序将会缩小一个分区，为 %1 腾出空间。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>取代一个分区</strong><br/>以 %1 <strong>替代</strong>一个分区。
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       这个存储器上已经有 %1 了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       这个存储器上已经有一个操作系统了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       这个存储器上已经有多个操作系统了。您想要怎么做？<br/>在任何变更应用到存储器上前，您都可以重新查看并确认您的选择。
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       此存储设备已经有操作系统，但是分区表 <strong>%1</strong> 与所需的 <strong>%2</strong>.<br/>不同。
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       此存储设备 <strong>已挂载</strong>其中一个分区。
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       该存储设备是 <strong>非活动RAID</strong> 设备的一部分。
     
     
-      
+      
       No Swap
       无交换分区
     
     
-      
+      
       Reuse Swap
       重用交换分区
     
     
-      
+      
       Swap (no Hibernate)
       交换分区(无休眠)
     
     
-      
+      
       Swap (with Hibernate)
       交换分区(带休眠)
     
     
-      
+      
       Swap to file
       交换到文件
     
@@ -748,12 +748,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       设置键盘型号为 %1。<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       设置键盘布局为 %1/%2。
     
@@ -803,49 +803,49 @@ The installer will quit and all changes will be lost.
       网络安装。（已禁用：无法获取软件包列表，请检查网络连接）
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       此计算机不满足安装 %1 的某些推荐配置。
 安装可以继续，但是一些特性可能被禁用。
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       此电脑未满足安装 %1 的最低需求。<br/>安装无法继续。<a href="#details">详细信息...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       此计算机不满足安装 %1 的某些推荐配置。
 安装可以继续，但是一些特性可能被禁用。
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       此电脑未满足一些安装 %1 的推荐需求。<br/>可以继续安装，但一些功能可能会被停用。
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       本程序将会问您一些问题并在您的电脑上安装及设置 %2 。
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>欢迎使用 %1 的 Calamares 安装程序</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>欢迎使用 %1 设置</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>欢迎使用 %1 的 Calamares 安装程序</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>欢迎使用 %1 安装程序</h1>
     
@@ -940,15 +940,40 @@ The installer will quit and all changes will be lost.
       %1 的安装操作已完成。
     
     
-      
+      
       Package Selection
       软件包选择
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       请在列表中选一个产品。被选中的产品将会被安装。
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      摘要
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      预览——当你启动安装过程，以下行为将被执行
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      这是您开始安装后所会发生的事情的概览。
+    
   
   
     ContextualProcessJob
@@ -2439,6 +2464,14 @@ The installer will quit and all changes will be lost.
       请在列表中选一个产品。被选中的产品将会被安装。
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      软件包
+    
+  
   
     PackageChooserViewStep
     
@@ -2722,17 +2755,17 @@ The installer will quit and all changes will be lost.
       安装引导程序至：
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       您是否确定要在 %1 上创建新分区表？
     
     
-      
+      
       Can not create new partition
       无法创建新分区
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       ％1上的分区表已经有％2个主分区，并且不能再添加。请删除一个主分区并添加扩展分区。
     
@@ -2750,107 +2783,82 @@ The installer will quit and all changes will be lost.
       分区
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      将 %1 安装在其他操作系统<strong>旁边</strong>。
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>抹除</strong>磁盘并安装 %1。
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      以 %1 <strong>替代</strong>一个分区。
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>手动</strong>分区
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      将 %1 安装在磁盘 <strong>%2</strong> (%3) 上的另一个操作系统<strong>旁边</strong>。
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>抹除</strong> 磁盘 <strong>%2</strong> (%3) 并且安装 %1。
+      
+      Current:
+      当前：
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      以 %1 <strong>替代</strong> 一个在磁盘 <strong>%2</strong> (%3) 上的分区。
+      
+      After:
+      之后：
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      在磁盘 <strong>%1</strong> (%2) 上<strong>手动</strong>分区。
+      
+      No EFI system partition configured
+      未配置 EFI 系统分区
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      磁盘 <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      
     
     
-      
-      Current:
-      当前：
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      
     
     
-      
-      After:
-      之后：
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      
     
     
-      
-      No EFI system partition configured
-      未配置 EFI 系统分区
+      
+      The filesystem must have type FAT32.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      必须有 EFI 系统分区才能启动 %1 。<br/><br/>要配置 EFI 系统分区，后退一步，然后创建或选中一个 FAT32 分区并为之设置 <strong>%3</strong> 标记及挂载点 <strong>%2</strong>。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。
+      
+      The filesystem must be at least %1 MiB in size.
+      
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      必须有 EFI 系统分区才能启动 %1 。<br/><br/>已有挂载点为 <strong>%2</strong> 的分区，但是未设置 <strong>%3</strong> 标记。<br/>要设置此标记，后退并编辑分区。<br/><br/>你可以不创建 EFI 系统分区并继续安装，但是你的系统可能无法启动。
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      
     
     
-      
-      EFI system partition flag not set
-      未设置 EFI 系统分区标记
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      
     
     
-      
+      
       Option to use GPT on BIOS
       在 BIOS 上使用 GPT
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT 分区表对于所有系统来说都是最佳选项。本安装程序支持在 BIOS 模式下设置 GPT 分区表。<br/><br/>要在 BIOS 模式下配置 GPT 分区表，（若你尚未配置好）返回并设置分区表为 GPT，然后创建一个 8MB 的、未经格式化的、启用<strong>bios_grub</strong> 标记的分区。<br/><br/>一个未格式化的 8MB 的分区对于在 BIOS 模式下使用 GPT 启动 %1 来说是非常有必要的。
     
     
-      
+      
       Boot partition not encrypted
       引导分区未加密
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       您尝试用单独的引导分区配合已加密的根分区使用，但引导分区未加密。<br/><br/>这种配置方式可能存在安全隐患，因为重要的系统文件存储在了未加密的分区上。<br/>您可以继续保持此配置，但是系统解密将在系统启动时而不是引导时进行。<br/>要加密引导分区，请返回上一步并重新创建此分区，并在分区创建窗口选中 <strong>加密</strong> 选项。
     
     
-      
+      
       has at least one disk device available.
       有至少一个可用的磁盘设备。
     
     
-      
+      
       There are no partitions to install on.
       无可用于安装的分区。
     
@@ -2985,7 +2993,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1（%2）
     
@@ -3311,46 +3319,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       为了更好的体验，请确保这台电脑: 
     
     
-      
+      
       System requirements
       系统需求
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      此计算机不满足安装 %1 的某些推荐配置。
-安装可以继续，但是一些特性可能被禁用。
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      此电脑未满足安装 %1 的最低需求。<br/>安装无法继续。<a href="#details">详细信息...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      此计算机不满足安装 %1 的某些推荐配置。
-安装可以继续，但是一些特性可能被禁用。
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      此电脑未满足一些安装 %1 的推荐需求。<br/>可以继续安装，但一些功能可能会被停用。
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      本程序将会问您一些问题并在您的电脑上安装及设置 %2 。
-    
-  
   
     ScanningDialog
     
@@ -3642,27 +3620,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      预览——当你启动安装过程，以下行为将被执行
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      这是您开始安装后所会发生的事情的概览。
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      摘要
-    
-  
   
     TrackingInstallJob
     
@@ -3994,7 +3951,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       欢迎
     
@@ -4002,7 +3959,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       欢迎
     
@@ -4085,21 +4042,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>语言</h1> </br>
                    系统语言区域设置会影响部份命令行用户界面的语言及字符集。 当前设置是 <strong>%1</strong>.
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>区域</h1> </br>
                     系统区域设置会影响数字和日期格式。 当前设置是 <strong>%1</strong>。
     
     
-      
+      
       Back
       后退
     
@@ -4165,6 +4122,45 @@ Output:
 <p>这些是发布日志样例</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4222,132 +4218,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       选择您的用户名和凭据登录并执行管理任务
     
     
-      
+      
       What is your name?
       您的姓名？
     
     
-      
+      
       Your Full Name
       全名
     
     
-      
+      
       What name do you want to use to log in?
       您想要使用的登录用户名是？
     
     
-      
+      
       Login Name
       登录名
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       如果有多人要使用此计算机，您可以在安装后创建多个账户。
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       只允许小写字母、数组、下划线"_" 和 连字符"-"
     
     
-      
+      
       root is not allowed as username.
       用户名不能为root
     
     
-      
+      
       What is the name of this computer?
       计算机名称为？
     
     
-      
+      
       Computer Name
       计算机名称
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       将计算机设置为对其他网络上计算机可见时将使用此名称。
     
     
-      
+      
       localhost is not allowed as hostname.
       localhost不能为用户名
     
     
-      
+      
       Choose a password to keep your account safe.
       选择一个密码来保证您的账户安全。
     
     
-      
+      
       Password
       密码
     
     
-      
+      
       Repeat Password
       重复密码
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       输入相同密码两次，以检查输入错误。好的密码包含字母，数字，标点的组合，应当至少为 8 个字符长，并且应按一定周期更换。
     
     
-      
+      
       Validate passwords quality
       验证密码质量
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       若选中此项，密码强度检测会开启，你将不被允许使用弱密码。
     
     
-      
+      
       Log in automatically without asking for the password
       不询问密码自动登录
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       只允许字母、数组、下划线"_" 和 连字符"-"，最少两个字符。
     
     
-      
+      
       Reuse user password as root password
       重用用户密码作为 root 密码
     
     
-      
+      
       Use the same password for the administrator account.
       为管理员帐号使用同样的密码。
     
     
-      
+      
       Choose a root password to keep your account safe.
       选择一个 root 密码来保证您的账户安全。
     
     
-      
+      
       Root Password
       Root 密码
     
     
-      
+      
       Repeat Root Password
       重复 Root 密码
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       输入相同密码两次，以检查输入错误。
     
diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts
index db1ecd4d9c..1805ddc41b 100644
--- a/lang/calamares_zh_HK.ts
+++ b/lang/calamares_zh_HK.ts
@@ -487,12 +487,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       
     
     
-      
+      
       %1 Installer
       
     
@@ -531,149 +531,149 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Select storage de&vice:
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       
     
     
-      
+      
       Reuse %1 as home partition for %2.
       
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       
     
     
-      
+      
       Boot loader location:
       
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       
     
     
-      
+      
       EFI system partition:
       
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       
     
     
-      
+      
       No Swap
       
     
     
-      
+      
       Reuse Swap
       
     
     
-      
+      
       Swap (no Hibernate)
       
     
     
-      
+      
       Swap (with Hibernate)
       
     
     
-      
+      
       Swap to file
       
     
@@ -741,12 +741,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       
     
     
-      
+      
       Set keyboard layout to %1/%2.
       
     
@@ -796,47 +796,47 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -931,15 +931,40 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Package Selection
       
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       
     
+    
+      
+      Install option: <strong>%1</strong>
+      
+    
+    
+      
+      None
+      
+    
+    
+      
+      Summary
+      
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      
+    
   
   
     ContextualProcessJob
@@ -2427,6 +2452,14 @@ The installer will quit and all changes will be lost.
       
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      
+    
+  
   
     PackageChooserViewStep
     
@@ -2710,17 +2743,17 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       
     
     
-      
+      
       Can not create new partition
       
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       
     
@@ -2738,107 +2771,82 @@ The installer will quit and all changes will be lost.
       
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
+      
+      Current:
       
     
     
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
+      
+      After:
       
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
+      
+      No EFI system partition configured
       
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
+      
+      EFI system partition configured incorrectly
       
     
     
-      
-      Disk <strong>%1</strong> (%2)
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
-      Current:
+      
+      The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
-      After:
+      
+      The filesystem must have type FAT32.
       
     
     
-      
-      No EFI system partition configured
+      
+      The filesystem must be at least %1 MiB in size.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
+      
+      The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
-      EFI system partition flag not set
-      
-    
-    
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2970,7 +2978,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3293,44 +3301,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       
     
     
-      
+      
       System requirements
       
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      
-    
-  
   
     ScanningDialog
     
@@ -3622,27 +3602,6 @@ Output:
       
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      
-    
-  
   
     TrackingInstallJob
     
@@ -3974,7 +3933,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       
     
@@ -3982,7 +3941,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       
     
@@ -4052,19 +4011,19 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       
     
     
-      
+      
       Back
       
     
@@ -4129,6 +4088,45 @@ Output:
       
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      
+    
+    
+      
+      LibreOffice
+      
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      
+    
+    
+      
+      No Office Suite
+      
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      
+    
+    
+      
+      Minimal Install
+      
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      
+    
+  
   
     release_notes
     
@@ -4165,132 +4163,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       
     
     
-      
+      
       What is your name?
       
     
     
-      
+      
       Your Full Name
       
     
     
-      
+      
       What name do you want to use to log in?
       
     
     
-      
+      
       Login Name
       
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       
     
     
-      
+      
       root is not allowed as username.
       
     
     
-      
+      
       What is the name of this computer?
       
     
     
-      
+      
       Computer Name
       
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       
     
     
-      
+      
       localhost is not allowed as hostname.
       
     
     
-      
+      
       Choose a password to keep your account safe.
       
     
     
-      
+      
       Password
       
     
     
-      
+      
       Repeat Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       
     
     
-      
+      
       Validate passwords quality
       
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       
     
     
-      
+      
       Log in automatically without asking for the password
       
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       
     
     
-      
+      
       Reuse user password as root password
       
     
     
-      
+      
       Use the same password for the administrator account.
       
     
     
-      
+      
       Choose a root password to keep your account safe.
       
     
     
-      
+      
       Root Password
       
     
     
-      
+      
       Repeat Root Password
       
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       
     
diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts
index 4cb526bb4f..bca1ae1a98 100644
--- a/lang/calamares_zh_TW.ts
+++ b/lang/calamares_zh_TW.ts
@@ -493,12 +493,12 @@ The installer will quit and all changes will be lost.
   
     CalamaresWindow
     
-      
+      
       %1 Setup Program
       %1 設定程式
     
     
-      
+      
       %1 Installer
       %1 安裝程式
     
@@ -537,149 +537,149 @@ The installer will quit and all changes will be lost.
       表單
     
     
-      
+      
       Select storage de&vice:
       選取儲存裝置(&V)：
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       Current:
       目前：
     
     
-      
+      
       After:
       之後：
     
     
-      
+      
       <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
       <strong>手動分割</strong><br/>可以自行建立或重新調整分割區大小。
     
     
-      
+      
       Reuse %1 as home partition for %2.
       重新使用 %1 作為 %2 的家目錄分割區。
     
     
-      
+      
       <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
       <strong>選取要縮減的分割區，然後拖曳底部條狀物來調整大小</strong>
     
     
-      
+      
       %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
       %1 會縮減到 %2MiB，並且會為 %4 建立新的 %3MiB 分割區。
     
     
-      
+      
       Boot loader location:
       開機載入器位置：
     
     
-      
+      
       <strong>Select a partition to install on</strong>
       <strong>選取分割區以安裝在其上</strong>
     
     
-      
+      
       An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
       在這個系統找不到 EFI 系統分割區。請回到上一步並使用手動分割以設定 %1。
     
     
-      
+      
       The EFI system partition at %1 will be used for starting %2.
       在 %1 的 EFI 系統分割區將會在開始 %2 時使用。
     
     
-      
+      
       EFI system partition:
       EFI 系統分割區：
     
     
-      
+      
       This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       這個儲存裝置上似乎還沒有作業系統。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device.
       <strong>抹除磁碟</strong><br/>這將會<font color="red">刪除</font>目前選取的儲存裝置所有的資料。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1.
       <strong>並存安裝</strong><br/>安裝程式會縮小一個分割區，以讓出空間給 %1。
     
     
-      
-      
-      
-      
+      
+      
+      
+      
       <strong>Replace a partition</strong><br/>Replaces a partition with %1.
       <strong>取代一個分割區</strong><br/>用 %1 取代一個分割區。
     
     
-      
+      
       This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       這個儲存裝置上已經有 %1 了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。
     
     
-      
+      
       This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       這個儲存裝置上已經有一個作業系統了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。
     
     
-      
+      
       This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device.
       這個儲存裝置上已經有多個作業系統了。您想要怎麼做？<br/>在任何變更套用到儲存裝置上前，您都可以重新檢視並確認您的選擇。
     
     
-      
+      
       This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/>
       此儲存裝置上已有作業系統，但分割表 <strong>%1</strong> 與需要的 <strong>%2</strong> 不同。<br/>
     
     
-      
+      
       This storage device has one of its partitions <strong>mounted</strong>.
       此裝置<strong>已掛載</strong>其中一個分割區。
     
     
-      
+      
       This storage device is a part of an <strong>inactive RAID</strong> device.
       此儲存裝置是<strong>非作用中 RAID</strong> 裝置的一部份。
     
     
-      
+      
       No Swap
       沒有 Swap
     
     
-      
+      
       Reuse Swap
       重用 Swap
     
     
-      
+      
       Swap (no Hibernate)
       Swap（沒有冬眠）
     
     
-      
+      
       Swap (with Hibernate)
       Swap（有冬眠）
     
     
-      
+      
       Swap to file
       Swap 到檔案
     
@@ -747,12 +747,12 @@ The installer will quit and all changes will be lost.
   
     Config
     
-      
+      
       Set keyboard model to %1.<br/>
       設定鍵盤型號為 %1 。<br/>
     
     
-      
+      
       Set keyboard layout to %1/%2.
       設定鍵盤佈局為 %1/%2 。
     
@@ -802,47 +802,47 @@ The installer will quit and all changes will be lost.
       網路安裝。（已停用：無法擷取軟體包清單，請檢查您的網路連線）
     
     
-      
+      
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
       此電腦未滿足安裝 %1 的最低配備。<br/>設定無法繼續。<a href="#details">詳細資訊...</a>
     
     
-      
+      
       This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
       此電腦未滿足安裝 %1 的最低配備。<br/>安裝無法繼續。<a href="#details">詳細資訊...</a>
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
       此電腦未滿足一些安裝 %1 的推薦需求。<br/>設定可以繼續，但部份功能可能會被停用。
     
     
-      
+      
       This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
       此電腦未滿足一些安裝 %1 的推薦需求。<br/>安裝可以繼續，但部份功能可能會被停用。
     
     
-      
+      
       This program will ask you some questions and set up %2 on your computer.
       本程式會問您一些問題，然後在您的電腦安裝及設定 %2。
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>歡迎使用 %1 的 Calamares 安裝程式</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>歡迎使用 %1 安裝程式</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>歡迎使用 %1 的 Calamares 安裝程式</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>歡迎使用 %1 安裝程式</h1>
     
@@ -937,15 +937,40 @@ The installer will quit and all changes will be lost.
       %1 的安裝已完成。
     
     
-      
+      
       Package Selection
       軟體包選擇
     
     
-      
+      
       Please pick a product from the list. The selected product will be installed.
       請從清單中挑選產品。將會安裝選定的產品。
     
+    
+      
+      Install option: <strong>%1</strong>
+      安裝選項：<strong>%1</strong>
+    
+    
+      
+      None
+      無
+    
+    
+      
+      Summary
+      總覽
+    
+    
+      
+      This is an overview of what will happen once you start the setup procedure.
+      這是開始安裝後所會發生的事的概覽。
+    
+    
+      
+      This is an overview of what will happen once you start the install procedure.
+      這是您開始安裝後所會發生的事的概覽。
+    
   
   
     ContextualProcessJob
@@ -2435,6 +2460,14 @@ The installer will quit and all changes will be lost.
       請從清單中挑選產品。將會安裝選定的產品。
     
   
+  
+    PackageChooserQmlViewStep
+    
+      
+      Packages
+      軟體包
+    
+  
   
     PackageChooserViewStep
     
@@ -2718,17 +2751,17 @@ The installer will quit and all changes will be lost.
       安裝開機管理程式於：
     
     
-      
+      
       Are you sure you want to create a new partition table on %1?
       您是否確定要在 %1 上建立一個新的分割區表格？
     
     
-      
+      
       Can not create new partition
       無法建立新分割區
     
     
-      
+      
       The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.
       在 %1 上的分割表已有 %2 個主要分割區，無法再新增。請移除一個主要分割區並新增一個延伸分割區。
     
@@ -2746,107 +2779,82 @@ The installer will quit and all changes will be lost.
       分割區
     
     
-      
-      Install %1 <strong>alongside</strong> another operating system.
-      將 %1 安裝在其他作業系統<strong>旁邊</strong>。
-    
-    
-      
-      <strong>Erase</strong> disk and install %1.
-      <strong>抹除</strong>磁碟並安裝 %1。
-    
-    
-      
-      <strong>Replace</strong> a partition with %1.
-      以 %1 <strong>取代</strong>一個分割區。
-    
-    
-      
-      <strong>Manual</strong> partitioning.
-      <strong>手動</strong>分割
-    
-    
-      
-      Install %1 <strong>alongside</strong> another operating system on disk <strong>%2</strong> (%3).
-      將 %1 安裝在磁碟 <strong>%2</strong> (%3) 上的另一個作業系統<strong>旁邊</strong>。
-    
-    
-      
-      <strong>Erase</strong> disk <strong>%2</strong> (%3) and install %1.
-      <strong>抹除</strong> 磁碟 <strong>%2</strong> (%3) 並且安裝 %1。
+      
+      Current:
+      目前：
     
     
-      
-      <strong>Replace</strong> a partition on disk <strong>%2</strong> (%3) with %1.
-      以 %1 <strong>取代</strong> 一個在磁碟 <strong>%2</strong> (%3) 上的分割區。
+      
+      After:
+      之後：
     
     
-      
-      <strong>Manual</strong> partitioning on disk <strong>%1</strong> (%2).
-      在磁碟 <strong>%1</strong> (%2) 上<strong>手動</strong>分割。
+      
+      No EFI system partition configured
+      未設定 EFI 系統分割區
     
     
-      
-      Disk <strong>%1</strong> (%2)
-      磁碟 <strong>%1</strong> (%2)
+      
+      EFI system partition configured incorrectly
+      EFI 系統分割區設定不正確
     
     
-      
-      Current:
-      目前：
+      
+      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
+      要啟動 %1 必須要有 EFI 系統分割區。<br/><br/>要設定 EFI 系統分割區，返回並選取或建立適合的檔案系統。
     
     
-      
-      After:
-      之後：
+      
+      The filesystem must be mounted on <strong>%1</strong>.
+      檔案系統必須掛載於 <strong>%1</strong>。
     
     
-      
-      No EFI system partition configured
-      未設定 EFI 系統分割區
+      
+      The filesystem must have type FAT32.
+      檔案系統必須有類型 FAT32。
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a FAT32 filesystem with the <strong>%3</strong> flag enabled and mount point <strong>%2</strong>.<br/><br/>You can continue without setting up an EFI system partition but your system may fail to start.
-      需要 EFI 系統分割區以啟動 %1。<br/><br/>要設定 EFI 系統分割區，回到上一步並選取或建立一個包含啟用 <strong>%3</strong> 旗標以及掛載點位於 <strong>%2</strong> 的 FAT32 檔案系統。<br/><br/>您也可以不設定 EFI 系統分割區並繼續，但是您的系統可能會無法啟動。
+      
+      The filesystem must be at least %1 MiB in size.
+      檔案系統必須至少有 %1 MiB 的大小。
     
     
-      
-      An EFI system partition is necessary to start %1.<br/><br/>A partition was configured with mount point <strong>%2</strong> but its <strong>%3</strong> flag is not set.<br/>To set the flag, go back and edit the partition.<br/><br/>You can continue without setting the flag but your system may fail to start.
-      需要 EFI 系統分割區以啟動 %1。<br/><br/>有一個分割區的掛載點設定為 <strong>%2</strong>，但未設定 <strong>%3</strong> 旗標。<br/>要設定此旗標，回到上一步並編輯分割區。<br/><br/>您也可以不設定旗標並繼續，但您的系統可能會無法啟動。
+      
+      The filesystem must have flag <strong>%1</strong> set.
+      檔案系統必須有旗標 <strong>%1</strong> 設定。
     
     
-      
-      EFI system partition flag not set
-      未設定 EFI 系統分割區旗標
+      
+      You can continue without setting up an EFI system partition but your system may fail to start.
+      您可以在不設定 EFI 系統分割區的情況下繼續，但您的系統可能無法啟動。
     
     
-      
+      
       Option to use GPT on BIOS
       在 BIOS 上使用 GPT 的選項
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT 分割表對所有系統都是最佳選項。此安裝程式同時也支援 BIOS 系統。<br/><br/>要在 BIOS 上設定 GPT 分割表，（如果還沒有完成的話）請回上一步並將分割表設定為 GPT，然後建立 8 MB 的未格式化分割區，並啟用 <strong>bios_grub</strong> 旗標。<br/>要在 BIOS 系統上使用 GPT 分割區啟動 %1 則必須使用未格式化的 8MB 分割區。
     
     
-      
+      
       Boot partition not encrypted
       開機分割區未加密
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       設定了單獨的開機分割區以及加密的根分割區，但是開機分割區並不會被加密。<br/><br/>這種設定可能會造成安全問題，因為重要的系統檔案是放在未加密的分割區中。<br/>您也可以繼續，但是檔案系統的解鎖會在系統啟動後才發生。<br/>要加密開機分割區，回到上一頁並重新建立它，並在分割區建立視窗選取<strong>加密</strong>。
     
     
-      
+      
       has at least one disk device available.
       有至少一個可用的磁碟裝置。
     
     
-      
+      
       There are no partitions to install on.
       沒有可用於安裝的分割區。
     
@@ -2981,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3307,44 +3315,16 @@ Output:
   
     ResultsListDialog
     
-      
+      
       For best results, please ensure that this computer:
       為了得到最佳的結果，請確保此電腦：
     
     
-      
+      
       System requirements
       系統需求
     
   
-  
-    ResultsListWidget
-    
-      
-      This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      此電腦未滿足安裝 %1 的最低配備。<br/>設定無法繼續。<a href="#details">詳細資訊...</a>
-    
-    
-      
-      This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a>
-      此電腦未滿足安裝 %1 的最低配備。<br/>安裝無法繼續。<a href="#details">詳細資訊...</a>
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled.
-      此電腦未滿足一些安裝 %1 的推薦需求。<br/>設定可以繼續，但部份功能可能會被停用。
-    
-    
-      
-      This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled.
-      此電腦未滿足一些安裝 %1 的推薦需求。<br/>安裝可以繼續，但部份功能可能會被停用。
-    
-    
-      
-      This program will ask you some questions and set up %2 on your computer.
-      本程式會問您一些問題，然後在您的電腦安裝及設定 %2。
-    
-  
   
     ScanningDialog
     
@@ -3636,27 +3616,6 @@ Output:
       %L1 / %L2
     
   
-  
-    SummaryPage
-    
-      
-      This is an overview of what will happen once you start the setup procedure.
-      這是開始安裝後所會發生的事的概覽。
-    
-    
-      
-      This is an overview of what will happen once you start the install procedure.
-      這是您開始安裝後所會發生的事的概覽。
-    
-  
-  
-    SummaryViewStep
-    
-      
-      Summary
-      總覽
-    
-  
   
     TrackingInstallJob
     
@@ -3988,7 +3947,7 @@ Output:
   
     WelcomeQmlViewStep
     
-      
+      
       Welcome
       歡迎
     
@@ -3996,7 +3955,7 @@ Output:
   
     WelcomeViewStep
     
-      
+      
       Welcome
       歡迎
     
@@ -4079,21 +4038,21 @@ Output:
   
     i18n
     
-      
+      
       <h1>Languages</h1> </br>
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>.
       <h1>語言</h1> </br>
                     系統語系設定會影響某些命令列使用者介面元素的語言與字元集。目前的設定為 <strong>%1</strong>。
     
     
-      
+      
       <h1>Locales</h1> </br>
                     The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>.
       <h1>語系</h1> </br>
                     系統語系設定會影響數字與日期格式。目前的設定為 <strong>%1</strong>。
     
     
-      
+      
       Back
       返回
     
@@ -4159,6 +4118,46 @@ Output:
             <p>此為發行記事範本。</p>
     
   
+  
+    packagechooserq
+    
+      
+      LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
+                    Default option.
+      LibreOffice 是強大且自由的辦公室套裝軟體，被世界上數以百萬計的人們使用。其包含了多個應用程式，使其成為市場上功能最強大的自由與開放原始碼辦公室套裝軟體。<br/>
+                    預設選項。
+    
+    
+      
+      LibreOffice
+      LibreOffice
+    
+    
+      
+      If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
+      如果您不想安裝辦公室套裝軟體，只要選取「不要辦公室套裝軟體」就好。您隨時都可以在已安裝的系統上新增一個或多個您需要的軟體。
+    
+    
+      
+      No Office Suite
+      不要辦公室套裝軟體
+    
+    
+      
+      Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
+      建立最小化的桌面安裝，移除所有額外的應用程式並稍後再決定您想要新增哪些東西到您的系統中。如此的安裝不會有什麼例子，其不會有辦公室套裝軟體、沒有多媒體播放程式、沒有圖片檢視程式或列印支援。其就只有桌面、檔案瀏覽器、軟體包管理程式、文字編輯器與簡易的網路瀏覽器。
+    
+    
+      
+      Minimal Install
+      最小安裝
+    
+    
+      
+      Please select an option for your install, or use the default: LibreOffice included.
+      請選取您安裝的選項，或使用預設：包含 LibreOffice。
+    
+  
   
     release_notes
     
@@ -4215,132 +4214,132 @@ Output:
   
     usersq
     
-      
+      
       Pick your user name and credentials to login and perform admin tasks
       挑選您的使用者名稱與憑證以登入並執行管理工作
     
     
-      
+      
       What is your name?
       該如何稱呼您？
     
     
-      
+      
       Your Full Name
       您的全名
     
     
-      
+      
       What name do you want to use to log in?
       您想使用何種登入名稱？
     
     
-      
+      
       Login Name
       登入名稱
     
     
-      
+      
       If more than one person will use this computer, you can create multiple accounts after installation.
       若有多於一個人使用此電腦，您可以在安裝後建立多個帳號。
     
     
-      
+      
       Only lowercase letters, numbers, underscore and hyphen are allowed.
       僅允許小寫字母、數字、底線與連接號。
     
     
-      
+      
       root is not allowed as username.
       不允許使用 root 作為使用者名稱。
     
     
-      
+      
       What is the name of this computer?
       這部電腦的名字是？
     
     
-      
+      
       Computer Name
       電腦名稱
     
     
-      
+      
       This name will be used if you make the computer visible to others on a network.
       若您將此電腦設定為讓網路上的其他電腦可見時將會使用此名稱。
     
     
-      
+      
       localhost is not allowed as hostname.
       不允許使用 localhost 作為主機名稱。
     
     
-      
+      
       Choose a password to keep your account safe.
       輸入密碼以確保帳號的安全性。
     
     
-      
+      
       Password
       密碼
     
     
-      
+      
       Repeat Password
       確認密碼
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
       輸入同一個密碼兩次，以檢查輸入錯誤。一個好的密碼包含了字母、數字及標點符號的組合、至少八個字母長，且按一固定週期更換。
     
     
-      
+      
       Validate passwords quality
       驗證密碼品質
     
     
-      
+      
       When this box is checked, password-strength checking is done and you will not be able to use a weak password.
       當此勾選框被勾選，密碼強度檢查即完成，您也無法再使用弱密碼。
     
     
-      
+      
       Log in automatically without asking for the password
       自動登入，無需輸入密碼
     
     
-      
+      
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
       僅允許字母、數字、底線與連接號，最少兩個字元。
     
     
-      
+      
       Reuse user password as root password
       重用使用者密碼為 root 密碼
     
     
-      
+      
       Use the same password for the administrator account.
       為管理員帳號使用同樣的密碼。
     
     
-      
+      
       Choose a root password to keep your account safe.
       選擇 root 密碼來維護您的帳號安全。
     
     
-      
+      
       Root Password
       Root 密碼
     
     
-      
+      
       Repeat Root Password
       確認 Root 密碼
     
     
-      
+      
       Enter the same password twice, so that it can be checked for typing errors.
       輸入同樣的密碼兩次，這樣可以檢查輸入錯誤。
     

From b9334853949f4ff02ba3752bfac4aecc14a8fd06 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Wed, 8 Sep 2021 13:01:02 +0200
Subject: [PATCH 425/492] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python.pot                               | 183 ++++---
 lang/python/ar/LC_MESSAGES/python.po          | 418 ++++++++-------
 lang/python/as/LC_MESSAGES/python.po          | 454 ++++++++--------
 lang/python/ast/LC_MESSAGES/python.po         | 440 ++++++++--------
 lang/python/az/LC_MESSAGES/python.po          | 488 +++++++++--------
 lang/python/az_AZ/LC_MESSAGES/python.po       | 488 +++++++++--------
 lang/python/be/LC_MESSAGES/python.po          | 466 ++++++++--------
 lang/python/bg/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/bn/LC_MESSAGES/python.po          | 402 +++++++-------
 lang/python/ca/LC_MESSAGES/python.po          | 482 +++++++++--------
 lang/python/ca@valencia/LC_MESSAGES/python.po | 464 ++++++++--------
 lang/python/cs_CZ/LC_MESSAGES/python.po       | 488 ++++++++---------
 lang/python/da/LC_MESSAGES/python.po          | 460 ++++++++--------
 lang/python/de/LC_MESSAGES/python.po          | 490 +++++++++--------
 lang/python/el/LC_MESSAGES/python.po          | 378 +++++++------
 lang/python/en_GB/LC_MESSAGES/python.po       | 390 +++++++-------
 lang/python/eo/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/es/LC_MESSAGES/python.po          | 470 ++++++++---------
 lang/python/es_MX/LC_MESSAGES/python.po       | 468 ++++++++--------
 lang/python/es_PE/LC_MESSAGES/python.po       | 376 +++++++------
 lang/python/es_PR/LC_MESSAGES/python.po       | 376 +++++++------
 lang/python/et/LC_MESSAGES/python.po          | 400 +++++++-------
 lang/python/eu/LC_MESSAGES/python.po          | 400 +++++++-------
 lang/python/fa/LC_MESSAGES/python.po          | 454 ++++++++--------
 lang/python/fi_FI/LC_MESSAGES/python.po       | 478 +++++++++--------
 lang/python/fr/LC_MESSAGES/python.po          | 468 ++++++++--------
 lang/python/fr_CH/LC_MESSAGES/python.po       | 376 +++++++------
 lang/python/fur/LC_MESSAGES/python.po         | 464 ++++++++--------
 lang/python/gl/LC_MESSAGES/python.po          | 400 +++++++-------
 lang/python/gu/LC_MESSAGES/python.po          | 376 +++++++------
 lang/python/he/LC_MESSAGES/python.po          | 478 +++++++++--------
 lang/python/hi/LC_MESSAGES/python.po          | 476 +++++++++--------
 lang/python/hr/LC_MESSAGES/python.po          | 484 +++++++++--------
 lang/python/hu/LC_MESSAGES/python.po          | 458 ++++++++--------
 lang/python/id/LC_MESSAGES/python.po          | 400 +++++++-------
 lang/python/id_ID/LC_MESSAGES/python.po       | 372 +++++++------
 lang/python/ie/LC_MESSAGES/python.po          | 424 ++++++++-------
 lang/python/is/LC_MESSAGES/python.po          | 382 +++++++-------
 lang/python/it_IT/LC_MESSAGES/python.po       | 466 ++++++++--------
 lang/python/ja/LC_MESSAGES/python.po          | 464 ++++++++--------
 lang/python/kk/LC_MESSAGES/python.po          | 376 +++++++------
 lang/python/kn/LC_MESSAGES/python.po          | 376 +++++++------
 lang/python/ko/LC_MESSAGES/python.po          | 458 ++++++++--------
 lang/python/ko_KR/LC_MESSAGES/python.po       | 372 +++++++------
 lang/python/lo/LC_MESSAGES/python.po          | 372 +++++++------
 lang/python/lt/LC_MESSAGES/python.po          | 490 +++++++++--------
 lang/python/lv/LC_MESSAGES/python.po          | 380 +++++++------
 lang/python/mk/LC_MESSAGES/python.po          | 396 +++++++-------
 lang/python/ml/LC_MESSAGES/python.po          | 380 +++++++------
 lang/python/mr/LC_MESSAGES/python.po          | 376 +++++++------
 lang/python/nb/LC_MESSAGES/python.po          | 378 +++++++------
 lang/python/ne/LC_MESSAGES/python.po          | 376 +++++++------
 lang/python/ne_NP/LC_MESSAGES/python.po       | 376 +++++++------
 lang/python/nl/LC_MESSAGES/python.po          | 468 ++++++++--------
 lang/python/pl/LC_MESSAGES/python.po          | 478 +++++++++--------
 lang/python/pt_BR/LC_MESSAGES/python.po       | 484 +++++++++--------
 lang/python/pt_PT/LC_MESSAGES/python.po       | 484 +++++++++--------
 lang/python/ro/LC_MESSAGES/python.po          | 394 +++++++-------
 lang/python/ru/LC_MESSAGES/python.po          | 438 ++++++++-------
 lang/python/ru_RU/LC_MESSAGES/python.po       | 384 +++++++-------
 lang/python/si/LC_MESSAGES/python.po          | 382 +++++++-------
 lang/python/sk/LC_MESSAGES/python.po          | 450 ++++++++--------
 lang/python/sl/LC_MESSAGES/python.po          | 384 +++++++-------
 lang/python/sq/LC_MESSAGES/python.po          | 484 +++++++++--------
 lang/python/sr/LC_MESSAGES/python.po          | 408 +++++++-------
 lang/python/sr@latin/LC_MESSAGES/python.po    | 380 +++++++------
 lang/python/sv/LC_MESSAGES/python.po          | 484 +++++++++--------
 lang/python/te/LC_MESSAGES/python.po          | 376 +++++++------
 lang/python/tg/LC_MESSAGES/python.po          | 466 ++++++++--------
 lang/python/th/LC_MESSAGES/python.po          | 372 +++++++------
 lang/python/tr_TR/LC_MESSAGES/python.po       | 462 ++++++++--------
 lang/python/uk/LC_MESSAGES/python.po          | 498 +++++++++---------
 lang/python/ur/LC_MESSAGES/python.po          | 376 +++++++------
 lang/python/uz/LC_MESSAGES/python.po          | 372 +++++++------
 lang/python/vi/LC_MESSAGES/python.po          | 452 ++++++++--------
 lang/python/zh/LC_MESSAGES/python.po          | 372 +++++++------
 lang/python/zh_CN/LC_MESSAGES/python.po       | 458 ++++++++--------
 lang/python/zh_HK/LC_MESSAGES/python.po       | 372 +++++++------
 lang/python/zh_TW/LC_MESSAGES/python.po       | 458 ++++++++--------
 79 files changed, 16650 insertions(+), 16773 deletions(-)

diff --git a/lang/python.pot b/lang/python.pot
index 6bd8bfd927..b7ce4cbad8 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
-#
+# 
 #, fuzzy
 msgid ""
 msgstr ""
@@ -12,104 +12,108 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
-msgstr ""
+msgstr "Install bootloader."
 
 #: src/modules/bootloader/main.py:508
 msgid "Bootloader installation error"
-msgstr ""
+msgstr "Bootloader installation error"
 
 #: src/modules/bootloader/main.py:509
 msgid ""
-"The bootloader could not be installed. The installation command 
    {!s} returned error code {!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
-msgstr ""
+msgstr "Cannot write KDM configuration file"
 
 #: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
-msgstr ""
+msgstr "KDM config file {!s} does not exist"
 
 #: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
-msgstr ""
+msgstr "Cannot write LXDM configuration file"
 
 #: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
-msgstr ""
+msgstr "LXDM config file {!s} does not exist"
 
 #: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
-msgstr ""
+msgstr "Cannot write LightDM configuration file"
 
 #: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
-msgstr ""
+msgstr "LightDM config file {!s} does not exist"
 
 #: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
-msgstr ""
+msgstr "Cannot configure LightDM"
 
 #: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
-msgstr ""
+msgstr "No LightDM greeter installed."
 
 #: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
-msgstr ""
+msgstr "Cannot write SLIM configuration file"
 
 #: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
-msgstr ""
+msgstr "SLIM config file {!s} does not exist"
 
 #: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
-msgstr ""
+msgstr "No display managers selected for the displaymanager module."
 
 #: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
-msgstr ""
+msgstr "Display manager configuration was incomplete"
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
-msgstr ""
+msgstr "Creating initramfs with dracut."
 
 #: src/modules/dracut/main.py:49
 msgid "Failed to run dracut on the target"
-msgstr ""
+msgstr "Failed to run dracut on the target"
 
 #: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
 msgid "The exit code was {}"
-msgstr ""
+msgstr "The exit code was {}"
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
-msgstr ""
+msgstr "Dummy python job."
 
 #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
 #: src/modules/dummypython/main.py:94
 msgid "Dummy python step {}"
-msgstr ""
+msgstr "Dummy python step {}"
 
 #: src/modules/fstab/main.py:29
 msgid "Writing fstab."
-msgstr ""
+msgstr "Writing fstab."
 
 #: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
 #: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
@@ -120,263 +124,282 @@ msgstr ""
 #: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
 #: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
 msgid "Configuration Error"
-msgstr ""
+msgstr "Configuration Error"
 
 #: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
 #: src/modules/initramfscfg/main.py:86
 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
 #: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
 msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
+msgstr "No partitions are defined for 
    {!s}
     to use."
 
 #: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
 #: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91 src/modules/networkcfg/main.py:43
-#: src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr ""
+msgstr "No root mount point is given for 
    {!s}
     to use."
 
 #: src/modules/fstab/main.py:389
 msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+msgstr "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
-msgstr ""
+msgstr "Configure GRUB."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
-msgstr ""
+msgstr "Setting hardware clock."
 
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
-msgstr ""
+msgstr "Configuring mkinitcpio."
 
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
-msgstr ""
+msgstr "Configuring initramfs."
 
 #: src/modules/localecfg/main.py:30
 msgid "Configuring locales."
-msgstr ""
+msgstr "Configuring locales."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
-msgstr ""
+msgstr "Configuring encrypted swap."
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr ""
+msgstr "Creating initramfs with mkinitfs."
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr ""
+msgstr "Failed to run mkinitfs on the target"
 
 #: src/modules/mount/main.py:30
 msgid "Mounting partitions."
-msgstr ""
+msgstr "Mounting partitions."
 
 #: src/modules/networkcfg/main.py:29
 msgid "Saving network configuration."
-msgstr ""
+msgstr "Saving network configuration."
 
 #: src/modules/openrcdmcryptcfg/main.py:26
 msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+msgstr "Configuring OpenRC dmcrypt service."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
 msgid "Install packages."
-msgstr ""
+msgstr "Install packages."
 
 #: src/modules/packages/main.py:57
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
+msgstr "Processing packages (%(count)d / %(total)d)"
 
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Installing one package."
+msgstr[1] "Installing %(num)d packages."
 
 #: src/modules/packages/main.py:65
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Removing one package."
+msgstr[1] "Removing %(num)d packages."
 
 #: src/modules/packages/main.py:638 src/modules/packages/main.py:650
 #: src/modules/packages/main.py:678
 msgid "Package Manager error"
-msgstr ""
+msgstr "Package Manager error"
 
 #: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 
 #: src/modules/packages/main.py:651
 msgid ""
-"The package manager could not update the system. The command 
    {!s}
     "
-"returned error code {!s}."
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 
 #: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 
 #: src/modules/plymouthcfg/main.py:27
 msgid "Configure Plymouth theme"
-msgstr ""
+msgstr "Configure Plymouth theme"
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
-msgstr ""
+msgstr "Installing data."
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
-msgstr ""
+msgstr "Configure OpenRC services"
 
 #: src/modules/services-openrc/main.py:57
 msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
+msgstr "Cannot add service {name!s} to run-level {level!s}."
 
 #: src/modules/services-openrc/main.py:59
 msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
+msgstr "Cannot remove service {name!s} from run-level {level!s}."
 
 #: src/modules/services-openrc/main.py:61
 msgid ""
 "Unknown service-action {arg!s} for service {name!s} in run-"
 "level {level!s}."
 msgstr ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 
 #: src/modules/services-openrc/main.py:93
 #: src/modules/services-systemd/main.py:59
 msgid "Cannot modify service"
-msgstr ""
+msgstr "Cannot modify service"
 
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 
 #: src/modules/services-openrc/main.py:101
 msgid "Target runlevel does not exist"
-msgstr ""
+msgstr "Target runlevel does not exist"
 
 #: src/modules/services-openrc/main.py:102
 msgid ""
 "The path for runlevel {level!s} is {path!s}, which does not "
 "exist."
 msgstr ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 
 #: src/modules/services-openrc/main.py:110
 msgid "Target service does not exist"
-msgstr ""
+msgstr "Target service does not exist"
 
 #: src/modules/services-openrc/main.py:111
 msgid ""
-"The path for service {name!s} is {path!s}, which does not exist."
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 
 #: src/modules/services-systemd/main.py:26
 msgid "Configure systemd services"
-msgstr ""
+msgstr "Configure systemd services"
 
 #: src/modules/services-systemd/main.py:60
 msgid ""
 "systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 
 #: src/modules/services-systemd/main.py:63
 #: src/modules/services-systemd/main.py:67
 msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+msgstr "Cannot enable systemd service {name!s}."
 
 #: src/modules/services-systemd/main.py:65
 msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+msgstr "Cannot enable systemd target {name!s}."
 
 #: src/modules/services-systemd/main.py:69
 msgid "Cannot disable systemd target {name!s}."
-msgstr ""
+msgstr "Cannot disable systemd target {name!s}."
 
 #: src/modules/services-systemd/main.py:71
 msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
+msgstr "Cannot mask systemd unit {name!s}."
 
 #: src/modules/services-systemd/main.py:73
 msgid ""
-"Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 
 #: src/modules/umount/main.py:31
 msgid "Unmount file systems."
-msgstr ""
+msgstr "Unmount file systems."
 
 #: src/modules/unpackfs/main.py:35
 msgid "Filling up filesystems."
-msgstr ""
+msgstr "Filling up filesystems."
 
 #: src/modules/unpackfs/main.py:255
 msgid "rsync failed with error code {}."
-msgstr ""
+msgstr "rsync failed with error code {}."
 
 #: src/modules/unpackfs/main.py:300
 msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
+msgstr "Unpacking image {}/{}, file {}/{}"
 
 #: src/modules/unpackfs/main.py:315
 msgid "Starting to unpack {}"
-msgstr ""
+msgstr "Starting to unpack {}"
 
 #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
 msgid "Failed to unpack image \"{}\""
-msgstr ""
+msgstr "Failed to unpack image \"{}\""
 
 #: src/modules/unpackfs/main.py:431
 msgid "No mount point for root partition"
-msgstr ""
+msgstr "No mount point for root partition"
 
 #: src/modules/unpackfs/main.py:432
 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
+msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 
 #: src/modules/unpackfs/main.py:437
 msgid "Bad mount point for root partition"
-msgstr ""
+msgstr "Bad mount point for root partition"
 
 #: src/modules/unpackfs/main.py:438
 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
 
 #: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
 #: src/modules/unpackfs/main.py:478
 msgid "Bad unsquash configuration"
-msgstr ""
+msgstr "Bad unsquash configuration"
 
 #: src/modules/unpackfs/main.py:455
 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 
 #: src/modules/unpackfs/main.py:459
 msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+msgstr "The source filesystem \"{}\" does not exist"
 
 #: src/modules/unpackfs/main.py:465
 msgid ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed"
 msgstr ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 
 #: src/modules/unpackfs/main.py:479
 msgid "The destination \"{}\" in the target system is not a directory"
-msgstr ""
+msgstr "The destination \"{}\" in the target system is not a directory"
diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po
index 2e04ea65c5..c92ff98cb4 100644
--- a/lang/python/ar/LC_MESSAGES/python.po
+++ b/lang/python/ar/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: aboodilankaboot, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
@@ -22,131 +22,18 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "جاري تركيب الأقسام"
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "خطأ في الضبط"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "تعديل خدمات systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "لا يمكن تعديل الخدمة"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "الغاء تحميل ملف النظام"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "جاري ملئ أنظمة الملفات"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "فشل rsync مع رمز الخطأ {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "تثبيت محمل الإقلاع"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -203,71 +90,102 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "إعداد مدير العرض لم يكتمل"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "كود الخروج كان {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "عملية بايثون دميه"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "عملية  دميه خطوه بايثون {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "خطأ في الضبط"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "جاري إعداد ساعة الهاردوير"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "الـ runlevel الهدف غير موجود"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "الخدمة الهدف غير موجودة"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "جاري تركيب الأقسام"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "جاري حفظ الإعدادات"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -302,96 +220,176 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "تثبيت محمل الإقلاع"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "جاري إعداد ساعة الهاردوير"
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "لا يمكن تعديل الخدمة"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "الـ runlevel الهدف غير موجود"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "كود الخروج كان {}"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "الخدمة الهدف غير موجودة"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "تعديل خدمات systemd"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "عملية بايثون دميه"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "عملية  دميه خطوه بايثون {}"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "الغاء تحميل ملف النظام"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "جاري ملئ أنظمة الملفات"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "فشل rsync مع رمز الخطأ {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "جاري حفظ الإعدادات"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po
index 144624be7c..91c4017272 100644
--- a/lang/python/as/LC_MESSAGES/python.po
+++ b/lang/python/as/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Deep Jyoti Choudhury , 2020\n"
 "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n"
@@ -21,136 +21,19 @@ msgstr ""
 "Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB কনফিগাৰ কৰক।"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "বিভাজন মাউন্ট্ কৰা।"
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "কনফিগাৰেচন ত্ৰুটি"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
    ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
-"অজ্ঞাত systemd কমাণ্ড্।"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ফাইল চিছটেম​বোৰ মাউণ্টৰ পৰা আতৰাওক।"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ফাইল চিছটেম​বোৰ পূৰণ কৰা হৈ আছে।"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync ক্ৰুটি কোড {}ৰ সৈতে বিফল হ'ল।"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "ইমেজ \"{}\" খোলাত ব্যৰ্থ হ'ল"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "ৰুট বিভাজনত কোনো মাউণ্ট পইণ্ট্ নাই"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ত rootMountPoint key নাই, একো কৰিব পৰা নাযায়"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "মুল বিভাজনৰ বাবে বেয়া মাউন্ট্ পইন্ট্"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint হ'ল \"{}\", যিটো উপস্থিত নাই, একো কৰিব পৰা নাযায়"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "বেয়া unsquash কনফিগাৰেচন"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" ফাইল চিছটেম উপস্থিত নাই"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs বিচৰাত ব্যৰ্থ হ'ল, নিশ্চিত কৰক যে আপুনি squashfs-tools ইন্স্তল "
-"কৰিছে"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -206,22 +89,155 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "এক্সিড্ কোড্ আছিল {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "ডামী Pythonৰ কায্য"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "ডামী Pythonৰ পদক্ষেপ {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab লিখি আছে।"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "কনফিগাৰেচন ত্ৰুটি"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
    ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "ব্যৱহাৰৰ বাবে 
    {!s}
    ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB কনফিগাৰ কৰক।"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "এন্ক্ৰিপ্টেড স্ৱেপ কন্ফিগাৰ কৰি আছে।"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "বিভাজন মাউন্ট্ কৰা।"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "পেকেজ ইন্স্তল কৰক।"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "ডাটা ইন্স্তল কৰি আছে।"
@@ -246,6 +262,11 @@ msgstr ""
 "ৰান-লেভেল {level!s}ত সেৱা {name!s}ৰ বাবে অজ্ঞাত সেৱা কাৰ্য্য "
 "{arg!s} ।"
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -272,124 +293,101 @@ msgid ""
 "exist."
 msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "পেকেজ ইন্স্তল কৰক।"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) পেকেজবোৰ সংশোধন কৰি আছে"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "%(num)d পেকেজবোৰ ইনস্তল হৈ আছে।"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "%(num)d পেকেজবোৰ আতৰোৱা হৈ আছে।"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
+"অজ্ঞাত systemd কমাণ্ড্।"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ফাইল চিছটেম​বোৰ মাউণ্টৰ পৰা আতৰাওক।"
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ফাইল চিছটেম​বোৰ পূৰণ কৰা হৈ আছে।"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync ক্ৰুটি কোড {}ৰ সৈতে বিফল হ'ল।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "এক্সিড্ কোড্ আছিল {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "ইমেজ \"{}\" খোলাত ব্যৰ্থ হ'ল"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "ৰুট বিভাজনত কোনো মাউণ্ট পইণ্ট্ নাই"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ত rootMountPoint key নাই, একো কৰিব পৰা নাযায়"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "মুল বিভাজনৰ বাবে বেয়া মাউন্ট্ পইন্ট্"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint হ'ল \"{}\", যিটো উপস্থিত নাই, একো কৰিব পৰা নাযায়"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab লিখি আছে।"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "বেয়া unsquash কনফিগাৰেচন"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ডামী Pythonৰ কায্য"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "ডামী Pythonৰ পদক্ষেপ {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" ফাইল চিছটেম উপস্থিত নাই"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs বিচৰাত ব্যৰ্থ হ'ল, নিশ্চিত কৰক যে আপুনি squashfs-tools ইন্স্তল "
+"কৰিছে"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po
index 8e39f88a3a..71e48d1843 100644
--- a/lang/python/ast/LC_MESSAGES/python.po
+++ b/lang/python/ast/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: enolp , 2020\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -21,135 +21,19 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nun pue modificase'l serviciu"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontaxe de sistemes de ficheros."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Rellenando los sistemes de ficheros."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falló col códigu de fallu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Fallu al desempaquetar la imaxe «{}»"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nun hai un puntu de montaxe pa la partición del raigañu"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nun contién una clave «rootMountPoint». Nun va facese nada"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "El puntu de montaxe ye incorreutu pa la partición del raigañu"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "La configuración d'espardimientu ye incorreuta"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalando'l xestor d'arrinque."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de ficheros d'orixe «{}» nun esiste"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Fallu al alcontrar unsquashfs, asegúrate que tienes instaláu'l paquete "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -205,74 +89,104 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del xestor de pantalles nun se completó"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
-
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configurando l'intercambéu cifráu."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Fallu al executar dracut nel destín"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando datos."
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El códigu de salida foi {}"
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabayu maniquín en Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pasu maniquín {} en Python"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Nun pue amestase'l serviciu {name!s} al nivel d'execución {level!s}."
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
-"Nun pue desaniciase'l serviciu {name!s} del nivel d'execución {level!s}."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivel d'execución de destín nun esiste"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando'l reló de hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El serviciu de destín nun esiste"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locales."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurando l'intercambéu cifráu."
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
+
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
 msgid "Install packages."
@@ -297,96 +211,180 @@ msgid_plural "Removing %(num)d packages."
 msgstr[0] "Desaniciando un paquete."
 msgstr[1] "Desaniciando %(num)d paquetes."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalando'l xestor d'arrinque."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando datos."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Nun pue amestase'l serviciu {name!s} al nivel d'execución {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
+"Nun pue desaniciase'l serviciu {name!s} del nivel d'execución {level!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando'l reló de hardware."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Nun pue modificase'l serviciu"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivel d'execución de destín nun esiste"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El códigu de salida foi {}"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El serviciu de destín nun esiste"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Fallu al executar dracut nel destín"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabayu maniquín en Python."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pasu maniquín {} en Python"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locales."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontaxe de sistemes de ficheros."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Rellenando los sistemes de ficheros."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falló col códigu de fallu {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Fallu al desempaquetar la imaxe «{}»"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nun hai un puntu de montaxe pa la partición del raigañu"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nun contién una clave «rootMountPoint». Nun va facese nada"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "El puntu de montaxe ye incorreutu pa la partición del raigañu"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "La configuración d'espardimientu ye incorreuta"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de ficheros d'orixe «{}» nun esiste"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Fallu al alcontrar unsquashfs, asegúrate que tienes instaláu'l paquete "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu"
diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index f3f3693a42..d284319d67 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: xxmn77 , 2021\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
@@ -21,141 +21,21 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Tənzimləmə xətası"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fayl sistemini ayırmaq."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fayl sistemlərini doldurmaq."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync uğursuz oldu, xəta kodu: {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
-"{}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Tərkiblərini açmağa başladılır {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
-"əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash xətalı tənzimlənməsi"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
+"{!s} ilə cavab verdi."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -213,23 +93,164 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ilə initramfs yaratmaq."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hədəfdə dracut başladılmadı"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Tənzimləmə xətası"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
+"göstərilməyib."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs tənzimlənir."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Paket meneceri xətası"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
    {!s}
     əmri xəta"
+" kodu {!s} ilə cavab verdi."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. 
    {!s}
     əmri xəta kodu {!s} "
+"ilə cavab verdi."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
    {!s}
     "
+"əmri xəta kodu {!s} ilə cavab verdi."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Quraşdırılma tarixi."
@@ -254,6 +275,11 @@ msgstr ""
 "{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
 "{arg!s} xidmət fəaliyyəti."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -282,134 +308,106 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Paket meneceri xətası"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
    {!s}
     əmri xəta"
-" kodu {!s} ilə cavab verdi."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
 
-#: src/modules/packages/main.py:601
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Paket meneceri sistemi yeniləyə bimədi. 
    {!s}
     əmri xəta kodu {!s} "
-"ilə cavab verdi."
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
    {!s}
     "
-"əmri xəta kodu {!s} ilə cavab verdi."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fayl sistemini ayırmaq."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fayl sistemlərini doldurmaq."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync uğursuz oldu, xəta kodu: {}."
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
-"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
-"{!s} ilə cavab verdi."
+"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
+"{}/{}"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Tərkiblərini açmağa başladılır {}"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
+"əməliyyat getmir"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ilə initramfs yaratmaq."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hədəfdə dracut başladılmadı"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash xətalı tənzimlənməsi"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
-"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
-"göstərilməyib."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
+"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index ba5c1f5d2a..cb387be383 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: xxmn77 , 2021\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
@@ -21,141 +21,21 @@ msgstr ""
 "Language: az_AZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Tənzimləmə xətası"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fayl sistemini ayırmaq."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fayl sistemlərini doldurmaq."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync uğursuz oldu, xəta kodu: {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
-"{}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Tərkiblərini açmağa başladılır {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
-"əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash xətalı tənzimlənməsi"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
+"{!s} ilə cavab verdi."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -213,23 +93,164 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ilə initramfs yaratmaq."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hədəfdə dracut başladılmadı"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab yazılır."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Tənzimləmə xətası"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
+"göstərilməyib."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs tənzimlənir."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketləri quraşdırmaq."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "(%(count)d / %(total)d) paketləri işlənir"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Bir paket quraşdırılır."
+msgstr[1] "%(num)d paket quraşdırılır."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Bir paket silinir"
+msgstr[1] "%(num)d paket silinir."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Paket meneceri xətası"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
    {!s}
     əmri xəta"
+" kodu {!s} ilə cavab verdi."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Paket meneceri sistemi yeniləyə bimədi. 
    {!s}
     əmri xəta kodu {!s} "
+"ilə cavab verdi."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
    {!s}
     "
+"əmri xəta kodu {!s} ilə cavab verdi."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Quraşdırılma tarixi."
@@ -254,6 +275,11 @@ msgstr ""
 "{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
 "{arg!s} xidmət fəaliyyəti."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -282,134 +308,106 @@ msgid ""
 "exist."
 msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketləri quraşdırmaq."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "(%(count)d / %(total)d) paketləri işlənir"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Bir paket quraşdırılır."
-msgstr[1] "%(num)d paket quraşdırılır."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Bir paket silinir"
-msgstr[1] "%(num)d paket silinir."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Paket meneceri xətası"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-"Bu paket meneceri yenilənmələri hazırlaya bilmədi. 
    {!s}
     əmri xəta"
-" kodu {!s} ilə cavab verdi."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
 
-#: src/modules/packages/main.py:601
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Paket meneceri sistemi yeniləyə bimədi. 
    {!s}
     əmri xəta kodu {!s} "
-"ilə cavab verdi."
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
    {!s}
     "
-"əmri xəta kodu {!s} ilə cavab verdi."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fayl sistemini ayırmaq."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fayl sistemlərini doldurmaq."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync uğursuz oldu, xəta kodu: {}."
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
-"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
-"{!s} ilə cavab verdi."
+"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
+"{}/{}"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Tərkiblərini açmağa başladılır {}"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
+"əməliyyat getmir"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ilə initramfs yaratmaq."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hədəfdə dracut başladılmadı"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash xətalı tənzimlənməsi"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
-"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
-"göstərilməyib."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
+"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po
index eae79316fc..00feffa8ee 100644
--- a/lang/python/be/LC_MESSAGES/python.po
+++ b/lang/python/be/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Źmicier Turok , 2020\n"
 "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n"
@@ -21,136 +21,19 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Наладзіць GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Мантаванне раздзелаў."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Памылка канфігурацыі"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Раздзелы для 
    {!s}
     не вызначаныя."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Наладзіць службы systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Немагчыма наладзіць службу"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Немагчыма ўключыць службу systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Немагчыма ўключыць мэту systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Немагчыма выключыць мэту systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Усталяваць загрузчык."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"Невядомыя systemd загады {command!s} і {suffix!s} "
-"для адзінкі {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Адмантаваць файлавыя сістэмы."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Запаўненне файлавых сістэм."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "памылка rsync з кодам {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Распакоўванне вобраза {}/{}, файл {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Запуск распакоўвання {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Не атрымалася распакаваць вобраз \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Для каранёвага раздзела няма пункта мантавання"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage не змяшчае ключа \"rootMountPoint\", нічога не выконваецца"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Хібны пункт мантавання для каранёвага раздзела"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" не існуе, нічога не выконваецца"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Хібная канфігурацыя unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Файлавая сістэма для \"{}\" ({}) не падтрымліваецца вашым бягучым ядром"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Зыходная файлавая сістэма \"{}\" не існуе"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Не атрымалася знайсці unsquashfs, праверце ці ўсталяваны ў вас пакунак "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -208,75 +91,103 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Наладка дысплейнага кіраўніка не завершаная."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Наладка mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Стварэнне initramfs з dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не атрымалася запусціць dracut у пункце прызначэння"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхаду {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Задача Dummy python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Крок Dummy python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Запіс fstab."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Памылка канфігурацыі"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Раздзелы для 
    {!s}
     не вызначаныя."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Каранёвы пункт мантавання для
    {!s}
     не пададзены."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Наладка зашыфраванага swap."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Усталёўка даных."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Наладзіць GRUB."
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Наладзіць службы OpenRC"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Наладка апаратнага гадзінніка."
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Не атрымалася дадаць службу {name!s} на ўзровень запуску  {level!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Наладка mkinitcpio."
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Не атрымалася выдаліць службу {name!s} з узроўню запуску {level!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Наладка initramfs."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Невядомае дзеянне {arg!s} для службы {name!s} на ўзроўні "
-"запуску {level!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Наладка лакаляў."
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} пад chroot вярнуўся з кодам памылкі {num!s}."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Наладка зашыфраванага swap."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Мэтавы ўзровень запуску не існуе"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Стварэнне initramfs праз mkinitfs."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "Шлях {path!s} да ўзроўня запуску {level!s} не існуе."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Мэтавая служба не існуе"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Мантаванне раздзелаў."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "Шлях {path!s} да службы {level!s} не існуе."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Захаванне сеткавай канфігурацыі."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Наладзіць тэму Plymouth"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Наладка OpenRC dmcrypt."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -306,96 +217,183 @@ msgstr[1] "Выдаленне %(num)d пакункаў."
 msgstr[2] "Выдаленне %(num)d пакункаў."
 msgstr[3] "Выдаленне %(num)d пакункаў."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Усталяваць загрузчык."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Наладзіць тэму Plymouth"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Усталёўка даных."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Наладзіць службы OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Не атрымалася дадаць службу {name!s} на ўзровень запуску  {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Не атрымалася выдаліць службу {name!s} з узроўню запуску {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
+"Невядомае дзеянне {arg!s} для службы {name!s} на ўзроўні "
+"запуску {level!s}."
+
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Немагчыма наладзіць службу"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:94
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"rc-update {arg!s} пад chroot вярнуўся з кодам памылкі {num!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Наладка апаратнага гадзінніка."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Мэтавы ўзровень запуску не існуе"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Стварэнне initramfs праз mkinitfs."
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "Шлях {path!s} да ўзроўня запуску {level!s} не існуе."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Мэтавая служба не існуе"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхаду {}"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "Шлях {path!s} да службы {level!s} не існуе."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Стварэнне initramfs з dracut."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Наладзіць службы systemd"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не атрымалася запусціць dracut у пункце прызначэння"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Наладка initramfs."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Немагчыма ўключыць службу systemd {name!s}."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Наладка OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Немагчыма ўключыць мэту systemd {name!s}."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запіс fstab."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Немагчыма выключыць мэту systemd {name!s}."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Невядомыя systemd загады {command!s} і {suffix!s} "
+"для адзінкі {name!s}."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Задача Dummy python."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Адмантаваць файлавыя сістэмы."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Крок Dummy python {}"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Запаўненне файлавых сістэм."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Наладка лакаляў."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "памылка rsync з кодам {}."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Захаванне сеткавай канфігурацыі."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Распакоўванне вобраза {}/{}, файл {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Запуск распакоўвання {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Не атрымалася распакаваць вобраз \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Для каранёвага раздзела няма пункта мантавання"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage не змяшчае ключа \"rootMountPoint\", нічога не выконваецца"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Хібны пункт мантавання для каранёвага раздзела"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" не існуе, нічога не выконваецца"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Хібная канфігурацыя unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Файлавая сістэма для \"{}\" ({}) не падтрымліваецца вашым бягучым ядром"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Зыходная файлавая сістэма \"{}\" не існуе"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Не атрымалася знайсці unsquashfs, праверце ці ўсталяваны ў вас пакунак "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po
index e54c3e9a95..69e58be068 100644
--- a/lang/python/bg/LC_MESSAGES/python.po
+++ b/lang/python/bg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Georgi Georgiev (Жоро) , 2020\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтирай файловите системи."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фиктивна задача на python."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фиктивна стъпка на python {}"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Инсталирай пакетите."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработване на пакетите (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Инсталиране на един пакет."
+msgstr[1] "Инсталиране на %(num)d пакети."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Премахване на един пакет."
+msgstr[1] "Премахване на %(num)d пакети."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,124 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Инсталирай пакетите."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обработване на пакетите (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Инсталиране на един пакет."
-msgstr[1] "Инсталиране на %(num)d пакети."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Премахване на един пакет."
-msgstr[1] "Премахване на %(num)d пакети."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтирай файловите системи."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фиктивна задача на python."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фиктивна стъпка на python {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po
index aca9f91ff6..05b51ae52e 100644
--- a/lang/python/bn/LC_MESSAGES/python.po
+++ b/lang/python/bn/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n"
 "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n"
@@ -21,132 +21,18 @@ msgstr ""
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "কনফিগার করুন জিআরইউবি।"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "মাউন্ট করছে পার্টিশনগুলো।"
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "কনফিগারেশন ত্রুটি"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
    {!এস}
     ব্যবহার করার জন্য।"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "সেবা পরিবর্তন করতে পারে না"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "আনপ্যাক করা শুরু করছে {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -203,71 +89,102 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "কনফিগারেশন ত্রুটি"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
    {!এস}
     ব্যবহার করার জন্য।"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "কনফিগার করুন জিআরইউবি।"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "মাউন্ট করছে পার্টিশনগুলো।"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -294,96 +211,177 @@ msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "সেবা পরিবর্তন করতে পারে না"
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "আনপ্যাক করা শুরু করছে {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po
index 0bc9f07fbd..53e42f43f3 100644
--- a/lang/python/ca/LC_MESSAGES/python.po
+++ b/lang/python/ca/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Davidmp , 2021\n"
 "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
@@ -21,138 +21,21 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Es munten les particions."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Error de configuració"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No s'han definit particions perquè les usi 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Ordres desconegudes de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmunta els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "S'omplen els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Ha fallat rsync amb el codi d'error {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Es desempaqueta la imatge {}/{}, fitxer {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Es comença a desempaquetar {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ha fallat desempaquetar la imatge \"{}\"."
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No hi ha punt de muntatge per a la partició d'arrel."
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punt de muntatge incorrecte per a la partició d'arrel"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "El punt de muntatge d'arrel és \"{}\", que no existeix. No es fa res."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuració incorrecta d'unsquash."
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "El sistema de fitxers per a {} ({}) no és admès pel nucli actual."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "S'instal·la el carregador d'arrencada."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de fitxers font \"{}\" no existeix."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Error d'instal·lació del carregador d'arrencada"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Ha fallat trobar unsquashfs, assegureu-vos que tingueu el paquet squashfs-"
-"tools instal·lat."
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
+"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
+"
    {!s}
    ha retornat el codi d'error {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -211,23 +94,163 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Es configura mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Es creen initramfs amb dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Ha fallat executar dracut a la destinació."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi de sortida ha estat {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python fictícia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python fitctici {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "S'escriu fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Error de configuració"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No s'han definit particions perquè les usi 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No s'ha proporcionat el punt de muntatge perquè l'usi 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"No hi ha cap configuració de 
    {!s}
     perquè la usi 
    {!s}
    ."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "S'estableix el rellotge del maquinari."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Es configura mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Es configuren initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Es configuren les llengües."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Es configura l'intercanvi encriptat."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Es creen initramfs amb mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ha fallat executar mkinitfs a la destinació."
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Es munten les particions."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Es desa la configuració de la xarxa."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Es configura el sevei OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instal·la els paquets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Es processen paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'instal·la un paquet."
+msgstr[1] "S'instal·len %(num)d paquets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se suprimeix un paquet."
+msgstr[1] "Se suprimeixen %(num)d paquets."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Error del gestor de paquets"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut preparar les actualitzacions. "
+"L'ordre
    {!s}
     ha retornat el codi d'error {!s}."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
+"
    {!s}
     ha retornat el codi d'error {!s}."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
+"
    {!s}
     ha retornat el codi d'error {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "S'instal·len dades."
@@ -253,6 +276,11 @@ msgstr ""
 "Servei - acció desconeguda {arg!s} per al servei {name!s} al "
 "nivell d'execució {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -283,133 +311,103 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instal·la els paquets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Es processen paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'instal·la un paquet."
-msgstr[1] "S'instal·len %(num)d paquets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se suprimeix un paquet."
-msgstr[1] "Se suprimeixen %(num)d paquets."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Error del gestor de paquets"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"El gestor de paquets no ha pogut preparar les actualitzacions. "
-"L'ordre
    {!s}
     ha retornat el codi d'error {!s}."
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut actualitzar el sistema. L'ordre "
-"
    {!s}
     ha retornat el codi d'error {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
-"
    {!s}
     ha retornat el codi d'error {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "S'instal·la el carregador d'arrencada."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Error d'instal·lació del carregador d'arrencada"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
-"
    {!s}
    ha retornat el codi d'error {!s}."
+"Ordres desconegudes de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "S'estableix el rellotge del maquinari."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmunta els sistemes de fitxers."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Es creen initramfs amb mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "S'omplen els sistemes de fitxers."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ha fallat executar mkinitfs a la destinació."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Ha fallat rsync amb el codi d'error {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi de sortida ha estat {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Es desempaqueta la imatge {}/{}, fitxer {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Es creen initramfs amb dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Es comença a desempaquetar {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Ha fallat executar dracut a la destinació."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ha fallat desempaquetar la imatge \"{}\"."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No hi ha punt de muntatge per a la partició d'arrel."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Es configura el sevei OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "S'escriu fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punt de muntatge incorrecte per a la partició d'arrel"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"No hi ha cap configuració de 
    {!s}
     perquè la usi 
    {!s}
    ."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "El punt de muntatge d'arrel és \"{}\", que no existeix. No es fa res."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python fictícia."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuració incorrecta d'unsquash."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python fitctici {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "El sistema de fitxers per a {} ({}) no és admès pel nucli actual."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Es configuren les llengües."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de fitxers font \"{}\" no existeix."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Es desa la configuració de la xarxa."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ha fallat trobar unsquashfs, assegureu-vos que tingueu el paquet squashfs-"
+"tools instal·lat."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po
index 871140a43f..024b13dba5 100644
--- a/lang/python/ca@valencia/LC_MESSAGES/python.po
+++ b/lang/python/ca@valencia/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Raul , 2021\n"
 "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n"
@@ -21,140 +21,19 @@ msgstr ""
 "Language: ca@valencia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "S'estan muntant les particions."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "S'ha produït un error en la configuració."
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No s'han definit particions perquè les use 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instal·la el carregador d'arrancada."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Es desconeixen les ordres de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmunta els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "S'estan emplenant els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Ha fallat rsync amb el codi d'error {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "S’està començant a desempaquetar {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No s’ha pogut desempaquetar la imatge \"{}\"."
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No hi ha cap punt de muntatge per a la partició d'arrel."
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage no conté cap clau de \"rootMountPoint\". No s'està fent res."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "El punt de muntatge per a la partició d'arrel és incorrecte."
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-"El punt de muntatge d'arrel és \"{}\", que no existeix. No s’està fent res."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "La configuració d'unsquash és incorrecta."
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "El nucli actual no admet el sistema de fitxers per a \"{}\" ({})."
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de fitxers font \"{}\" no existeix."
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"No s’ha pogut trobar unsquashfs. Assegureu-vos que teniu el paquet squashfs-"
-"tools instal·lat."
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinació \"{}\" en el sistema de destinació no és un directori."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -213,23 +92,156 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "S'està configurant mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creació d’initramfs amb dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "No s’ha pogut executar dracut en la destinació."
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi d'eixida ha estat {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python de proves."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python de proves {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escriptura d’fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "S'ha produït un error en la configuració."
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No s'han definit particions perquè les use 
    {!s}
    ."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No s'ha proporcionat el punt de muntatge perquè l'use 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuració del rellotge del maquinari."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "S'està configurant mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Es configuren initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuració d’idioma."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "S’està configurant l'intercanvi encriptat."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creació d’initramfs amb mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No s’ha pogut executar mkinitfs en la destinació."
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "S'estan muntant les particions."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "S'està guardant la configuració de la xarxa."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuració del servei OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instal·la els paquets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'està instal·lant un paquet."
+msgstr[1] "S'està instal·lant %(num)d paquets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "S’està eliminant un paquet."
+msgstr[1] "S’està eliminant %(num)d paquets."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "S'estan instal·lant les dades."
@@ -255,6 +267,11 @@ msgstr ""
 "Servei - acció desconeguda {arg!s} per al servei {name!s} al "
 "nivell d'execució {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -285,124 +302,105 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instal·la els paquets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'està instal·lant un paquet."
-msgstr[1] "S'està instal·lant %(num)d paquets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "S’està eliminant un paquet."
-msgstr[1] "S’està eliminant %(num)d paquets."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instal·la el carregador d'arrancada."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Es desconeixen les ordres de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuració del rellotge del maquinari."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmunta els sistemes de fitxers."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creació d’initramfs amb mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "S'estan emplenant els sistemes de fitxers."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No s’ha pogut executar mkinitfs en la destinació."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Ha fallat rsync amb el codi d'error {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi d'eixida ha estat {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creació d’initramfs amb dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "S’està començant a desempaquetar {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "No s’ha pogut executar dracut en la destinació."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No s’ha pogut desempaquetar la imatge \"{}\"."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No hi ha cap punt de muntatge per a la partició d'arrel."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuració del servei OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage no conté cap clau de \"rootMountPoint\". No s'està fent res."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escriptura d’fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "El punt de muntatge per a la partició d'arrel és incorrecte."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
+"El punt de muntatge d'arrel és \"{}\", que no existeix. No s’està fent res."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python de proves."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "La configuració d'unsquash és incorrecta."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python de proves {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "El nucli actual no admet el sistema de fitxers per a \"{}\" ({})."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuració d’idioma."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de fitxers font \"{}\" no existeix."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "S'està guardant la configuració de la xarxa."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"No s’ha pogut trobar unsquashfs. Assegureu-vos que teniu el paquet squashfs-"
+"tools instal·lat."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinació \"{}\" en el sistema de destinació no és un directori."
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index 9ac7c6b82d..28780a9970 100644
--- a/lang/python/cs_CZ/LC_MESSAGES/python.po
+++ b/lang/python/cs_CZ/LC_MESSAGES/python.po
@@ -6,16 +6,16 @@
 # Translators:
 # pavelrz, 2017
 # LiberteCzech , 2020
-# Pavel Borecki , 2020
+# Pavel Borecki , 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Pavel Borecki , 2020\n"
+"Last-Translator: Pavel Borecki , 2021\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,139 +23,21 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Nastavování zavaděče GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Připojování oddílů."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Chyba nastavení"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Pro 
    {!s}
     nejsou zadány žádné oddíly."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Nastavit služby systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Službu se nedaří upravit"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedaří se vypnout systemd cíl {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedaří se maskovat systemd jednotku {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Neznámé systemd příkazy {command!s} a {suffix!s} "
-"pro jednotku {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odpojit souborové systémy."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Naplňování souborových systémů."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync se nezdařilo s chybových kódem {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Rozbalování obrazu {}/{}, soubor {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Zahajování rozbalení {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Nepodařilo se rozbalit obraz „{}“"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Žádný přípojný bot pro kořenový oddíl"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage neobsahuje klíč „rootMountPoint“ – nic se nebude dělat"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Chybný přípojný bod pro kořenový oddíl"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "kořenovýPřípojnýBod je „{}“, který neexistuje – nic se nebude dělat"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Chybná nastavení unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Souborový systém „{}“ ({}) není jádrem systému, které právě používáte, "
-"podporován"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalace zavaděče systému."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Zdrojový souborový systém „{}“ neexistuje"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Chyba při instalaci zavaděče systému"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nepodařilo se nalézt unsquashfs – ověřte, že máte nainstalovaný balíček "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Cíl „{}“ v cílovém systému není složka"
+"Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz 
    {!s} "
+"vrátil chybový kód {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -213,22 +95,167 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Nastavení správce displeje nebylo úplné"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Nastavování mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváření initramfs s dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Na cíli se nepodařilo spustit dracut"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Návratový kód byl {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testovací úloha python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testovací krok {} python."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisování fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Chyba nastavení"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Pro 
    {!s}
     nejsou zadány žádné oddíly."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Pro 
    {!s}
     není zadán žádný přípojný bod."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Pro 
    {!s}
     není zadáno žádné nastavení 
    {!s}
    , které "
+"použít. "
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Nastavování zavaděče GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavování hardwarových hodin."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Nastavování mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Nastavování initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Nastavování místních a jazykových nastavení."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Nastavování šifrovaného prostoru pro odkládání stránek paměti."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Vytváření initramfs nástrojem mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Na cíli se nepodařilo spustit mkinitfs"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Připojování oddílů."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukládání nastavení sítě."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Nastavování služby OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Nainstalovat balíčky."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Je instalován jeden balíček."
+msgstr[1] "Jsou instalovány %(num)d balíčky."
+msgstr[2] "Je instalováno %(num)d balíčků."
+msgstr[3] "Je instalováno %(num)d balíčků."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Odebírá se jeden balíček."
+msgstr[1] "Odebírají se %(num)d balíčky."
+msgstr[2] "Odebírá se %(num)d balíčků."
+msgstr[3] "Odebírá se %(num)d balíčků."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Chyba nástroje pro správu balíčků"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo připravit aktualizace. Příkaz "
+"
    {!s}
     vrátil chybový kód {!s}."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo aktualizovat systém. Příkaz "
+"
    {!s}
     vrátil chybový kód {!s}."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Nástroji pro správu balíčků se nepodařilo udělat změny v nainstalovaném "
+"systému. Příkaz 
    {!s}
     vrátil chybový kód {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Nastavit téma vzhledu pro Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalace dat."
@@ -255,6 +282,11 @@ msgstr ""
 "Neznámá akce služby {arg!s} pro službu {name!s} v úrovni chodu "
 "(runlevel) {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Službu se nedaří upravit"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -285,128 +317,104 @@ msgstr ""
 "Popis umístění pro službu {name!s} je {path!s}, která "
 "neexistuje."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Nastavit téma vzhledu pro Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalovat balíčky."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Zpracovávání balíčků (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Je instalován jeden balíček."
-msgstr[1] "Jsou instalovány %(num)d balíčky."
-msgstr[2] "Je instalováno %(num)d balíčků."
-msgstr[3] "Je instalováno %(num)d balíčků."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Odebírá se jeden balíček."
-msgstr[1] "Odebírají se %(num)d balíčky."
-msgstr[2] "Odebírá se %(num)d balíčků."
-msgstr[3] "Odebírá se %(num)d balíčků."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Nastavit služby systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalace zavaděče systému."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedaří se vypnout systemd cíl {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedaří se maskovat systemd jednotku {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Neznámé systemd příkazy {command!s} a {suffix!s} "
+"pro jednotku {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavování hardwarových hodin."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojit souborové systémy."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Vytváření initramfs s mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Naplňování souborových systémů."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Na cíli se nepodařilo spustit mkinitfs"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync se nezdařilo s chybových kódem {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Návratový kód byl {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbalování obrazu {}/{}, soubor {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Vytváření initramfs s dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Zahajování rozbalení {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Na cíli se nepodařilo spustit dracut"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepodařilo se rozbalit obraz „{}“"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Nastavování initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Žádný přípojný bot pro kořenový oddíl"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Nastavování služby OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage neobsahuje klíč „rootMountPoint“ – nic se nebude dělat"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisování fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Chybný přípojný bod pro kořenový oddíl"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "kořenovýPřípojnýBod je „{}“, který neexistuje – nic se nebude dělat"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testovací úloha python."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Chybná nastavení unsquash"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testovací krok {} python."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Souborový systém „{}“ ({}) není jádrem systému, které právě používáte, "
+"podporován"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Nastavování místních a jazykových nastavení."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový souborový systém „{}“ neexistuje"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Ukládání nastavení sítě."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nepodařilo se nalézt unsquashfs – ověřte, že máte nainstalovaný balíček "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Cíl „{}“ v cílovém systému není složka"
diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po
index 9cae3fb915..b448ddb94e 100644
--- a/lang/python/da/LC_MESSAGES/python.po
+++ b/lang/python/da/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: scootergrisen, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
@@ -22,137 +22,19 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurer GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Monterer partitioner."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Fejl ved konfiguration"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Der er ikke angivet nogle partitioner som 
    {!s}
     kan bruge."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurer systemd-tjenester"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Kan ikke redigere tjeneste"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installér bootloader."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kan ikke aktivere systemd-målet {name!s}."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kan ikke deaktivere systemd-målet {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan ikke maskere systemd-enheden {name!s}."
-
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Ukendte systemd-kommandoer {command!s} og "
-"{suffix!s} til enheden {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Afmonter filsystemer."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Udfylder filsystemer."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync mislykkede med fejlkoden {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Udpakker aftrykket {}/{}, filen {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Begynder at udpakke {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Kunne ikke udpakke aftrykket \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Intet monteringspunkt til rodpartition"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage indeholder ikke en \"rootMountPoint\"-nøgle, gør intet"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Dårligt monteringspunkt til rodpartition"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Dårlig unsquash-konfiguration"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Filsystemet til \"{}\" ({}) understøttes ikke af din nuværende kerne"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Kildefilsystemet \"{}\" findes ikke"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Kunne ikke finde unsquashfs, sørg for at pakken squashfs-tools er "
-"installeret"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -211,23 +93,156 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Displayhåndtering-konfiguration er ikke komplet"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerer mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Opretter initramfs med dracut."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Kunne ikke køre dracut på målet"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Afslutningskoden var {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python-job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python-trin {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Fejl ved konfiguration"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Der er ikke angivet nogle partitioner som 
    {!s}
     kan bruge."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Der er ikke angivet noget rodmonteringspunkt som 
    {!s}
     kan bruge."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurer GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Indstiller hardwareur."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerer mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerer initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerer lokaliteter."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurerer krypteret swap."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Opretter initramfs med mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kunne ikke køre mkinitfs på målet"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterer partitioner."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Gemmer netværkskonfiguration."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installér pakker."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Forarbejder pakker (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerer én pakke."
+msgstr[1] "Installerer %(num)d pakker."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjerner én pakke."
+msgstr[1] "Fjerner %(num)d pakker."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurer Plymouth-tema"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installerer data."
@@ -252,6 +267,11 @@ msgstr ""
 "Ukendt tjenestehandling {arg!s} til tjenesten {name!s} i "
 "kørselsniveauet {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Kan ikke redigere tjeneste"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -281,124 +301,102 @@ msgid ""
 msgstr ""
 "Stien til tjenesten {name!s} er {path!s}, som ikke findes."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurer Plymouth-tema"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installér pakker."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Forarbejder pakker (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerer én pakke."
-msgstr[1] "Installerer %(num)d pakker."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjerner én pakke."
-msgstr[1] "Fjerner %(num)d pakker."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurer systemd-tjenester"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kan ikke aktivere systemd-målet {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installér bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kan ikke deaktivere systemd-målet {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan ikke maskere systemd-enheden {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Ukendte systemd-kommandoer {command!s} og "
+"{suffix!s} til enheden {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Indstiller hardwareur."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Afmonter filsystemer."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Opretter initramfs med mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Udfylder filsystemer."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Kunne ikke køre mkinitfs på målet"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync mislykkede med fejlkoden {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Afslutningskoden var {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Udpakker aftrykket {}/{}, filen {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Opretter initramfs med dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Begynder at udpakke {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Kunne ikke køre dracut på målet"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Kunne ikke udpakke aftrykket \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerer initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Intet monteringspunkt til rodpartition"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage indeholder ikke en \"rootMountPoint\"-nøgle, gør intet"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Dårligt monteringspunkt til rodpartition"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python-job."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dårlig unsquash-konfiguration"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python-trin {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Filsystemet til \"{}\" ({}) understøttes ikke af din nuværende kerne"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerer lokaliteter."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Kildefilsystemet \"{}\" findes ikke"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Gemmer netværkskonfiguration."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Kunne ikke finde unsquashfs, sørg for at pakken squashfs-tools er "
+"installeret"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index b1e0beed9a..3e57487f86 100644
--- a/lang/python/de/LC_MESSAGES/python.po
+++ b/lang/python/de/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Gustav Gyges, 2021\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
@@ -23,141 +23,21 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurieren."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Hänge Partitionen ein."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Konfigurationsfehler"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Für 
    {!s}
     sind keine zu verwendenden Partitionen definiert."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriere systemd-Dienste"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Der Dienst kann nicht geändert werden."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
-"zurück."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Unbekannte systemd-Befehle {command!s} und "
-"{suffix!s} für Einheit {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dateisysteme aushängen."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Befüllen von Dateisystemen."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync fehlgeschlagen mit Fehlercode {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Beginn des Entpackens {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kein Einhängepunkt für die Root-Partition"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage enthält keinen Schlüssel namens \"rootMountPoint\", tue nichts"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ungültiger Einhängepunkt für die Root-Partition"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Ungültige unsquash-Konfiguration"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Das Dateisystem für \"{}\" ({}) wird von Ihrem aktuellen Kernel nicht "
-"unterstützt"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installiere Bootloader."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Das Quelldateisystem \"{}\" existiert nicht"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Fehler beim Installieren des Bootloaders"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Konnte unsquashfs nicht finden, stellen Sie sicher, dass Sie das Paket "
-"namens squashfs-tools installiert haben"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
+"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
+"
    {!s}
     erzeugte Fehlercode {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -215,24 +95,165 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Die Konfiguration des Displaymanager war unvollständig."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriere mkinitcpio. "
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Erstelle initramfs mit dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Ausführen von dracut auf dem Ziel schlug fehl"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Der Exit-Code war {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy Python-Job"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy Python-Schritt {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Schreibe fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Konfigurationsfehler"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Für 
    {!s}
     sind keine zu verwendenden Partitionen definiert."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Für 
    {!s}
     wurde kein Einhängepunkt für die Root-Partition "
 "angegeben."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Keine 
    {!s}
     Konfiguration gegeben die 
    {!s}
     benutzen "
+"könnte."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurieren."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Einstellen der Hardware-Uhr."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriere mkinitcpio. "
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriere initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriere Lokalisierungen."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfiguriere verschlüsselten Auslagerungsspeicher."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Erstelle initramfs mit mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Hänge Partitionen ein."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Speichere Netzwerkkonfiguration."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Pakete installieren "
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installiere ein Paket"
+msgstr[1] "Installiere %(num)d Pakete."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Entferne ein Paket"
+msgstr[1] "Entferne %(num)d Pakete."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Fehler im Paketmanager"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
+"
    {!s}
     erzeugte Fehlercode {!s}."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
+"
    {!s}
     erzeugte Fehlercode {!s}."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
+"
    {!s}
     erzeugte Fehlercode {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguriere Plymouth-Thema"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installiere Daten."
@@ -257,6 +278,11 @@ msgstr ""
 "Unbekannte Aktion {arg!s} für Dienst {name!s} in Runlevel "
 "{level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Der Dienst kann nicht geändert werden."
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -288,134 +314,106 @@ msgstr ""
 "Der Pfad für den Dienst {name!s} is {path!s}, welcher nicht "
 "existiert."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguriere Plymouth-Thema"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Pakete installieren "
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Verarbeite Pakete (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installiere ein Paket"
-msgstr[1] "Installiere %(num)d Pakete."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Entferne ein Paket"
-msgstr[1] "Entferne %(num)d Pakete."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Fehler im Paketmanager"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriere systemd-Dienste"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Der Paketmanager konnte die Aktualisierungen nicht vorbereiten. Der Befehl "
-"
    {!s}
     erzeugte Fehlercode {!s}."
+"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
+"zurück."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte das System nicht aktualisieren. Der Befehl "
-"
    {!s}
     erzeugte Fehlercode {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
-"
    {!s}
     erzeugte Fehlercode {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installiere Bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Fehler beim Installieren des Bootloaders"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
-"
    {!s}
     erzeugte Fehlercode {!s}."
+"Unbekannte systemd-Befehle {command!s} und "
+"{suffix!s} für Einheit {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Einstellen der Hardware-Uhr."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dateisysteme aushängen."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Erstelle initramfs mit mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Befüllen von Dateisystemen."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync fehlgeschlagen mit Fehlercode {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Der Exit-Code war {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Erstelle initramfs mit dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Beginn des Entpackens {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Ausführen von dracut auf dem Ziel schlug fehl"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriere initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kein Einhängepunkt für die Root-Partition"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage enthält keinen Schlüssel namens \"rootMountPoint\", tue nichts"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Schreibe fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ungültiger Einhängepunkt für die Root-Partition"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Keine 
    {!s}
     Konfiguration gegeben die 
    {!s}
     benutzen "
-"könnte."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy Python-Job"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ungültige unsquash-Konfiguration"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy Python-Schritt {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Das Dateisystem für \"{}\" ({}) wird von Ihrem aktuellen Kernel nicht "
+"unterstützt"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriere Lokalisierungen."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Das Quelldateisystem \"{}\" existiert nicht"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Speichere Netzwerkkonfiguration."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Konnte unsquashfs nicht finden, stellen Sie sicher, dass Sie das Paket "
+"namens squashfs-tools installiert haben"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po
index 5a9b39cf58..251383e3a2 100644
--- a/lang/python/el/LC_MESSAGES/python.po
+++ b/lang/python/el/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Efstathios Iosifidis , 2017\n"
 "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "εγκατάσταση πακέτων."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,124 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "εγκατάσταση πακέτων."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index 88026773bf..7096e5ced4 100644
--- a/lang/python/en_GB/LC_MESSAGES/python.po
+++ b/lang/python/en_GB/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jason Collins , 2018\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount file systems."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Install packages."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processing packages (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "Installing %(num)d packages."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "Removing %(num)d packages."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,124 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Install packages."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount file systems."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po
index 7a2dd43486..b978e272d1 100644
--- a/lang/python/eo/LC_MESSAGES/python.po
+++ b/lang/python/eo/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kurt Ankh Phoenix , 2018\n"
 "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Demeti dosieraj sistemoj."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Formala python laboro."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Formala python paŝo {}"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instali pakaĵoj."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalante unu pakaĵo."
+msgstr[1] "Instalante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Forigante unu pakaĵo."
+msgstr[1] "Forigante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,124 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instali pakaĵoj."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalante unu pakaĵo."
-msgstr[1] "Instalante %(num)d pakaĵoj."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Forigante unu pakaĵo."
-msgstr[1] "Forigante %(num)d pakaĵoj."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demeti dosieraj sistemoj."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Formala python laboro."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Formala python paŝo {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index f1fe11a615..bfb0a7723e 100644
--- a/lang/python/es/LC_MESSAGES/python.po
+++ b/lang/python/es/LC_MESSAGES/python.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pier Jose Gotta Perez , 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
@@ -26,143 +26,19 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB - menú de arranque multisistema -"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando particiones"
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Error de configuración"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No hay definidas particiones en 1{!s}1 para usar."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar servicios de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La orden  systemctl {arg!s}  en chroot  devolvió el código de "
-"error  {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede activar el servicio de systemd  {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No se puede activar el objetivo de systemd  {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No se puede desactivar el objetivo de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No se puede enmascarar la unidad de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Órdenes desconocidas de systemd  {command!s} y "
-"{suffix!s} para la/s unidad /es {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de archivos."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Rellenando los sistemas de archivos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Falló la sincronización  mediante rsync  con el código de error {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Iniciando el desempaquetado {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No se pudo desempaquetar la imagen «{}»"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-"No especificó un punto de montaje para la  partición raíz - / o root -"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"No se hace nada porque el almacenamiento no contiene una clave de  "
-"\"rootMountPoint\" punto de montaje para la raíz."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punto de montaje no válido para una partición raíz,"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "Como el punto de montaje raíz es \"{}\", y no existe, no se hace nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuración de \"unsquash\" no válida"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar gestor de arranque."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
-"actual"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de archivos de origen  \"{}\" no existe"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"No se encontró unsquashfs; cerciórese de que tenga instalado el paquete "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destino \"{}\" en el sistema escogido  no es una carpeta"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -220,23 +96,157 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio - sistema de arranque básico -."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+"Creando initramfs - sistema de arranque - con dracut - su constructor -."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Falló en ejecutar dracut - constructor de arranques - en el objetivo"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarea de python ficticia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso {} de python ficticio"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiendo la tabla de particiones fstab"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No hay definidas particiones en 1{!s}1 para usar."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No se facilitó un punto de montaje raíz utilizable para 
    {!s}
     "
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB - menú de arranque multisistema -"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj de la computadora."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio - sistema de arranque básico -."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs - sistema de inicio -."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando especificaciones locales o regionales."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando la memoria de intercambio - swap - encriptada."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando la  configuración de red."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar paquetes."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando %(num)d paquetes."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Eliminando un paquete."
+msgstr[1] "Eliminando %(num)d paquetes."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure el tema de Plymouth - menú de bienvenida."
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando datos."
@@ -265,6 +275,11 @@ msgstr ""
 "Acción desconocida d/e el/los servicio/s {arg!s} para el/los "
 "servicio/s {name!s} en el/los rango/s de ejecución {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -295,125 +310,108 @@ msgstr ""
 "La ruta hacia el/los servicio/s {name!s} es {path!s}, y no "
 "existe."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure el tema de Plymouth - menú de bienvenida."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar paquetes."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar servicios de systemd"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La orden  systemctl {arg!s}  en chroot  devolvió el código de "
+"error  {num!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando %(num)d paquetes."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede activar el servicio de systemd  {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Eliminando un paquete."
-msgstr[1] "Eliminando %(num)d paquetes."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No se puede activar el objetivo de systemd  {name!s}."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No se puede desactivar el objetivo de systemd {name!s}."
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad de systemd {name!s}."
 
-#: src/modules/packages/main.py:601
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Órdenes desconocidas de systemd  {command!s} y "
+"{suffix!s} para la/s unidad /es {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivos."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar gestor de arranque."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Rellenando los sistemas de archivos."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Falló la sincronización  mediante rsync  con el código de error {}."
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj de la computadora."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Iniciando el desempaquetado {}"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No se pudo desempaquetar la imagen «{}»"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
+"No especificó un punto de montaje para la  partición raíz - / o root -"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
-
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
-"Creando initramfs - sistema de arranque - con dracut - su constructor -."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Falló en ejecutar dracut - constructor de arranques - en el objetivo"
+"No se hace nada porque el almacenamiento no contiene una clave de  "
+"\"rootMountPoint\" punto de montaje para la raíz."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs - sistema de inicio -."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punto de montaje no válido para una partición raíz,"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "Como el punto de montaje raíz es \"{}\", y no existe, no se hace nada"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiendo la tabla de particiones fstab"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuración de \"unsquash\" no válida"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
+"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
+"actual"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarea de python ficticia."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso {} de python ficticio"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos de origen  \"{}\" no existe"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando especificaciones locales o regionales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"No se encontró unsquashfs; cerciórese de que tenga instalado el paquete "
+"squashfs-tools"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Guardando la  configuración de red."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destino \"{}\" en el sistema escogido  no es una carpeta"
diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po
index 269b7964a0..bf88de046b 100644
--- a/lang/python/es_MX/LC_MESSAGES/python.po
+++ b/lang/python/es_MX/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Erland Huaman , 2021\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
@@ -23,142 +23,19 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando particiones."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Error de configuración"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No hay particiones definidas para que 
    {!s}
     use."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura los servicios de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio."
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La llamada de: systemctl {arg!s} en chroot retorna código de "
-"error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede habilitar el servicio {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No se puede habilitar el objetivo {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-"No se puede deshabilitar el objetivo {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No se puede enmascarar la unidad {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"systemd no reconoce los comandos {command!s} y "
-"{suffix!s}para la unidad {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de archivo."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Llenando sistema de archivos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falló con código de error {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Iniciando a desempaquetar {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Se falló en la desempaquetización de la imagen \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No existe punto de montaje para la partición raíz"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Mal punto de montaje para la partición raíz"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Mala configuración del paquete unsquash"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar el cargador de arranque."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" "
-"({})"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de archivos fuente \"{}\" no existe"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools "
-"instalado"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -216,22 +93,155 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creando initramfs con dracut"
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Se falló al intentar correr dracut en el objetivo"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabajo python ficticio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso python ficticio {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiento fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No hay particiones definidas para que 
    {!s}
     use."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj del hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locales."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando la swap encriptada."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creando initramfs con mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Se falló al intentar correr mkinitfs en el objetivo"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando configuración de red."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio OpenRc dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar paquetes."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d/%(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando%(num)d paquetes."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removiendo un paquete."
+msgstr[1] "Removiendo %(num)dpaquetes."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurando el tema de Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando data."
@@ -254,6 +264,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio."
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -279,124 +294,107 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurando el tema de Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar paquetes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d/%(total)d)"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura los servicios de systemd"
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando%(num)d paquetes."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La llamada de: systemctl {arg!s} en chroot retorna código de "
+"error {num!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removiendo un paquete."
-msgstr[1] "Removiendo %(num)dpaquetes."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede habilitar el servicio {name!s} de systemd."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No se puede habilitar el objetivo {name!s} de systemd."
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
+"No se puede deshabilitar el objetivo {name!s} de systemd."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad {name!s} de systemd."
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"systemd no reconoce los comandos {command!s} y "
+"{suffix!s}para la unidad {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar el cargador de arranque."
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivo."
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Llenando sistema de archivos."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj del hardware."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falló con código de error {}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creando initramfs con mkinitfs."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Se falló al intentar correr mkinitfs en el objetivo"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Iniciando a desempaquetar {}"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Se falló en la desempaquetización de la imagen \"{}\""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creando initramfs con dracut"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No existe punto de montaje para la partición raíz"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Se falló al intentar correr dracut en el objetivo"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Mal punto de montaje para la partición raíz"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio OpenRc dmcrypt."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiento fstab."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mala configuración del paquete unsquash"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
+"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" "
+"({})"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabajo python ficticio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso python ficticio {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos fuente \"{}\" no existe"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools "
+"instalado"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Guardando configuración de red."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
diff --git a/lang/python/es_PE/LC_MESSAGES/python.po b/lang/python/es_PE/LC_MESSAGES/python.po
index 02528a757a..2ad6b0e0e0 100644
--- a/lang/python/es_PE/LC_MESSAGES/python.po
+++ b/lang/python/es_PE/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Spanish (Peru) (https://www.transifex.com/calamares/teams/20061/es_PE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po
index ed3c1e041a..af5f27c77f 100644
--- a/lang/python/es_PR/LC_MESSAGES/python.po
+++ b/lang/python/es_PR/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: es_PR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po
index ee5b372c50..4aa5969fc6 100644
--- a/lang/python/et/LC_MESSAGES/python.po
+++ b/lang/python/et/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Madis Otenurm, 2019\n"
 "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
@@ -21,131 +21,18 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Haagi failisüsteemid lahti."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,71 +89,102 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testiv python'i töö."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testiv python'i aste {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -293,96 +211,176 @@ msgid_plural "Removing %(num)d packages."
 msgstr[0] "Eemaldan ühe paketi."
 msgstr[1] "Eemaldan %(num)d paketti."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testiv python'i töö."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testiv python'i aste {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Haagi failisüsteemid lahti."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po
index 3e5ac0ac27..7539cf9d8a 100644
--- a/lang/python/eu/LC_MESSAGES/python.po
+++ b/lang/python/eu/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Ander Elortondo, 2019\n"
 "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
@@ -21,131 +21,18 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fitxategi sistemak desmuntatu."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -203,71 +90,102 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python lana."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python urratsa {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -294,96 +212,176 @@ msgid_plural "Removing %(num)d packages."
 msgstr[0] "Pakete bat kentzen."
 msgstr[1] "%(num)dpakete kentzen."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python lana."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python urratsa {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fitxategi sistemak desmuntatu."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po
index 92d71c9c18..50682fe625 100644
--- a/lang/python/fa/LC_MESSAGES/python.po
+++ b/lang/python/fa/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: alireza jamshidi , 2020\n"
 "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
@@ -22,136 +22,19 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "در حال پیکربندی گراب."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "در حال سوار کردن افرازها."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "خطای پیکربندی"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "هیچ افرازی برای استفادهٔ 
    {!s}
     تعریف نشده."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "در حال پیکربندی خدمات سیستم‌دی"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "نمی‌توان خدمت را دستکاری کرد"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "نصب بارکنندهٔ راه‌اندازی."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
-"برگرداند."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
-
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
-"{suffix!s} برای واحد {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "پیاده کردن سامانه‌های پرونده."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "در حال پر کردن سامانه‌پرونده‌ها."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "آرسینک با رمز خطای {} شکست خورد."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "در حال بسته‌گشایی تصویر {}/{}، پروندهٔ {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "در حال شروع بسته‌گشایی {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "شکست در بسته‌گشایی تصویر {}"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمی‌شود"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمی‌شود"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "پیکربندی بد unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "کرنل کنونیتان از سامانه‌پروندهٔ {} ({}) پشتیبانی نمی‌کند"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "شکست در یافتن unsquashfs. مطمئن شوید بستهٔ squashfs-tools نصب است"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -207,72 +90,103 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "پیکربندی مدیر نمایش کامل نبود"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "پیکربندی mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "در حال ایجاد initramfs با dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "شکست در اجرای dracut روی هدف"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "رمز خروج {} بود"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "کار پایتونی الکی."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "گام پایتونی الکی {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "در حال نوشتن fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "خطای پیکربندی"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "هیچ افرازی برای استفادهٔ 
    {!s}
     تعریف نشده."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
    {!s}
     داده نشده."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "در حال پیکربندی مبادلهٔ رمزشده."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "داده‌های نصب"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "در حال پیکربندی گراب."
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "پیکربندی خدمات OpenRC"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "در حال تنظیم ساعت سخت‌افزاری."
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "نمی‌توان خدمت {name!s} را به سطح اجرایی {level!s} افزود."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "پیکربندی mkinitcpio."
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "نمی‌توان خدمت {name!s} را از سطح اجرایی {level!s} برداشت."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "در حال پیکربندی initramfs."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "پیکربندی مکانها"
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "در حال پیکربندی مبادلهٔ رمزشده."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "سطح اجرایی هدف وجود ندارد."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "خدمت هدف وجود ندارد"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "در حال سوار کردن افرازها."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "در حال ذخیرهٔ پیکربندی شبکه."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -298,96 +212,180 @@ msgid_plural "Removing %(num)d packages."
 msgstr[0] "در حال برداشتن یک بسته."
 msgstr[1] "در حال برداشتن %(num)d بسته."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "نصب بارکنندهٔ راه‌اندازی."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "داده‌های نصب"
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "پیکربندی خدمات OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "نمی‌توان خدمت {name!s} را به سطح اجرایی {level!s} افزود."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "نمی‌توان خدمت {name!s} را از سطح اجرایی {level!s} برداشت."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "نمی‌توان خدمت را دستکاری کرد"
+
+#: src/modules/services-openrc/main.py:94
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "در حال تنظیم ساعت سخت‌افزاری."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "سطح اجرایی هدف وجود ندارد."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "خدمت هدف وجود ندارد"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "رمز خروج {} بود"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "در حال پیکربندی خدمات سیستم‌دی"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "در حال ایجاد initramfs با dracut."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
+"برگرداند."
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "شکست در اجرای dracut روی هدف"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "در حال پیکربندی initramfs."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "در حال نوشتن fstab."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
+"{suffix!s} برای واحد {name!s}."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "کار پایتونی الکی."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "پیاده کردن سامانه‌های پرونده."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "گام پایتونی الکی {}"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "در حال پر کردن سامانه‌پرونده‌ها."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "پیکربندی مکانها"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "آرسینک با رمز خطای {} شکست خورد."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "در حال ذخیرهٔ پیکربندی شبکه."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "در حال بسته‌گشایی تصویر {}/{}، پروندهٔ {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "در حال شروع بسته‌گشایی {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "شکست در بسته‌گشایی تصویر {}"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمی‌شود"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمی‌شود"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "پیکربندی بد unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "کرنل کنونیتان از سامانه‌پروندهٔ {} ({}) پشتیبانی نمی‌کند"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "شکست در یافتن unsquashfs. مطمئن شوید بستهٔ squashfs-tools نصب است"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po
index 9646e5c64c..733bc72196 100644
--- a/lang/python/fi_FI/LC_MESSAGES/python.po
+++ b/lang/python/fi_FI/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kimmo Kujansuu , 2021\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
@@ -21,136 +21,21 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Määritä GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Yhdistä osiot."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Määritysvirhe"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Ei ole määritetty käyttämään osioita 
    {!s}
     ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Määritä systemd palvelut"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Palvelua ei voi muokata"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd-palvelua ei saa käyttöön {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd-kohdetta ei saa käyttöön {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd-kohdetta ei-voi poistaa käytöstä {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ei voi peittää systemd-yksikköä {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Tuntematon systemd komento {command!s} ja "
-"{suffix!s} laite {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Irrota tiedostojärjestelmät käytöstä."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Paikannetaan tiedostojärjestelmiä."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync epäonnistui virhekoodilla {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Pakkauksen purkaminen alkaa {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Kuvan purkaminen epäonnistui \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ei liitoskohtaa juuri root osiolle"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ei sisällä \"rootMountPoint\" avainta, eikä tee mitään"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Huono kiinnityspiste root-osioon"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint on \"{}\", jota ei ole, eikä tee mitään"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Huono epäpuhdas kokoonpano"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Tiedostojärjestelmä \"{}\" ({}) ei tue sinun nykyistä kerneliä "
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Asenna bootloader."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Lähde tiedostojärjestelmää \"{}\" ei ole olemassa"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Bootloader asennusvirhe"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti "
-"asennettuna"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Kohdejärjestelmän \"{}\" kohde ei ole hakemisto"
+"Bootloaderia ei voitu asentaa. Asennuskomento 
    {!s}
     palautti "
+"virhekoodin {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -208,77 +93,104 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Näytönhallinnan kokoonpano oli puutteellinen"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Määritetään mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Initramfs luominen dracut:lla."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Dracut-ohjelman suorittaminen ei onnistunut"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Poistumiskoodi oli {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Harjoitus python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Harjoitus python vaihe {}"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab kirjoittaminen."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Määritysvirhe"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Ei ole määritetty käyttämään osioita 
    {!s}
     ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Root-juuri kiinnityspistettä  
    {!s}
     ei ole annettu käytettäväksi."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Salatun swapin määrittäminen."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "Ei 
    {!s}
     määritys annetaan 
    {!s}
     varten."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Asennetaan tietoja."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Määritä GRUB."
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Määritä OpenRC-palvelut"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Laitteiston kellon asettaminen."
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Palvelua {name!s} ei-voi lisätä suorituksen tasolle {level!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Määritetään mkinitcpio."
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Ei voi poistaa palvelua {name!s} ajo-tasolla {level!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Määritetään initramfs."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Tuntematon  huoltotoiminto{arg!s} palvelun {name!s} "
-"palvelutasolle  {level!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Määritetään locales."
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} palautti chrootissa virhekoodin {num!s}."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Salatun swapin määrittäminen."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Kohde runlevel ei ole olemassa"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Initramfs luominen mkinitfs avulla."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "Ajotason polku {level!s} on {path!s}, jota ei ole."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kohteen mkinitfs-suoritus epäonnistui."
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Kohdepalvelua ei ole"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Yhdistä osiot."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Palvelun polku {name!s} on {path!s},  jota ei ole olemassa."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Tallennetaan verkon määrityksiä."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Määritä Plymouthin teema"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt-palvelun määrittäminen."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -304,12 +216,12 @@ msgid_plural "Removing %(num)d packages."
 msgstr[0] "Removing one package."
 msgstr[1] "Poistaa %(num)d paketteja."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr "Paketinhallinnan virhe"
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
@@ -317,7 +229,7 @@ msgstr ""
 "Paketinhallinta ei voinut valmistella päivityksiä. Komento 
    {!s}
     "
 "palautti virhekoodin {!s}."
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
@@ -325,7 +237,7 @@ msgstr ""
 "Paketinhallinta ei voinut päivittää järjestelmää. Komento 
    {!s}
     "
 "palautti virhekoodin {!s}."
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
@@ -333,75 +245,161 @@ msgstr ""
 "Paketinhallinta ei voinut tehdä muutoksia asennettuun järjestelmään. Komento"
 " 
    {!s}
     palautti virhekoodin {!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Asenna bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Määritä Plymouthin teema"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Bootloader asennusvirhe"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Asennetaan tietoja."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Määritä OpenRC-palvelut"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Palvelua {name!s} ei-voi lisätä suorituksen tasolle {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Ei voi poistaa palvelua {name!s} ajo-tasolla {level!s}."
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
-"Bootloaderia ei voitu asentaa. Asennuskomento 
    {!s}
     palautti "
-"virhekoodin {!s}."
+"Tuntematon  huoltotoiminto{arg!s} palvelun {name!s} "
+"palvelutasolle  {level!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Laitteiston kellon asettaminen."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Palvelua ei voi muokata"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Initramfs luominen mkinitfs avulla."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} palautti chrootissa virhekoodin {num!s}."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Kohteen mkinitfs-suoritus epäonnistui."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Kohde runlevel ei ole olemassa"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Poistumiskoodi oli {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "Ajotason polku {level!s} on {path!s}, jota ei ole."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Initramfs luominen dracut:lla."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Kohdepalvelua ei ole"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Dracut-ohjelman suorittaminen ei onnistunut"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Palvelun polku {name!s} on {path!s},  jota ei ole olemassa."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Määritetään initramfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Määritä systemd palvelut"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt-palvelun määrittäminen."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab kirjoittaminen."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd-palvelua ei saa käyttöön {name!s}."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "Ei 
    {!s}
     määritys annetaan 
    {!s}
     varten."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd-kohdetta ei saa käyttöön {name!s}."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Harjoitus python job."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd-kohdetta ei-voi poistaa käytöstä {name!s}."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Harjoitus python vaihe {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ei voi peittää systemd-yksikköä {name!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Määritetään locales."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Tuntematon systemd komento {command!s} ja "
+"{suffix!s} laite {name!s}."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Tallennetaan verkon määrityksiä."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Irrota tiedostojärjestelmät käytöstä."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Paikannetaan tiedostojärjestelmiä."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync epäonnistui virhekoodilla {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Pakkauksen purkaminen alkaa {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Kuvan purkaminen epäonnistui \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ei liitoskohtaa juuri root osiolle"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ei sisällä \"rootMountPoint\" avainta, eikä tee mitään"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Huono kiinnityspiste root-osioon"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint on \"{}\", jota ei ole, eikä tee mitään"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Huono epäpuhdas kokoonpano"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Tiedostojärjestelmä \"{}\" ({}) ei tue sinun nykyistä kerneliä "
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Lähde tiedostojärjestelmää \"{}\" ei ole olemassa"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti "
+"asennettuna"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Kohdejärjestelmän \"{}\" kohde ei ole hakemisto"
diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index 300c553f72..b495c28c5a 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: roxfr , 2021\n"
 "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
@@ -30,141 +30,19 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configuration du GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montage des partitions."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Erreur de configuration"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-"Aucune partition n'est définie pour être utilisée par 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurer les services systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impossible de modifier le service"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
-"{num!s}"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossible d'activer le service systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossible d'activer la cible systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Impossible de désactiver la cible systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossible de masquer l'unit systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Commandes systemd {command!s} et {suffix!s} "
-"inconnues pour l'unit {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Démonter les systèmes de fichiers"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Remplir les systèmes de fichiers."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync a échoué avec le code d'erreur {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Décompression de l'image {}/{}, fichier {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Commencer à décompresser {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Impossible de décompresser l'image \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Pas de point de montage pour la partition racine"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ne contient pas de clé \"rootMountPoint\", ne fait rien"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Mauvais point de montage pour la partition racine"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint est \"{}\", ce qui n'existe pas, ne fait rien"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Mauvaise configuration unsquash"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installation du bootloader."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"Le système de fichiers pour \"{}\" ({}) n'est pas pris en charge par votre "
-"noyau actuel"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Le système de fichiers source \"{}\" n'existe pas"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Échec de la recherche de unsquashfs, assurez-vous que le paquetage squashfs-"
-"tools est installé."
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -224,24 +102,158 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuration du gestionnaire d'affichage était incomplète"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configuration de mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Configuration du initramfs avec dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Erreur d'exécution de dracut sur la cible."
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Le code de sortie était {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tâche factice de python"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Étape factice de python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Écriture du fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Erreur de configuration"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+"Aucune partition n'est définie pour être utilisée par 
    {!s}
    ."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Aucun point de montage racine n'a été donné pour être utilisé par "
 "
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configuration du GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuration de l'horloge matériel."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configuration de mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configuration du initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuration des locales."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configuration du swap chiffrée."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Création d'initramfs avec mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Échec de l'exécution de mkinitfs sur la cible"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montage des partitions."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sauvegarde de la configuration du réseau en cours."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuration du service OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installer les paquets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Traitement des paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installation d'un paquet."
+msgstr[1] "Installation de %(num)d paquets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Suppression d'un paquet."
+msgstr[1] "Suppression de %(num)d paquets."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurer le thème Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installation de données."
@@ -266,6 +278,11 @@ msgstr ""
 "Service-action {arg!s} inconnue pour le service {name!s} dans "
 "le run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Impossible de modifier le service"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -297,124 +314,105 @@ msgstr ""
 "Le chemin pour le service {name!s} est {path!s}, qui n'existe "
 "pas."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurer le thème Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installer les paquets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Traitement des paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installation d'un paquet."
-msgstr[1] "Installation de %(num)d paquets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Suppression d'un paquet."
-msgstr[1] "Suppression de %(num)d paquets."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurer les services systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
+"{num!s}"
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossible d'activer le service systemd {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossible d'activer la cible systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installation du bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Impossible de désactiver la cible systemd {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossible de masquer l'unit systemd {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Commandes systemd {command!s} et {suffix!s} "
+"inconnues pour l'unit {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuration de l'horloge matériel."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Démonter les systèmes de fichiers"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Création d'initramfs avec mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Remplir les systèmes de fichiers."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Échec de l'exécution de mkinitfs sur la cible"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync a échoué avec le code d'erreur {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Le code de sortie était {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Décompression de l'image {}/{}, fichier {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Configuration du initramfs avec dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Commencer à décompresser {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Erreur d'exécution de dracut sur la cible."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Impossible de décompresser l'image \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuration du initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Pas de point de montage pour la partition racine"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuration du service OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ne contient pas de clé \"rootMountPoint\", ne fait rien"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Écriture du fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Mauvais point de montage pour la partition racine"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint est \"{}\", ce qui n'existe pas, ne fait rien"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tâche factice de python"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mauvaise configuration unsquash"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Étape factice de python {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Le système de fichiers pour \"{}\" ({}) n'est pas pris en charge par votre "
+"noyau actuel"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuration des locales."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Le système de fichiers source \"{}\" n'existe pas"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Sauvegarde de la configuration du réseau en cours."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Échec de la recherche de unsquashfs, assurez-vous que le paquetage squashfs-"
+"tools est installé."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po
index 1e9cdb4dfc..1f26b91c0f 100644
--- a/lang/python/fr_CH/LC_MESSAGES/python.po
+++ b/lang/python/fr_CH/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: fr_CH\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po
index 455138a9d2..c3bc380c5d 100644
--- a/lang/python/fur/LC_MESSAGES/python.po
+++ b/lang/python/fur/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Fabio Tomat , 2020\n"
 "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n"
@@ -21,140 +21,19 @@ msgstr ""
 "Language: fur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montaç des partizions."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Erôr di configurazion"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No je stade definide nissune partizion di doprâ par 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure i servizis di systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impussibil modificâ il servizi"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
-"erôr {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instale il bootloader."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"Impussibil disabilitâ la destinazion di systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comants di systemd {command!s} e {suffix!s} no "
-"cognossûts pe unitât {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dismonte i file-systems."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Daûr a jemplâ i filesystems."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Sincronizazion cun rsync falide cun codiç di erôr {}. "
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Estrazion imagjin {}/{}, file {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Daûr a scomençâ la estrazion {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No si è rivâts a estrai la imagjin \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nissun pont di montaç pe partizion lidrîs"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nol conten une clâf \"rootMountPoint\", duncje no si fâs nuie"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Pont di montaç sbaliât pe partizion lidrîs"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint al è \"{}\", che nol esist, duncje no si fâs nuie"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configurazion di \"unsquash\" sbaliade"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Il filesystem par \"{}\" ({}) nol è supuartât dal to kernel atuâl"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Il filesystem sorzint \"{}\" nol esist"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"No si è rivâts a cjatâ unsquashfs, controle di vê instalât il pachet "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,23 +91,156 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazion dal gjestôr dai visôrs no jere complete"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Daûr a configurâ di mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Daûr a creâ initramfs cun dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "No si è rivâts a eseguî dracut su la destinazion"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codiç di jessude al jere {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Lavôr di python pustiç."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passaç di python pustiç {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Daûr a scrivi fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Erôr di configurazion"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No je stade definide nissune partizion di doprâ par 
    {!s}
    ."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nol è stât indicât nissun pont di montaç di doprâ par 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Daûr a configurâ l'orloi hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Daûr a configurâ di mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Daûr a configurâ initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Daûr a configurâ la localizazion."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Daûr a configurâ la memorie di scambi (swap) cifrade."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Daûr a creâ il initramfs cun mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaç des partizions."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvament de configurazion di rêt."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instale pachets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Daûr a instalâ un pachet."
+msgstr[1] "Daûr a instalâ %(num)d pachets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Daûr a gjavâ un pachet."
+msgstr[1] "Daûr a gjavâ %(num)d pachets."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure il teme di Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Daûr a instalâ i dâts."
@@ -253,6 +265,11 @@ msgstr ""
 "Azion dal servizi {arg!s} no cognossude pal servizi {name!s} "
 "tal run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Impussibil modificâ il servizi"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -282,124 +299,105 @@ msgid ""
 msgstr ""
 "Il percors pal servizi {name!s} al è {path!s}, che nol esist."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure il teme di Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instale pachets."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure i servizis di systemd"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
+"erôr {num!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Daûr a instalâ un pachet."
-msgstr[1] "Daûr a instalâ %(num)d pachets."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Daûr a gjavâ un pachet."
-msgstr[1] "Daûr a gjavâ %(num)d pachets."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
+"Impussibil disabilitâ la destinazion di systemd {name!s}."
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
 
-#: src/modules/packages/main.py:601
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Comants di systemd {command!s} e {suffix!s} no "
+"cognossûts pe unitât {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dismonte i file-systems."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instale il bootloader."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Daûr a jemplâ i filesystems."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Sincronizazion cun rsync falide cun codiç di erôr {}. "
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazion imagjin {}/{}, file {}/{}"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Daûr a configurâ l'orloi hardware."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Daûr a scomençâ la estrazion {}"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Daûr a creâ il initramfs cun mkinitfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No si è rivâts a estrai la imagjin \"{}\""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nissun pont di montaç pe partizion lidrîs"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codiç di jessude al jere {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nol conten une clâf \"rootMountPoint\", duncje no si fâs nuie"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Daûr a creâ initramfs cun dracut."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Pont di montaç sbaliât pe partizion lidrîs"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "No si è rivâts a eseguî dracut su la destinazion"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint al è \"{}\", che nol esist, duncje no si fâs nuie"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Daûr a configurâ initramfs."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazion di \"unsquash\" sbaliade"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Il filesystem par \"{}\" ({}) nol è supuartât dal to kernel atuâl"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Daûr a scrivi fstab."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorzint \"{}\" nol esist"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"No si è rivâts a cjatâ unsquashfs, controle di vê instalât il pachet "
+"squashfs-tools"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Lavôr di python pustiç."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passaç di python pustiç {}"
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Daûr a configurâ la localizazion."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Salvament de configurazion di rêt."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po
index 6537946102..e58a670367 100644
--- a/lang/python/gl/LC_MESSAGES/python.po
+++ b/lang/python/gl/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Xosé, 2018\n"
 "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n"
@@ -21,131 +21,18 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de ficheiros."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -203,71 +90,102 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuración do xestor de pantalla foi incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa parva de python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso parvo de python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -294,96 +212,176 @@ msgid_plural "Removing %(num)d packages."
 msgstr[0] "A retirar un paquete."
 msgstr[1] "A retirar %(num)d paquetes."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa parva de python."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso parvo de python {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po
index 8a08b7bf6e..77b46e939d 100644
--- a/lang/python/gu/LC_MESSAGES/python.po
+++ b/lang/python/gu/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po
index e84547385b..2d87361a51 100644
--- a/lang/python/he/LC_MESSAGES/python.po
+++ b/lang/python/he/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yaron Shahrabani , 2021\n"
 "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n"
@@ -23,135 +23,21 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "הגדרת GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "מחיצות מעוגנות."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "שגיאת הגדרות"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "לא הוגדרו מחיצות לשימוש של 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "הגדרת שירותי systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "לא ניתן לשנות את השירות"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "התקנת מנהל אתחול."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "שגיאת התקנת מנהל אתחול"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"פקודות לא ידועות של systemd‏ {command!s} "
-"ו־{suffix!s} עבור היחידה {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ניתוק עיגון מערכות קבצים."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "מערכות הקבצים מתמלאות."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync נכשל עם קוד השגיאה {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "קובץ הדמות נפרס {}/{}, קובץ {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "הפריסה של {} מתחילה"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "פריסת קובץ הדמות \"{}\" נכשלה"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "אין נקודת עגינה למחיצת העל"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "נקודת העגינה של מחיצת השורה שגויה"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "תצורת unsquash שגויה"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "מערכת הקבצים עבור „{}” ‏({}) אינה נתמכת על ידי הליבה הנוכחית שלך."
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "מערכת הקבצים במקור „{}” אינה קיימת"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "איתור unsquashfs לא צלח, נא לוודא שהחבילה squashfs-tools מותקנת"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
+"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
    {!s}
     החזירה את קוד "
+"השגיאה {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -209,77 +95,103 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "תצורת מנהל התצוגה אינה שלמה"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio מותקן."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "נוצר initramfs עם dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "הרצת dracut על היעד נכשלה"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "קוד היציאה היה {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "משימת דמה של Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "צעד דמה של Python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab נכתב."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "שגיאת הגדרות"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "לא הוגדרו מחיצות לשימוש של 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
    {!s}
    ."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "מוגדר שטח החלפה מוצפן."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "לא סופקה תצורת 
    {!s}
     לשימוש 
    {!s}
    ."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "הנתונים מותקנים."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "הגדרת GRUB."
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "הגדרת שירותי OpenRC"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "שעון החומרה מוגדר."
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "לא ניתן להוסיף את השירות {name!s} לשכבת ההפעלה {level!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio מותקן."
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "לא ניתן להסיר את השירות {name!s} משכבת ההפעלה {level!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs מוגדר."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"service-action‏ (פעולת שירות) {arg!s} בלתי ידועה עבור השירות "
-"{name!s} בשכבת ההפעלה {level!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "השפות מוגדרות."
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"הקריאה rc-update {arg!s} במצב chroot החזירה את קוד השגיאה "
-"{num!s}."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "מוגדר שטח החלפה מוצפן."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "יעד שכבת ההפעלה אינו קיים"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "initramfs נוצר בעזרת mkinitfs."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"הנתיב לשכבת ההפעלה {level!s} הוא {path!s} ונתיב זה אינו קיים."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "הרצת mkinitfs על היעד נכשלה"
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "שירות היעד אינו קיים"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "מחיצות מעוגנות."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "הגדרות הרשת נשמרות."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "הגדרת ערכת עיצוב של Plymouth"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "שירות dmcrypt ל־OpenRC מוגדר."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -309,12 +221,12 @@ msgstr[1] "מתבצעת הסרה של %(num)d חבילות."
 msgstr[2] "מתבצעת הסרה של %(num)d חבילות."
 msgstr[3] "מתבצעת הסרה של %(num)d חבילות."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr "שגיאת מנהל חבילות"
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
@@ -322,7 +234,7 @@ msgstr ""
 "מנהל החבילות לא הצליח להכין את העדכונים. הפקודה 
    {!s}
     החזירה את "
 "קוד השגיאה {!s}."
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
@@ -330,7 +242,7 @@ msgstr ""
 "מנהל החבילות לא הצליח לעדכן את המערכת. הפקודה 
    {!s}
     החזירה את קוד "
 "השגיאה {!s}."
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
@@ -338,75 +250,161 @@ msgstr ""
 "מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה 
    {!s}
     "
 "החזירה את קוד השגיאה {!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "התקנת מנהל אתחול."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "הגדרת ערכת עיצוב של Plymouth"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "שגיאת התקנת מנהל אתחול"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "הנתונים מותקנים."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "הגדרת שירותי OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "לא ניתן להוסיף את השירות {name!s} לשכבת ההפעלה {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "לא ניתן להסיר את השירות {name!s} משכבת ההפעלה {level!s}."
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
-"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
    {!s}
     החזירה את קוד "
-"השגיאה {!s}."
+"service-action‏ (פעולת שירות) {arg!s} בלתי ידועה עבור השירות "
+"{name!s} בשכבת ההפעלה {level!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "שעון החומרה מוגדר."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "לא ניתן לשנות את השירות"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "initramfs נוצר בעזרת mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"הקריאה rc-update {arg!s} במצב chroot החזירה את קוד השגיאה "
+"{num!s}."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "הרצת mkinitfs על היעד נכשלה"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "יעד שכבת ההפעלה אינו קיים"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "קוד היציאה היה {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"הנתיב לשכבת ההפעלה {level!s} הוא {path!s} ונתיב זה אינו קיים."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "נוצר initramfs עם dracut."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "שירות היעד אינו קיים"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "הרצת dracut על היעד נכשלה"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs מוגדר."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "הגדרת שירותי systemd"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "שירות dmcrypt ל־OpenRC מוגדר."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab נכתב."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "לא סופקה תצורת 
    {!s}
     לשימוש 
    {!s}
    ."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "משימת דמה של Python."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "צעד דמה של Python {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "השפות מוגדרות."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"פקודות לא ידועות של systemd‏ {command!s} "
+"ו־{suffix!s} עבור היחידה {name!s}."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "הגדרות הרשת נשמרות."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ניתוק עיגון מערכות קבצים."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "מערכות הקבצים מתמלאות."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync נכשל עם קוד השגיאה {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "קובץ הדמות נפרס {}/{}, קובץ {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "הפריסה של {} מתחילה"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "פריסת קובץ הדמות \"{}\" נכשלה"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "אין נקודת עגינה למחיצת העל"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "נקודת העגינה של מחיצת השורה שגויה"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "תצורת unsquash שגויה"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "מערכת הקבצים עבור „{}” ‏({}) אינה נתמכת על ידי הליבה הנוכחית שלך."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "מערכת הקבצים במקור „{}” אינה קיימת"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "איתור unsquashfs לא צלח, נא לוודא שהחבילה squashfs-tools מותקנת"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index fc9607a8b3..dc8c9c3e49 100644
--- a/lang/python/hi/LC_MESSAGES/python.po
+++ b/lang/python/hi/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Panwar108 , 2021\n"
 "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
@@ -21,135 +21,21 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB विन्यस्त करना।"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "विभाजन माउंट करना।"
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "विन्यास त्रुटि"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd सेवाएँ विन्यस्त करना"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "सेवा को संशोधित नहीं किया जा सकता"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
-"{suffix!s}।"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "फ़ाइल सिस्टम माउंट से हटाना।"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "फाइल सिस्टम भरना।"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync त्रुटि कोड {} के साथ विफल।"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "इमेज फ़ाइल {}/{}, फ़ाइल {}/{} सम्पीड़ित की जा रही है"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} हेतु संपीड़न प्रक्रिया आरंभ हो रही है "
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "इमेज फ़ाइल \"{}\" को खोलने में विफल"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "रुट विभाजन हेतु कोई माउंट पॉइंट नहीं है"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage में \"rootMountPoint\" कुंजी नहीं है, कुछ नहीं किया जाएगा"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "रुट विभाजन हेतु ख़राब माउंट पॉइंट"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "रुट माउंट पॉइंट \"{}\" है, जो कि मौजूद नहीं है, कुछ नहीं किया जाएगा"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "ख़राब unsquash विन्यास सेटिंग्स"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) हेतु फ़ाइल सिस्टम आपके वर्तमान कर्नेल द्वारा समर्थित नहीं है"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "बूट लोडर इंस्टॉल करना।"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" स्रोत फ़ाइल सिस्टम मौजूद नहीं है"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "बूट लोडर इंस्टॉल त्रुटि"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल है"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
+"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड 
    {!s}
     हेतु त्रुटि कोड "
+"{!s} प्राप्त।"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -207,76 +93,106 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio को विन्यस्त करना।"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracut के साथ initramfs बनाना।"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "लक्ष्य पर dracut निष्पादन विफल"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "त्रुटि कोड  {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "डमी पाइथन प्रक्रिया ।"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab पर राइट करना।"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "विन्यास त्रुटि"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "एन्क्रिप्टेड स्वैप को विन्यस्त करना।"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"कोई 
    {!s}
     विन्यास प्रदान नहीं किया गया 
    {!s}
     के उपयोग "
+"हेतु।"
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "डाटा इंस्टॉल करना।"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB विन्यस्त करना।"
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC सेवाएँ विन्यस्त करना"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "हार्डवेयर घड़ी सेट करना।"
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "रन-लेवल {level!s} में सेवा {name!s} को जोड़ा नहीं जा सका।"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio को विन्यस्त करना।"
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "रन-लेवल {level!s} में सेवा {name!s} को हटाया नहीं जा सका।"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs को विन्यस्त करना। "
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"रन-लेवल {level!s} में सेवा {name!s} हेतु अज्ञात सेवा-कार्य "
-"{arg!s}।"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "स्थानिकी को विन्यस्त करना।"
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot में  rc-update {arg!s} कॉल त्रुटि कोड {num!s}।"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "एन्क्रिप्टेड स्वैप को विन्यस्त करना।"
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "लक्षित रनलेवल मौजूद नहीं है"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs के साथ initramfs बनाना।"
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"रनलेवल {level!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "लक्षित सेवा मौजूद नहीं है"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "विभाजन माउंट करना।"
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth थीम विन्यस्त करना "
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -302,12 +218,12 @@ msgid_plural "Removing %(num)d packages."
 msgstr[0] "एक पैकेज हटाया जा रहा है।"
 msgstr[1] "%(num)d पैकेज हटाए जा रहे हैं।"
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr "पैकेज प्रबंधक त्रुटि"
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
@@ -315,7 +231,7 @@ msgstr ""
 "पैकेज प्रबंधक द्वारा अपडेट तैयार करना विफल। कमांड 
    {!s}
     हेतु "
 "त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
@@ -323,7 +239,7 @@ msgstr ""
 "पैकेज प्रबंधक द्वारा सिस्टम अपडेट करना विफल। कमांड 
    {!s}
     हेतु "
 "त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
@@ -331,77 +247,159 @@ msgstr ""
 "पैकेज प्रबंधक द्वारा इंस्टॉल हो रखें सिस्टम पर परिवर्तन करना विफल। कमांड "
 "
    {!s}
     हेतु त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "बूट लोडर इंस्टॉल करना।"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth थीम विन्यस्त करना "
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "बूट लोडर इंस्टॉल त्रुटि"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "डाटा इंस्टॉल करना।"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC सेवाएँ विन्यस्त करना"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "रन-लेवल {level!s} में सेवा {name!s} को जोड़ा नहीं जा सका।"
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "रन-लेवल {level!s} में सेवा {name!s} को हटाया नहीं जा सका।"
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
-"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड 
    {!s}
     हेतु त्रुटि कोड "
-"{!s} प्राप्त।"
+"रन-लेवल {level!s} में सेवा {name!s} हेतु अज्ञात सेवा-कार्य "
+"{arg!s}।"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "हार्डवेयर घड़ी सेट करना।"
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "सेवा को संशोधित नहीं किया जा सकता"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs के साथ initramfs बनाना।"
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot में  rc-update {arg!s} कॉल त्रुटि कोड {num!s}।"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "लक्षित रनलेवल मौजूद नहीं है"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "त्रुटि कोड  {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"रनलेवल {level!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracut के साथ initramfs बनाना।"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "लक्षित सेवा मौजूद नहीं है"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "लक्ष्य पर dracut निष्पादन विफल"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs को विन्यस्त करना। "
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd सेवाएँ विन्यस्त करना"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab पर राइट करना।"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"कोई 
    {!s}
     विन्यास प्रदान नहीं किया गया 
    {!s}
     के उपयोग "
-"हेतु।"
+"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
+"{suffix!s}।"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "डमी पाइथन प्रक्रिया ।"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "फ़ाइल सिस्टम माउंट से हटाना।"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "फाइल सिस्टम भरना।"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "स्थानिकी को विन्यस्त करना।"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync त्रुटि कोड {} के साथ विफल।"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "इमेज फ़ाइल {}/{}, फ़ाइल {}/{} सम्पीड़ित की जा रही है"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} हेतु संपीड़न प्रक्रिया आरंभ हो रही है "
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "इमेज फ़ाइल \"{}\" को खोलने में विफल"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "रुट विभाजन हेतु कोई माउंट पॉइंट नहीं है"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage में \"rootMountPoint\" कुंजी नहीं है, कुछ नहीं किया जाएगा"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "रुट विभाजन हेतु ख़राब माउंट पॉइंट"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "रुट माउंट पॉइंट \"{}\" है, जो कि मौजूद नहीं है, कुछ नहीं किया जाएगा"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "ख़राब unsquash विन्यास सेटिंग्स"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) हेतु फ़ाइल सिस्टम आपके वर्तमान कर्नेल द्वारा समर्थित नहीं है"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" स्रोत फ़ाइल सिस्टम मौजूद नहीं है"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल है"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po
index 0bfbe0ee2f..36c7749bfb 100644
--- a/lang/python/hr/LC_MESSAGES/python.po
+++ b/lang/python/hr/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lovro Kudelić , 2021\n"
 "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
@@ -21,138 +21,21 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurirajte GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montiranje particija."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Greška konfiguracije"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nema definiranih particija za 
    {!s}
     korištenje."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriraj systemd servise"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Ne mogu modificirati servis"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne mogu omogućiti systemd servis {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Ne mogu omogućiti systemd cilj {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Nepoznata systemd naredba {command!s} i {suffix!s}"
-" za jedinicu {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odmontiraj datotečne sustave."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Popunjavanje datotečnih sustava."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync nije uspio s kodom pogreške {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Otpakiravanje slike {}/{}, datoteka {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Početak raspakiravanja {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Otpakiravnje slike nije uspjelo \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nema točke montiranja za root particiju"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ne sadrži ključ \"rootMountPoint\", ne radi ništa"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Neispravna točka montiranja za root particiju"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Neispravna unsquash konfiguracija"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Datotečni sustav za \"{}\" ({}) nije podržan na vašem trenutnom kernelu"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instaliram bootloader."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Izvorni datotečni sustav \"{}\" ne postoji"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Greška prilikom instalacije bootloadera"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Neuspješno pronalaženje unsquashfs, provjerite imate li instaliran paket "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
+"Bootloader nije mogao biti instaliran. Instalacijska naredba 
    {!s}
    "
+" je vratila kod pogreške {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -210,23 +93,164 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriranje mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Stvaranje initramfs s dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Izlazni kod bio je {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testni python posao."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testni python korak {}"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisujem fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Greška konfiguracije"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nema definiranih particija za 
    {!s}
     korištenje."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nijedna root točka montiranja nije definirana za 
    {!s}
     korištenje."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "Nije dana konfiguracija 
    {!s}
     za 
    {!s}
     upotrebu."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurirajte GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Postavljanje hardverskog sata."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriranje mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriranje initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriranje lokalizacije."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfiguriranje šifriranog swapa."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Stvaranje initramfs s mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montiranje particija."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Spremanje mrežne konfiguracije."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriranje servisa OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instaliraj pakete."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Obrađujem pakete (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instaliram paket."
+msgstr[1] "Instaliram %(num)d pakete."
+msgstr[2] "Instaliram %(num)d pakete."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Uklanjam paket."
+msgstr[1] "Uklanjam %(num)d pakete."
+msgstr[2] "Uklanjam %(num)d pakete."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Pogreška upravitelja paketa"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba 
    {!s}
     "
+"je vratila kôd pogreške {!s}."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao ažurirati sustav. Naredba 
    {!s}
     je "
+"vratila kod pogreške {!s}."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
+"Naredba 
    {!s}
     je vratila kôd pogreške {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurirajte Plymouth temu"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instaliranje podataka."
@@ -251,6 +275,11 @@ msgstr ""
 "Nepoznat service-action {arg!s} za servis {name!s} u run-level "
 "{level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Ne mogu modificirati servis"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -281,134 +310,103 @@ msgid ""
 msgstr ""
 "Putanja servisa  {name!s} je {path!s}, međutim ona ne postoji."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurirajte Plymouth temu"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instaliraj pakete."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Obrađujem pakete (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instaliram paket."
-msgstr[1] "Instaliram %(num)d pakete."
-msgstr[2] "Instaliram %(num)d pakete."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Uklanjam paket."
-msgstr[1] "Uklanjam %(num)d pakete."
-msgstr[2] "Uklanjam %(num)d pakete."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Pogreška upravitelja paketa"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriraj systemd servise"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Upravitelj paketa nije mogao pripremiti ažuriranja. Naredba 
    {!s}
     "
-"je vratila kôd pogreške {!s}."
+"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
+"{num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao ažurirati sustav. Naredba 
    {!s}
     je "
-"vratila kod pogreške {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne mogu omogućiti systemd servis {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
-"Naredba 
    {!s}
     je vratila kôd pogreške {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Ne mogu omogućiti systemd cilj {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instaliram bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Greška prilikom instalacije bootloadera"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Bootloader nije mogao biti instaliran. Instalacijska naredba 
    {!s}
    "
-" je vratila kod pogreške {!s}."
+"Nepoznata systemd naredba {command!s} i {suffix!s}"
+" za jedinicu {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Postavljanje hardverskog sata."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontiraj datotečne sustave."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Stvaranje initramfs s mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Popunjavanje datotečnih sustava."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync nije uspio s kodom pogreške {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Izlazni kod bio je {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Otpakiravanje slike {}/{}, datoteka {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Stvaranje initramfs s dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Početak raspakiravanja {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Otpakiravnje slike nije uspjelo \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriranje initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nema točke montiranja za root particiju"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriranje servisa OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ne sadrži ključ \"rootMountPoint\", ne radi ništa"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisujem fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Neispravna točka montiranja za root particiju"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "Nije dana konfiguracija 
    {!s}
     za 
    {!s}
     upotrebu."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testni python posao."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Neispravna unsquash konfiguracija"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testni python korak {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Datotečni sustav za \"{}\" ({}) nije podržan na vašem trenutnom kernelu"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriranje lokalizacije."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Izvorni datotečni sustav \"{}\" ne postoji"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Spremanje mrežne konfiguracije."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Neuspješno pronalaženje unsquashfs, provjerite imate li instaliran paket "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po
index 70b3ec2f7f..3b2b63b3dc 100644
--- a/lang/python/hu/LC_MESSAGES/python.po
+++ b/lang/python/hu/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lajos Pasztor , 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
@@ -24,139 +24,19 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurálása."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Partíciók csatolása."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Konfigurációs hiba"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nincsenek partíciók meghatározva a 
    {!s}
     használatához."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd szolgáltatások beállítása"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "a szolgáltatást nem lehet módosítani"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nem sikerült a systemd cél {name!s} letiltása."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nem maszkolható systemd egység: {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Ismeretlen systemd parancsok {command!s} és "
-"{suffix!s} a {name!s} egységhez. "
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fájlrendszerek leválasztása."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fájlrendszerek betöltése."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "az rsync elhalt a(z) {} hibakóddal"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" kép kicsomagolása nem sikerült"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nincs betöltési pont a root partíciónál"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nem tartalmaz \"rootMountPoint\" kulcsot, semmi nem történik"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Rossz betöltési pont a root partíciónál"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", ami nem létezik, semmi nem történik"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Rossz unsquash konfiguráció"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Rendszerbetöltő telepítése."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "A forrás fájlrendszer \"{}\" nem létezik"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs nem található, győződj meg róla a squashfs-tools csomag telepítve"
-" van."
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,22 +92,155 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A kijelzőkezelő konfigurációja hiányos volt"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio konfigurálása."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "initramfs létrehozása ezzel: dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "dracut futtatása nem sikerült a célon."
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "A kilépési kód {} volt."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Hamis Python feladat."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hamis {}. Python lépés"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab írása."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Konfigurációs hiba"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nincsenek partíciók meghatározva a 
    {!s}
     használatához."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nincs root csatolási pont megadva a 
    {!s}
     használatához."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurálása."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Rendszeridő beállítása."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio konfigurálása."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs konfigurálása."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "nyelvi értékek konfigurálása."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Titkosított swap konfigurálása."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partíciók csatolása."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Hálózati konfiguráció mentése."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Csomagok telepítése."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Egy csomag telepítése."
+msgstr[1] "%(num)d csomag telepítése."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Egy csomag eltávolítása."
+msgstr[1] "%(num)d csomag eltávolítása."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth téma beállítása"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Adatok telepítése."
@@ -252,6 +265,11 @@ msgstr ""
 "Ismeretlen service-action {arg!s} a szolgáltatáshoz {name!s} in"
 " run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "a szolgáltatást nem lehet módosítani"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -281,124 +299,104 @@ msgid ""
 msgstr ""
 "A szolgáltatás {name!s} elérési útja {path!s}, nem létezik."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth téma beállítása"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Csomagok telepítése."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Egy csomag telepítése."
-msgstr[1] "%(num)d csomag telepítése."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Egy csomag eltávolítása."
-msgstr[1] "%(num)d csomag eltávolítása."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd szolgáltatások beállítása"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
+"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Rendszerbetöltő telepítése."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nem sikerült a systemd cél {name!s} letiltása."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nem maszkolható systemd egység: {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Ismeretlen systemd parancsok {command!s} és "
+"{suffix!s} a {name!s} egységhez. "
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Rendszeridő beállítása."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fájlrendszerek leválasztása."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fájlrendszerek betöltése."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "az rsync elhalt a(z) {} hibakóddal"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "A kilépési kód {} volt."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kép kicsomagolása nem sikerült"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "initramfs létrehozása ezzel: dracut."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nincs betöltési pont a root partíciónál"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "dracut futtatása nem sikerült a célon."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nem tartalmaz \"rootMountPoint\" kulcsot, semmi nem történik"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs konfigurálása."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Rossz betöltési pont a root partíciónál"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint is \"{}\", ami nem létezik, semmi nem történik"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab írása."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Rossz unsquash konfiguráció"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Hamis Python feladat."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hamis {}. Python lépés"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "A forrás fájlrendszer \"{}\" nem létezik"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "nyelvi értékek konfigurálása."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs nem található, győződj meg róla a squashfs-tools csomag telepítve"
+" van."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Hálózati konfiguráció mentése."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po
index 8496ab1045..3ab952bc99 100644
--- a/lang/python/id/LC_MESSAGES/python.po
+++ b/lang/python/id/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Drajat Hasan , 2021\n"
 "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
@@ -24,131 +24,18 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Kesalahan Konfigurasi"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Lepaskan sistem berkas."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -205,71 +92,102 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurasi display manager belum rampung"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tugas dumi python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Langkah {} dumi python"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Kesalahan Konfigurasi"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -294,96 +212,176 @@ msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
 msgstr[0] "mencopot %(num)d paket"
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tugas dumi python."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Langkah {} dumi python"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Lepaskan sistem berkas."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/id_ID/LC_MESSAGES/python.po b/lang/python/id_ID/LC_MESSAGES/python.po
index 0d18c44909..81cb79a023 100644
--- a/lang/python/id_ID/LC_MESSAGES/python.po
+++ b/lang/python/id_ID/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/calamares/teams/20061/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,122 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po
index 9bf156d179..17c8b0ae38 100644
--- a/lang/python/ie/LC_MESSAGES/python.po
+++ b/lang/python/ie/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Caarmi, 2020\n"
 "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n"
@@ -21,133 +21,18 @@ msgstr ""
 "Language: ie\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurante GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montente partitiones."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Errore de configuration"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Null partition es definit por usa de 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurante servicios de systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Invocation de systemctl {arg!s} in chroot retrodat li code "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne successat activar li servicio de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ne successat depaccar li image \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Ínvalid configuration de unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installante li bootloader."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -204,22 +89,155 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurante mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr ""
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Li code de termination esset {}"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrition de fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Errore de configuration"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Null partition es definit por usa de 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurante GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurante mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurante initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurante locales."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr ""
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montente partitiones."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installante paccages."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurante li tema de Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installante li data."
@@ -242,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -269,124 +292,99 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurante li tema de Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installante paccages."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurante servicios de systemd"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Invocation de systemctl {arg!s} in chroot retrodat li code "
+"{num!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne successat activar li servicio de systemd {name!s}."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installante li bootloader."
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Li code de termination esset {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ne successat depaccar li image \"{}\""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurante initramfs."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrition de fstab."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ínvalid configuration de unsquash"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurante locales."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po
index a2b35e4a9e..dfee8b9be1 100644
--- a/lang/python/is/LC_MESSAGES/python.po
+++ b/lang/python/is/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kristján Magnússon, 2018\n"
 "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Aftengja skráarkerfi."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Setja upp pakka."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Vinnslupakkar (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Setja upp einn pakka."
+msgstr[1] "Setur upp %(num)d pakka."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjarlægi einn pakka."
+msgstr[1] "Fjarlægi %(num)d pakka."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,124 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Setja upp pakka."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Vinnslupakkar (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Setja upp einn pakka."
-msgstr[1] "Setur upp %(num)d pakka."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjarlægi einn pakka."
-msgstr[1] "Fjarlægi %(num)d pakka."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Aftengja skráarkerfi."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po
index 87c9e38b02..26f6253a0f 100644
--- a/lang/python/it_IT/LC_MESSAGES/python.po
+++ b/lang/python/it_IT/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Giuseppe Pignataro , 2021\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
@@ -24,141 +24,19 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montaggio partizioni."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Errore di Configurazione"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nessuna partizione definita per l'uso con 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura servizi  systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Impossibile modificare il servizio"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
-" di errore {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossibile abilitare il servizio systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossibile abilitare la destinazione systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-"Impossibile disabilitare la destinazione systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossibile mascherare l'unità systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comandi systemd sconosciuti {command!s} "
-"e{suffix!s} per l'unità {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Smonta i file system."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Copia dei file system."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync fallita con codice d'errore {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Estrazione immagine {}/{}, file {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Avvio dell'estrazione {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Estrazione dell'immagine \"{}\" fallita"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nessun punto di montaggio per la partizione di root"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installa il bootloader."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"globalstorage non contiene una chiave \"rootMountPoint\", nessuna azione "
-"prevista"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punto di montaggio per la partizione di root errato"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint è \"{}\" ma non esiste, nessuna azione prevista"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configurazione unsquash errata"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Il filesystem per \"{}\" ({}) non è supportato dal kernel corrente"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Il filesystem sorgente \"{}\" non esiste"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Impossibile trovare unsquashfs, assicurarsi di aver installato il pacchetto "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinazione del sistema \"{}\" non è una directory"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -217,22 +95,155 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazione del display manager è incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurazione di mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creazione di initramfs con dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Impossibile eseguire dracut sulla destinazione"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codice di uscita era {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fittizio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Python step {} fittizio"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrittura di fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Errore di Configurazione"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nessuna partizione definita per l'uso con 
    {!s}
    ."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nessun punto di mount root è dato in l'uso per 
    {!s}
    "
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Impostazione del clock hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurazione di mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurazione di initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurazione della localizzazione."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurazione per lo swap cifrato."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Sto creando initramfs con mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Impossibile eseguire mkinitfs sulla destinazione"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaggio partizioni."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvataggio della configurazione di rete."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurazione del servizio OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installa pacchetti."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installando un pacchetto."
+msgstr[1] "Installazione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Rimuovendo un pacchetto."
+msgstr[1] "Rimozione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura il tema Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installazione dei dati."
@@ -257,6 +268,11 @@ msgstr ""
 "Service-action sconosciuta {arg!s} per il servizio {name!s} nel"
 " run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Impossibile modificare il servizio"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,124 +302,106 @@ msgid ""
 msgstr ""
 "Il percorso del servizio {name!s} è {path!s}, ma non esiste."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura il tema Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installa pacchetti."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura servizi  systemd"
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
+" di errore {num!s}."
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installando un pacchetto."
-msgstr[1] "Installazione di %(num)d pacchetti."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossibile abilitare il servizio systemd {name!s}."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Rimuovendo un pacchetto."
-msgstr[1] "Rimozione di %(num)d pacchetti."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossibile abilitare la destinazione systemd {name!s}."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
+"Impossibile disabilitare la destinazione systemd {name!s}."
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossibile mascherare l'unità systemd {name!s}."
 
-#: src/modules/packages/main.py:601
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Comandi systemd sconosciuti {command!s} "
+"e{suffix!s} per l'unità {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Smonta i file system."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installa il bootloader."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Copia dei file system."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync fallita con codice d'errore {}."
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazione immagine {}/{}, file {}/{}"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Impostazione del clock hardware."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Avvio dell'estrazione {}"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Sto creando initramfs con mkinitfs."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Estrazione dell'immagine \"{}\" fallita"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Impossibile eseguire mkinitfs sulla destinazione"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nessun punto di montaggio per la partizione di root"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codice di uscita era {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage non contiene una chiave \"rootMountPoint\", nessuna azione "
+"prevista"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creazione di initramfs con dracut."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punto di montaggio per la partizione di root errato"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Impossibile eseguire dracut sulla destinazione"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint è \"{}\" ma non esiste, nessuna azione prevista"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurazione di initramfs."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazione unsquash errata"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurazione del servizio OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Il filesystem per \"{}\" ({}) non è supportato dal kernel corrente"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrittura di fstab."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorgente \"{}\" non esiste"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Impossibile trovare unsquashfs, assicurarsi di aver installato il pacchetto "
+"squashfs-tools"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fittizio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Python step {} fittizio"
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurazione della localizzazione."
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Salvataggio della configurazione di rete."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinazione del sistema \"{}\" non è una directory"
diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po
index 3732bc8d05..3c0a4d7494 100644
--- a/lang/python/ja/LC_MESSAGES/python.po
+++ b/lang/python/ja/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: UTUMI Hirosi , 2021\n"
 "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
@@ -23,135 +23,20 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUBを設定にします。"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "パーティションのマウント。"
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "コンフィグレーションエラー"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     に使用するパーティションが定義されていません。"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemdサービスを設定"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "サービスが変更できません"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s}というsystemdサービスが可能にすることができません"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が開始できません。"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が停止できません。"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ブートローダーをインストール"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd ユニット {name!s} をマスクできません。"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "ブートローダーのインストールエラー"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
-"{suffix!s}。"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ファイルシステムをアンマウント。"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ファイルシステムに書き込んでいます。"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "エラーコード {} によりrsyncを失敗。"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "イメージ {}/{}, ファイル {}/{} を解凍しています"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} の解凍を開始しています"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "イメージ  \"{}\" の展開に失敗"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "ルートパーティションのためのマウントポイントがありません"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "ルートパーティションのためのマウントポイントが不正です"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "unsquash の設定が不正です"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) のファイルシステムは、現在のカーネルではサポートされていません"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "ソースファイルシステム  \"{}\" は存在しません"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "unsquashfs が見つかりませんでした。 squashfs-toolsがインストールされているか、確認してください。"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
+"ブートローダーをインストールできませんでした。インストールコマンド 
    {!s}
     がエラーコード {!s} を返しました。"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -207,22 +92,157 @@ msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リ
 msgid "Display manager configuration was incomplete"
 msgstr "ディスプレイマネージャの設定が不完全です"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpioを設定しています。"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracutとinitramfsを作成しています。"
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "ターゲット上で dracut の実行に失敗"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "停止コードは {} でした"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstabを書き込んでいます。"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "コンフィグレーションエラー"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     に使用するパーティションが定義されていません。"
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr " 
    {!s}
     を使用するのにルートマウントポイントが与えられていません。"
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "
    {!s}
     が使用する 
    {!s}
     設定が指定されていません。"
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUBを設定にします。"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "ハードウェアクロックの設定"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpioを設定しています。"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfsを設定しています。"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "ロケールを設定しています。"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "暗号化したswapを設定しています。"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfsを使用してinitramfsを作成します。"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "ターゲットでmkinitfsを実行できませんでした"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "パーティションのマウント。"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ネットワーク設定を保存しています。"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcryptサービスを設定しています。"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "パッケージのインストール"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "パッケージを処理しています (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] " %(num)d パッケージをインストールしています。"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] " %(num)d パッケージを削除しています。"
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "パッケージマネージャーのエラー"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはアップデートを準備できませんでした。コマンド 
    {!s}
     はエラーコード {!s} を返しました。"
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはシステムをアップデートできませんでした。 コマンド 
    {!s}
     はエラーコード {!s} を返しました。"
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド 
    {!s}
     はエラーコード {!s} "
+"を返しました。"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouthテーマを設定"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "データのインストール。"
@@ -246,6 +266,11 @@ msgid ""
 msgstr ""
 "ランレベル {level!s} 内のサービス {name!s} に対する未知のサービスアクション {arg!s}。"
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "サービスが変更できません"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -271,127 +296,100 @@ msgid ""
 "exist."
 msgstr "サービス {name!s} のパスが {path!s} です。これは存在しません。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouthテーマを設定"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "パッケージのインストール"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "パッケージを処理しています (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] " %(num)d パッケージをインストールしています。"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] " %(num)d パッケージを削除しています。"
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "パッケージマネージャーのエラー"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemdサービスを設定"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"パッケージマネージャーはアップデートを準備できませんでした。コマンド 
    {!s}
     はエラーコード {!s} を返しました。"
+"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはシステムをアップデートできませんでした。 コマンド 
    {!s}
     はエラーコード {!s} を返しました。"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s}というsystemdサービスが可能にすることができません"
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド 
    {!s}
     はエラーコード {!s} "
-"を返しました。"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が開始できません。"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ブートローダーをインストール"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が停止できません。"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "ブートローダーのインストールエラー"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd ユニット {name!s} をマスクできません。"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"ブートローダーをインストールできませんでした。インストールコマンド 
    {!s}
     がエラーコード {!s} を返しました。"
+"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
+"{suffix!s}。"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "ハードウェアクロックの設定"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ファイルシステムをアンマウント。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfsを使用してinitramfsを作成します。"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ファイルシステムに書き込んでいます。"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "ターゲットでmkinitfsを実行できませんでした"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "エラーコード {} によりrsyncを失敗。"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "停止コードは {} でした"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "イメージ {}/{}, ファイル {}/{} を解凍しています"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutとinitramfsを作成しています。"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} の解凍を開始しています"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "ターゲット上で dracut の実行に失敗"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "イメージ  \"{}\" の展開に失敗"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfsを設定しています。"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントがありません"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcryptサービスを設定しています。"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstabを書き込んでいます。"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントが不正です"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "
    {!s}
     が使用する 
    {!s}
     設定が指定されていません。"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "unsquash の設定が不正です"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) のファイルシステムは、現在のカーネルではサポートされていません"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "ロケールを設定しています。"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "ソースファイルシステム  \"{}\" は存在しません"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "ネットワーク設定を保存しています。"
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "unsquashfs が見つかりませんでした。 squashfs-toolsがインストールされているか、確認してください。"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po
index 7017f998e9..748f6c6fd5 100644
--- a/lang/python/kk/LC_MESSAGES/python.po
+++ b/lang/python/kk/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: kk\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po
index 38989f06cb..7d0b2da4b8 100644
--- a/lang/python/kn/LC_MESSAGES/python.po
+++ b/lang/python/kn/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index 6d3f2b5f53..857ef4d80c 100644
--- a/lang/python/ko/LC_MESSAGES/python.po
+++ b/lang/python/ko/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: JungHee Lee , 2021\n"
 "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
@@ -22,134 +22,19 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB 구성"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "파티션 마운트 중."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "구성 오류"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "사용할 
    {!s}
    에 대해 정의된 파티션이 없음."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd 서비스 구성"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "서비스를 수정할 수 없음"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
-"s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "파일 시스템 마운트를 해제합니다."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "파일 시스템을 채우는 중."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync가 {} 오류 코드로 실패했습니다."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "이미지 {}/{}, 파일 {}/{} 압축푸는 중"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} 압축 풀기 시작 중"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다."
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "루트 파티션에 대한 마운트 위치 없음"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "루트 파티션에 대한 잘못된 마운트 위치"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "잘못된 unsquash 구성"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({})에 대한 파일 시스템은 현재 커널에서 지원되지 않습니다."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "부트로더 설치."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "부트로더 설치 오류"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치되어 있는지 확인하십시오."
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr "부트로더를 설치할 수 없습니다. 
    {!s}
     설치 명령에서  {!s} 오류 코드를 반환했습니다."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -207,22 +92,154 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio 구성 중."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracut을 사용하여 initramfs 만들기."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "대상에서 dracut을 실행하지 못함"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "종료 코드 {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "더미 파이썬 작업."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "더미 파이썬 단계 {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab 쓰기."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "구성 오류"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "사용할 
    {!s}
    에 대해 정의된 파티션이 없음."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "
    {!s}
    에서 사용할 루트 마운트 지점이 제공되지 않음."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "
    {!s}
     구성 없음은 
    {!s}
    을(를) 사용할 수 있도록 제공됩니다."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB 구성"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "하드웨어 클럭 설정 중."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio 구성 중."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs 구성 중."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "로컬 구성 중."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "암호화된 스왑 구성 중."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs로 initramfs 생성 중."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "파티션 마운트 중."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "네트워크 구성 저장 중."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt 서비스 구성 중."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "패키지를 설치합니다."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "패키지 처리중 (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "패키지 관리자 오류"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "플리머스 테마 구성"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "데이터 설치중."
@@ -247,6 +264,11 @@ msgstr ""
 "run-level {level!s}의 service {name!s}에 대해 알 수 없는 service-action "
 "{arg!s}입니다."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "서비스를 수정할 수 없음"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -272,123 +294,99 @@ msgid ""
 "exist."
 msgstr "{name!s} 서비스에 대한 경로는 {path!s}이고, 존재하지 않습니다."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "플리머스 테마 구성"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "패키지를 설치합니다."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "패키지 처리중 (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd 서비스 구성"
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "패키지 관리자 오류"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "부트로더 설치."
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "부트로더 설치 오류"
+"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
+"s}."
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr "부트로더를 설치할 수 없습니다. 
    {!s}
     설치 명령에서  {!s} 오류 코드를 반환했습니다."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "파일 시스템 마운트를 해제합니다."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "하드웨어 클럭 설정 중."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "파일 시스템을 채우는 중."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs로 initramfs 생성 중."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync가 {} 오류 코드로 실패했습니다."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "이미지 {}/{}, 파일 {}/{} 압축푸는 중"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "종료 코드 {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} 압축 풀기 시작 중"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracut을 사용하여 initramfs 만들기."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다."
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "대상에서 dracut을 실행하지 못함"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "루트 파티션에 대한 마운트 위치 없음"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs 구성 중."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt 서비스 구성 중."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "루트 파티션에 대한 잘못된 마운트 위치"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab 쓰기."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "
    {!s}
     구성 없음은 
    {!s}
    을(를) 사용할 수 있도록 제공됩니다."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "잘못된 unsquash 구성"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "더미 파이썬 작업."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({})에 대한 파일 시스템은 현재 커널에서 지원되지 않습니다."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "더미 파이썬 단계 {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "로컬 구성 중."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치되어 있는지 확인하십시오."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "네트워크 구성 저장 중."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
diff --git a/lang/python/ko_KR/LC_MESSAGES/python.po b/lang/python/ko_KR/LC_MESSAGES/python.po
index 75302ae602..fe6c202a39 100644
--- a/lang/python/ko_KR/LC_MESSAGES/python.po
+++ b/lang/python/ko_KR/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Korean (Korea) (https://www.transifex.com/calamares/teams/20061/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,122 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po
index c4515f106a..0804a62dc6 100644
--- a/lang/python/lo/LC_MESSAGES/python.po
+++ b/lang/python/lo/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,122 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po
index d1c10622e1..e47cfd9b13 100644
--- a/lang/python/lt/LC_MESSAGES/python.po
+++ b/lang/python/lt/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Moo, 2021\n"
 "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
@@ -22,138 +22,21 @@ msgstr ""
 "Language: lt\n"
 "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigūruoti GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Prijungiami skaidiniai."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Konfigūracijos klaida"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
    {!s}
     naudojimui."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigūruoti systemd tarnybas"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nepavyksta modifikuoti tarnybos"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Nežinomos systemd komandos {command!s} ir "
-"{suffix!s} įtaisui {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Atjungti failų sistemas."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Užpildomos failų sistemos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync patyrė nesėkmę su klaidos kodu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Išpakuojamas atvaizdis {}/{}, failas {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Pradedama išpakuoti {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Nepavyko išpakuoti atvaizdį „{}“"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nėra prijungimo taško šaknies skaidiniui"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage viduje nėra „rootMountPoint“ rakto, nieko nedaroma"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Blogas šaknies skaidinio prijungimo taškas"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint yra „{}“, kurio nėra, nieko nedaroma"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Bloga unsquash konfigūracija"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta „{}“ ({})"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Įdiegti operacinės sistemos paleidyklę."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Šaltinio failų sistemos „{}“ nėra"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Operacinės sistemos paleidyklės diegimo klaida"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nepavyko rasti unsquashfs, įsitikinkite, kad esate įdiegę squashfs-tools "
-"paketą"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
+"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
+"
    {!s}
     grąžino klaidos kodą {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -211,81 +94,107 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigūruojama mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Sukuriama initramfs naudojant dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nepavyko paskirties vietoje paleisti dracut"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Išėjimo kodas buvo {}"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktyvi python užduotis."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktyvus python žingsnis {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Rašoma fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Konfigūracijos klaida"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
    {!s}
     naudojimui."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nėra nurodyta jokių šaknies prijungimo taškų, skirtų 
    {!s}
     "
 "naudojimui."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigūruojamas šifruotas sukeitimų skaidinys."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Nenurodyta jokia 
    {!s}
     konfigūracija, kurią 
    {!s}
     galėtų"
+" naudoti."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Įdiegiami duomenys."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigūruoti GRUB."
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigūruoti OpenRC tarnybas"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nustatomas aparatinės įrangos laikrodis."
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Nepavyksta pridėti tarnybą {name!s} į vykdymo lygmenį {level!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigūruojama mkinitcpio."
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Nepavyksta pašalinti tarnybą {name!s} iš vykdymo lygmens {level!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigūruojama initramfs."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Nežinomas tarnybos veiksmas {arg!s}, skirtas tarnybai {name!s} "
-"vykdymo lygmenyje {level!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigūruojamos lokalės."
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigūruojamas šifruotas sukeitimų skaidinys."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Paskirties vykdymo lygmens nėra"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Kuriama initramfs naudojant mkinitfs."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Vykdymo lygmens {level!s} kelias yra {path!s}, kurio savo "
-"ruožtu nėra."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Paskirties tarnybos nėra"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Prijungiami skaidiniai."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Įrašoma tinklo konfigūracija."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigūruoti Plymouth temą"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -315,12 +224,12 @@ msgstr[1] "Šalinami %(num)d paketai."
 msgstr[2] "Šalinama %(num)d paketų."
 msgstr[3] "Šalinama %(num)d paketų."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr "Paketų tvarkytuvės klaida"
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
@@ -328,7 +237,7 @@ msgstr ""
 "Paketų tvarkytuvei nepavyko paruošti atnaujinimų. Komanda 
    {!s}
     "
 "grąžino klaidos kodą {!s}."
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
@@ -336,7 +245,7 @@ msgstr ""
 "Paketų tvarkytuvei nepavyko atnaujinti sistemos. Komanda 
    {!s}
     "
 "grąžino klaidos kodą {!s}."
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
@@ -344,77 +253,166 @@ msgstr ""
 "Paketų tvarkytuvei nepavyko atlikti pakeitimų įdiegtoje sistemoje. Komanda "
 "
    {!s}
     grąžino klaidos kodą {!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Įdiegti operacinės sistemos paleidyklę."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigūruoti Plymouth temą"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Operacinės sistemos paleidyklės diegimo klaida"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Įdiegiami duomenys."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigūruoti OpenRC tarnybas"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Nepavyksta pridėti tarnybą {name!s} į vykdymo lygmenį {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Nepavyksta pašalinti tarnybą {name!s} iš vykdymo lygmens {level!s}."
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
-"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
-"
    {!s}
     grąžino klaidos kodą {!s}."
+"Nežinomas tarnybos veiksmas {arg!s}, skirtas tarnybai {name!s} "
+"vykdymo lygmenyje {level!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nustatomas aparatinės įrangos laikrodis."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Nepavyksta modifikuoti tarnybos"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Kuriama initramfs naudojant mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Paskirties vykdymo lygmens nėra"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Išėjimo kodas buvo {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Vykdymo lygmens {level!s} kelias yra {path!s}, kurio savo "
+"ruožtu nėra."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Sukuriama initramfs naudojant dracut."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Paskirties tarnybos nėra"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nepavyko paskirties vietoje paleisti dracut"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigūruojama initramfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigūruoti systemd tarnybas"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Rašoma fstab."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Nenurodyta jokia 
    {!s}
     konfigūracija, kurią 
    {!s}
     galėtų"
-" naudoti."
+"Nežinomos systemd komandos {command!s} ir "
+"{suffix!s} įtaisui {name!s}."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktyvi python užduotis."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Atjungti failų sistemas."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktyvus python žingsnis {}"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Užpildomos failų sistemos."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigūruojamos lokalės."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync patyrė nesėkmę su klaidos kodu {}."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Įrašoma tinklo konfigūracija."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Išpakuojamas atvaizdis {}/{}, failas {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Pradedama išpakuoti {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepavyko išpakuoti atvaizdį „{}“"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nėra prijungimo taško šaknies skaidiniui"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage viduje nėra „rootMountPoint“ rakto, nieko nedaroma"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Blogas šaknies skaidinio prijungimo taškas"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint yra „{}“, kurio nėra, nieko nedaroma"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Bloga unsquash konfigūracija"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta „{}“ ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Šaltinio failų sistemos „{}“ nėra"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nepavyko rasti unsquashfs, įsitikinkite, kad esate įdiegę squashfs-tools "
+"paketą"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po
index 9c1a06033b..3318346533 100644
--- a/lang/python/lv/LC_MESSAGES/python.po
+++ b/lang/python/lv/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,223 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +258,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,126 +288,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po
index 4edd1b7ece..e2af880b5b 100644
--- a/lang/python/mk/LC_MESSAGES/python.po
+++ b/lang/python/mk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Martin Ristovski , 2018\n"
 "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n"
@@ -21,131 +21,18 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr ""
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,71 +89,102 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr ""
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -293,96 +211,176 @@ msgid_plural "Removing %(num)d packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po
index 03ff8a7c2c..af0570b5cf 100644
--- a/lang/python/ml/LC_MESSAGES/python.po
+++ b/lang/python/ml/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Balasankar C , 2019\n"
 "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n"
@@ -22,201 +22,221 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -241,6 +261,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -266,124 +291,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po
index 16b6cd832c..7b6802c41b 100644
--- a/lang/python/mr/LC_MESSAGES/python.po
+++ b/lang/python/mr/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po
index 5041680d79..f2c84468aa 100644
--- a/lang/python/nb/LC_MESSAGES/python.po
+++ b/lang/python/nb/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 865ac004d9acf2568b2e4b389e0007c7_fba755c <3516cc82d94f87187da1e036e5f09e42_616112>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installer pakker."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,124 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installer pakker."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr ""
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ne/LC_MESSAGES/python.po b/lang/python/ne/LC_MESSAGES/python.po
index a681def560..3781bdfe3f 100644
--- a/lang/python/ne/LC_MESSAGES/python.po
+++ b/lang/python/ne/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Nepali (https://www.transifex.com/calamares/teams/20061/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po
index 95117a1b1d..585f52c769 100644
--- a/lang/python/ne_NP/LC_MESSAGES/python.po
+++ b/lang/python/ne_NP/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: ne_NP\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po
index 222c5169d0..ef25fb2998 100644
--- a/lang/python/nl/LC_MESSAGES/python.po
+++ b/lang/python/nl/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Adriaan de Groot , 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
@@ -22,143 +22,19 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB instellen."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Partities mounten."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Configuratiefout"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Geen partities gedefinieerd voor 
    {!s}
     om te gebruiken."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configureer systemd services "
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "De service kan niet worden gewijzigd"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-"De systemd service {name!s} kon niet worden ingeschakeld."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Onbekende systemd opdrachten {command!s} en "
-"{suffix!s} voor unit {name!s}. "
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount bestandssystemen."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Bestandssystemen opvullen."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync mislukte met foutcode {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Bestandssysteem uitpakken {}/{}, bestand {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Beginnen met uitpakken van {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Uitpakken van bestandssysteem \"{}\" mislukt"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Geen mount-punt voor de root-partitie"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage bevat geen sleutel \"rootMountPoint\", er wordt niks gedaan"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Onjuist mount-punt voor de root-partitie"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-"rootMountPoint is ingesteld op \"{}\", welke niet bestaat, er wordt niks "
-"gedaan"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Foutieve unsquash configuratie"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installeer bootloader"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"Het bestandssysteem voor \"{}\" ({}) wordt niet ondersteund door je huidige "
-"kernel"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Het bronbestandssysteem \"{}\" bestaat niet"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs niet gevonden, verifieer dat je het squashfs-tools pakket heb "
-"geïnstalleerd"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -216,23 +92,156 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Display manager configuratie was incompleet"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Instellen van mkinitcpio"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "initramfs aanmaken met dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Uitvoeren van dracut op het doel is mislukt"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "De afsluitcode was {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Voorbeeld Python-taak"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Voorbeeld Python-stap {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab schrijven."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Configuratiefout"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Geen partities gedefinieerd voor 
    {!s}
     om te gebruiken."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Geen hoofd mount punt is gegeven voor 
    {!s}
     om te gebruiken. "
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB instellen."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Instellen van hardwareklok"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Instellen van mkinitcpio"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Instellen van initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Taal en locatie instellen."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Instellen van versleutelde swap."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Een initramfs wordt aangemaakt met mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partities mounten."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Netwerk-configuratie opslaan."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configureren van OpenRC dmcrypt service."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Pakketten installeren."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Pakket installeren."
+msgstr[1] "%(num)d pakketten installeren."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Pakket verwijderen."
+msgstr[1] "%(num)d pakketten verwijderen."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth thema instellen"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Data aan het installeren."
@@ -257,6 +266,11 @@ msgstr ""
 "Onbekende serviceactie {arg!s} voor service {name!s} in "
 "runlevel {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "De service kan niet worden gewijzigd"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,124 +300,108 @@ msgid ""
 msgstr ""
 "Het pad voor service {level!s} is {path!s}, welke niet bestaat"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth thema instellen"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Pakketten installeren."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Pakket installeren."
-msgstr[1] "%(num)d pakketten installeren."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Pakket verwijderen."
-msgstr[1] "%(num)d pakketten verwijderen."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configureer systemd services "
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
+"{num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
+"De systemd service {name!s} kon niet worden ingeschakeld."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installeer bootloader"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Onbekende systemd opdrachten {command!s} en "
+"{suffix!s} voor unit {name!s}. "
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Instellen van hardwareklok"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount bestandssystemen."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Een initramfs wordt aangemaakt met mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Bestandssystemen opvullen."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync mislukte met foutcode {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "De afsluitcode was {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Bestandssysteem uitpakken {}/{}, bestand {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "initramfs aanmaken met dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Beginnen met uitpakken van {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Uitvoeren van dracut op het doel is mislukt"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Uitpakken van bestandssysteem \"{}\" mislukt"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Instellen van initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Geen mount-punt voor de root-partitie"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configureren van OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage bevat geen sleutel \"rootMountPoint\", er wordt niks gedaan"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab schrijven."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Onjuist mount-punt voor de root-partitie"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
+"rootMountPoint is ingesteld op \"{}\", welke niet bestaat, er wordt niks "
+"gedaan"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Voorbeeld Python-taak"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Foutieve unsquash configuratie"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Voorbeeld Python-stap {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Het bestandssysteem voor \"{}\" ({}) wordt niet ondersteund door je huidige "
+"kernel"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Taal en locatie instellen."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Het bronbestandssysteem \"{}\" bestaat niet"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Netwerk-configuratie opslaan."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs niet gevonden, verifieer dat je het squashfs-tools pakket heb "
+"geïnstalleerd"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po
index 3085d44afc..71dae327ab 100644
--- a/lang/python/pl/LC_MESSAGES/python.po
+++ b/lang/python/pl/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jacob B. , 2021\n"
 "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
@@ -24,143 +24,19 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfiguracja GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montowanie partycji."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Błąd konfiguracji"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nie ma zdefiniowanych partycji dla 
    {!s}
     do użytku."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguracja usług systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nie można zmodyfikować usług"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nie można włączyć usługi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nie można włączyć celu w systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nie można wyłączyć celu w systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nie można zamaskować jednostki systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Nieznana komenda systemd {command!s} oraz "
-"{suffix!s} dla jednostki {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odmontuj systemy plików."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Zapełnianie systemu plików."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync zakończyło działanie kodem błędu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Rozpoczynanie odpakowywania {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Błąd rozpakowywania obrazu \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Brak punktu montowania partycji root"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nie zawiera klucza \"rootMountPoint\", nic nie zostanie "
-"zrobione"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Błędny punkt montowania partycji root"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-"Punkt montowania partycji root (rootMountPoint) jest \"{}\", które nie "
-"istnieje; nic nie zostanie zrobione"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Błędna konfiguracja unsquash"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalacja programu rozruchowego."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego "
-"systemu"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Źródłowy system plików \"{}\" nie istnieje"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nie można odnaleźć unsquashfs, upewnij się, że masz zainstalowany pakiet "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -218,23 +94,160 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracja menedżera wyświetlania była niekompletna"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurowanie mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Tworzenie initramfs z dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nie udało się włączyć dracut."
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Kod wyjściowy to {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Zadanie fikcyjne Python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Krok fikcyjny Python {}"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisywanie fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Błąd konfiguracji"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nie ma zdefiniowanych partycji dla 
    {!s}
     do użytku."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nie znaleziono głównego punktu montowania dla 
    {!s}
     do użycia."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfiguracja GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ustawianie zegara systemowego."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurowanie mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurowanie initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurowanie ustawień lokalnych."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurowanie zaszyfrowanej przestrzeni wymiany."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Tworzenie initramfs z mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nie udało się włączyć mkinitfs."
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montowanie partycji."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Zapisywanie konfiguracji sieci."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurowanie usługi OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Zainstaluj pakiety."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalowanie jednego pakietu."
+msgstr[1] "Instalowanie %(num)d pakietów."
+msgstr[2] "Instalowanie %(num)d pakietów."
+msgstr[3] "Instalowanie%(num)d pakietów."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Usuwanie jednego pakietu."
+msgstr[1] "Usuwanie %(num)d pakietów."
+msgstr[2] "Usuwanie %(num)d pakietów."
+msgstr[3] "Usuwanie %(num)d pakietów."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguracja motywu Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalowanie danych."
@@ -261,6 +274,11 @@ msgstr ""
 "Nieznana akcja-usługi {arg!s} dla usługi {name!s} w poziomie-"
 "uruchamiania {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Nie można zmodyfikować usług"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -289,128 +307,108 @@ msgid ""
 "exist."
 msgstr "Ścieżka do usługi {name!s} to {path!s},  nie istnieje."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguracja motywu Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Zainstaluj pakiety."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalowanie jednego pakietu."
-msgstr[1] "Instalowanie %(num)d pakietów."
-msgstr[2] "Instalowanie %(num)d pakietów."
-msgstr[3] "Instalowanie%(num)d pakietów."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Usuwanie jednego pakietu."
-msgstr[1] "Usuwanie %(num)d pakietów."
-msgstr[2] "Usuwanie %(num)d pakietów."
-msgstr[3] "Usuwanie %(num)d pakietów."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguracja usług systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nie można włączyć usługi systemd {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nie można włączyć celu w systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalacja programu rozruchowego."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nie można wyłączyć celu w systemd {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nie można zamaskować jednostki systemd {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Nieznana komenda systemd {command!s} oraz "
+"{suffix!s} dla jednostki {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ustawianie zegara systemowego."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontuj systemy plików."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Tworzenie initramfs z mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Zapełnianie systemu plików."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nie udało się włączyć mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync zakończyło działanie kodem błędu {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kod wyjściowy to {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Tworzenie initramfs z dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Rozpoczynanie odpakowywania {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nie udało się włączyć dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Błąd rozpakowywania obrazu \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurowanie initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Brak punktu montowania partycji root"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurowanie usługi OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nie zawiera klucza \"rootMountPoint\", nic nie zostanie "
+"zrobione"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisywanie fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Błędny punkt montowania partycji root"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
+"Punkt montowania partycji root (rootMountPoint) jest \"{}\", które nie "
+"istnieje; nic nie zostanie zrobione"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Zadanie fikcyjne Python."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Błędna konfiguracja unsquash"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Krok fikcyjny Python {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego "
+"systemu"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurowanie ustawień lokalnych."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Źródłowy system plików \"{}\" nie istnieje"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Zapisywanie konfiguracji sieci."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nie można odnaleźć unsquashfs, upewnij się, że masz zainstalowany pakiet "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index 3ceeeb09a5..2224ed2ab4 100644
--- a/lang/python/pt_BR/LC_MESSAGES/python.po
+++ b/lang/python/pt_BR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Guilherme Marçal Silva, 2021\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
@@ -22,138 +22,21 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando partições."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Erro de Configuração."
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Sem partições definidas para uso por 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços do systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Não é possível modificar o serviço"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"A chamada systemctl {arg!s} no chroot retornou o código de erro"
-" {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível habilitar o serviço {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível habilitar o alvo {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade {name!s} do systemd."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comandos desconhecidos do systemd {command!s} e "
-"{suffix!s} para a unidade {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar os sistemas de arquivos."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Preenchendo sistemas de arquivos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "O rsync falhou com o código de erro {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Descompactando imagem {}/{}, arquivo {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Começando a descompactar {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nenhum ponto de montagem para a partição root"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "O globalstorage não contém uma chave \"rootMountPoint\". Nada foi feito."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ponto de montagem incorreto para a partição root"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "O rootMountPoint é \"{}\", mas ele não existe. Nada foi feito."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuração incorreta do unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Não há suporte para o sistema de arquivos \"{}\" ({}) no seu kernel atual"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar carregador de inicialização."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "O sistema de arquivos de origem \"{}\" não existe"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de inicialização"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Ocorreu uma falha ao localizar o unsquashfs, certifique-se de que o pacote "
-"squashfs-tools esteja instalado"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "A destinação \"{}\" no sistema de destino não é um diretório"
+"O carregador de inicialização não pôde ser instalado. O comando de "
+"instalação 
    {!s}
     retornou o código de erro {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,23 +95,164 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gerenciador de exibição está incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando initramfs com dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Erro ao executar dracut no alvo"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa modelo python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Etapa modelo python {}"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escrevendo fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Erro de Configuração."
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Sem partições definidas para uso por 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nenhum ponto de montagem para o root fornecido para uso por 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Nenhuma configuração 
    {!s}
     é dada para que 
    {!s}
     possa "
+"utilizar."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando relógio de hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locais."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando swap encriptada."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Criando initramfs com mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar mkinitfs no alvo"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando partições."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvando configuração de rede."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando serviço dmcrypt do OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar pacotes."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processando pacotes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando um pacote."
+msgstr[1] "Instalando %(num)d pacotes."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removendo um pacote."
+msgstr[1] "Removendo %(num)d pacotes."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Erro do Gerenciador de Pacotes"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
+"
    {!s}
     retornou o código de erro {!s}."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
+"
    {!s}
     retornou o código de erro {!s}."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
+"comando 
    {!s}
     retornou o código de erro {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando os dados."
@@ -255,6 +279,11 @@ msgstr ""
 "Serviço de ação {arg!s} desconhecido para o serviço {name!s} no"
 " nível de execução {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Não é possível modificar o serviço"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,134 +315,103 @@ msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, o qual não "
 "existe."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar pacotes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processando pacotes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando um pacote."
-msgstr[1] "Instalando %(num)d pacotes."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removendo um pacote."
-msgstr[1] "Removendo %(num)d pacotes."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Erro do Gerenciador de Pacotes"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços do systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
-"
    {!s}
     retornou o código de erro {!s}."
+"A chamada systemctl {arg!s} no chroot retornou o código de erro"
+" {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
-"
    {!s}
     retornou o código de erro {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível habilitar o serviço {name!s} do systemd."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
-"comando 
    {!s}
     retornou o código de erro {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível habilitar o alvo {name!s} do systemd."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar carregador de inicialização."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de inicialização"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade {name!s} do systemd."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"O carregador de inicialização não pôde ser instalado. O comando de "
-"instalação 
    {!s}
     retornou o código de erro {!s}."
+"Comandos desconhecidos do systemd {command!s} e "
+"{suffix!s} para a unidade {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando relógio de hardware."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar os sistemas de arquivos."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Criando initramfs com mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Preenchendo sistemas de arquivos."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar mkinitfs no alvo"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "O rsync falhou com o código de erro {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Descompactando imagem {}/{}, arquivo {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Criando initramfs com dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Começando a descompactar {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Erro ao executar dracut no alvo"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando serviço dmcrypt do OpenRC."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "O globalstorage não contém uma chave \"rootMountPoint\". Nada foi feito."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escrevendo fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem incorreto para a partição root"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Nenhuma configuração 
    {!s}
     é dada para que 
    {!s}
     possa "
-"utilizar."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "O rootMountPoint é \"{}\", mas ele não existe. Nada foi feito."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa modelo python."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuração incorreta do unsquash"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Etapa modelo python {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Não há suporte para o sistema de arquivos \"{}\" ({}) no seu kernel atual"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locais."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de arquivos de origem \"{}\" não existe"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Salvando configuração de rede."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ocorreu uma falha ao localizar o unsquashfs, certifique-se de que o pacote "
+"squashfs-tools esteja instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "A destinação \"{}\" no sistema de destino não é um diretório"
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index 66cabb331b..06ad17f99e 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Hugo Carvalho , 2021\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
@@ -23,140 +23,21 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar o GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "A montar partições."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Erro de configuração"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nenhuma partição está definida para 
    {!s}
     usar."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Não é possível modificar serviço"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chamar pelo chroot retornou com código de "
-"erro {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível ativar o serviço systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível ativar o destino do systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desativar o destino do systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade do systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Comandos do systemd desconhecidos {command!s} e "
-"{suffix!s} por unidade {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de ficheiros."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "A preencher os sistemas de ficheiros."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falhou com código de erro {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "A descompactar imagem {}/{}, ficheiro {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "A começar a descompactação {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Falha ao descompactar imagem \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nenhum ponto de montagem para a partição root"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage não contém um \"rootMountPoint\" chave, nada a fazer"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ponto de montagem mau para partição root"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Má configuração unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"O sistema de ficheiros para \"{}\" ({}) não é suportado pelo seu kernel "
-"atual"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar o carregador de arranque."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "O sistema de ficheiros fonte \"{}\" não existe"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de arranque"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Falha ao procurar unsquashfs, certifique-se que tem o pacote squashfs-tools "
-"instalado"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "O destino \"{}\" no sistema de destino não é um diretório"
+"Não foi possível instalar o carregador de arranque. O comando de instalação "
+"
    {!s}
     apresentou o código de erro {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -215,22 +96,161 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gestor de exibição estava incompleta"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "A configurar o mkintcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando o initramfs com o dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Falha ao executar o dracut no destino"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa Dummy python."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passo Dummy python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "A escrever o fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Erro de configuração"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nenhuma partição está definida para 
    {!s}
     usar."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nenhum ponto de montagem root é fornecido para 
    {!s}
     usar."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Não é dada nenhuma configuração 
    {!s}
     para 
    {!s}
     "
+"utilizar."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar o GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "A definir o relógio do hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "A configurar o mkintcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "A configurar o initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "A configurar a localização."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando a swap criptografada."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "A criar o initramfs com o mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar o mkintfs no destino"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "A montar partições."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "A guardar a configuração de rede."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "A configurar o serviço OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar pacotes."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "A processar pacotes (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "A instalar um pacote."
+msgstr[1] "A instalar %(num)d pacotes."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "A remover um pacote."
+msgstr[1] "A remover %(num)d pacotes."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Erro do gestor de pacotes"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu preparar atualizações. O comando "
+"
    {!s}
     apresentou o código de erro {!s}."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
+"
    {!s}
     apresentou o código de erro {!s}."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "A instalar dados."
@@ -257,6 +277,11 @@ msgstr ""
 "Serviço de ação desconhecido {arg!s} para serviço {name!s} em "
 "nível de execução {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Não é possível modificar serviço"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -287,132 +312,105 @@ msgid ""
 msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, que não existe."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar pacotes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "A processar pacotes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "A instalar um pacote."
-msgstr[1] "A instalar %(num)d pacotes."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "A remover um pacote."
-msgstr[1] "A remover %(num)d pacotes."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Erro do gestor de pacotes"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"O gestor de pacotes não conseguiu preparar atualizações. O comando "
-"
    {!s}
     apresentou o código de erro {!s}."
+"systemctl {arg!s} chamar pelo chroot retornou com código de "
+"erro {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
-"
    {!s}
     apresentou o código de erro {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível ativar o serviço systemd {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível ativar o destino do systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar o carregador de arranque."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desativar o destino do systemd {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de arranque"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade do systemd {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Não foi possível instalar o carregador de arranque. O comando de instalação "
-"
    {!s}
     apresentou o código de erro {!s}."
+"Comandos do systemd desconhecidos {command!s} e "
+"{suffix!s} por unidade {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "A definir o relógio do hardware."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "A criar o initramfs com o mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "A preencher os sistemas de ficheiros."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar o mkintfs no destino"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falhou com código de erro {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "A descompactar imagem {}/{}, ficheiro {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Criando o initramfs com o dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "A começar a descompactação {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Falha ao executar o dracut no destino"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Falha ao descompactar imagem \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "A configurar o initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "A configurar o serviço OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage não contém um \"rootMountPoint\" chave, nada a fazer"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "A escrever o fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem mau para partição root"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Não é dada nenhuma configuração 
    {!s}
     para 
    {!s}
     "
-"utilizar."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa Dummy python."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Má configuração unsquash"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passo Dummy python {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"O sistema de ficheiros para \"{}\" ({}) não é suportado pelo seu kernel "
+"atual"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "A configurar a localização."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de ficheiros fonte \"{}\" não existe"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "A guardar a configuração de rede."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Falha ao procurar unsquashfs, certifique-se que tem o pacote squashfs-tools "
+"instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "O destino \"{}\" no sistema de destino não é um diretório"
diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po
index 9affed1db9..ba2c8ab1f2 100644
--- a/lang/python/ro/LC_MESSAGES/python.po
+++ b/lang/python/ro/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Sebastian Brici , 2018\n"
 "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
@@ -22,201 +22,223 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Demonteaza sistemul de fisiere"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fictiv."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalează pachetele."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Se procesează pachetele (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalează un pachet."
+msgstr[1] "Se instalează %(num)d pachete."
+msgstr[2] "Se instalează %(num)d din pachete."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Se elimină un pachet."
+msgstr[1] "Se elimină %(num)d pachet."
+msgstr[2] "Se elimină %(num)d de pachete."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -241,6 +263,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -266,126 +293,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalează pachetele."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Se procesează pachetele (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalează un pachet."
-msgstr[1] "Se instalează %(num)d pachete."
-msgstr[2] "Se instalează %(num)d din pachete."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Se elimină un pachet."
-msgstr[1] "Se elimină %(num)d pachet."
-msgstr[2] "Se elimină %(num)d de pachete."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demonteaza sistemul de fisiere"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fictiv."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po
index 06c62fbeb5..97b825a40d 100644
--- a/lang/python/ru/LC_MESSAGES/python.po
+++ b/lang/python/ru/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: ZIzA, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
@@ -22,132 +22,18 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Настройте GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтирование разделов."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Ошибка конфигурации"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Не определены разделы для использования 
    {!S}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Настройка systemd сервисов"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не могу изменить сервис"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Размонтирование файловой системы."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Наполнение файловой системы."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr ""
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Установить загрузчик."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -204,72 +90,103 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Создание initramfs с помощью dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не удалось запустить dracut на цели"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхода {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Настройка зашифрованного swap."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Запись fstab."
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Установка данных."
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Ошибка конфигурации"
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Настройка служб OpenRC"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Не определены разделы для использования 
    {!S}
    ."
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Настройте GRUB."
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Установка аппаратных часов."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Настройка initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Настройка языка."
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Настройка зашифрованного swap."
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Целевой сервис не существует."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтирование разделов."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Сохранение настроек сети."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Настроить тему Plymouth"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Настройка службы OpenRC dmcrypt."
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -299,96 +216,177 @@ msgstr[1] "Удаление %(num)d пакетов."
 msgstr[2] "Удаление %(num)d пакетов."
 msgstr[3] "Удаление %(num)d пакетов."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Установить загрузчик."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Настроить тему Plymouth"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Установка данных."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Настройка служб OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Установка аппаратных часов."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Не могу изменить сервис"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхода {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Создание initramfs с помощью dracut."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Целевой сервис не существует."
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не удалось запустить dracut на цели"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Настройка initramfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Настройка systemd сервисов"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Настройка службы OpenRC dmcrypt."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запись fstab."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Настройка языка."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Сохранение настроек сети."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Размонтирование файловой системы."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Наполнение файловой системы."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
diff --git a/lang/python/ru_RU/LC_MESSAGES/python.po b/lang/python/ru_RU/LC_MESSAGES/python.po
index 77ca09d205..b31c12c65f 100644
--- a/lang/python/ru_RU/LC_MESSAGES/python.po
+++ b/lang/python/ru_RU/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Russian (Russia) (https://www.transifex.com/calamares/teams/20061/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,225 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,128 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po
index bfe7ba3234..d72d1321a7 100644
--- a/lang/python/si/LC_MESSAGES/python.po
+++ b/lang/python/si/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Hela Basa, 2021\n"
 "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n"
@@ -21,201 +21,221 @@ msgstr ""
 "Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
-msgstr ""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ජාල වින්‍යාසය සුරැකෙමින්."
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -240,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -265,124 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
-msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
-msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
-
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
-
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "ජාල වින්‍යාසය සුරැකෙමින්."
diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po
index 12948a6700..d66f63bb8c 100644
--- a/lang/python/sk/LC_MESSAGES/python.po
+++ b/lang/python/sk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Dušan Kazik , 2020\n"
 "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
@@ -21,137 +21,20 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurácia zavádzača GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Pripájanie oddielov."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Chyba konfigurácie"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nie sú určené žiadne oddiely na použitie pre 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurácia služieb systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Nedá sa upraviť služba"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
-"kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedá sa povoliť služba systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Neznáme príkazy systému systemd {command!s} a "
-"{suffix!s} pre jednotku {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odpojenie súborových systémov."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Napĺňanie súborových systémov."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Príkaz rsync zlyhal s chybovým kódom {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Rozbaľuje sa obraz {}/{}, súbor {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Spúšťa sa rozbaľovanie {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Zlyhalo rozbalenie obrazu „{}“"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Žiadny bod pripojenia pre koreňový oddiel"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Zlý bod pripojenia pre koreňový oddiel"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Inštalácia zavádzača."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Nesprávna konfigurácia nástroja unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Súborový systém pre \"{}\" ({}) nie je podporovaný vaším aktuálnym jadrom"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Zdrojový súborový systém \"{}\" neexistuje"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
-
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Nedá sa zapísať konfiguračný súbor správcu KDM"
@@ -206,72 +89,103 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurácia správcu zobrazenia nebola úplná"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurácia mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváranie initramfs pomocou nástroja dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Zlyhalo spustenie nástroja dracut v cieli"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Kód skončenia bol {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktívna úloha jazyka python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktívny krok {} jazyka python"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisovanie fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Chyba konfigurácie"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nie sú určené žiadne oddiely na použitie pre 
    {!s}
    ."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre 
    {!s}
    ."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigurácia zašifrovaného odkladacieho priestoru."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Inštalácia údajov."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurácia zavádzača GRUB."
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigurácia služieb OpenRC"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavovanie hardvérových hodín."
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurácia mkinitcpio."
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurácia initramfs."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurácia miestnych nastavení."
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigurácia zašifrovaného odkladacieho priestoru."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Cieľová služba neexistuje"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Pripájanie oddielov."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukladanie sieťovej konfigurácie."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurácia motívu služby Plymouth"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -301,96 +215,180 @@ msgstr[1] "Odstraňujú sa %(num)d balíky."
 msgstr[2] "Odstraňuje sa %(num)d balíkov."
 msgstr[3] "Odstraňuje sa %(num)d balíkov."
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Inštalácia zavádzača."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurácia motívu služby Plymouth"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Inštalácia údajov."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigurácia služieb OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavovanie hardvérových hodín."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Nedá sa upraviť služba"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kód skončenia bol {}"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Vytváranie initramfs pomocou nástroja dracut."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Cieľová služba neexistuje"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Zlyhalo spustenie nástroja dracut v cieli"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurácia initramfs."
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurácia služieb systemd"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
+"kód {num!s}."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisovanie fstab."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedá sa povoliť služba systému systemd {name!s}."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Neznáme príkazy systému systemd {command!s} a "
+"{suffix!s} pre jednotku {name!s}."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktívna úloha jazyka python."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojenie súborových systémov."
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktívny krok {} jazyka python"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Napĺňanie súborových systémov."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurácia miestnych nastavení."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Príkaz rsync zlyhal s chybovým kódom {}."
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Ukladanie sieťovej konfigurácie."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbaľuje sa obraz {}/{}, súbor {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Spúšťa sa rozbaľovanie {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Zlyhalo rozbalenie obrazu „{}“"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Žiadny bod pripojenia pre koreňový oddiel"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Zlý bod pripojenia pre koreňový oddiel"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Nesprávna konfigurácia nástroja unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Súborový systém pre \"{}\" ({}) nie je podporovaný vaším aktuálnym jadrom"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový súborový systém \"{}\" neexistuje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po
index 42abdc76bb..284a18fba2 100644
--- a/lang/python/sl/LC_MESSAGES/python.po
+++ b/lang/python/sl/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,225 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +260,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,128 +290,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po
index e34ef08b7e..53f224071c 100644
--- a/lang/python/sq/LC_MESSAGES/python.po
+++ b/lang/python/sq/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Besnik Bleta , 2021\n"
 "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
@@ -21,139 +21,21 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Formësoni GRUB-in."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Po montohen pjesë."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Gabim Formësimi"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "S’ka pjesë të përkufizuara për 
    {!s}
     për t’u përdorur."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Formësoni shërbime systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "S’modifikohet dot shërbimi"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "S’aktivizohet dot objektivi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "S’maskohet dot njësia systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Urdhra të panjohur systemd {command!s} dhe "
-"{suffix!s} për njësi {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Çmontoni sisteme kartelash."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Po mbushen sisteme kartelash."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync dështoi me kod gabimi {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Po shpaketohet paketa {}/{}, kartela {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Po fillohet të shpaketohet {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Dështoi shpaketimi i figurës \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "S’ka pikë montimi për ndarjen rrënjë"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage nuk përmban një vlerë \"rootMountPoint\", s’po bëhet gjë"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Pikë e gabuar montimi për ndarjen rrënjë"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint është \"{}\", që s’ekziston, s’po bëhet gjë"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Formësim i keq i unsquash-it"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Sistemi i kartelave për \"{}\" ({}) nuk mbulohet nga kerneli juaj i tanishëm"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalo ngarkues nisjesh."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Gabim instalimi Ngarkuesi Nisësi"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"S’u arrit të gjendej unsquashfs, sigurohuni se e keni të instaluar paketën "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
+"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
    {!s}
     u "
+"përgjigj me kod gabimi {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -211,23 +93,163 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Po formësohet mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Po krijohet initramfs me dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "S’u arrit të xhirohej dracut mbi objektivin"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Kodi i daljes qe {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Akt python dummy."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hap python {} dummy"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Po shkruhet fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Gabim Formësimi"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "S’ka pjesë të përkufizuara për 
    {!s}
     për t’u përdorur."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "S’është dhënë pikë montimi rrënjë për 
    {!s}
     për t’u përdorur."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"S’është dhënë formësim 
    {!s}
     për t’u përdorur nga 
    {!s}
    ."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Formësoni GRUB-in."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Po caktohet ora hardware."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Po formësohet mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Po formësohet initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Po formësohen vendoret."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Po formësohet pjesë swap e fshehtëzuar."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Po krijohet initramfs me mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Po montohen pjesë."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Po ruhet formësimi i rrjetit."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Po formësohet shërbim OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalo paketa."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Po instalohet një paketë."
+msgstr[1] "Po instalohen %(num)d paketa."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Po hiqet një paketë."
+msgstr[1] "Po hiqen %(num)d paketa."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Gabim Përgjegjësi Paketash"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri 
    {!s}
     u"
+" përgjigj me kod gabimi {!s}."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri 
    {!s}
     u "
+"përgjigj me kod gabimi {!s}."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
+"
    {!s}
     u përgjigj me kod gabimi {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Formësoni temën Plimuth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Po instalohen të dhëna."
@@ -252,6 +274,11 @@ msgstr ""
 "Service-action {arg!s} i panjohur për shërbimin {name!s} te "
 "run-level {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "S’modifikohet dot shërbimi"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -283,133 +310,104 @@ msgstr ""
 "Shtegu për shërbimin {name!s} është {path!s}, i cili nuk "
 "ekziston."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Formësoni temën Plimuth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalo paketa."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Po përpunohen paketat (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Po instalohet një paketë."
-msgstr[1] "Po instalohen %(num)d paketa."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Po hiqet një paketë."
-msgstr[1] "Po hiqen %(num)d paketa."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Gabim Përgjegjësi Paketash"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Formësoni shërbime systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Përgjegjësi i paketave s’përgatiti dot përditësime. Urdhri 
    {!s}
     u"
-" përgjigj me kod gabimi {!s}."
+"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
+"{num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’përditësoi dot sistemin. Urdhri 
    {!s}
     u "
-"përgjigj me kod gabimi {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
-"
    {!s}
     u përgjigj me kod gabimi {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "S’aktivizohet dot objektivi systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalo ngarkues nisjesh."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Gabim instalimi Ngarkuesi Nisësi"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "S’maskohet dot njësia systemd {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
    {!s}
     u "
-"përgjigj me kod gabimi {!s}."
+"Urdhra të panjohur systemd {command!s} dhe "
+"{suffix!s} për njësi {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Po caktohet ora hardware."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Çmontoni sisteme kartelash."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Po krijohet initramfs me mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Po mbushen sisteme kartelash."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync dështoi me kod gabimi {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Kodi i daljes qe {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Po shpaketohet paketa {}/{}, kartela {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Po krijohet initramfs me dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Po fillohet të shpaketohet {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "S’u arrit të xhirohej dracut mbi objektivin"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Dështoi shpaketimi i figurës \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Po formësohet initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "S’ka pikë montimi për ndarjen rrënjë"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Po formësohet shërbim OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage nuk përmban një vlerë \"rootMountPoint\", s’po bëhet gjë"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Po shkruhet fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Pikë e gabuar montimi për ndarjen rrënjë"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"S’është dhënë formësim 
    {!s}
     për t’u përdorur nga 
    {!s}
    ."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint është \"{}\", që s’ekziston, s’po bëhet gjë"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Akt python dummy."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Formësim i keq i unsquash-it"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hap python {} dummy"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Sistemi i kartelave për \"{}\" ({}) nuk mbulohet nga kerneli juaj i tanishëm"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Po formësohen vendoret."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Po ruhet formësimi i rrjetit."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"S’u arrit të gjendej unsquashfs, sigurohuni se e keni të instaluar paketën "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po
index f581621a8f..ac0822784a 100644
--- a/lang/python/sr/LC_MESSAGES/python.po
+++ b/lang/python/sr/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Slobodan Simić , 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
@@ -21,131 +21,18 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Подеси ГРУБ"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтирање партиција."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Грешка поставе"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Подеси „systemd“ сервисе"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не могу да мењам сервис"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтирање фајл-система."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Попуњавање фајл-система."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync неуспешан са кодом грешке {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Неуспело распакивање одраза \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Нема тачке мотирања за root партицију"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Лоша тачка монтирања за корену партицију"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -202,71 +89,102 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Инсталирање података."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
 
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Уписивање fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Грешка поставе"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Подеси ГРУБ"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Подешавање локалитета."
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтирање партиција."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Упис поставе мреже."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -295,96 +213,176 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
 msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/packages/main.py:589
+#: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
+#: src/modules/packages/main.py:651
 msgid ""
 "The package manager could not update the system. The command 
    {!s}
    "
 " returned error code {!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Инсталирање података."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Не могу да мењам сервис"
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Подеси „systemd“ сервисе"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Уписивање fstab."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтирање фајл-система."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Попуњавање фајл-система."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync неуспешан са кодом грешке {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Подешавање локалитета."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Упис поставе мреже."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Неуспело распакивање одраза \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Нема тачке мотирања за root партицију"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Лоша тачка монтирања за корену партицију"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po
index 143777e541..21e634ab2b 100644
--- a/lang/python/sr@latin/LC_MESSAGES/python.po
+++ b/lang/python/sr@latin/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,223 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +258,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,126 +288,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po
index c0dba7b0b9..9c4e0b1a3a 100644
--- a/lang/python/sv/LC_MESSAGES/python.po
+++ b/lang/python/sv/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Luna Jernberg , 2021\n"
 "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
@@ -23,138 +23,21 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurera GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Monterar partitioner."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Konfigurationsfel"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Inga partitioner är definerade för 
    {!s}
     att använda."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurera systemd tjänster"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Kunde inte modifiera tjänst"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Anrop till systemctl {arg!s}i chroot returnerade felkod "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kunde inte aktivera systemd tjänst {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kunde inte aktivera systemd målsystem {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan inte maskera systemd unit {name!s}"
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Okända systemd kommandon {command!s} och {suffix!s} för "
-"enhet {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Avmontera filsystem."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Packar upp filsystem."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync misslyckades med felkod {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Packar upp avbild {}/{}, fil {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Börjar att packa upp {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Misslyckades att packa upp avbild \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ingen monteringspunkt för root partition"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage innehåller ingen \"rootMountPoint\"-nyckel, så gör inget"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Dålig monteringspunkt för root partition"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint är \"{}\", vilket inte finns, så gör inget"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Dålig unsquash konfiguration"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Filsystemet för \"{}\" ({}) stöds inte av din nuvarande kärna"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installera starthanterare."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Källfilsystemet \"{}\" existerar inte"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Starthanterare installationsfel"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Kunde inte hitta unsquashfs, se till att du har paketet squashfs-tools "
-"installerat"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
+"Starthanterare kunde inte installeras. Installationskommandot "
+"
    {!s}
    returnerade felkod {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,23 +95,164 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguration för displayhanteraren var inkomplett"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerar mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Skapar initramfs med dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Misslyckades att köra dracut på målet "
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Felkoden var {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Exempel python jobb"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Exempel python steg {}"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Konfigurationsfel"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Inga partitioner är definerade för 
    {!s}
     att använda."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Ingen root monteringspunkt är angiven för 
    {!s}
     att använda."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Ingen 
    {!s}
     konfiguration är angiven för 
    {!s}
     att "
+"använda. "
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurera GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ställer hårdvaruklockan."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerar mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerar initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerar språkinställningar"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurerar krypterad swap."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Skapar initramfs med mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Misslyckades att köra mkinitfs på målet "
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterar partitioner."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sparar nätverkskonfiguration."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerar OpenRC dmcrypt tjänst."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installera paket."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Bearbetar paket (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerar ett paket."
+msgstr[1] "Installerar %(num)d paket."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Tar bort ett paket."
+msgstr[1] "Tar bort %(num)d paket."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Pakethanterare fel"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte förbereda uppdateringar kommandot 
    {!s}
    "
+" returnerade felkod {!s}."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte uppdatera systemet. kommandot 
    {!s}
     "
+"returnerade felkod {!s}."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
+"kommandot 
    {!s}
     returnerade felkod {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurera Plymouth tema"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installerar data."
@@ -253,6 +277,11 @@ msgstr ""
 "Okänt tjänst-anrop {arg!s}för tjänsten {name!s} i körnivå "
 "{level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Kunde inte modifiera tjänst"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -283,134 +312,103 @@ msgid ""
 msgstr ""
 "Sökvägen för tjänst {name!s} är {path!s}, som inte existerar."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurera Plymouth tema"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installera paket."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Bearbetar paket (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerar ett paket."
-msgstr[1] "Installerar %(num)d paket."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Tar bort ett paket."
-msgstr[1] "Tar bort %(num)d paket."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Pakethanterare fel"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurera systemd tjänster"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Pakethanteraren kunde inte förbereda uppdateringar kommandot 
    {!s}
    "
-" returnerade felkod {!s}."
+"Anrop till systemctl {arg!s}i chroot returnerade felkod "
+"{num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte uppdatera systemet. kommandot 
    {!s}
     "
-"returnerade felkod {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kunde inte aktivera systemd tjänst {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
-"kommandot 
    {!s}
     returnerade felkod {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kunde inte aktivera systemd målsystem {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installera starthanterare."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Starthanterare installationsfel"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan inte maskera systemd unit {name!s}"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Starthanterare kunde inte installeras. Installationskommandot "
-"
    {!s}
    returnerade felkod {!s}."
+"Okända systemd kommandon {command!s} och {suffix!s} för "
+"enhet {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ställer hårdvaruklockan."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Avmontera filsystem."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Skapar initramfs med mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Packar upp filsystem."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Misslyckades att köra mkinitfs på målet "
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync misslyckades med felkod {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Felkoden var {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Packar upp avbild {}/{}, fil {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Skapar initramfs med dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Börjar att packa upp {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Misslyckades att köra dracut på målet "
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Misslyckades att packa upp avbild \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerar initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ingen monteringspunkt för root partition"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerar OpenRC dmcrypt tjänst."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage innehåller ingen \"rootMountPoint\"-nyckel, så gör inget"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Dålig monteringspunkt för root partition"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Ingen 
    {!s}
     konfiguration är angiven för 
    {!s}
     att "
-"använda. "
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint är \"{}\", vilket inte finns, så gör inget"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Exempel python jobb"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dålig unsquash konfiguration"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Exempel python steg {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Filsystemet för \"{}\" ({}) stöds inte av din nuvarande kärna"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerar språkinställningar"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Källfilsystemet \"{}\" existerar inte"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Sparar nätverkskonfiguration."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Kunde inte hitta unsquashfs, se till att du har paketet squashfs-tools "
+"installerat"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po
index 35ad32465b..291e4d0c88 100644
--- a/lang/python/te/LC_MESSAGES/python.po
+++ b/lang/python/te/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po
index bc26911935..fbcef8e1d9 100644
--- a/lang/python/tg/LC_MESSAGES/python.po
+++ b/lang/python/tg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Victor Ibragimov , 2020\n"
 "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n"
@@ -21,140 +21,19 @@ msgstr ""
 "Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Танзимоти GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Васлкунии қисмҳои диск."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Хатои танзимкунӣ"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Ягон қисми диск барои истифодаи 
    {!s}
     муайян карда нашуд."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Танзимоти хидматҳои systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Хидмат тағйир дода намешавад"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
-" вуҷуд овард."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Фармонҳои systemd-и номаълум {command!s} ва "
-"{suffix!s} барои воҳиди {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Ҷудо кардани низомҳои файлӣ."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Пурборкунӣ бо низомҳои файлӣ."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync бо рамзи хатои {} қатъ шуд."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Баровардани тимсол: {}/{}, файл: {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Оғози барориши {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Тимсоли \"{}\" бароварда нашуд"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ягон нуқтаи васл барои қисми диски реша (root) нест"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Насбкунии боркунандаи роҳандозӣ."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"globalstorage калиди \"rootMountPoint\"-ро дар бар намегирад, ҳeҷ кop "
-"намeкyнад"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Нуқтаи васли нодуруст барои қисми диски реша (root)"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint аз \"{}\" иборат аст, ки вуҷуд надорад, ҳeҷ кop намeкyнад"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Танзимоти unsquash нодуруст аст"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Низоми файлӣ барои \"{}\" ({}) бо ҳастаи ҷории шумо дастгирӣ намешавад"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Низоми файлии манбаи \"{}\" вуҷуд надорад"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"unsquashfs ёфт нашуд, мутмаин шавед, ки бастаи squashfs-tools насб карда "
-"шудааст"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -212,22 +91,155 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Танзимкунии mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Эҷодкунии initramfs бо dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "dracut дар низоми интихобшуда иҷро нашуд"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Рамзи барориш: {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Вазифаи амсилаи python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Қадами амсилаи python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Сабткунии fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Хатои танзимкунӣ"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Ягон қисми диск барои истифодаи 
    {!s}
     муайян карда нашуд."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Нуқтаи васли реша (root) барои истифодаи 
    {!s}
     дода нашуд."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Танзимоти GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Танзимкунии соати сахтафзор."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Танзимкунии mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Танзимкунии initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Танзимкунии маҳаллигардониҳо."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Танзимкунии мубодилаи рамзгузоришуда."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Эҷодкунии initramfs бо mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Васлкунии қисмҳои диск."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Нигоҳдории танзимоти шабака."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Танзимкунии хидмати OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Насбкунии қуттиҳо."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Насбкунии як баста."
+msgstr[1] "Насбкунии %(num)d баста."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Тозакунии як баста"
+msgstr[1] "Тозакунии %(num)d баста."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Танзимоти мавзӯи Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Насбкунии иттилоот."
@@ -252,6 +264,11 @@ msgstr ""
 "Хидмати амалии {arg!s} барои хидмати {name!s} дар run-level "
 "{level!s} номаълум аст."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Хидмат тағйир дода намешавад"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -283,124 +300,105 @@ msgstr ""
 "Масир барои хидмати {name!s} аз {path!s} иборат аст, аммо он "
 "вуҷуд надорад."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Танзимоти мавзӯи Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Насбкунии қуттиҳо."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Насбкунии як баста."
-msgstr[1] "Насбкунии %(num)d баста."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Тозакунии як баста"
-msgstr[1] "Тозакунии %(num)d баста."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Танзимоти хидматҳои systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
+" вуҷуд овард."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Насбкунии боркунандаи роҳандозӣ."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Фармонҳои systemd-и номаълум {command!s} ва "
+"{suffix!s} барои воҳиди {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Танзимкунии соати сахтафзор."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Ҷудо кардани низомҳои файлӣ."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Эҷодкунии initramfs бо mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Пурборкунӣ бо низомҳои файлӣ."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync бо рамзи хатои {} қатъ шуд."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Рамзи барориш: {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Баровардани тимсол: {}/{}, файл: {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Эҷодкунии initramfs бо dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Оғози барориши {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "dracut дар низоми интихобшуда иҷро нашуд"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Тимсоли \"{}\" бароварда нашуд"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Танзимкунии initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ягон нуқтаи васл барои қисми диски реша (root) нест"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Танзимкунии хидмати OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage калиди \"rootMountPoint\"-ро дар бар намегирад, ҳeҷ кop "
+"намeкyнад"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Сабткунии fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Нуқтаи васли нодуруст барои қисми диски реша (root)"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint аз \"{}\" иборат аст, ки вуҷуд надорад, ҳeҷ кop намeкyнад"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Вазифаи амсилаи python."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Танзимоти unsquash нодуруст аст"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Қадами амсилаи python {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Низоми файлӣ барои \"{}\" ({}) бо ҳастаи ҷории шумо дастгирӣ намешавад"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Танзимкунии маҳаллигардониҳо."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Низоми файлии манбаи \"{}\" вуҷуд надорад"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Нигоҳдории танзимоти шабака."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs ёфт нашуд, мутмаин шавед, ки бастаи squashfs-tools насб карда "
+"шудааст"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po
index e17496846d..97c7f90cba 100644
--- a/lang/python/th/LC_MESSAGES/python.po
+++ b/lang/python/th/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,122 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po
index c1884715ff..09b8be3e64 100644
--- a/lang/python/tr_TR/LC_MESSAGES/python.po
+++ b/lang/python/tr_TR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Demiray Muhterem , 2020\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@@ -22,138 +22,19 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB'u yapılandır."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölümlemeleri bağlanıyor."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Yapılandırma Hatası"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     kullanması için hiçbir bölüm tanımlanmadı."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd hizmetlerini yapılandır"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Hizmet değiştirilemiyor"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Systemd birimi maskeleyemiyor {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Bilinmeyen sistem komutları {command!s} ve "
-"{suffix!s}  {name!s} birimi için."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dosya sistemlerini ayırın."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Dosya sistemlerini dolduruyorum."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync {} hata koduyla başarısız oldu."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Açılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Dışa aktarım başlatılıyor {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" kurulum medyası aktarılamadı"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "kök disk bölümü için bağlama noktası yok"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükleyici kuruluyor"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"globalstorage bir \"rootMountPoint\" anahtarı içermiyor, hiçbirşey yapılmadı"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök disk bölümü için hatalı bağlama noktası"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash yapılandırma sorunlu"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) Dosya sistemi mevcut çekirdeğiniz tarafından desteklenmiyor"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" Kaynak dosya sistemi mevcut değil"
-
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Unsquashfs bulunamadı, squashfs-tools paketinin kurulu olduğundan emin olun."
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -211,22 +92,155 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Mkinitcpio yapılandırılıyor."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ile initramfs oluşturuluyor."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hedef üzerinde dracut çalıştırılamadı"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıkış kodu {} idi"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab dosyasına yazılıyor."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Yapılandırma Hatası"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     kullanması için hiçbir bölüm tanımlanmadı."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "
    {!s}
     kullanması için kök bağlama noktası verilmedi."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB'u yapılandır."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Donanım saati ayarlanıyor."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Mkinitcpio yapılandırılıyor."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Initramfs yapılandırılıyor."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Sistem yerelleri yapılandırılıyor."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Şifreli takas alanı yapılandırılıyor."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Mkinitfs ile initramfs oluşturuluyor."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hedefte mkinitfs çalıştırılamadı"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölümlemeleri bağlanıyor."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ağ yapılandırması kaydediliyor."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketleri yükle"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paketler işleniyor (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d paket yükleniyor"
+msgstr[1] "%(num)d paket yükleniyor"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d paket kaldırılıyor."
+msgstr[1] "%(num)d paket kaldırılıyor."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth temasını yapılandır"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Veri yükleniyor."
@@ -251,6 +265,11 @@ msgstr ""
 "Çalışma düzeyinde {level!s} hizmetinde {name!s} servisi için bilinmeyen "
 "hizmet eylemi {arg!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Hizmet değiştirilemiyor"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -278,124 +297,103 @@ msgid ""
 "exist."
 msgstr "{name!s} hizmetinin yolu {path!s}, ki mevcut değil."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth temasını yapılandır"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketleri yükle"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketler işleniyor (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d paket yükleniyor"
-msgstr[1] "%(num)d paket yükleniyor"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d paket kaldırılıyor."
-msgstr[1] "%(num)d paket kaldırılıyor."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd hizmetlerini yapılandır"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
+"{num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükleyici kuruluyor"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Systemd birimi maskeleyemiyor {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Bilinmeyen sistem komutları {command!s} ve "
+"{suffix!s}  {name!s} birimi için."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Donanım saati ayarlanıyor."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dosya sistemlerini ayırın."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Mkinitfs ile initramfs oluşturuluyor."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Dosya sistemlerini dolduruyorum."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hedefte mkinitfs çalıştırılamadı"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync {} hata koduyla başarısız oldu."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıkış kodu {} idi"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Açılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ile initramfs oluşturuluyor."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Dışa aktarım başlatılıyor {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hedef üzerinde dracut çalıştırılamadı"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kurulum medyası aktarılamadı"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Initramfs yapılandırılıyor."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "kök disk bölümü için bağlama noktası yok"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage bir \"rootMountPoint\" anahtarı içermiyor, hiçbirşey yapılmadı"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab dosyasına yazılıyor."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök disk bölümü için hatalı bağlama noktası"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash yapılandırma sorunlu"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) Dosya sistemi mevcut çekirdeğiniz tarafından desteklenmiyor"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Sistem yerelleri yapılandırılıyor."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" Kaynak dosya sistemi mevcut değil"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Ağ yapılandırması kaydediliyor."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Unsquashfs bulunamadı, squashfs-tools paketinin kurulu olduğundan emin olun."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po
index d4ef292bdc..0ebdf95a6e 100644
--- a/lang/python/uk/LC_MESSAGES/python.po
+++ b/lang/python/uk/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yuri Chornoivan , 2021\n"
 "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
@@ -23,143 +23,21 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Налаштовування GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтування розділів."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Помилка налаштовування"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Не визначено розділів для використання 
    {!s}
    ."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Налаштуйте служби systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Не вдалося змінити службу"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
-"повідомлення з кодом помилки {num! s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Не вдалося ввімкнути службу systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Не вдалося вимкнути завдання systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Не вдалося замаскувати вузол systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Невідомі команди systemd {command!s} та {suffix!s}"
-" для пристрою {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтувати файлові системи."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Заповнення файлових систем."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Розпаковуємо образ {} з {}, файл {} з {}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Починаємо розпаковувати {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Не вдалося розпакувати образ «{}»"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Немає точки монтування для кореневого розділу"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо "
-"ніяких дій."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Помилкова точна монтування для кореневого розділу"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
-"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не "
-"виконуватимемо ніяких дій."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Помилкові налаштування unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"У поточному ядрі системи не передбачено підтримки файлової системи «{}» ({})"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Встановити завантажувач."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Вихідної файлової системи «{}» не існує"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Помилка встановлення завантажувача"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Не вдалося знайти unsquashfs; переконайтеся, що встановлено пакет squashfs-"
-"tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Призначення «{}» у цільовій системі не є каталогом"
+"Не вдалося встановити завантажувач. Програмою для встановлення "
+"
    {!s}
     повернуто код помилки {!s}."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -217,23 +95,167 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Налаштування засобу керування дисплеєм є неповними"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Налаштовуємо mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Створюємо initramfs за допомогою dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не вдалося виконати dracut над призначенням"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Код виходу — {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фіктивне завдання python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фіктивний крок python {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Записуємо fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Помилка налаштовування"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Не визначено розділів для використання 
    {!s}
    ."
+
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Не вказано кореневої точки монтування для використання у 
    {!s}
    ."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+"Не надано налаштувань 
    {!s}
     для використання у 
    {!s}
    ."
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Налаштовування GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Встановлюємо значення для апаратного годинника."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Налаштовуємо mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Налаштовуємо initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Налаштовуємо локалі."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Налаштовуємо зашифрований розділ резервної пам'яті."
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Створення initramfs за допомогою mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не вдалося виконати mkinitfs над призначенням"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтування розділів."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Зберігаємо налаштування мережі."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Налаштовуємо службу dmcrypt OpenRC."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Встановити пакети."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обробляємо пакунки (%(count)d з %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Встановлюємо %(num)d пакунок."
+msgstr[1] "Встановлюємо %(num)d пакунки."
+msgstr[2] "Встановлюємо %(num)d пакунків."
+msgstr[3] "Встановлюємо один пакунок."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Вилучаємо %(num)d пакунок."
+msgstr[1] "Вилучаємо %(num)d пакунки."
+msgstr[2] "Вилучаємо %(num)d пакунків."
+msgstr[3] "Вилучаємо один пакунок."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Помилка засобу керування пакунками"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося приготувати оновлення. Програмою "
+"
    {!s}
     повернуто код помилки {!s}."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося оновити систему. Програмою "
+"
    {!s}
     повернуто код помилки {!s}."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
+"Програмою 
    {!s}
     повернуто код помилки {!s}."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Налаштувати тему Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Встановлюємо дані."
@@ -258,6 +280,11 @@ msgstr ""
 "Невідома дія зі службою {arg!s} для служби {name!s} на рівні "
 "запуску {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Не вдалося змінити службу"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -289,137 +316,108 @@ msgstr ""
 "Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
 "існує."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Налаштувати тему Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Встановити пакети."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обробляємо пакунки (%(count)d з %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Встановлюємо %(num)d пакунок."
-msgstr[1] "Встановлюємо %(num)d пакунки."
-msgstr[2] "Встановлюємо %(num)d пакунків."
-msgstr[3] "Встановлюємо один пакунок."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Вилучаємо %(num)d пакунок."
-msgstr[1] "Вилучаємо %(num)d пакунки."
-msgstr[2] "Вилучаємо %(num)d пакунків."
-msgstr[3] "Вилучаємо один пакунок."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "Помилка засобу керування пакунками"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Налаштуйте служби systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Засобу керування пакунками не вдалося приготувати оновлення. Програмою "
-"
    {!s}
     повернуто код помилки {!s}."
+"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
+"повідомлення з кодом помилки {num! s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося оновити систему. Програмою "
-"
    {!s}
     повернуто код помилки {!s}."
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Не вдалося ввімкнути службу systemd {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
-"Програмою 
    {!s}
     повернуто код помилки {!s}."
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Встановити завантажувач."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Не вдалося вимкнути завдання systemd {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "Помилка встановлення завантажувача"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Не вдалося замаскувати вузол systemd {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Не вдалося встановити завантажувач. Програмою для встановлення "
-"
    {!s}
     повернуто код помилки {!s}."
+"Невідомі команди systemd {command!s} та {suffix!s}"
+" для пристрою {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Встановлюємо значення для апаратного годинника."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтувати файлові системи."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Створення initramfs за допомогою mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Заповнення файлових систем."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не вдалося виконати mkinitfs над призначенням"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Код виходу — {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Розпаковуємо образ {} з {}, файл {} з {}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Створюємо initramfs за допомогою dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Починаємо розпаковувати {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не вдалося виконати dracut над призначенням"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Не вдалося розпакувати образ «{}»"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Налаштовуємо initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Немає точки монтування для кореневого розділу"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Налаштовуємо службу dmcrypt OpenRC."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо "
+"ніяких дій."
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Записуємо fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Помилкова точна монтування для кореневого розділу"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
-"Не надано налаштувань 
    {!s}
     для використання у 
    {!s}
    ."
+"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не "
+"виконуватимемо ніяких дій."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фіктивне завдання python."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Помилкові налаштування unsquash"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фіктивний крок python {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"У поточному ядрі системи не передбачено підтримки файлової системи «{}» ({})"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Налаштовуємо локалі."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Вихідної файлової системи «{}» не існує"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Зберігаємо налаштування мережі."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Не вдалося знайти unsquashfs; переконайтеся, що встановлено пакет squashfs-"
+"tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Призначення «{}» у цільовій системі не є каталогом"
diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po
index 8d58fc4261..f124edb9d7 100644
--- a/lang/python/ur/LC_MESSAGES/python.po
+++ b/lang/python/ur/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,221 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +256,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,124 +286,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po
index 5c38cbb89e..aa894a6739 100644
--- a/lang/python/uz/LC_MESSAGES/python.po
+++ b/lang/python/uz/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,122 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po
index c33a759092..328a79b260 100644
--- a/lang/python/vi/LC_MESSAGES/python.po
+++ b/lang/python/vi/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: T. Tran , 2020\n"
 "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n"
@@ -21,135 +21,19 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Cấu hình GRUB"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Đang gắn kết các phân vùng."
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "Lỗi cấu hình"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Không có phân vùng nào được định nghĩa cho 
    {!s}
     để dùng."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Cấu hình các dịch vụ systemd"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "Không thể sửa đổi dịch vụ"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Đang cài đặt bộ khởi động."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Không thể bật dịch vụ systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Không nhận ra lệnh systemd {command!s} và "
-"{suffix!s} cho đơn vị {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Gỡ kết nối các hệ thống tập tin."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Đang làm đầy các hệ thống tập tin."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync thất bại với lỗi {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Bắt đầu bung nội dung {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Bung hình ảnh thất bại \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Không có điểm kết nối cho phân vùng gốc"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage không có khoá \"rootMountPoint\", sẽ không làm gì cả"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Sai điểm kết nối cho phân vùng gốc"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint không tồn tại, có giá trị là \"{}\", sẽ không làm gì cả"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Sai cấu hình bung nén"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Hệ thống tập tin cho \"{}\" ({}) không được hỗ trợ bởi nhân hiện tại"
-
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Hệ thống tập tin nguồn \"{}\" không tồn tại"
-
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "Không tìm thấy lệnh unsquashfs, vui lòng cài đặt gói squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -208,22 +92,153 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Cầu hình quản lý hiện thị không hoàn tất"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Đang cấu hình mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Đang tạo initramfs bằng dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Chạy dracut thất bại ở hệ thống đích"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "Mã lỗi trả về là {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Ví dụ công việc python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Ví dụ python bước {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Đang viết vào fstab."
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "Lỗi cấu hình"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Không có phân vùng nào được định nghĩa cho 
    {!s}
     để dùng."
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Không có điểm kết nối gốc cho 
    {!s}
     để dùng."
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Cấu hình GRUB"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Đang thiết lập đồng hồ máy tính."
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Đang cấu hình mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Đang cấu hình initramfs."
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Đang cấu hình ngôn ngữ."
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Đang cấu hình hoán đổi mã hoá"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Đang tạo initramfs bằng mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Đang gắn kết các phân vùng."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Đang lưu cấu hình mạng."
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Đang cài đặt các gói ứng dụng."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Đang xử lý gói (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Cấu hình giao diện Plymouth"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Đang cài đặt dữ liệu."
@@ -248,6 +263,11 @@ msgstr ""
 "Không nhận ra thao tác {arg!s} cho dịch vụ {name!s} ở run-level"
 " {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "Không thể sửa đổi dịch vụ"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -279,122 +299,100 @@ msgstr ""
 "Đường dẫn cho dịch vụ {name!s} là {path!s}, nhưng không tồn "
 "tại."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Cấu hình giao diện Plymouth"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Đang cài đặt các gói ứng dụng."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Đang xử lý gói (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr ""
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Cấu hình các dịch vụ systemd"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Không thể bật dịch vụ systemd {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Đang cài đặt bộ khởi động."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr ""
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Không nhận ra lệnh systemd {command!s} và "
+"{suffix!s} cho đơn vị {name!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Đang thiết lập đồng hồ máy tính."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Gỡ kết nối các hệ thống tập tin."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Đang tạo initramfs bằng mkinitfs."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Đang làm đầy các hệ thống tập tin."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync thất bại với lỗi {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "Mã lỗi trả về là {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Đang tạo initramfs bằng dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Bắt đầu bung nội dung {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Chạy dracut thất bại ở hệ thống đích"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Bung hình ảnh thất bại \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Đang cấu hình initramfs."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Không có điểm kết nối cho phân vùng gốc"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage không có khoá \"rootMountPoint\", sẽ không làm gì cả"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Đang viết vào fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Sai điểm kết nối cho phân vùng gốc"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint không tồn tại, có giá trị là \"{}\", sẽ không làm gì cả"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Ví dụ công việc python."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Sai cấu hình bung nén"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Ví dụ python bước {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Hệ thống tập tin cho \"{}\" ({}) không được hỗ trợ bởi nhân hiện tại"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Đang cấu hình ngôn ngữ."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Hệ thống tập tin nguồn \"{}\" không tồn tại"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "Đang lưu cấu hình mạng."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "Không tìm thấy lệnh unsquashfs, vui lòng cài đặt gói squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po
index 7471fe96c1..e4e89ce606 100644
--- a/lang/python/zh/LC_MESSAGES/python.po
+++ b/lang/python/zh/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (https://www.transifex.com/calamares/teams/20061/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,122 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index 36ba26f767..40e684c24c 100644
--- a/lang/python/zh_CN/LC_MESSAGES/python.po
+++ b/lang/python/zh_CN/LC_MESSAGES/python.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 玉堂白鹤 , 2021\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
@@ -25,134 +25,19 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "配置 GRUB."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "挂载分区。"
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "配置错误"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "没有分配分区给 
    {!s}
    。"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "配置 systemd 服务"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "无法修改服务"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "无法启用 systemd 服务 {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "无法启用 systemd 目标 {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "无法禁用 systemd 目标 {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "无法屏蔽 systemd 单元 {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
-"{suffix!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "卸载文件系统。"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "写入文件系统。"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync 报错，错误码 {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "解压镜像 {}/{}，文件{}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "开始解压 {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "解压镜像失败 \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "无 root 分区挂载点"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "错误的 root 分区挂载点"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "错误的 unsquash 配置"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "你当前的内核不支持文件系统 \"{}\" ({})"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安装启动加载器。"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "源文件系统 \"{}\" 不存在"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "启动加载器安装出错"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "未找到 unsquashfs，请确保安装了 squashfs-tools 软件包"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "目标系统中的 \"{}\" 不是一个目录"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr "无法安装启动加载器。安装命令
    {!s}
    返回错误代码 {!s}。"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -208,22 +93,153 @@ msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显
 msgid "Display manager configuration was incomplete"
 msgstr "显示管理器配置不完全"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "配置 mkinitcpio."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "用 dracut 创建 initramfs."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "无法在目标中运行 dracut "
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "退出码是 {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "占位 Python 任务。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "占位 Python 步骤 {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在写入 fstab。"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "配置错误"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "没有分配分区给 
    {!s}
    。"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr " 未设置 
    {!s}
     要使用的根挂载点。"
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "无 
    {!s}
     配置可供 
    {!s}
     使用。"
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "配置 GRUB."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "设置硬件时钟。"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "配置 mkinitcpio."
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在配置初始内存文件系统。"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在进行本地化配置。"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "配置加密交换分区。"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在用 mkinitfs 创建initramfs。"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "无法在目标中运行 mkinitfs"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "挂载分区。"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在保存网络配置。"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "配置 OpenRC dmcrypt 服务。"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "安装软件包。"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "软件包处理中（%(count)d/%(total)d）"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "安装%(num)d软件包。"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "移除%(num)d软件包。"
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "软件包管理器错误"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr "软件包管理器无法准备更新。命令
    {!s}
    返回错误代码{!s}。"
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr "软件包管理器无法更新系统。命令
    {!s}
    返回错误代码{!s}。"
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr "软件包管理器无法对已安装的系统进行更改。命令
    {!s}
    返回错误代码{!s}。"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "配置 Plymouth 主题"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "安装数据."
@@ -246,6 +262,11 @@ msgid ""
 "level {level!s}."
 msgstr "未知的服务动作 {arg!s}，服务名: {name!s}，运行级别: {level!s}."
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "无法修改服务"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -271,122 +292,99 @@ msgid ""
 "exist."
 msgstr "服务 {name!s} 的路径 {path!s} 不存在。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "配置 Plymouth 主题"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "安装软件包。"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "软件包处理中（%(count)d/%(total)d）"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "安装%(num)d软件包。"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "移除%(num)d软件包。"
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "软件包管理器错误"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "配置 systemd 服务"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr "软件包管理器无法准备更新。命令
    {!s}
    返回错误代码{!s}。"
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr "软件包管理器无法更新系统。命令
    {!s}
    返回错误代码{!s}。"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "无法启用 systemd 服务 {name!s}."
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr "软件包管理器无法对已安装的系统进行更改。命令
    {!s}
    返回错误代码{!s}。"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "无法启用 systemd 目标 {name!s}."
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安装启动加载器。"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "无法禁用 systemd 目标 {name!s}."
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "启动加载器安装出错"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "无法屏蔽 systemd 单元 {name!s}."
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr "无法安装启动加载器。安装命令
    {!s}
    返回错误代码 {!s}。"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
+"{suffix!s}."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "设置硬件时钟。"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "卸载文件系统。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在用 mkinitfs 创建initramfs。"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "写入文件系统。"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "无法在目标中运行 mkinitfs"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync 报错，错误码 {}."
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "退出码是 {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "解压镜像 {}/{}，文件{}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "用 dracut 创建 initramfs."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "开始解压 {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "无法在目标中运行 dracut "
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "解压镜像失败 \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在配置初始内存文件系统。"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "无 root 分区挂载点"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "配置 OpenRC dmcrypt 服务。"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在写入 fstab。"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "错误的 root 分区挂载点"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "无 
    {!s}
     配置可供 
    {!s}
     使用。"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "占位 Python 任务。"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "错误的 unsquash 配置"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "占位 Python 步骤 {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "你当前的内核不支持文件系统 \"{}\" ({})"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在进行本地化配置。"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "源文件系统 \"{}\" 不存在"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "正在保存网络配置。"
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "未找到 unsquashfs，请确保安装了 squashfs-tools 软件包"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "目标系统中的 \"{}\" 不是一个目录"
diff --git a/lang/python/zh_HK/LC_MESSAGES/python.po b/lang/python/zh_HK/LC_MESSAGES/python.po
index d911132ca0..9613bfa8e2 100644
--- a/lang/python/zh_HK/LC_MESSAGES/python.po
+++ b/lang/python/zh_HK/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (Hong Kong) (https://www.transifex.com/calamares/teams/20061/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,201 +17,219 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -236,6 +254,11 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -261,122 +284,97 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:589
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/packages/main.py:629
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:503
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po
index 967bad991f..cd531289d3 100644
--- a/lang/python/zh_TW/LC_MESSAGES/python.po
+++ b/lang/python/zh_TW/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-14 12:55+0200\n"
+"POT-Creation-Date: 2021-09-06 11:40+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 黃柏諺 , 2021\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
@@ -22,134 +22,19 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "設定 GRUB。"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "正在掛載分割區。"
-
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
-#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
-#: src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
-#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
-#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:39
-msgid "Configuration Error"
-msgstr "設定錯誤"
-
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
-#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
-#: src/modules/fstab/main.py:356
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "沒有分割區被定義為 
    {!s}
     以供使用。"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "設定 systemd 服務"
-
-#: src/modules/services-systemd/main.py:59
-#: src/modules/services-openrc/main.py:93
-msgid "Cannot modify service"
-msgstr "無法修改服務"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "無法啟用 systemd 服務 {name!s}。"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "無法啟用 systemd 目標 {name!s}。"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "無法停用 systemd 目標 {name!s}。"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "無法 mask systemd 單位 {name!s}。"
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
-"{name!s}。"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "解除掛載檔案系統。"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "填滿檔案系統。"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync 失敗，錯誤碼 {} 。"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "正在解壓縮 {}/{}，檔案 {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "開始解壓縮 {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "無法解開映像檔 \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "沒有 root 分割區的掛載點"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "root 分割區掛載點錯誤"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "錯誤的 unsquash 設定"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安裝開機載入程式。"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "來源檔案系統 \"{}\" 不存在"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "開機載入程式安裝錯誤"
 
-#: src/modules/unpackfs/main.py:465
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "找不到 unsquashfs，請確定已安裝 squashfs-tools 軟體包"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "目標系統中的目的地 \"{}\" 不是目錄"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr "無法安裝開機載入程式。安裝指令 
    {!s}
     回傳了錯誤碼 {!s}。"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -205,22 +90,153 @@ msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf
 msgid "Display manager configuration was incomplete"
 msgstr "顯示管理器設定不完整"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "正在設定 mkinitcpio。"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "正在使用 dracut 建立 initramfs。"
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "在目標上執行 dracut 失敗"
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr "結束碼為 {}"
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "假的 python 工作。"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "假的 python step {}"
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在寫入 fstab。"
+
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
+#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
+#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
+msgid "Configuration Error"
+msgstr "設定錯誤"
+
+#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
+#: src/modules/initramfscfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "沒有分割區被定義為 
    {!s}
     以供使用。"
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
+#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
-#: src/modules/networkcfg/main.py:40
+#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "沒有給定的根掛載點 
    {!s}
     以供使用。"
 
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "無 
    {!s}
     設定可供 
    {!s}
     使用。"
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "設定 GRUB。"
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "正在設定硬體時鐘。"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "正在設定 mkinitcpio。"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在設定 initramfs。"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在設定語系。"
+
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "正在設定已加密的 swap。"
 
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在使用 mkinitfs 建立 initramfs。"
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "在目標上執行 mkinitfs 失敗"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "正在掛載分割區。"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在儲存網路設定。"
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "正在設定 OpenRC dmcrypt 服務。"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "安裝軟體包。"
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "正在處理軟體包 (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "正在安裝 %(num)d 軟體包。"
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "正在移除 %(num)d 軟體包。"
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "軟體包管理程式錯誤"
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr "軟體包管理程式無法準備更新。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr "軟體包管理程式無法更新系統。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "設定 Plymouth 主題"
+
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "正在安裝資料。"
@@ -243,6 +259,11 @@ msgid ""
 "level {level!s}."
 msgstr "未知的服務動作 {arg!s} 給服務 {name!s} 在執行層級 {level!s}。"
 
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr "無法修改服務"
+
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -268,122 +289,99 @@ msgid ""
 "exist."
 msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "設定 Plymouth 主題"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "安裝軟體包。"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "正在處理軟體包 (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "正在安裝 %(num)d 軟體包。"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "正在移除 %(num)d 軟體包。"
-
-#: src/modules/packages/main.py:588 src/modules/packages/main.py:600
-#: src/modules/packages/main.py:628
-msgid "Package Manager error"
-msgstr "軟體包管理程式錯誤"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "設定 systemd 服務"
 
-#: src/modules/packages/main.py:589
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr "軟體包管理程式無法準備更新。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
 
-#: src/modules/packages/main.py:601
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr "軟體包管理程式無法更新系統。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "無法啟用 systemd 服務 {name!s}。"
 
-#: src/modules/packages/main.py:629
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "無法啟用 systemd 目標 {name!s}。"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安裝開機載入程式。"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "無法停用 systemd 目標 {name!s}。"
 
-#: src/modules/bootloader/main.py:502
-msgid "Bootloader installation error"
-msgstr "開機載入程式安裝錯誤"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "無法 mask systemd 單位 {name!s}。"
 
-#: src/modules/bootloader/main.py:503
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr "無法安裝開機載入程式。安裝指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
+"{name!s}。"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "正在設定硬體時鐘。"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "解除掛載檔案系統。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在使用 mkinitfs 建立 initramfs。"
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "填滿檔案系統。"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "在目標上執行 mkinitfs 失敗"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync 失敗，錯誤碼 {} 。"
 
-#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
-msgid "The exit code was {}"
-msgstr "結束碼為 {}"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "正在解壓縮 {}/{}，檔案 {}/{}"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "正在使用 dracut 建立 initramfs。"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "開始解壓縮 {}"
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "在目標上執行 dracut 失敗"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "無法解開映像檔 \"{}\""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在設定 initramfs。"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "沒有 root 分割區的掛載點"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "正在設定 OpenRC dmcrypt 服務。"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事"
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在寫入 fstab。"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "root 分割區掛載點錯誤"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "無 
    {!s}
     設定可供 
    {!s}
     使用。"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事"
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "假的 python 工作。"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "錯誤的 unsquash 設定"
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "假的 python step {}"
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在設定語系。"
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "來源檔案系統 \"{}\" 不存在"
 
-#: src/modules/networkcfg/main.py:28
-msgid "Saving network configuration."
-msgstr "正在儲存網路設定。"
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "找不到 unsquashfs，請確定已安裝 squashfs-tools 軟體包"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "目標系統中的目的地 \"{}\" 不是目錄"

From 8d71e67a75f35e4f779563c671155f49da9dae77 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 8 Sep 2021 13:23:20 +0200
Subject: [PATCH 426/492] Add Q_OBJECT macro where it's missing

- Transifex tools complain about missing Q_OBJECT (which makes
  some sense -- you end up with a different context for calls
  to tr(), of the base class).
---
 src/calamares/VariantModel.h        | 1 +
 src/libcalamares/JobExample.h       | 3 +++
 src/libcalamares/JobQueue.cpp       | 5 +++++
 src/modules/license/LicenseWidget.h | 1 +
 4 files changed, 10 insertions(+)

diff --git a/src/calamares/VariantModel.h b/src/calamares/VariantModel.h
index 3b0b594b75..9d33231450 100644
--- a/src/calamares/VariantModel.h
+++ b/src/calamares/VariantModel.h
@@ -30,6 +30,7 @@
  */
 class VariantModel : public QAbstractItemModel
 {
+    Q_OBJECT
 public:
     /** @brief Auxiliary data
      *
diff --git a/src/libcalamares/JobExample.h b/src/libcalamares/JobExample.h
index 5c527af6d8..e3506fec14 100644
--- a/src/libcalamares/JobExample.h
+++ b/src/libcalamares/JobExample.h
@@ -23,6 +23,7 @@ namespace Calamares
  */
 class DLLEXPORT NamedJob : public Job
 {
+    Q_OBJECT
 public:
     explicit NamedJob( const QString& name, QObject* parent = nullptr )
         : Job( parent )
@@ -39,6 +40,7 @@ class DLLEXPORT NamedJob : public Job
 /// @brief Job does nothing, always succeeds
 class DLLEXPORT GoodJob : public NamedJob
 {
+    Q_OBJECT
 public:
     explicit GoodJob( const QString& name, QObject* parent = nullptr )
         : NamedJob( name, parent )
@@ -52,6 +54,7 @@ class DLLEXPORT GoodJob : public NamedJob
 /// @brief Job does nothing, always fails
 class DLLEXPORT FailJob : public NamedJob
 {
+    Q_OBJECT
 public:
     explicit FailJob( const QString& name, QObject* parent = nullptr )
         : NamedJob( name, parent )
diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp
index a975c2c910..00b30f3187 100644
--- a/src/libcalamares/JobQueue.cpp
+++ b/src/libcalamares/JobQueue.cpp
@@ -47,6 +47,7 @@ using WeightedJobList = QList< WeightedJob >;
 
 class JobThread : public QThread
 {
+    Q_OBJECT
 public:
     JobThread( JobQueue* queue )
         : QThread( queue )
@@ -288,3 +289,7 @@ JobQueue::globalStorage() const
 }
 
 }  // namespace Calamares
+
+#include "utils/moc-warnings.h"
+
+#include "JobQueue.moc"
diff --git a/src/modules/license/LicenseWidget.h b/src/modules/license/LicenseWidget.h
index 3f99163b99..eb7d8edd87 100644
--- a/src/modules/license/LicenseWidget.h
+++ b/src/modules/license/LicenseWidget.h
@@ -22,6 +22,7 @@ class QPushButton;
 
 class LicenseWidget : public QWidget
 {
+    Q_OBJECT
 public:
     LicenseWidget( LicenseEntry e, QWidget* parent = nullptr );
     ~LicenseWidget() override;

From cefe3dd4ff4855b5868e9c1b3614586b4c0b7dec Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 8 Sep 2021 13:30:32 +0200
Subject: [PATCH 427/492] [tracking] Add Q_OBJECT, sanitize API

---
 src/modules/tracking/TrackingJobs.cpp | 77 +++++++++++++++++++++++++--
 src/modules/tracking/TrackingJobs.h   | 66 ++---------------------
 2 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp
index dba6000e12..5e3cd12b5f 100644
--- a/src/modules/tracking/TrackingJobs.cpp
+++ b/src/modules/tracking/TrackingJobs.cpp
@@ -19,11 +19,76 @@
 
 #include 
 
-#include 
-#include 
-
 #include 
 
+
+// Namespace keeps all the actual jobs anonymous, the
+// public API is the addJob() functions below the namespace.
+namespace
+{
+
+/** @brief Install-tracking job (gets a URL)
+ *
+ * The install-tracking job (there is only one kind) does a GET
+ * on a configured URL with some additional information about
+ * the machine (if configured into the URL).
+ *
+ * No persistent tracking is done.
+ */
+class TrackingInstallJob : public Calamares::Job
+{
+    Q_OBJECT
+public:
+    TrackingInstallJob( const QString& url );
+    ~TrackingInstallJob() override;
+
+    QString prettyName() const override;
+    QString prettyStatusMessage() const override;
+    Calamares::JobResult exec() override;
+
+private:
+    const QString m_url;
+};
+
+/** @brief Tracking machines, update-manager style
+ *
+ * The machine has a machine-id, and this is sed(1)'ed into the
+ * update-manager configuration, to report the machine-id back
+ * to distro servers.
+ */
+class TrackingMachineUpdateManagerJob : public Calamares::Job
+{
+    Q_OBJECT
+public:
+    ~TrackingMachineUpdateManagerJob() override;
+
+    QString prettyName() const override;
+    QString prettyStatusMessage() const override;
+    Calamares::JobResult exec() override;
+};
+
+/** @brief Turn on KUserFeedback in target system
+ *
+ * This writes suitable files for turning on KUserFeedback for the
+ * normal user configured in Calamares. The feedback can be reconfigured
+ * by the user through Plasma's user-feedback dialog.
+ */
+class TrackingKUserFeedbackJob : public Calamares::Job
+{
+    Q_OBJECT
+public:
+    TrackingKUserFeedbackJob( const QString& username, const QStringList& areas );
+    ~TrackingKUserFeedbackJob() override;
+
+    QString prettyName() const override;
+    QString prettyStatusMessage() const override;
+    Calamares::JobResult exec() override;
+
+private:
+    QString m_username;
+    QStringList m_areas;
+};
+
 TrackingInstallJob::TrackingInstallJob( const QString& url )
     : m_url( url )
 {
@@ -161,6 +226,8 @@ FeedbackLevel=16
     return Calamares::JobResult::ok();
 }
 
+} // namespace
+
 void
 addJob( Calamares::JobList& list, InstallTrackingConfig* config )
 {
@@ -223,3 +290,7 @@ addJob( Calamares::JobList& list, UserTrackingConfig* config )
         }
     }
 }
+
+#include "utils/moc-warnings.h"
+
+#include "TrackingJobs.moc"
diff --git a/src/modules/tracking/TrackingJobs.h b/src/modules/tracking/TrackingJobs.h
index b58880f00a..4a6e90c316 100644
--- a/src/modules/tracking/TrackingJobs.h
+++ b/src/modules/tracking/TrackingJobs.h
@@ -16,79 +16,19 @@ class InstallTrackingConfig;
 class MachineTrackingConfig;
 class UserTrackingConfig;
 
-class QSemaphore;
-
 /** @section Tracking Jobs
  *
  * The tracking jobs do the actual work of configuring tracking on the
  * target machine. Tracking jobs may have *styles*, variations depending
  * on the distro or environment of the target system. At the root of
  * each family of tracking jobs (installation, machine, user) there is
- * a class with static method `addJob()` that takes the configuration
+ * free function `addJob()` that takes the configuration
  * information from the relevant Config sub-object and optionally
  * adds the right job (subclass!) to the list of jobs.
- */
-
-/** @brief Install-tracking job (gets a URL)
- *
- * The install-tracking job (there is only one kind) does a GET
- * on a configured URL with some additional information about
- * the machine (if configured into the URL).
  *
- * No persistent tracking is done.
+ * There are no job-classes defined here because you need to be using the
+ * `addJob()` interface instead.
  */
-class TrackingInstallJob : public Calamares::Job
-{
-    Q_OBJECT
-public:
-    TrackingInstallJob( const QString& url );
-    ~TrackingInstallJob() override;
-
-    QString prettyName() const override;
-    QString prettyStatusMessage() const override;
-    Calamares::JobResult exec() override;
-
-private:
-    const QString m_url;
-};
-
-/** @brief Tracking machines, update-manager style
- *
- * The machine has a machine-id, and this is sed(1)'ed into the
- * update-manager configuration, to report the machine-id back
- * to distro servers.
- */
-class TrackingMachineUpdateManagerJob : public Calamares::Job
-{
-    Q_OBJECT
-public:
-    ~TrackingMachineUpdateManagerJob() override;
-
-    QString prettyName() const override;
-    QString prettyStatusMessage() const override;
-    Calamares::JobResult exec() override;
-};
-
-/** @brief Turn on KUserFeedback in target system
- *
- * This writes suitable files for turning on KUserFeedback for the
- * normal user configured in Calamares. The feedback can be reconfigured
- * by the user through Plasma's user-feedback dialog.
- */
-class TrackingKUserFeedbackJob : public Calamares::Job
-{
-public:
-    TrackingKUserFeedbackJob( const QString& username, const QStringList& areas );
-    ~TrackingKUserFeedbackJob() override;
-
-    QString prettyName() const override;
-    QString prettyStatusMessage() const override;
-    Calamares::JobResult exec() override;
-
-private:
-    QString m_username;
-    QStringList m_areas;
-};
 
 void addJob( Calamares::JobList& list, InstallTrackingConfig* config );
 void addJob( Calamares::JobList& list, MachineTrackingConfig* config );

From e98bf0da72ae48792f20753df64eb44c266e62da Mon Sep 17 00:00:00 2001
From: Johannes Kamprad 
Date: Sun, 12 Sep 2021 13:47:38 +0200
Subject: [PATCH 428/492] Update shellprocess.conf

a minor typo
---
 src/modules/shellprocess/shellprocess.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/shellprocess/shellprocess.conf b/src/modules/shellprocess/shellprocess.conf
index 8501d98444..07947f38fb 100644
--- a/src/modules/shellprocess/shellprocess.conf
+++ b/src/modules/shellprocess/shellprocess.conf
@@ -68,7 +68,7 @@ dontChroot: false
 #     - "/bin/ls"
 #     - "/usr/bin/true"
 
-# Script may be a lit of items (if the touch command fails, it is
+# Script may be a list of items (if the touch command fails, it is
 # ignored; the slowloris command has a different timeout from the
 # other commands in the list):
 script:

From 95621005800adc1920dfb71daf8668e7032b864e Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Mon, 13 Sep 2021 12:53:36 +0200
Subject: [PATCH 429/492] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_ar.ts          | 233 ++++++++++++++--------------
 lang/calamares_as.ts          | 237 ++++++++++++++--------------
 lang/calamares_ast.ts         | 233 ++++++++++++++--------------
 lang/calamares_az.ts          | 278 +++++++++++++++++----------------
 lang/calamares_az_AZ.ts       | 278 +++++++++++++++++----------------
 lang/calamares_be.ts          | 237 ++++++++++++++--------------
 lang/calamares_bg.ts          | 233 ++++++++++++++--------------
 lang/calamares_bn.ts          | 233 ++++++++++++++--------------
 lang/calamares_ca.ts          | 237 ++++++++++++++--------------
 lang/calamares_ca@valencia.ts | 237 ++++++++++++++--------------
 lang/calamares_cs_CZ.ts       | 237 ++++++++++++++--------------
 lang/calamares_da.ts          | 237 ++++++++++++++--------------
 lang/calamares_de.ts          | 237 ++++++++++++++--------------
 lang/calamares_el.ts          | 233 ++++++++++++++--------------
 lang/calamares_en.ts          | 237 ++++++++++++++--------------
 lang/calamares_en_GB.ts       | 233 ++++++++++++++--------------
 lang/calamares_eo.ts          | 229 ++++++++++++++-------------
 lang/calamares_es.ts          | 233 ++++++++++++++--------------
 lang/calamares_es_MX.ts       | 233 ++++++++++++++--------------
 lang/calamares_es_PE.ts       | 229 ++++++++++++++-------------
 lang/calamares_es_PR.ts       | 229 ++++++++++++++-------------
 lang/calamares_et.ts          | 233 ++++++++++++++--------------
 lang/calamares_eu.ts          | 233 ++++++++++++++--------------
 lang/calamares_fa.ts          | 237 ++++++++++++++--------------
 lang/calamares_fi_FI.ts       | 241 +++++++++++++++--------------
 lang/calamares_fr.ts          | 237 ++++++++++++++--------------
 lang/calamares_fr_CH.ts       | 229 ++++++++++++++-------------
 lang/calamares_fur.ts         | 237 ++++++++++++++--------------
 lang/calamares_gl.ts          | 233 ++++++++++++++--------------
 lang/calamares_gu.ts          | 229 ++++++++++++++-------------
 lang/calamares_he.ts          | 237 ++++++++++++++--------------
 lang/calamares_hi.ts          | 237 ++++++++++++++--------------
 lang/calamares_hr.ts          | 237 ++++++++++++++--------------
 lang/calamares_hu.ts          | 233 ++++++++++++++--------------
 lang/calamares_id.ts          | 233 ++++++++++++++--------------
 lang/calamares_id_ID.ts       | 229 ++++++++++++++-------------
 lang/calamares_ie.ts          | 237 ++++++++++++++--------------
 lang/calamares_is.ts          | 233 ++++++++++++++--------------
 lang/calamares_it_IT.ts       | 237 ++++++++++++++--------------
 lang/calamares_ja.ts          | 247 ++++++++++++++++--------------
 lang/calamares_kk.ts          | 229 ++++++++++++++-------------
 lang/calamares_kn.ts          | 229 ++++++++++++++-------------
 lang/calamares_ko.ts          | 270 ++++++++++++++++----------------
 lang/calamares_ko_KR.ts       | 229 ++++++++++++++-------------
 lang/calamares_lo.ts          | 229 ++++++++++++++-------------
 lang/calamares_lt.ts          | 237 ++++++++++++++--------------
 lang/calamares_lv.ts          | 229 ++++++++++++++-------------
 lang/calamares_mk.ts          | 229 ++++++++++++++-------------
 lang/calamares_ml.ts          | 233 ++++++++++++++--------------
 lang/calamares_mr.ts          | 229 ++++++++++++++-------------
 lang/calamares_nb.ts          | 233 ++++++++++++++--------------
 lang/calamares_ne.ts          | 229 ++++++++++++++-------------
 lang/calamares_ne_NP.ts       | 229 ++++++++++++++-------------
 lang/calamares_nl.ts          | 237 ++++++++++++++--------------
 lang/calamares_pl.ts          | 233 ++++++++++++++--------------
 lang/calamares_pt_BR.ts       | 237 ++++++++++++++--------------
 lang/calamares_pt_PT.ts       | 237 ++++++++++++++--------------
 lang/calamares_ro.ts          | 233 ++++++++++++++--------------
 lang/calamares_ru.ts          | 237 ++++++++++++++--------------
 lang/calamares_ru_RU.ts       | 229 ++++++++++++++-------------
 lang/calamares_si.ts          | 229 ++++++++++++++-------------
 lang/calamares_sk.ts          | 237 ++++++++++++++--------------
 lang/calamares_sl.ts          | 233 ++++++++++++++--------------
 lang/calamares_sq.ts          | 237 ++++++++++++++--------------
 lang/calamares_sr.ts          | 231 +++++++++++++++-------------
 lang/calamares_sr@latin.ts    | 233 ++++++++++++++--------------
 lang/calamares_sv.ts          | 237 ++++++++++++++--------------
 lang/calamares_te.ts          | 229 ++++++++++++++-------------
 lang/calamares_tg.ts          | 237 ++++++++++++++--------------
 lang/calamares_th.ts          | 233 ++++++++++++++--------------
 lang/calamares_tr_TR.ts       | 237 ++++++++++++++--------------
 lang/calamares_uk.ts          | 237 ++++++++++++++--------------
 lang/calamares_ur.ts          | 235 ++++++++++++++--------------
 lang/calamares_uz.ts          | 229 ++++++++++++++-------------
 lang/calamares_vi.ts          | 237 ++++++++++++++--------------
 lang/calamares_zh.ts          | 229 ++++++++++++++-------------
 lang/calamares_zh_CN.ts       | 280 ++++++++++++++++++----------------
 lang/calamares_zh_HK.ts       | 229 ++++++++++++++-------------
 lang/calamares_zh_TW.ts       | 237 ++++++++++++++--------------
 79 files changed, 9754 insertions(+), 8881 deletions(-)

diff --git a/lang/calamares_ar.ts b/lang/calamares_ar.ts
index 0c946cb068..d5443626b8 100644
--- a/lang/calamares_ar.ts
+++ b/lang/calamares_ar.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       انتهى
     
@@ -293,54 +293,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       فشل التثبيت
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       خطأ
     
     
-      
-      
+      
       &Yes
       &نعم
     
     
-      
-      
+      
       &No
       &لا
     
     
-      
+      
       &Close
       &اغلاق
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -349,124 +347,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       الإستمرار في التثبيت؟
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       مثبّت %1 على وشك بإجراء تعديلات على قرصك لتثبيت %2.<br/><strong>لن تستطيع التّراجع عن هذا.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &ثبت الأن
     
     
-      
+      
       Go &back
       &إرجع
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &ثبت
     
     
-      
+      
       Setup is complete. Close the setup program.
       اكتمل الإعداد. أغلق برنامج الإعداد.
     
     
-      
+      
       The installation is complete. Close the installer.
       اكتمل التثبيت , اغلق المثبِت
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       الغاء الـ تثبيت من دون احداث تغيير في النظام
     
     
-      
+      
       &Next
       &التالي
     
     
-      
+      
       &Back
       &رجوع
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       &إلغاء
     
     
-      
+      
       Cancel setup?
       إلغاء الإعداد؟
     
     
-      
+      
       Cancel installation?
       إلغاء التثبيت؟
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       هل تريد حقًا إلغاء عملية الإعداد الحالية؟
 سيتم إنهاء برنامج الإعداد وسيتم فقد جميع التغييرات.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       أتريد إلغاء عمليّة التّثبيت الحاليّة؟
@@ -833,22 +831,22 @@ The installer will quit and all changes will be lost.
       سيطرح البرنامج بعض الأسئلة عليك ويعدّ %2 على حاسوبك.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1713,17 +1711,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       كونسول غير مثبّت
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       ينفّذ السّكربت: &nbsp;<code>%1</code>
     
@@ -1788,32 +1786,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       أقبل الشّروط والأحكام أعلاه.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2818,92 +2816,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       جاري جمع معلومات عن النظام...
     
     
-      
+      
       Partitions
       الأقسام
     
     
-      
+      
       Current:
       الحاليّ:
     
     
-      
+      
       After:
       بعد:
     
     
-      
+      
       No EFI system partition configured
       لم يُضبط أيّ قسم نظام EFI
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3035,7 +3033,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3659,25 +3657,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      &نعم
+    
+    
+      
+      &No
+      &لا
+    
+    
+      
+      &Cancel
+      &إلغاء
+    
+    
+      
+      &Close
+      &اغلاق
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3685,28 +3711,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3714,28 +3740,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4087,44 +4113,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      طراز لوحة المفاتيح:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      اكتب هنا لتجرّب لوحة المفاتيح
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_as.ts b/lang/calamares_as.ts
index 5a52a5b766..2e787a7e6d 100644
--- a/lang/calamares_as.ts
+++ b/lang/calamares_as.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       হৈ গ'ল
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       চেত্ আপ বিফল হ'ল
     
     
-      
+      
       Installation Failed
       ইনস্তলেচন বিফল হ'ল
     
     
-      
+      
       Would you like to paste the install log to the web?
       আপুনি ৱেবত ইণ্স্টল ল'গ পেস্ট কৰিব বিচাৰে নেকি?
     
     
-      
+      
       Error
       ত্ৰুটি
     
     
-      
-      
+      
       &Yes
       হয় (&Y)
     
     
-      
-      
+      
       &No
       নহয় (&N)
     
     
-      
+      
       &Close
       বন্ধ (&C)
     
     
-      
+      
       Install Log Paste URL
       ইনস্তল​ ল'গ পেস্ট URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       আপলোড বিফল হৈছিল। কোনো ৱেব-পেস্ট কৰা হোৱা নাছিল।
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       কেলামাৰেচৰ আৰম্ভণি বিফল হ'ল
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ইনস্তল কৰিব পৰা নগ'ল। কেলামাৰেচে সকলোবোৰ সংৰূপ দিয়া মডিউল লোড্ কৰাত সফল নহ'ল। এইটো এটা আপোনাৰ ডিষ্ট্ৰিবিউচনে কি ধৰণে কেলামাৰেচ ব্যৱহাৰ কৰিছে, সেই সম্বন্ধীয় সমস্যা।
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>নিম্নোক্ত মডিউলবোৰ লোড্ কৰিৱ পৰা নগ'ল:
     
     
-      
+      
       Continue with setup?
       চেত্ আপ অব্যাহত ৰাখিব?
     
     
-      
+      
       Continue with installation?
       ইন্স্তলেচন অব্যাহত ৰাখিব?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 চেত্ আপ প্ৰগ্ৰেমটোৱে %2 চেত্ আপ কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 ইনস্তলাৰটোৱে %2 ইনস্তল কৰিবলৈ আপোনাৰ ডিস্কত সালসলনি কৰিব।<br/><strong>আপুনি এইবোৰ পিছত পূৰ্বলৈ সলনি কৰিব নোৱাৰিব।</strong>
     
     
-      
+      
       &Set up now
       এতিয়া চেত্ আপ কৰক (&S)
     
     
-      
+      
       &Install now
       এতিয়া ইনস্তল কৰক (&I)
     
     
-      
+      
       Go &back
       উভতি যাওক (&b)
     
     
-      
+      
       &Set up
       চেত্ আপ কৰক (&S)
     
     
-      
+      
       &Install
       ইনস্তল (&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       চেত্ আপ সম্পূৰ্ণ হ'ল। প্ৰোগ্ৰেম বন্ধ কৰক।
     
     
-      
+      
       The installation is complete. Close the installer.
       ইনস্তলেচন সম্পূৰ্ণ হ'ল। ইন্স্তলাৰ বন্ধ কৰক।
     
     
-      
+      
       Cancel setup without changing the system.
       চিছ্তেম সলনি নকৰাকৈ চেত্ আপ বাতিল কৰক।
     
     
-      
+      
       Cancel installation without changing the system.
       চিছ্তেম সলনি নকৰাকৈ ইনস্তলেচন বাতিল কৰক।
     
     
-      
+      
       &Next
       পৰবর্তী (&N)
     
     
-      
+      
       &Back
       পাছলৈ (&B)
     
     
-      
+      
       &Done
       হৈ গ'ল (&D)
     
     
-      
+      
       &Cancel
       বাতিল কৰক (&C)
     
     
-      
+      
       Cancel setup?
       চেত্ আপ বাতিল কৰিব?
     
     
-      
+      
       Cancel installation?
       ইনস্তলেছন বাতিল কৰিব?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       সচাকৈয়ে চলিত চেত্ আপ প্ৰক্ৰিয়া বাতিল কৰিব বিচাৰে নেকি?
 চেত্ আপ প্ৰোগ্ৰেম বন্ধ হ'ব আৰু গোটেই সলনিবোৰ নোহোৱা হৈ যাব।
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       সচাকৈয়ে চলিত ইনস্তল প্ৰক্ৰিয়া বাতিল কৰিব বিচাৰে নেকি?
@@ -825,22 +823,22 @@ The installer will quit and all changes will be lost.
       এইটো প্ৰগ্ৰেমে অপোনাক কিছুমান প্ৰশ্ন সুধিব আৰু অপোনাৰ কম্পিউটাৰত %2 স্থাপন কৰিব।
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       %1ৰ Calamares চেত্ আপ প্ৰগ্ৰামলৈ আদৰণি জনাইছো।
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1> %1 চেত্ আপলৈ আদৰণি জনাইছো।</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1ৰ কেলামাৰেচ ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 ইনস্তলাৰলৈ আদৰণি জনাইছো।</h1>
     
@@ -1705,17 +1703,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       কনচোল্ ইন্সটল কৰা নাই
     
     
-      
+      
       Please install KDE Konsole and try again!
       অনুগ্ৰহ কৰি কেডিই কনচোল্ ইন্সটল কৰক আৰু পুনৰ চেষ্টা কৰক!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       নিস্পাদিত লিপি: &nbsp; <code>%1</code>
     
@@ -1780,32 +1778,32 @@ The installer will quit and all changes will be lost.
       <h1>অনুজ্ঞা-পত্ৰ চুক্তি</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       মই ওপৰোক্ত চৰ্তাৱলী গ্ৰহণ কৰিছোঁ।
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       অনুগ্ৰহ কৰি ব্যৱহাৰকৰ্তাৰ অনুজ্ঞা-পত্ৰ চুক্তি (EULA) সমূহ ভালদৰে নিৰীক্ষণ কৰক।
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       এই চেচ্ আপ প্ৰক্ৰিয়াই মালিকানা চফটৱেৰ ইনস্তল কৰিব যিটো অনুজ্ঞা-পত্ৰৰ চৰ্তৰ অধীন বিষয় হ'ব।
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       যদি আপুনি চৰ্তাৱলী গ্ৰহণ নকৰে, চেত্ আপ প্ৰক্ৰিয়া চলাই যাব নোৱাৰিব।
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       এই চেত্ আপ প্ৰক্ৰিয়াই অতিৰিক্ত বৈশিষ্ট্য থকা সঁজুলি প্ৰদান কৰি ব্যৱহাৰকৰ্তাৰ অভিজ্ঞতা সংবৰ্দ্ধন কৰাৰ বাবে মালিকানা চফটৱেৰ ইনস্তল কৰিব যিটো অনুজ্ঞা-পত্ৰৰ চৰ্তৰ অধীন বিষয় হ'ব।
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       যাদি আপুনি চৰ্তাৱলী নামানে, মালিকিস্ৱত্ত থকা চফ্টৱেৰ ইনস্তল নহব আৰু মুকলি উৎস বিকল্প ব্যৱহাৰ হ'ব।
     
@@ -2776,92 +2774,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       চিছটেম তথ্য সংগ্ৰহ কৰা হৈ আছে।
     
     
-      
+      
       Partitions
       বিভাজনসমুহ
     
     
-      
+      
       Current:
       বর্তমান:
     
     
-      
+      
       After:
       পিছত:
     
     
-      
+      
       No EFI system partition configured
       কোনো EFI চিছটেম বিভাজন কনফিগাৰ কৰা হোৱা নাই
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       GPTৰ BIOSত ব্যৱহাৰৰ বাবে বিকল্প
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       এটা GPT পৰ্তিসোন টেবুল সকলো স্যস্তেমৰ বাবে উত্তম বিকল্প হয় | এই ইন্সালাৰতোৱে তেনে স্থাপনকৰণ BIOS স্যস্তেমতো কৰে |<br/><br/>এটা GPT পৰ্তিসোন টেবুল কনফিগাৰ কৰিবলৈ ( যদি আগতে কৰা নাই ) পাছলৈ গৈ  পৰ্তিসোন টেবুলখনক GPTলৈ পৰিৱৰ্তন কৰক,  তাৰপাচত 8 MBৰ উনফোৰমেতেট পৰ্তিতিওন এটা বনাব | <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
     
     
-      
+      
       Boot partition not encrypted
       বুত্ বিভাজন এনক্ৰিপ্ত্ নহয়
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       এনক্ৰিপ্তেড ৰুট বিভাজনৰ সৈতে এটা বেলেগ বুট বিভাজন চেত্ আপ কৰা হৈছিল, কিন্তু বুট বিভাজন এনক্ৰিপ্তেড কৰা হোৱা নাই। <br/><br/>এইধৰণৰ চেত্ আপ সুৰক্ষিত নহয় কাৰণ গুৰুত্ব্পুৰ্ণ চিছটেম ফাইল আন্এনক্ৰিপ্তেড বিভাজনত ৰখা হয়। <br/>আপুনি বিচাৰিলে চলাই থাকিব পাৰে কিন্তু পিছ্ত চিছটেম আৰম্ভৰ সময়ত ফাইল চিছটেম খোলা যাব। <br/>বুট বিভাজন এনক্ৰিপ্ত্ কৰিবলৈ উভতি যাওক আৰু বিভাজন বনোৱা windowত <strong>Encrypt</strong> বাচনি কৰি আকৌ বনাওক।
     
     
-      
+      
       has at least one disk device available.
       অতি কমেও এখন ডিস্ক্ উপলব্ধ আছে।
     
     
-      
+      
       There are no partitions to install on.
       ইনস্তল কৰিবলৈ কোনো বিভাজন নাই।
     
@@ -2996,7 +2994,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3621,25 +3619,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      ঠিক আছে (&O)
+    
+    
+      
+      &Yes
+      হয় (&Y)
+    
+    
+      
+      &No
+      নহয় (&N)
+    
+    
+      
+      &Cancel
+      বাতিল কৰক (&C)
+    
+    
+      
+      &Close
+      বন্ধ (&C)
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       ইনস্তল সম্বন্ধীয় প্ৰতিক্ৰিয়া
     
     
-      
+      
       Sending installation feedback.
       ইন্স্তল সম্বন্ধীয় প্ৰতিক্ৰিয়া পঠাই আছে।
     
     
-      
+      
       Internal error in install-tracking.
       ইন্স্তল-ক্ৰুটিৰ আভ্যন্তৰীণ ক্ৰুটি।
     
     
-      
+      
       HTTP request timed out.
       HTTP ৰিকুৱেস্টৰ সময় উকলি গ'ল।
     
@@ -3647,28 +3673,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE ব্যৱহাৰকৰ্তাৰ সম্বন্ধীয় প্ৰতিক্ৰীয়া
     
     
-      
+      
       Configuring KDE user feedback.
       কনফিগাৰত KDE ব্যৱহাৰকৰ্তাৰ সম্বন্ধীয় প্ৰতিক্ৰীয়া
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       KDE ব্যৱহাৰকৰ্তাৰ ফিডবেক কনফিগাৰেচনৰ ক্ৰুটি।
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       KDE ব্যৱহাৰকৰ্তাৰ প্ৰতিক্ৰিয়া ঠাকভাৱে কন্ফিগাৰ কৰিব পৰা নগ'ল, লিপি ক্ৰুটি %1।
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       KDE ব্যৱহাৰকৰ্তাৰ প্ৰতিক্ৰিয়া ঠাকভাৱে কন্ফিগাৰ কৰিব পৰা নগ'ল, কেলামাৰেচ ক্ৰুটি %1।
     
@@ -3676,28 +3702,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       মেচিন সম্বন্ধীয় প্ৰতিক্ৰীয়া
     
     
-      
+      
       Configuring machine feedback.
       মেচিন সম্বন্ধীয় প্ৰতিক্ৰীয়া কনফিগাৰ কৰি আছে‌।
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       মেচিনত ফিডবেক কনফিগাৰেচনৰ ক্ৰুটি।
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       মেচিনৰ প্ৰতিক্ৰিয়া ঠাকভাৱে কন্ফিগাৰ কৰিব পৰা নগ'ল, লিপি ক্ৰুটি %1।
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       মেচিনৰ প্ৰতিক্ৰিয়া ঠাকভাৱে কন্ফিগাৰ কৰিব পৰা নগ'ল, কেলামাৰেচ ক্ৰুটি %1।
     
@@ -4051,45 +4077,30 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      কিবোৰ্ড মডেল
-    
-    
-      
-      Layouts
-      লেআউট
-    
-    
-      
-      Keyboard Layout
-      কিবোৰ্ড লেআউট
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      মডেল
+      
+      Keyboard Model:
+      কিবোৰ্ড মডেল:
     
     
-      
-      Variants
-      ভিন্ন ৰুপ
+      
+      Layouts
+      লেআউট
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      আপোনাৰ কিবোৰ্ড পৰীক্ষা কৰিবলৈ ইয়াত টাইপ কৰক
     
     
-      
-      Test your keyboard
-      কিবোৰ্ড পৰীক্ষা কৰক
+      
+      Variants
+      ভিন্ন ৰুপ
     
   
   
diff --git a/lang/calamares_ast.ts b/lang/calamares_ast.ts
index 466ad6bc42..d25285a005 100644
--- a/lang/calamares_ast.ts
+++ b/lang/calamares_ast.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Fecho
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Falló la configuración
     
     
-      
+      
       Installation Failed
       Falló la instalación
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Fallu
     
     
-      
-      
+      
       &Yes
       &Sí
     
     
-      
-      
+      
       &No
       &Non
     
     
-      
+      
       &Close
       &Zarrar
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Falló l'aniciu de Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 nun pue instalase. Calamares nun foi a cargar tolos módulos configuraos. Esto ye un problema col mou nel que la distribución usa Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Nun pudieron cargase los módulos de darréu:
     
     
-      
+      
       Continue with setup?
       ¿Siguir cola instalación?
     
     
-      
+      
       Continue with installation?
       ¿Siguir cola instalación?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El programa d'instalación de %1 ta a piques de facer cambeos nel discu pa configurar %2.<br/><strong>Nun vas ser a desfacer estos cambeos.<strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       L'instalador de %1 ta a piques de facer cambeos nel discu pa instalar %2.<br/><strong>Nun vas ser a desfacer esos cambeos.</strong>
     
     
-      
+      
       &Set up now
       &Configurar agora
     
     
-      
+      
       &Install now
       &Instalar agora
     
     
-      
+      
       Go &back
       Dir p'&atrás
     
     
-      
+      
       &Set up
       &Configurar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       Completóse la configuración. Zarra'l programa de configuración.
     
     
-      
+      
       The installation is complete. Close the installer.
       Completóse la instalación. Zarra l'instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Encaboxa la configuración ensin camudar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Encaboxa la instalación ensin camudar el sistema.
     
     
-      
+      
       &Next
       &Siguiente
     
     
-      
+      
       &Back
       &Atrás
     
     
-      
+      
       &Done
       &Fecho
     
     
-      
+      
       &Cancel
       &Encaboxar
     
     
-      
+      
       Cancel setup?
       ¿Encaboxar la configuración?
     
     
-      
+      
       Cancel installation?
       ¿Encaboxar la instalación?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       ¿De xuru que quies encaboxar el procesu actual de configuración?
 El programa de configuración va colar y van perdese tolos cambeos.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       ¿De xuru que quies encaboxar el procesu actual d'instalación?
@@ -825,22 +823,22 @@ L'instalador va colar y van perdese tolos cambeos.
       Esti programa va facete dalgunes entrugues y va configurar %2 nel ordenador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Afáyate nel programa de configuración de Calamares pa %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Afáyate na configuración de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Afáyate nel instalador Calamares pa %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Afáyate nel instalador de %1</h1>
     
@@ -1705,17 +1703,17 @@ L'instalador va colar y van perdese tolos cambeos.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole nun s'instaló
     
     
-      
+      
       Please install KDE Konsole and try again!
       ¡Instala Konsole y volvi tentalo!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Executando'l script: &nbsp;<code>%1</code>
     
@@ -1780,32 +1778,32 @@ L'instalador va colar y van perdese tolos cambeos.
       
     
     
-      
+      
       I accept the terms and conditions above.
       Aceuto los términos y condiciones d'enriba.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Esti procedimientu va instalar software privativu que ta suxetu a términos de llicencia.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Si nun aceutes los términos, el procedimientu de configuración nun pue siguir.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Esti procedimientu de configuración pue instalar software privativu que ta suxetu a términos de llicencia pa fornir carauterístiques adicionales y ameyorar la esperiencia d'usuariu.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Si nun aceutes los términos, el software privativu nun va instalase y van usase les alternatives de códigu abiertu.
     
@@ -2774,92 +2772,92 @@ L'instalador va colar y van perdese tolos cambeos.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Recoyendo la información del sistema...
     
     
-      
+      
       Partitions
       Particiones
     
     
-      
+      
       Current:
       Anguaño:
     
     
-      
+      
       After:
       Dempués:
     
     
-      
+      
       No EFI system partition configured
       Nun se configuró nenguna partición del sistema EFI
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       La partición d'arrinque nun ta cifrada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Configuróse una partición d'arrinque xunto con una partición raigañu cifrada pero la partición d'arrinque nun ta cifrada.<br/><br/>Hai problemes de seguranza con esta triba de configuración porque los ficheros importantes del sistema caltiénense nuna partición ensin cifrar.<br/>Podríes siguir si quixeres pero'l desbloquéu del sistema de ficheros va asoceder más sero nel aniciu del sistema.<br/>Pa cifrar la partición raigañu, volvi p'atrás y recreala esbillando <strong>Cifrar</strong> na ventana de creación de particiones.
     
     
-      
+      
       has at least one disk device available.
       tien polo menos un preséu disponible d'almacenamientu
     
     
-      
+      
       There are no partitions to install on.
       Nun hai particiones nes qu'instalar.
     
@@ -2994,7 +2992,7 @@ Salida:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3621,25 +3619,53 @@ Salida:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Aceutar
+    
+    
+      
+      &Yes
+      &Sí
+    
+    
+      
+      &No
+      &Non
+    
+    
+      
+      &Cancel
+      &Encaboxar
+    
+    
+      
+      &Close
+      &Zarrar
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Instalación del siguimientu
     
     
-      
+      
       Sending installation feedback.
       Unviando'l siguimientu de la instalación.
     
     
-      
+      
       Internal error in install-tracking.
       Fallu internu n'install-tracking.
     
     
-      
+      
       HTTP request timed out.
       Escosó'l tiempu d'espera de la solicitú HTTP.
     
@@ -3647,28 +3673,28 @@ Salida:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3676,28 +3702,28 @@ Salida:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Siguimientu de la máquina
     
     
-      
+      
       Configuring machine feedback.
       Configurando'l siguimientu de la máquina.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Fallu na configuración del siguimientu de la máquina.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Nun pudo configurase afayadizamente'l siguimientu de la máquina, fallu del script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Nun pudo configurase afayadizamente'l siguimientu de la máquina, fallu de Calamares %1.
     
@@ -4050,45 +4076,30 @@ Salida:
   
     keyboardq
     
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
+      
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Keyboard Layout
-      
+      
+      Keyboard Model:
+      Modelu del tecláu:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      
+      Layouts
       
     
     
-      
-      Models
-      Modelos
+      
+      Type here to test your keyboard
+      Teclexa equí pa probar el tecláu
     
     
-      
+      
       Variants
       Variantes
     
-    
-      
-      Keyboard Variant
-      
-    
-    
-      
-      Test your keyboard
-      
-    
   
   
     localeq
diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts
index f9ae263eea..eecb26d62d 100644
--- a/lang/calamares_az.ts
+++ b/lang/calamares_az.ts
@@ -24,7 +24,7 @@
     
       
       This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.
-      Bu sistem <strong>BIOS</strong> açılış mühiti ilə başladılıb.<br><br>BIOS açılış mühitini ayarlamaq üçün quraşdırıcı bölmənin başlanğıcına və ya<strong>Master Boot Record</strong> üzərində <strong>GRUB</strong> və ya <strong>systemd-boot</strong> kimi yükləyici istifadə etməlidir. Əgər bunun avtomatik olaraq qurulmasını istəmirsinizsə özünüz əl ilə bölmələr yarada bilərsiniz.
+      Bu sistem <strong>BIOS</strong> önyükləyici mühiti ilə işə salındı. <br> <br> BIOS mühitindən başlatmanı tənzimləmək üçün, bu quraşdırıcı, ya bölmənin əvvəlində ya da bölmələr cədvəlinin yanında <strong>Əsas Önyükləyici Qeydi</strong> bölməsində <strong>GRUB</strong> kimi bir önyükləyici quraşdırmalıdır (buna üstünlük verilir). Bu, siz əl ilə bölmə yaratmadığınız halda öz-özünə quraşdırılır. Əgər cədvəli siz bölsəniz hər bir bölməni ayrıca ayarlamalısınız.
     
   
   
@@ -32,12 +32,12 @@
     
       
       Master Boot Record of %1
-      %1 əsas Ön yükləyici qurmaq
+      %1 ƏsasÖnyükləyici Qeydi
     
     
       
       Boot Partition
-      Ön yükləyici bölməsi
+      Önyükləyici bölməsi
     
     
       
@@ -47,7 +47,7 @@
     
       
       Do not install a boot loader
-      Ön yükləyicini qurmamaq
+      Önyükləyici quraşdırmayın
     
     
       
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Quraşdırılma başa çatdı
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Quraşdırılma xətası
     
     
-      
+      
       Installation Failed
       Quraşdırılma alınmadı
     
     
-      
+      
       Would you like to paste the install log to the web?
       Quraşdırma jurnalını vebdə yerləşdirmək istəyirsinizmi?
     
     
-      
+      
       Error
       Xəta
     
     
-      
-      
+      
       &Yes
       &Bəli
     
     
-      
-      
+      
       &No
       &Xeyr
     
     
-      
+      
       &Close
       &Bağlamaq
     
     
-      
+      
       Install Log Paste URL
       Jurnal yerləşdirmə URL-nu daxil etmək
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Keçid mübadilə yaddaşına kopyalandı
     
     
-      
+      
       Calamares Initialization Failed
       Calamares işə salına bilmədi
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Yüklənə bilməyən modullar aşağıdakılardır:
     
     
-      
+      
       Continue with setup?
       Quraşdırılma davam etdirilsin?
     
     
-      
+      
       Continue with installation?
       Quraşdırılma davam etdirilsin?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong>
     
     
-      
+      
       &Set up now
       &İndi ayarlamaq
     
     
-      
+      
       &Install now
       Q&uraşdırmağa başlamaq
     
     
-      
+      
       Go &back
       &Geriyə
     
     
-      
+      
       &Set up
       A&yarlamaq
     
     
-      
+      
       &Install
       Qu&raşdırmaq
     
     
-      
+      
       Setup is complete. Close the setup program.
       Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın.
     
     
-      
+      
       The installation is complete. Close the installer.
       Quraşdırma başa çatdı. Quraşdırıcını bağlayın.
     
     
-      
+      
       Cancel setup without changing the system.
       Sistemi dəyişdirmədən quraşdırmanı ləğv etmək.
     
     
-      
+      
       Cancel installation without changing the system.
       Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək.
     
     
-      
+      
       &Next
       İ&rəli
     
     
-      
+      
       &Back
       &Geriyə
     
     
-      
+      
       &Done
       &Hazır
     
     
-      
+      
       &Cancel
       İm&tina etmək
     
     
-      
+      
       Cancel setup?
       Quraşdırılmadan imtina edilsin?
     
     
-      
+      
       Cancel installation?
       Yüklənmədən imtina edilsin?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz?
 Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz?
@@ -829,22 +827,22 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Bu proqram sizə bəzi suallar verəcək və %2 əməliyyat sistemini sizin komputerinizə qurmağa kömək edəcək.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 üçün Calamares quraşdırma proqramına xoş gəldiniz!</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 quraşdırmaq üçün xoş gəldiniz</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 üçün Calamares quraşdırıcısına xoş gəldiniz!</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 quraşdırıcısına xoş gəldiniz</h1>
     
@@ -951,12 +949,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Install option: <strong>%1</strong>
-      
+      Quraşdırma seçimi: <strong>%1</strong>
     
     
       
       None
-      
+      Heç biri
     
     
       
@@ -1709,17 +1707,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole quraşdırılmayıb
     
     
-      
+      
       Please install KDE Konsole and try again!
       Lütfən KDE Konsole tətbiqini quraşdırın və yenidən cəhd edin!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Ssenari icra olunur. &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.<h1>Lisenziya razılaşması</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Mən yuxarıda göstərilən şərtləri qəbul edirəm.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Lütfən lisenziya razılaşması (EULA) ilə tanış olun.
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Bu quraşdırma proseduru lisenziya şərtlərinə tabe olan xüsusi proqram təminatını quraşdıracaqdır.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Lisenziya razılaşmalarını qəbul etməsəniz quraşdırılma davam etdirilə bilməz.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Bu quraşdırma proseduru, əlavə xüsusiyyətlər təmin etmək və istifadəçi təcrübəsini artırmaq üçün lisenziyalaşdırma şərtlərinə tabe olan xüsusi proqram təminatını quraşdıra bilər.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Şərtlərlə razılaşmasanız, xüsusi proqram quraşdırılmayacaq və bunun əvəzinə açıq mənbə kodu ilə alternativlər istifadə ediləcəkdir.
     
@@ -2781,92 +2779,92 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sistem məlumatları toplanır ...
     
     
-      
+      
       Partitions
       Bölmələr
     
     
-      
+      
       Current:
       Cari:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       No EFI system partition configured
       EFI sistemi bölməsi tənzimlənməyib
     
     
-      
+      
       EFI system partition configured incorrectly
-      
+      EFİ sistem bölməsi səhv yaradıldı
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
-      
+      EFİ fayl sistemi %1 başladılması üçün lazımdır.<br/> <br/> EFİ fayl sistemini quraşdırmaq üçün geri qayıdın və uyğun fayl sistemini seçin və ya yaradın.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
-      
+      Fayl sistemi burada qoşulmalıdır: <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
-      
+      Fayl sistemi FAT32 olmalıdır.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
-      
+      Fayl sisteminin ölçüsü ən az %1 MiB olmalıdır.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
-      
+      Fayl sisteminə <strong>%1</strong> bayrağı təyin olunmalıdır.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
-      
+      Siz, EFİ sistem bölməsini ayarlamadan davam edə bilərsiniz, lakin bu sisteminizin işə düşə bilməməsinə səbəb ola bilər.
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS-da GPT istifadəsi seçimi
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT bölmə cədvəli bütün sistemlər üçün yaxşıdır. Bu quraşdırıcı BIOS sistemləri üçün də belə bir quruluşu dəstəkləyir.<br/><br/>BİOS-da GPT bölmələr cədvəlini ayarlamaq üçün (əgər bu edilməyibsə) geriyə qayıdın və bölmələr cədvəlini GPT-yə qurun, sonra isə <strong>bios_grub</strong> bayrağı seçilmiş 8 MB-lıq formatlanmamış bölmə yaradın.<br/><br/>8 MB-lıq formatlanmamış bölmə GPT ilə BİOS sistemində %1 başlatmaq üçün lazımdır.
     
     
-      
+      
       Boot partition not encrypted
       Ön yükləyici bölməsi çifrələnməyib
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Şifrəli bir kök bölməsi ilə birlikdə ayrı bir ön yükləyici bölməsi qurulub, ancaq ön yükləyici bölməsi şifrələnməyib.<br/><br/>Bu cür quraşdırma ilə bağlı təhlükəsizlik problemləri olur, çünki vacib sistem sənədləri şifrəsiz bölmədə saxlanılır.<br/>İstəyirsinizsə davam edə bilərsiniz, lakin, fayl sisteminin kilidi, sistem başladıldıqdan daha sonra açılacaqdır.<br/>Yükləmə hissəsini şifrələmək üçün geri qayıdın və bölmə yaratma pəncərəsində <strong>Şifrələmə</strong> menyusunu seçərək onu yenidən yaradın.
     
     
-      
+      
       has at least one disk device available.
       ən az bir disk qurğusu mövcuddur.
     
     
-      
+      
       There are no partitions to install on.
       Quraşdırmaq üçün bölmə yoxdur.
     
@@ -3001,7 +2999,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3628,25 +3626,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Bəli
+    
+    
+      
+      &No
+      &Xeyr
+    
+    
+      
+      &Cancel
+      &İmtina etmək
+    
+    
+      
+      &Close
+      &Bağlamaq
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Quraşdırılma hesabatı
     
     
-      
+      
       Sending installation feedback.
       Quraşdırılma hesabatının göndərməsi.
     
     
-      
+      
       Internal error in install-tracking.
       install-tracking daxili xətası.
     
     
-      
+      
       HTTP request timed out.
       HTTP sorğusunun vaxtı keçdi.
     
@@ -3654,28 +3680,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE istifadəçi hesabatı
     
     
-      
+      
       Configuring KDE user feedback.
       KDE istifadəçi hesabatının tənzimlənməsi.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       KDE istifadəçi hesabatının tənzimlənməsində xəta.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       KDE istifadəçi hesabatı düzgün tənzimlənmədi, əmr xətası %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       KDE istifadəçi hesabatı düzgün tənzimlənmədi, Calamares xətası %1.
     
@@ -3683,28 +3709,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Kompyuter hesabatı
     
     
-      
+      
       Configuring machine feedback.
       kompyuter hesabatının tənzimlənməsi.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Kompyuter hesabatının tənzimlənməsində xəta.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Kompyuter hesabatı düzgün tənzimlənmədi, əmr xətası %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Kompyuter hesabatı düzgün tənzimlənmədi, Calamares xətası %1.
     
@@ -4070,45 +4096,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Klaviatura Modeli
-    
-    
-      
-      Layouts
-      Qatlar
+      
+      To activate keyboard preview, select a layout.
+      Klaviatura önbaxışını aktiv etmək üçün bir qat seçin.
     
     
-      
-      Keyboard Layout
-      Klaviatura Qatları
+      
+      Keyboard Model:
+      Klaviatura modeli:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Yazı dili və variantını seçmək üçün üstünlük verdiyiniz klaviatura modelini seçin və ya avadanlıq tərəfindən aşkar edilən klaviaturaya əsaslanan standart birini seçin.
+      
+      Layouts
+      Qatlar
     
     
-      
-      Models
-      Modellər
+      
+      Type here to test your keyboard
+      Buraya yazaraq klaviaturanı yoxlayın
     
     
-      
+      
       Variants
       Variantlar
     
-    
-      
-      Keyboard Variant
-      Klaviatura variantı
-    
-    
-      
-      Test your keyboard
-      Klaviaturanızı yoxlayın
-    
   
   
     localeq
@@ -4134,37 +4145,38 @@ Output:
       
       LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
                     Default option.
-      
+      LibreOffice bütün dünyada milyonlarla insanın istifadə etdiyi güclü və pulsuz ofis proqramları dəstidir. Buraya, onu bazarda hərtərəfli Pulsuz və Açıq mənbəli ofis proqramları dəsti halına gətirən bir neçə tətbiqlər daxildir. <br/>
+                    İlkin seçimlər.
     
     
       
       LibreOffice
-      
+      LibreOffice
     
     
       
       If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
-      
+      Əgər ofis proqramları quraşdırmaq istəməsəniz, sadəcə "Ofis dəsti olmadan' seçin. Sİz daha sonra quraşdırılmış sistemə istədiyiniz tətbiqi (həmçinin ofis üçün) quraşdıra bilərsiniz.
     
     
       
       No Office Suite
-      
+      Ofis dəsti olmadan
     
     
       
       Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
-      
+      Minimum İş masası quraşdırması yaradın, bütün əlavə tətbiqləri silin və sonra sisteminizə nə əlavə etmək istədiyinizə qərar verin. Məsələn belə bir quraşdırmada Office Suite, media oynadıcı, şəkillərə baxış və ya printer dəstəyi üçün tətbiqləri quraşdırmaq istəməyə bilərsiniz. Bu, yalnızca fayl bələdçisi, paket idarəedicisi, mətn redaktoru və sadə veb bələdçidən ibarət sadə İş masası olacaq.
     
     
       
       Minimal Install
-      
+      Minimum quraşdırma
     
     
       
       Please select an option for your install, or use the default: LibreOffice included.
-      
+      Lütfən quraşdırmanız üçün bir seçim edin və ya ilkin variandan istifadə edin: LibreOffice daxildir.
     
   
   
diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts
index af9838fba7..787cf03456 100644
--- a/lang/calamares_az_AZ.ts
+++ b/lang/calamares_az_AZ.ts
@@ -24,7 +24,7 @@
     
       
       This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.
-      Bu sistem <strong>BIOS</strong> açılış mühiti ilə başladılıb.<br><br>BIOS açılış mühitini ayarlamaq üçün quraşdırıcı bölmənin başlanğıcına və ya<strong>Master Boot Record</strong> üzərində <strong>GRUB</strong> və ya <strong>systemd-boot</strong> kimi yükləyici istifadə etməlidir. Əgər bunun avtomatik olaraq qurulmasını istəmirsinizsə özünüz əl ilə bölmələr yarada bilərsiniz.
+      Bu sistem <strong>BIOS</strong> önyükləyici mühiti ilə işə salındı. <br> <br> BIOS mühitindən başlatmanı tənzimləmək üçün, bu quraşdırıcı, ya bölmənin əvvəlində ya da bölmələr cədvəlinin yanında <strong>Əsas Önyükləyici Qeydi</strong> bölməsində <strong>GRUB</strong> kimi bir önyükləyici quraşdırmalıdır (buna üstünlük verilir). Bu, siz əl ilə bölmə yaratmadığınız halda öz-özünə quraşdırılır. Əgər cədvəli siz bölsəniz hər bir bölməni ayrıca ayarlamalısınız.
     
   
   
@@ -32,12 +32,12 @@
     
       
       Master Boot Record of %1
-      %1 əsas Ön yükləyici qurmaq
+      %1 ƏsasÖnyükləyici Qeydi
     
     
       
       Boot Partition
-      Ön yükləyici bölməsi
+      Önyükləyici bölməsi
     
     
       
@@ -47,7 +47,7 @@
     
       
       Do not install a boot loader
-      Ön yükləyicini qurmamaq
+      Önyükləyici quraşdırmayın
     
     
       
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Quraşdırılma başa çatdı
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Quraşdırılma xətası
     
     
-      
+      
       Installation Failed
       Quraşdırılma alınmadı
     
     
-      
+      
       Would you like to paste the install log to the web?
       Quraşdırma jurnalını vebdə yerləşdirmək istəyirsinizmi?
     
     
-      
+      
       Error
       Xəta
     
     
-      
-      
+      
       &Yes
       &Bəli
     
     
-      
-      
+      
       &No
       &Xeyr
     
     
-      
+      
       &Close
       &Bağlamaq
     
     
-      
+      
       Install Log Paste URL
       Jurnal yerləşdirmə URL-nu daxil etmək
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Yükləmə uğursuz oldu. Heç nə vebdə daxil edilmədi.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Keçid mübadilə yaddaşına kopyalandı
     
     
-      
+      
       Calamares Initialization Failed
       Calamares işə salına bilmədi
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 quraşdırılmadı. Calamares konfiqurasiya edilmiş modulların hamısını yükləyə bilmədi. Bu Calamares'i, sizin distribütör tərəfindən necə istifadə edilməsindən asılı olan bir problemdir.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Yüklənə bilməyən modullar aşağıdakılardır:
     
     
-      
+      
       Continue with setup?
       Quraşdırılma davam etdirilsin?
     
     
-      
+      
       Continue with installation?
       Quraşdırılma davam etdirilsin?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 quraşdırıcı proqramı %2 quraşdırmaq üçün Sizin diskdə dəyişiklik etməyə hazırdır.<br/><strong>Bu dəyişikliyi ləğv etmək mümkün olmayacaq.</strong>
     
     
-      
+      
       &Set up now
       &İndi ayarlamaq
     
     
-      
+      
       &Install now
       Q&uraşdırmağa başlamaq
     
     
-      
+      
       Go &back
       &Geriyə
     
     
-      
+      
       &Set up
       A&yarlamaq
     
     
-      
+      
       &Install
       Qu&raşdırmaq
     
     
-      
+      
       Setup is complete. Close the setup program.
       Quraşdırma başa çatdı. Quraşdırma proqramını bağlayın.
     
     
-      
+      
       The installation is complete. Close the installer.
       Quraşdırma başa çatdı. Quraşdırıcını bağlayın.
     
     
-      
+      
       Cancel setup without changing the system.
       Sistemi dəyişdirmədən quraşdırmanı ləğv etmək.
     
     
-      
+      
       Cancel installation without changing the system.
       Sistemə dəyişiklik etmədən quraşdırmadan imtina etmək.
     
     
-      
+      
       &Next
       İ&rəli
     
     
-      
+      
       &Back
       &Geriyə
     
     
-      
+      
       &Done
       &Hazır
     
     
-      
+      
       &Cancel
       İm&tina etmək
     
     
-      
+      
       Cancel setup?
       Quraşdırılmadan imtina edilsin?
     
     
-      
+      
       Cancel installation?
       Yüklənmədən imtina edilsin?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Siz doğrudanmı hazırkı quraşdırmadan imtina etmək istəyirsiniz?
 Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Siz doğrudanmı hazırkı yüklənmədən imtina etmək istəyirsiniz?
@@ -829,22 +827,22 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.Bu proqram sizə bəzi suallar verəcək və %2 əməliyyat sistemini sizin komputerinizə qurmağa kömək edəcək.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 üçün Calamares quraşdırma proqramına xoş gəldiniz!</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 quraşdırmaq üçün xoş gəldiniz</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 üçün Calamares quraşdırıcısına xoş gəldiniz!</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 quraşdırıcısına xoş gəldiniz</h1>
     
@@ -951,12 +949,12 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
       
       Install option: <strong>%1</strong>
-      
+      Quraşdırma seçimi: <strong>%1</strong>
     
     
       
       None
-      
+      Heç biri
     
     
       
@@ -1709,17 +1707,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole quraşdırılmayıb
     
     
-      
+      
       Please install KDE Konsole and try again!
       Lütfən KDE Konsole tətbiqini quraşdırın və yenidən cəhd edin!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Ssenari icra olunur. &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.<h1>Lisenziya razılaşması</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Mən yuxarıda göstərilən şərtləri qəbul edirəm.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Lütfən lisenziya razılaşması (EULA) ilə tanış olun.
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Bu quraşdırma proseduru lisenziya şərtlərinə tabe olan xüsusi proqram təminatını quraşdıracaqdır.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Lisenziya razılaşmalarını qəbul etməsəniz quraşdırılma davam etdirilə bilməz.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Bu quraşdırma proseduru, əlavə xüsusiyyətlər təmin etmək və istifadəçi təcrübəsini artırmaq üçün lisenziyalaşdırma şərtlərinə tabe olan xüsusi proqram təminatını quraşdıra bilər.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Şərtlərlə razılaşmasanız, xüsusi proqram quraşdırılmayacaq və bunun əvəzinə açıq mənbə kodu ilə alternativlər istifadə ediləcəkdir.
     
@@ -2781,92 +2779,92 @@ Lütfən bir birinci disk bölümünü çıxarın və əvəzinə genişləndiril
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sistem məlumatları toplanır ...
     
     
-      
+      
       Partitions
       Bölmələr
     
     
-      
+      
       Current:
       Cari:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       No EFI system partition configured
       EFI sistemi bölməsi tənzimlənməyib
     
     
-      
+      
       EFI system partition configured incorrectly
-      
+      EFİ sistem bölməsi səhv yaradıldı
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
-      
+      EFİ fayl sistemi %1 başladılması üçün lazımdır.<br/> <br/> EFİ fayl sistemini quraşdırmaq üçün geri qayıdın və uyğun fayl sistemini seçin və ya yaradın.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
-      
+      Fayl sistemi burada qoşulmalıdır: <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
-      
+      Fayl sistemi FAT32 olmalıdır.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
-      
+      Fayl sisteminin ölçüsü ən az %1 MiB olmalıdır.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
-      
+      Fayl sisteminə <strong>%1</strong> bayrağı təyin olunmalıdır.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
-      
+      Siz, EFİ sistem bölməsini ayarlamadan davam edə bilərsiniz, lakin bu sisteminizin işə düşə bilməməsinə səbəb ola bilər.
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS-da GPT istifadəsi seçimi
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT bölmə cədvəli bütün sistemlər üçün yaxşıdır. Bu quraşdırıcı BIOS sistemləri üçün də belə bir quruluşu dəstəkləyir.<br/><br/>BİOS-da GPT bölmələr cədvəlini ayarlamaq üçün (əgər bu edilməyibsə) geriyə qayıdın və bölmələr cədvəlini GPT-yə qurun, sonra isə <strong>bios_grub</strong> bayrağı seçilmiş 8 MB-lıq formatlanmamış bölmə yaradın.<br/><br/>8 MB-lıq formatlanmamış bölmə GPT ilə BİOS sistemində %1 başlatmaq üçün lazımdır.
     
     
-      
+      
       Boot partition not encrypted
       Ön yükləyici bölməsi çifrələnməyib
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Şifrəli bir kök bölməsi ilə birlikdə ayrı bir ön yükləyici bölməsi qurulub, ancaq ön yükləyici bölməsi şifrələnməyib.<br/><br/>Bu cür quraşdırma ilə bağlı təhlükəsizlik problemləri olur, çünki vacib sistem sənədləri şifrəsiz bölmədə saxlanılır.<br/>İstəyirsinizsə davam edə bilərsiniz, lakin, fayl sisteminin kilidi, sistem başladıldıqdan daha sonra açılacaqdır.<br/>Yükləmə hissəsini şifrələmək üçün geri qayıdın və bölmə yaratma pəncərəsində <strong>Şifrələmə</strong> menyusunu seçərək onu yenidən yaradın.
     
     
-      
+      
       has at least one disk device available.
       ən az bir disk qurğusu mövcuddur.
     
     
-      
+      
       There are no partitions to install on.
       Quraşdırmaq üçün bölmə yoxdur.
     
@@ -3001,7 +2999,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3628,25 +3626,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Bəli
+    
+    
+      
+      &No
+      &Xeyr
+    
+    
+      
+      &Cancel
+      &İmtina etmək
+    
+    
+      
+      &Close
+      &Bağlamaq
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Quraşdırılma hesabatı
     
     
-      
+      
       Sending installation feedback.
       Quraşdırılma hesabatının göndərməsi.
     
     
-      
+      
       Internal error in install-tracking.
       install-tracking daxili xətası.
     
     
-      
+      
       HTTP request timed out.
       HTTP sorğusunun vaxtı keçdi.
     
@@ -3654,28 +3680,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE istifadəçi hesabatı
     
     
-      
+      
       Configuring KDE user feedback.
       KDE istifadəçi hesabatının tənzimlənməsi.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       KDE istifadəçi hesabatının tənzimlənməsində xəta.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       KDE istifadəçi hesabatı düzgün tənzimlənmədi, əmr xətası %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       KDE istifadəçi hesabatı düzgün tənzimlənmədi, Calamares xətası %1.
     
@@ -3683,28 +3709,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Kompyuter hesabatı
     
     
-      
+      
       Configuring machine feedback.
       kompyuter hesabatının tənzimlənməsi.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Kompyuter hesabatının tənzimlənməsində xəta.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Kompyuter hesabatı düzgün tənzimlənmədi, əmr xətası %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Kompyuter hesabatı düzgün tənzimlənmədi, Calamares xətası %1.
     
@@ -4070,45 +4096,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Klaviatura Modeli
-    
-    
-      
-      Layouts
-      Qatlar
+      
+      To activate keyboard preview, select a layout.
+      Klaviatura önbaxışını aktiv etmək üçün bir qat seçin.
     
     
-      
-      Keyboard Layout
-      Klaviatura Qatları
+      
+      Keyboard Model:
+      Klaviatura modeli:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Yazı dili və variantını seçmək üçün üstünlük verdiyiniz klaviatura modelini seçin və ya avadanlıq tərəfindən aşkar edilən klaviaturaya əsaslanan standart birini seçin.
+      
+      Layouts
+      Qatlar
     
     
-      
-      Models
-      Modellər
+      
+      Type here to test your keyboard
+      Buraya yazaraq klaviaturanı yoxlayın
     
     
-      
+      
       Variants
       Variantlar
     
-    
-      
-      Keyboard Variant
-      Klaviatura variantı
-    
-    
-      
-      Test your keyboard
-      Klaviaturanızı yoxlayın
-    
   
   
     localeq
@@ -4134,37 +4145,38 @@ Output:
       
       LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
                     Default option.
-      
+      LibreOffice bütün dünyada milyonlarla insanın istifadə etdiyi güclü və pulsuz ofis proqramları dəstidir. Buraya, onu bazarda hərtərəfli Pulsuz və Açıq mənbəli ofis proqramları dəsti halına gətirən bir neçə tətbiqlər daxildir. <br/>
+                    İlkin seçimlər.
     
     
       
       LibreOffice
-      
+      LibreOffice
     
     
       
       If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
-      
+      Əgər ofis proqramları quraşdırmaq istəməsəniz, sadəcə "Ofis dəsti olmadan' seçin. Sİz daha sonra quraşdırılmış sistemə istədiyiniz tətbiqi (həmçinin ofis üçün) quraşdıra bilərsiniz.
     
     
       
       No Office Suite
-      
+      Ofis dəsti olmadan
     
     
       
       Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
-      
+      Minimum İş masası quraşdırması yaradın, bütün əlavə tətbiqləri silin və sonra sisteminizə nə əlavə etmək istədiyinizə qərar verin. Məsələn belə bir quraşdırmada Office Suite, media oynadıcı, şəkillərə baxış və ya printer dəstəyi üçün tətbiqləri quraşdırmaq istəməyə bilərsiniz. Bu, yalnızca fayl bələdçisi, paket idarəedicisi, mətn redaktoru və sadə veb bələdçidən ibarət sadə İş masası olacaq.
     
     
       
       Minimal Install
-      
+      Minimum quraşdırma
     
     
       
       Please select an option for your install, or use the default: LibreOffice included.
-      
+      Lütfən quraşdırmanız üçün bir seçim edin və ya ilkin variandan istifadə edin: LibreOffice daxildir.
     
   
   
diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts
index f5a40252f4..b1ae0842c8 100644
--- a/lang/calamares_be.ts
+++ b/lang/calamares_be.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Завершана
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Усталёўка схібіла
     
     
-      
+      
       Installation Failed
       Не атрымалася ўсталяваць
     
     
-      
+      
       Would you like to paste the install log to the web?
       Сапраўды хочаце ўставіць журнал усталёўкі па сеціўным адрасе?
     
     
-      
+      
       Error
       Памылка
     
     
-      
-      
+      
       &Yes
       &Так
     
     
-      
-      
+      
       &No
       &Не
     
     
-      
+      
       &Close
       &Закрыць
     
     
-      
+      
       Install Log Paste URL
       Уставіць журнал усталёўкі па URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Запампаваць не атрымалася.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +343,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Не атрымалася ініцыялізаваць Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Не атрымалася ўсталяваць %1. У Calamares не атрымалася загрузіць усе падрыхтаваныя модулі. Гэтая праблема ўзнікла праз асаблівасці выкарыстання Calamares вашым дыстрыбутывам.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Не атрымалася загрузіць наступныя модулі:
     
     
-      
+      
       Continue with setup?
       Працягнуць усталёўку?
     
     
-      
+      
       Continue with installation?
       Працягнуць усталёўку?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Праграма ўсталёўкі %1 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Скасаваць змены будзе немагчыма.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Праграма ўсталёўкі %1 гатовая ўнесці змены на ваш дыск, каб усталяваць %2.<br/><strong>Адрабіць змены будзе немагчыма.</strong>
     
     
-      
+      
       &Set up now
       &Усталяваць
     
     
-      
+      
       &Install now
       &Усталяваць
     
     
-      
+      
       Go &back
       &Назад
     
     
-      
+      
       &Set up
       &Усталяваць
     
     
-      
+      
       &Install
       &Усталяваць
     
     
-      
+      
       Setup is complete. Close the setup program.
       Усталёўка завершаная. Закрыйце праграму ўсталёўкі.
     
     
-      
+      
       The installation is complete. Close the installer.
       Усталёўка завершаная. Закрыйце праграму.
     
     
-      
+      
       Cancel setup without changing the system.
       Скасаваць усталёўку без змены сістэмы.
     
     
-      
+      
       Cancel installation without changing the system.
       Скасаваць усталёўку без змены сістэмы.
     
     
-      
+      
       &Next
       &Далей
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       &Завершана
     
     
-      
+      
       &Cancel
       &Скасаваць
     
     
-      
+      
       Cancel setup?
       Скасаваць усталёўку?
     
     
-      
+      
       Cancel installation?
       Скасаваць усталёўку?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Сапраўды хочаце скасаваць працэс усталёўкі? Праграма спыніць працу, а ўсе змены страцяцца.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Сапраўды хочаце скасаваць працэс усталёўкі? Праграма спыніць працу, а ўсе змены страцяцца.
@@ -827,22 +825,22 @@ The installer will quit and all changes will be lost.
       Гэтая праграма задасць вам некалькі пытанняў і дапаможа ўсталяваць %2 на ваш камп’ютар.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Вітаем у праграме ўсталёўкі Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Вітаем у праграме ўсталёўкі %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Вітаем у праграме ўсталёўкі Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Вітаем у праграме ўсталёўкі %1</h1>
     
@@ -1707,17 +1705,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole не ўсталяваная
     
     
-      
+      
       Please install KDE Konsole and try again!
       Калі ласка, ўсталюйце KDE Konsole і паўтарыце зноў!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Выкананне скрыпта: &nbsp;<code>%1</code>
     
@@ -1782,32 +1780,32 @@ The installer will quit and all changes will be lost.
       <h1>Ліцэнзійнае пагадненне</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Я пагаджаюся з пададзенымі вышэй умовамі.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Калі ласка, паглядзіце ліцэнзійную дамову з канчатковым карыстальнікам (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Падчас гэтай працэдуры ўсталюецца прапрыетарнае праграмнае забеспячэнне, на якое распаўсюджваюцца ўмовы ліцэнзавання.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Калі вы не згодныя з умовамі, то працягнуць усталёўку не атрымаецца.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Падчас гэтай працэдуры ўсталюецца прапрыетарнае праграмнае забеспячэнне, на якое распаўсюджваюцца ўмовы ліцэнзавання. Гэтае апраграмаванне патрабуецца для забеспячэння дадатковых функцый і паляпшэння ўзаемадзеяння з карыстальнікам.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Калі вы не згодныя з умовамі, то прапрыетарнае апраграмаванне не будзе ўсталявана. Замест яго будуць выкарыстоўвацца свабодныя альтэрнатывы.
     
@@ -2796,92 +2794,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Збор інфармацыі пра сістэму...
     
     
-      
+      
       Partitions
       Раздзелы
     
     
-      
+      
       Current:
       Бягучы:
     
     
-      
+      
       After:
       Пасля:
     
     
-      
+      
       No EFI system partition configured
       Няма наладжанага сістэмнага раздзела EFI
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Параметр для выкарыстання GPT у BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Табліца раздзелаў GPT - найлепшы варыянт для ўсіх сістэм. Гэтая праграма ўсталёўкі таксама падтрымлівае гэты варыянт і для BIOS.<br/><br/>Каб наладзіць GPT для BIOS (калі гэта яшчэ не зроблена), вярніцеся назад і абярыце табліцу раздзелаў GPT, пасля стварыце нефарматаваны раздзел памерам 8 МБ са сцягам <strong>bios_grub</strong>.<br/><br/>Гэты раздзел патрэбны для запуску %1 у BIOS з GPT.
     
     
-      
+      
       Boot partition not encrypted
       Загрузачны раздзел не зашыфраваны
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Уключана шыфраванне каранёвага раздзела, але выкарыстаны асобны загрузачны раздзел без шыфравання.<br/><br/>Пры такой канфігурацыі могуць узнікнуць праблемы з бяспекай, бо важныя сістэмныя даныя будуць захоўвацца на раздзеле без шыфравання.<br/>Вы можаце працягнуць, але файлавая сістэма разблакуецца падчас запуску сістэмы.<br/>Каб уключыць шыфраванне загрузачнага раздзела, вярніцеся назад і стварыце яго нанова, адзначыўшы <strong>Шыфраваць</strong> у акне стварэння раздзела.
     
     
-      
+      
       has at least one disk device available.
       ёсць прынамсі адна даступная дыскавая прылада.
     
     
-      
+      
       There are no partitions to install on.
       Няма раздзелаў для ўсталёўкі.
     
@@ -3016,7 +3014,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3643,25 +3641,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Добра
+    
+    
+      
+      &Yes
+      &Так
+    
+    
+      
+      &No
+      &Не
+    
+    
+      
+      &Cancel
+      &Скасаваць
+    
+    
+      
+      &Close
+      &Закрыць
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Справаздача па ўсталёўцы
     
     
-      
+      
       Sending installation feedback.
       Адпраўленне справаздачы па ўсталёўцы.
     
     
-      
+      
       Internal error in install-tracking.
       Унутраная памылка адсочвання ўсталёўкі.
     
     
-      
+      
       HTTP request timed out.
       Час чакання адказу ад HTTP сышоў.
     
@@ -3669,28 +3695,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Зваротная сувязь KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Наладка зваротнай сувязі KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Падчас наладкі зваротнай сувязі KDE адбылася памылка.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Не атрымалася наладзіць зваротную сувязь KDE, памылка скрыпта %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Не атрымалася наладзіць зваротную сувязь KDE, памылка Calamares %1.
     
@@ -3698,28 +3724,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Сістэма зваротнай сувязі
     
     
-      
+      
       Configuring machine feedback.
       Наладка сістэмы зваротнай сувязі.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Памылка ў канфігурацыі сістэмы зваротнай сувязі.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Не атрымалася наладзіць сістэму зваротнай сувязі, памылка скрыпта %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Не атрымалася наладзіць сістэму зваротнай сувязі, памылка Calamares %1.
     
@@ -4084,45 +4110,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Мадэль клавіятуры
-    
-    
-      
-      Layouts
-      Раскладкі
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Раскладка клавіятуры
+      
+      Keyboard Model:
+      Мадэль клавіятуры:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Пстрыкніце на пераважную мадэль клавіятуры, каб абраць раскладку і варыянт, альбо выкарыстоўвайце прадвызначаную ў залежнасці ад выяўленага абсталявання.
+      
+      Layouts
+      Раскладкі
     
     
-      
-      Models
-      Мадэлі
+      
+      Type here to test your keyboard
+      Радок уводу для праверкі вашай клавіятуры
     
     
-      
+      
       Variants
       Варыянты
     
-    
-      
-      Keyboard Variant
-      Варыянт клавіятуры
-    
-    
-      
-      Test your keyboard
-      Пратэстуйце сваю клавіятуру
-    
   
   
     localeq
diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index 320e06875a..c72c3def25 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Готово
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Неуспешна инсталация
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Грешка
     
     
-      
-      
+      
       &Yes
       &Да
     
     
-      
-      
+      
       &No
       &Не
     
     
-      
+      
       &Close
       &Затвори
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Инициализацията на Calamares се провали
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 не може да се инсталира. Calamares не можа да зареди всичките конфигурирани модули. Това е проблем с начина, по който Calamares е използван от дистрибуцията.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Следните модули не могат да се заредят:
     
     
-      
+      
       Continue with setup?
       Продължаване?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Инсталатора на %1 ще направи промени по вашия диск за да инсталира %2. <br><strong>Промените ще бъдат окончателни.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Инсталирай сега
     
     
-      
+      
       Go &back
       В&ръщане
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Инсталирай
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Инсталацията е завършена. Затворете инсталаторa.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Отказ от инсталацията без промяна на системата.
     
     
-      
+      
       &Next
       &Напред
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       &Готово
     
     
-      
+      
       &Cancel
       &Отказ
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Отмяна на инсталацията?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Наистина ли искате да отмените текущият процес на инсталиране?
@@ -825,22 +823,22 @@ The installer will quit and all changes will be lost.
       Тази програма ще ви зададе няколко въпроса и ще конфигурира %2 на вашия компютър.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1705,17 +1703,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole не е инсталиран
     
     
-      
+      
       Please install KDE Konsole and try again!
       Моля, инсталирайте KDE Konsole и опитайте отново!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Изпълняване на скрипт: &nbsp;<code>%1</code>
     
@@ -1780,32 +1778,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       Приемам лицензионните условия.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2774,92 +2772,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Събиране на системна информация...
     
     
-      
+      
       Partitions
       Дялове
     
     
-      
+      
       Current:
       Сегашен:
     
     
-      
+      
       After:
       След:
     
     
-      
+      
       No EFI system partition configured
       Няма конфигуриран EFI системен дял
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Липсва криптиране на дял за начално зареждане
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2993,7 +2991,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3617,25 +3615,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &ОК
+    
+    
+      
+      &Yes
+      &Да
+    
+    
+      
+      &No
+      &Не
+    
+    
+      
+      &Cancel
+      &Отказ
+    
+    
+      
+      &Close
+      &Затвори
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3643,28 +3669,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3672,28 +3698,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4045,44 +4071,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Модел на клавиатура:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Пишете тук за да тествате вашата клавиатура
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts
index f9d76c500f..49269be576 100644
--- a/lang/calamares_bn.ts
+++ b/lang/calamares_bn.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       সম্পন্ন
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       ইনস্টলেশন ব্যর্থ হলো
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       ত্রুটি
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       সেটআপ চালিয়ে যেতে চান?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 ইনস্টলার %2 সংস্থাপন করতে আপনার ডিস্কে পরিবর্তন করতে যাচ্ছে।
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       এবংএখনই ইনস্টল করুন
     
     
-      
+      
       Go &back
       এবংফিরে যান
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       এবং পরবর্তী
     
     
-      
+      
       &Back
       এবং পেছনে
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       এবংবাতিল করুন
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       ইনস্টলেশন বাতিল করবেন?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       আপনি কি সত্যিই বর্তমান সংস্থাপন প্রক্রিয়া বাতিল করতে চান?
@@ -824,22 +822,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1704,17 +1702,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       স্ক্রিপ্ট কার্যকর করা হচ্ছে: &nbsp;<code>%1</code>
     
@@ -1779,32 +1777,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       আমি উপরের শর্তাবলী মেনে নিচ্ছি।
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2773,92 +2771,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       সিস্টেম তথ্য সংগ্রহ করা হচ্ছে...
     
     
-      
+      
       Partitions
       পার্টিশনগুলো
     
     
-      
+      
       Current:
       বর্তমান:
     
     
-      
+      
       After:
       পরে:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2990,7 +2988,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3614,25 +3612,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      এবংবাতিল করুন
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3640,28 +3666,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3669,28 +3695,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4042,44 +4068,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      কীবোর্ড নকশা:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      আপনার কীবোর্ড পরীক্ষা করতে এখানে টাইপ করুন
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index f800445908..d132ea85dd 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Fet
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Ha fallat la configuració.
     
     
-      
+      
       Installation Failed
       La instal·lació ha fallat.
     
     
-      
+      
       Would you like to paste the install log to the web?
       Voleu enganxar el registre d'instal·lació a la xarxa?
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
       &Yes
       &Sí
     
     
-      
-      
+      
       &No
       &No
     
     
-      
+      
       &Close
       Tan&ca
     
     
-      
+      
       Install Log Paste URL
       URL de publicació del registre d'instal·lació
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 L'enllaç s'ha copiat al porta-retalls.
     
     
-      
+      
       Calamares Initialization Failed
       Ha fallat la inicialització de Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. Aquest és un problema amb la manera com el Calamares és utilitzat per la distribució.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>No s'han pogut carregar els mòduls següents:
     
     
-      
+      
       Continue with setup?
       Voleu continuar la configuració?
     
     
-      
+      
       Continue with installation?
       Voleu continuar la instal·lació?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El programa de configuració %1 està a punt de fer canvis al disc per tal de configurar %2.<br/><strong>No podreu desfer aquests canvis.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       L'instal·lador per a %1 està a punt de fer canvis al disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong>
     
     
-      
+      
       &Set up now
       Con&figura-ho ara
     
     
-      
+      
       &Install now
       &Instal·la'l ara
     
     
-      
+      
       Go &back
       Ves &enrere
     
     
-      
+      
       &Set up
       Con&figura-ho
     
     
-      
+      
       &Install
       &Instal·la
     
     
-      
+      
       Setup is complete. Close the setup program.
       La configuració s'ha acabat. Tanqueu el programa de configuració.
     
     
-      
+      
       The installation is complete. Close the installer.
       La instal·lació s'ha acabat. Tanqueu l'instal·lador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancel·la la configuració sense canviar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancel·leu la instal·lació sense canviar el sistema.
     
     
-      
+      
       &Next
       &Següent
     
     
-      
+      
       &Back
       &Enrere
     
     
-      
+      
       &Done
       &Fet
     
     
-      
+      
       &Cancel
       &Cancel·la
     
     
-      
+      
       Cancel setup?
       Voleu cancel·lar la configuració?
     
     
-      
+      
       Cancel installation?
       Voleu cancel·lar la instal·lació?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Realment voleu cancel·lar el procés de configuració actual?
 El programa de configuració es tancarà i es perdran tots els canvis.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Voleu cancel·lar el procés d'instal·lació actual?
@@ -829,22 +827,22 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Aquest programa us farà unes preguntes i instal·larà %2 a l'ordinador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Benvingut/da al programa de configuració del Calamares per a %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Benvingut/da a la configuració per a %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Benvingut/da a l'instal·lador Calamares per a %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Benvingut/da a l'instal·lador per a %1</h1>
     
@@ -1709,17 +1707,17 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       El Konsole no està instal·lat.
     
     
-      
+      
       Please install KDE Konsole and try again!
       Si us plau, instal·leu el Konsole de KDE i torneu-ho a intentar!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       S'executa l'script &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       <h1>Acord de llicència</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Accepto els termes i les condicions anteriors.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Si us plau, consulteu els acords de llicència d'usuari final (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Aquest procediment de configuració instal·larà programari de propietat subjecte a termes de llicència.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Si no esteu d’acord en els termes, el procediment de configuració no pot continuar.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Aquest procediment de configuració instal·larà programari de propietat subjecte a termes de llicència per tal de proporcionar característiques addicionals i millorar l'experiència de l'usuari.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Si no esteu d'acord en els termes, no s'instal·larà el programari de propietat i es faran servir les alternatives de codi lliure.
     
@@ -2780,92 +2778,92 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Es recopila informació del sistema...
     
     
-      
+      
       Partitions
       Particions
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Després:
     
     
-      
+      
       No EFI system partition configured
       No hi ha cap partició EFI de sistema configurada
     
     
-      
+      
       EFI system partition configured incorrectly
       Partició de sistema EFI configurada incorrectament
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       Cal una partició de sistema EFI per iniciar %1. <br/><br/>Per configurar-ne una, torneu enrere i seleccioneu o creeu un sistema de fitxers adequat.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       El sistema de fitxers ha d'estar muntat a <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
       El sistema de fitxers ha de ser del tipus FAT32.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       El sistema de fitxers ha de tenir un mínim de %1 MiB.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       El sistema de fitxers ha de tenir la bandera <strong>%1</strong> establerta.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       Podeu continuar sense configurar una partició del sistema EFI, però és possible que el sistema no s'iniciï.
     
     
-      
+      
       Option to use GPT on BIOS
       Opció per usar GPT amb BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       La millor opció per a tots els sistemes és una taula de particions GPT. Aquest instal·lador també admet aquesta configuració per a sistemes BIOS.<br/><br/>Per configurar una taula de particions GPT en un sistema BIOS, (si no s'ha fet ja) torneu enrere i establiu la taula de particions a GPT, després creeu una partició sense formatar de 8 MB amb la bandera <strong>bios_grub</strong> habilitada.<br/><br/>Cal una partició sense format de 8 MB per iniciar %1 en un sistema BIOS amb GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partició d'arrencada sense encriptar
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       S'ha establert una partició d'arrencada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrencada no està encriptada.<br/><br/>Hi ha assumptes de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers succeirà després, durant l'inici del sistema.<br/>Per encriptar la partició d'arrencada, torneu enrere i torneu-la a crear seleccionant <strong>Encripta</strong> a la finestra de creació de la partició.
     
     
-      
+      
       has at least one disk device available.
       tingui com a mínim un dispositiu de disc disponible.
     
     
-      
+      
       There are no partitions to install on.
       No hi ha particions per fer-hi una instal·lació.
     
@@ -3000,7 +2998,7 @@ Sortida:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3627,25 +3625,53 @@ La configuració pot continuar, però algunes característiques podrien estar in
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      D'ac&ord
+    
+    
+      
+      &Yes
+      &Sí
+    
+    
+      
+      &No
+      &No
+    
+    
+      
+      &Cancel
+      &Cancel·la
+    
+    
+      
+      &Close
+      Tan&ca
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Informació de retorn de la instal·lació
     
     
-      
+      
       Sending installation feedback.
       S'envia la informació de retorn de la instal·lació.
     
     
-      
+      
       Internal error in install-tracking.
       Error intern a install-tracking.
     
     
-      
+      
       HTTP request timed out.
       La petició HTTP ha esgotat el temps d'espera.
     
@@ -3653,28 +3679,28 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Informació de retorn d'usuaris de KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Es configura la informació de retorn dels usuaris de KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Error de configuració de la informació de retorn dels usuaris de KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       No s'ha pogut configurar la informació de retorn dels usuaris de KDE correctament. Error d'script %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       No s'ha pogut configurar la informació de retorn dels usuaris de KDE correctament. Error del Calamares %1.
     
@@ -3682,28 +3708,28 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Informació de retorn de la màquina
     
     
-      
+      
       Configuring machine feedback.
       Es configura la informació de retorn de la màquina.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Error a la configuració de la informació de retorn de la màquina.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       No s'ha pogut configurar la informació de retorn de la màquina correctament. Error d'script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       No s'ha pogut configurar la informació de retorn de la màquina correctament. Error del Calamares %1.
     
@@ -4071,45 +4097,30 @@ La configuració pot continuar, però algunes característiques podrien estar in
   
     keyboardq
     
-      
-      Keyboard Model
-      Model del teclat
-    
-    
-      
-      Layouts
-      Disposicions
+      
+      To activate keyboard preview, select a layout.
+      Per activar la previsualització del teclat, seleccioneu-ne una disposició.
     
     
-      
-      Keyboard Layout
-      Disposició del teclat
+      
+      Keyboard Model:
+      Model del teclat:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Cliqueu al model de teclat preferit per seleccionar-ne la disposició i la variant, o useu el predeterminat basat en el maquinari detectat.
+      
+      Layouts
+      Disposicions
     
     
-      
-      Models
-      Models
+      
+      Type here to test your keyboard
+      Escriviu aquí per comprovar el teclat
     
     
-      
+      
       Variants
       Variants
     
-    
-      
-      Keyboard Variant
-      Variant del teclat
-    
-    
-      
-      Test your keyboard
-      Proveu el teclat.
-    
   
   
     localeq
diff --git a/lang/calamares_ca@valencia.ts b/lang/calamares_ca@valencia.ts
index f00b87ed3a..1bc4da3abe 100644
--- a/lang/calamares_ca@valencia.ts
+++ b/lang/calamares_ca@valencia.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Fet
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       S'ha produït un error en la configuració.
     
     
-      
+      
       Installation Failed
       La instal·lació ha fallat.
     
     
-      
+      
       Would you like to paste the install log to the web?
       Voleu enganxar el registre d'instal·lació a la xarxa?
     
     
-      
+      
       Error
       S'ha produït un error.
     
     
-      
-      
+      
       &Yes
       &Sí
     
     
-      
-      
+      
       &No
       &No
     
     
-      
+      
       &Close
       Tan&ca
     
     
-      
+      
       Install Log Paste URL
       URL de publicació del registre d'instal·lació
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       La càrrega no s'ha fet correctament. No s'ha enganxat res a la xarxa.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       La inicialització del Calamares ha fallat.
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       No es pot instal·lar %1. El Calamares no ha pogut carregar tots els mòduls configurats. El problema es troba en com utilitza el Calamares la distribució.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>No s'han pogut carregar els mòduls següents:
     
     
-      
+      
       Continue with setup?
       Voleu continuar la configuració?
     
     
-      
+      
       Continue with installation?
       Voleu continuar la instal·lació?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El programa de configuració %1 està a punt de fer canvis en el disc per a configurar %2.<br/><strong>No podreu desfer aquests canvis.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       L'instal·lador per a %1 està a punt de fer canvis en el disc per tal d'instal·lar-hi %2.<br/><strong>No podreu desfer aquests canvis.</strong>
     
     
-      
+      
       &Set up now
       Con&figura-ho ara
     
     
-      
+      
       &Install now
       &Instal·la'l ara
     
     
-      
+      
       Go &back
       &Arrere
     
     
-      
+      
       &Set up
       Con&figuració
     
     
-      
+      
       &Install
       &Instal·la
     
     
-      
+      
       Setup is complete. Close the setup program.
       La configuració s'ha completat. Tanqueu el programa de configuració.
     
     
-      
+      
       The installation is complete. Close the installer.
       La instal·lació s'ha completat. Tanqueu l'instal·lador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancel·la la configuració sense canviar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancel·la la instal·lació sense canviar el sistema.
     
     
-      
+      
       &Next
       &Següent
     
     
-      
+      
       &Back
       A&rrere
     
     
-      
+      
       &Done
       &Fet
     
     
-      
+      
       &Cancel
       &Cancel·la
     
     
-      
+      
       Cancel setup?
       Voleu cancel·lar la configuració?
     
     
-      
+      
       Cancel installation?
       Voleu cancel·lar la instal·lació?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Voleu cancel·lar el procés de configuració actual?
 El programa de configuració es tancarà i es perdran tots els canvis.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Voleu cancel·lar el procés d'instal·lació actual?
@@ -825,22 +823,22 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       Aquest programa us farà unes preguntes i instal·larà %2 en l'ordinador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Us donen la benvinguda al programa de configuració del Calamares per a %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Us donen la benvinguda a la configuració per a %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Us donen la benvinguda a l'instal·lador del Calamares per a %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Us donen la benvinguda a l'instal·lador per a %1</h1>
     
@@ -1705,17 +1703,17 @@ L'instal·lador es tancarà i tots els canvis es perdran.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       El Konsole no està instal·lat.
     
     
-      
+      
       Please install KDE Konsole and try again!
       Instal·leu el Konsole de KDE i torneu a intentar-ho.
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       S'està executant l'script &nbsp;<code>%1</code>
     
@@ -1780,32 +1778,32 @@ L'instal·lador es tancarà i tots els canvis es perdran.
       <h1>Acord de llicència</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Accepte els termes i les condicions anteriors.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Consulteu els acords de llicència d'usuari final (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Aquest procediment de configuració instal·larà programari propietari subjecte a termes de llicència.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Si no esteu d'acord amb els termes, el procediment de configuració no pot continuar.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Aquest procediment de configuració instal·larà propietari subjecte a termes de llicència per tal de proporcionar característiques addicionals i millorar l'experiència de l'usuari.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Si no esteu d'acord en els termes, no s'instal·larà el programari propietari i es faran servir les alternatives de codi lliure.
     
@@ -2776,92 +2774,92 @@ per a desplaçar-s'hi i useu els botons +/- per a ampliar-lo o reduir-lo, o bé
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       S'està obtenint la informació del sistema...
     
     
-      
+      
       Partitions
       Particions
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Després:
     
     
-      
+      
       No EFI system partition configured
       No hi ha cap partició EFI de sistema configurada
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Opció per a usar GPT amb BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       La millor opció per a tots els sistemes és una taula de particions GPT. Aquest instal·lador també admet aquesta configuració per a sistemes BIOS.<br/><br/>Per a configurar una taula de particions GPT en un sistema BIOS, (si no s'ha fet ja) torneu arrere i establiu la taula de particions a GPT, després creeu una partició sense formatar de 8 MB amb el marcador <strong>bios_grub</strong> habilitada.<br/><br/>Cal una partició sense format de 8 MB per a iniciar %1 en un sistema BIOS amb GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partició d'arrancada sense encriptar
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       S'ha establit una partició d'arrancada separada conjuntament amb una partició d'arrel encriptada, però la partició d'arrancada no està encriptada.<br/><br/>Hi ha qüestions de seguretat amb aquest tipus de configuració, perquè hi ha fitxers del sistema importants en una partició no encriptada.<br/>Podeu continuar, si així ho desitgeu, però el desbloqueig del sistema de fitxers tindrà lloc després, durant l'inici del sistema.<br/>Per a encriptar la partició d'arrancada, torneu arrere i torneu-la a crear seleccionant <strong>Encripta</strong> en la finestra de creació de la partició.
     
     
-      
+      
       has at least one disk device available.
       té com a mínim un dispositiu de disc disponible.
     
     
-      
+      
       There are no partitions to install on.
       No hi ha particions per a fer-hi una instal·lació.
     
@@ -2996,7 +2994,7 @@ Eixida:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3623,25 +3621,53 @@ La configuració pot continuar, però és possible que algunes característiques
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      D'ac&ord
+    
+    
+      
+      &Yes
+      &Sí
+    
+    
+      
+      &No
+      &No
+    
+    
+      
+      &Cancel
+      &Cancel·la
+    
+    
+      
+      &Close
+      Tan&ca
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Informació de retorn de la instal·lació
     
     
-      
+      
       Sending installation feedback.
       S'envia la informació de retorn de la instal·lació.
     
     
-      
+      
       Internal error in install-tracking.
       S'ha produït un error intern en install-tracking.
     
     
-      
+      
       HTTP request timed out.
       La petició HTTP ha esgotat el temps d'espera.
     
@@ -3649,28 +3675,28 @@ La configuració pot continuar, però és possible que algunes característiques
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Informació de retorn d'usuaris de KDE.
     
     
-      
+      
       Configuring KDE user feedback.
       S'està configurant la informació de retorn dels usuaris de KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       S'ha produït un error en la configuració de la informació de retorn dels usuaris KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       No s'ha pogut configurar la informació de retorn dels usuaris de KDE correctament. S'ha produït un error en l'script %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       No s'ha pogut configurar la informació de retorn dels usuaris de KDE correctament. S'ha produït un error del Calamares %1.
     
@@ -3678,28 +3704,28 @@ La configuració pot continuar, però és possible que algunes característiques
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Informació de retorn de la màquina
     
     
-      
+      
       Configuring machine feedback.
       Es configura la informació de retorn de la màquina.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       S'ha produït un error en la configuració de la informació de retorn de la màquina.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       No s'ha pogut configurar la informació de retorn de la màquina correctament. S'ha produït un error d'script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       No s'ha pogut configurar la informació de retorn de la màquina correctament. S'ha produït un error del Calamares %1.
     
@@ -4065,45 +4091,30 @@ La configuració pot continuar, però és possible que algunes característiques
   
     keyboardq
     
-      
-      Keyboard Model
-      Model de teclat
-    
-    
-      
-      Layouts
-      Disposicions
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Disposició del teclat
+      
+      Keyboard Model:
+      Model de teclat:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Cliqueu en el model de teclat preferit per a seleccionar-ne la disposició i la variant, o useu el predeterminat basat en el maquinari detectat.
+      
+      Layouts
+      Disposicions
     
     
-      
-      Models
-      Models
+      
+      Type here to test your keyboard
+      Escriviu ací per a provar el teclat
     
     
-      
+      
       Variants
       Variants
     
-    
-      
-      Keyboard Variant
-      Variant del teclat
-    
-    
-      
-      Test your keyboard
-      Comproveu el teclat.
-    
   
   
     localeq
diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index 3c755e8ff2..1c2ed17556 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Hotovo
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Nastavení se nezdařilo
     
     
-      
+      
       Installation Failed
       Instalace se nezdařila
     
     
-      
+      
       Would you like to paste the install log to the web?
       Chcete vyvěsit záznam událostí při instalaci na web?
     
     
-      
+      
       Error
       Chyba
     
     
-      
-      
+      
       &Yes
       &Ano
     
     
-      
-      
+      
       &No
       &Ne
     
     
-      
+      
       &Close
       &Zavřít
     
     
-      
+      
       Install Log Paste URL
       URL pro vložení záznamu událostí při instalaci
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Nahrání se nezdařilo. Na web nebylo nic vloženo.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -349,124 +347,124 @@ Link copied to clipboard
 Odkaz na něj zkopírován do schránky
     
     
-      
+      
       Calamares Initialization Failed
       Inicializace Calamares se nezdařila
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 nemůže být nainstalováno. Calamares se nepodařilo načíst všechny nastavené moduly. Toto je problém způsobu použití Calamares ve vámi používané distribuci.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/> Následující moduly se nepodařilo načíst:
     
     
-      
+      
       Continue with setup?
       Pokračovat s instalací?
     
     
-      
+      
       Continue with installation?
       Pokračovat v instalaci?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instalátor %1 provede změny na datovém úložišti, aby bylo nainstalováno %2.<br/><strong>Změny nebude možné vrátit zpět.</strong>
     
     
-      
+      
       &Set up now
       Na&stavit nyní
     
     
-      
+      
       &Install now
       &Spustit instalaci
     
     
-      
+      
       Go &back
       Jít &zpět
     
     
-      
+      
       &Set up
       Na&stavit
     
     
-      
+      
       &Install
       Na&instalovat
     
     
-      
+      
       Setup is complete. Close the setup program.
       Nastavení je dokončeno. Ukončete nastavovací program.
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalace je dokončena. Ukončete instalátor.
     
     
-      
+      
       Cancel setup without changing the system.
       Zrušit nastavení bez změny v systému.
     
     
-      
+      
       Cancel installation without changing the system.
       Zrušení instalace bez provedení změn systému.
     
     
-      
+      
       &Next
       &Další
     
     
-      
+      
       &Back
       &Zpět
     
     
-      
+      
       &Done
       &Hotovo
     
     
-      
+      
       &Cancel
       &Storno
     
     
-      
+      
       Cancel setup?
       Zrušit nastavování?
     
     
-      
+      
       Cancel installation?
       Přerušit instalaci?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Opravdu chcete přerušit instalaci?
 Instalační program bude ukončen a všechny změny ztraceny.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Opravdu chcete instalaci přerušit?
@@ -833,22 +831,22 @@ Instalační program bude ukončen a všechny změny ztraceny.
       Tento program vám položí několik dotazů, aby na základě odpovědí příslušně nainstaloval %2 na váš počítač.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Vítejte v Calamares – instalačním programu pro %1.</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Vítejte v instalátoru %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Vítejte v Calamares, instalačním programu pro %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Vítejte v instalátoru %1.</h1>
     
@@ -1713,17 +1711,17 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole není nainstalované.
     
     
-      
+      
       Please install KDE Konsole and try again!
       Nainstalujte KDE Konsole a zkuste to znovu!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Spouštění skriptu: &nbsp;<code>%1</code>
     
@@ -1788,32 +1786,32 @@ Instalační program bude ukončen a všechny změny ztraceny.
       <h1>Licenční ujednání</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Souhlasím s výše uvedenými podmínkami.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Pročtěte si Smlouvy s koncovými uživatelem (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Tato nastavovací procedura nainstaluje proprietární software, který je předmětem licenčních podmínek.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Pokud s podmínkami nesouhlasíte, instalační procedura nemůže pokračovat.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Pro poskytování dalších funkcí a vylepšení pro uživatele, tato nastavovací procedura nainstaluje i proprietární software, který je předmětem licenčních podmínek.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Pokud nesouhlasíte s podmínkami, proprietární software nebude nainstalován a namísto toho budou použity opensource alternativy.
     
@@ -2802,92 +2800,92 @@ Instalační program bude ukončen a všechny změny ztraceny.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Shromažďování informací o systému…
     
     
-      
+      
       Partitions
       Oddíly
     
     
-      
+      
       Current:
       Stávající:
     
     
-      
+      
       After:
       Potom:
     
     
-      
+      
       No EFI system partition configured
       Není nastavený žádný EFI systémový oddíl
     
     
-      
+      
       EFI system partition configured incorrectly
       EFI systémový oddíl není nastaven správně
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       Aby bylo možné spouštět %1, je zapotřebí EFI systémový oddíl.<br/><br/>Takový nastavíte tak, že se vrátíte zpět a vyberete nebo vytvoříte příhodný souborový systém.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       Je třeba, aby souborový systém byl připojený na <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
       Je třeba, aby souborový systém byl typu FAT32.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       Je třeba, aby souborový systém byl alespoň %1 MiB velký.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       Je třeba, aby souborový systém měl nastavený příznak <strong>%1</strong>.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       Je možné pokračovat bez vytvoření EFI systémového oddílu, ale může se stát, že váš systém tím nenastartuje.
     
     
-      
+      
       Option to use GPT on BIOS
       Volba použít GPT i pro BIOS zavádění (MBR)
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT tabulka oddílů je nejlepší volbou pro všechny systémy. Tento instalátor podporuje takové uspořádání i pro zavádění v režimu BIOS firmware.<br/><br/>Pro nastavení GPT tabulky oddílů v případě BIOS, (pokud už není provedeno) jděte zpět a nastavte tabulku oddílů na, dále vytvořte 8 MB oddíl (bez souborového systému s příznakem <strong>bios_grub</strong>.<br/><br/>Tento oddíl je zapotřebí pro spuštění %1 na systému s BIOS firmware/režimem a GPT.
     
     
-      
+      
       Boot partition not encrypted
       Zaváděcí oddíl není šifrován
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Kromě šifrovaného kořenového oddílu byl vytvořen i nešifrovaný oddíl zavaděče.<br/><br/>To by mohl být bezpečnostní problém, protože na nešifrovaném oddílu jsou důležité soubory systému.<br/>Pokud chcete, můžete pokračovat, ale odemykání souborového systému bude probíhat později při startu systému.<br/>Pro zašifrování oddílu zavaděče se vraťte a vytvořte ho vybráním možnosti <strong>Šifrovat</strong> v okně při vytváření oddílu.
     
     
-      
+      
       has at least one disk device available.
       má k dispozici alespoň jedno zařízení pro ukládání dat.
     
     
-      
+      
       There are no partitions to install on.
       Nejsou zde žádné oddíly na které by se dalo nainstalovat.
     
@@ -3022,7 +3020,7 @@ Výstup:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3649,25 +3647,53 @@ Výstup:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Ano
+    
+    
+      
+      &No
+      &Ne
+    
+    
+      
+      &Cancel
+      &Storno
+    
+    
+      
+      &Close
+      &Zavřít
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Zpětná vazba z instalace
     
     
-      
+      
       Sending installation feedback.
       Posílání zpětné vazby z instalace.
     
     
-      
+      
       Internal error in install-tracking.
       Vnitřní chyba v install-tracking.
     
     
-      
+      
       HTTP request timed out.
       Překročen časový limit HTTP požadavku.
     
@@ -3675,28 +3701,28 @@ Výstup:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Zpětná vazba uživatele KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Nastavuje se zpětná vazba od uživatele pro KDE
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Chyba v nastavení zpětné vazby od uživatele pro KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Nepodařilo se správně nastavit zpětnou vazbu KDE uživatele, chyba ve skriptu %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Nepodařilo se správně nastavit zpětnou vazbu KDE uživatele, chyba Calamares %1.
     
@@ -3704,28 +3730,28 @@ Výstup:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Zpětná vazba stroje
     
     
-      
+      
       Configuring machine feedback.
       Nastavování zpětné vazby stroje
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Chyba v nastavení zpětné vazby stroje.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Nepodařilo se správně nastavit zpětnou vazbu stroje, chyba skriptu %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Nepodařilo se správně nastavit zpětnou vazbu stroje, chyba Calamares %1.
     
@@ -4093,45 +4119,30 @@ Výstup:
   
     keyboardq
     
-      
-      Keyboard Model
-      Model klávesnice
-    
-    
-      
-      Layouts
-      Rovzržení
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Rozvržení klávesnice
+      
+      Keyboard Model:
+      Model klávesnice:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Kliknutím na preferovaný model klávesnice vyberte rozvržení a variantu nebo použijte výchozí na základě zjištěného hardwaru.
+      
+      Layouts
+      Rovzržení
     
     
-      
-      Models
-      Modely
+      
+      Type here to test your keyboard
+      Klávesnici vyzkoušíte psaním sem
     
     
-      
+      
       Variants
       Varianty
     
-    
-      
-      Keyboard Variant
-      Varianta klávesnice
-    
-    
-      
-      Test your keyboard
-      Vyzkoušejte si svou klávesnici
-    
   
   
     localeq
diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts
index ceb580e23f..b09d868287 100644
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Færdig
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Opsætningen mislykkedes
     
     
-      
+      
       Installation Failed
       Installation mislykkedes
     
     
-      
+      
       Would you like to paste the install log to the web?
       Vil du indsætte installationsloggen på webbet?
     
     
-      
+      
       Error
       Fejl
     
     
-      
-      
+      
       &Yes
       &Ja
     
     
-      
-      
+      
       &No
       &Nej
     
     
-      
+      
       &Close
       &Luk
     
     
-      
+      
       Install Log Paste URL
       Indsættelses-URL for installationslog
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Uploaden lykkedes ikke. Der blev ikke foretaget nogen webindsættelse.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Initiering af Calamares mislykkedes
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 kan ikke installeres. Calamares kunne ikke indlæse alle de konfigurerede moduler. Det er et problem med den måde Calamares bruges på af distributionen.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Følgende moduler kunne ikke indlæses:
     
     
-      
+      
       Continue with setup?
       Fortsæt med opsætningen?
     
     
-      
+      
       Continue with installation?
       Fortsæt installationen?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1-opsætningsprogrammet er ved at foretage ændringer til din disk for at opsætte %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1-installationsprogrammet er ved at foretage ændringer til din disk for at installere %2.<br/><strong>Det vil ikke være muligt at fortryde ændringerne.</strong>
     
     
-      
+      
       &Set up now
       &Opsæt nu
     
     
-      
+      
       &Install now
       &Installér nu
     
     
-      
+      
       Go &back
       Gå &tilbage
     
     
-      
+      
       &Set up
       &Opsæt
     
     
-      
+      
       &Install
       &Installér
     
     
-      
+      
       Setup is complete. Close the setup program.
       Opsætningen er fuldført. Luk opsætningsprogrammet.
     
     
-      
+      
       The installation is complete. Close the installer.
       Installationen er fuldført. Luk installationsprogrammet.
     
     
-      
+      
       Cancel setup without changing the system.
       Annullér opsætningen uden at ændre systemet.
     
     
-      
+      
       Cancel installation without changing the system.
       Annullér installation uden at ændre systemet.
     
     
-      
+      
       &Next
       &Næste
     
     
-      
+      
       &Back
       &Tilbage
     
     
-      
+      
       &Done
       &Færdig
     
     
-      
+      
       &Cancel
       &Annullér
     
     
-      
+      
       Cancel setup?
       Annullér opsætningen?
     
     
-      
+      
       Cancel installation?
       Annullér installationen?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Vil du virkelig annullere den igangværende opsætningsproces?
 Opsætningsprogrammet vil stoppe og alle ændringer vil gå tabt.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Vil du virkelig annullere den igangværende installationsproces?
@@ -825,22 +823,22 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.Programmet vil stille dig nogle spørgsmål og opsætte %2 på din computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Velkommen til Calamares-opsætningsprogrammet til %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Velkommen til %1-opsætningen</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Velkommen til Calamares-installationsprogrammet til %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Velkommen til %1-installationsprogrammet</h1>
     
@@ -1705,17 +1703,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole er ikke installeret
     
     
-      
+      
       Please install KDE Konsole and try again!
       Installér venligst KDE Konsole og prøv igen!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Eksekverer skript: &nbsp;<code>%1</code>
     
@@ -1780,32 +1778,32 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.<h1>Licensaftale</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Jeg accepterer de ovenstående vilkår og betingelser.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Gennemse venligst slutbrugerlicensaftalerne (EULA'erne).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Opsætningsproceduren installerer proprietær software der er underlagt licenseringsvilkår.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Hvis du ikke er enig i vilkårne, kan opsætningsproceduren ikke fortsætte.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Opsætningsproceduren kan installere proprietær software der er underlagt licenseringsvilkår, for at kunne tilbyde yderligere funktionaliteter og forbedre brugeroplevelsen.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Hvis du ikke er enig i vilkårne vil der ikke blive installeret proprietær software, og open source-alternativer vil blive brugt i stedet.
     
@@ -2776,92 +2774,92 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Indsamler systeminformation ...
     
     
-      
+      
       Partitions
       Partitioner
     
     
-      
+      
       Current:
       Nuværende:
     
     
-      
+      
       After:
       Efter:
     
     
-      
+      
       No EFI system partition configured
       Der er ikke konfigureret nogen EFI-systempartition
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Valgmulighed til at bruge GPT på BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       En GPT-partitionstabel er den bedste valgmulighed til alle systemer. Installationsprogrammet understøtter også sådan en opsætning for BIOS-systemer.<br/><br/>Konfigurer en GPT-partitionstabel på BIOS, (hvis det ikke allerede er gjort) ved at gå tilbage og indstil partitionstabellen til GPT, opret herefter en 8 MB uformateret partition med <strong>bios_grub</strong>-flaget aktiveret.<br/><br/>En uformateret 8 MB partition er nødvendig for at starte %1 på et BIOS-system med GPT.
     
     
-      
+      
       Boot partition not encrypted
       Bootpartition ikke krypteret
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       En separat bootpartition blev opsat sammen med en krypteret rodpartition, men bootpartitionen er ikke krypteret.<br/><br/>Der er sikkerhedsmæssige bekymringer med denne slags opsætning, da vigtige systemfiler er gemt på en ikke-krypteret partition.<br/>Du kan fortsætte hvis du vil, men oplåsning af filsystemet sker senere under systemets opstart.<br/>For at kryptere bootpartitionen skal du gå tilbage og oprette den igen, vælge <strong>Kryptér</strong> i partitionsoprettelsesvinduet.
     
     
-      
+      
       has at least one disk device available.
       har mindst én tilgængelig diskenhed.
     
     
-      
+      
       There are no partitions to install on.
       Der er ikke nogen partitioner at installere på.
     
@@ -2996,7 +2994,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3624,25 +3622,53 @@ setting
       %L1/%L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Ja
+    
+    
+      
+      &No
+      &Nej
+    
+    
+      
+      &Cancel
+      &Annullér
+    
+    
+      
+      &Close
+      &Luk
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Installationsfeedback
     
     
-      
+      
       Sending installation feedback.
       Sender installationsfeedback.
     
     
-      
+      
       Internal error in install-tracking.
       Intern fejl i installationssporing.
     
     
-      
+      
       HTTP request timed out.
       HTTP-anmodning fik timeout.
     
@@ -3650,28 +3676,28 @@ setting
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE-brugerfeedback
     
     
-      
+      
       Configuring KDE user feedback.
       Konfigurerer KDE-brugerfeedback.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Fejl i konfiguration af KDE-brugerfeedback.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Kunne ikke konfigurere KDE-brugerfeedback korrekt, fejl i script %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Kunne ikke konfigurere KDE-brugerfeedback korrekt, fejl i Calamares %1.
     
@@ -3679,28 +3705,28 @@ setting
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Maskinfeedback
     
     
-      
+      
       Configuring machine feedback.
       Konfigurerer maskinfeedback.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Fejl i maskinfeedback-konfiguration.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Kunne ikke konfigurere maskinfeedback korrekt, fejl i script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Kunne ikke konfigurere maskinfeedback korrekt, fejl i Calamares %1.
     
@@ -4065,45 +4091,30 @@ setting
   
     keyboardq
     
-      
-      Keyboard Model
-      Tastaturmodel
-    
-    
-      
-      Layouts
-      Layouts
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Tastaturlayout
+      
+      Keyboard Model:
+      Tastaturmodel:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Klik på din foretrukne tastaturmodel for at vælge layout og variant, eller brug den som er standard baseret på det registrerede hardware.
+      
+      Layouts
+      Layouts
     
     
-      
-      Models
-      Modeller
+      
+      Type here to test your keyboard
+      Skriv her for at teste dit tastatur
     
     
-      
+      
       Variants
       Varianter
     
-    
-      
-      Keyboard Variant
-      Tastaturvariant
-    
-    
-      
-      Test your keyboard
-      Test dit tastatur
-    
   
   
     localeq
diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index dee0c7fe38..5b941d4c5a 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Fertig
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Setup fehlgeschlagen
     
     
-      
+      
       Installation Failed
       Installation gescheitert
     
     
-      
+      
       Would you like to paste the install log to the web?
       Möchten Sie das Installationsprotokoll an eine Internetadresse senden?
     
     
-      
+      
       Error
       Fehler
     
     
-      
-      
+      
       &Yes
       &Ja
     
     
-      
-      
+      
       &No
       &Nein
     
     
-      
+      
       &Close
       &Schließen
     
     
-      
+      
       Install Log Paste URL
       Internetadresse für das Senden des Installationsprotokolls
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Das Hochladen ist fehlgeschlagen. Es wurde nichts an eine Internetadresse gesendet.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Link wurde in die Zwischenablage kopiert
     
     
-      
+      
       Calamares Initialization Failed
       Initialisierung von Calamares fehlgeschlagen
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 kann nicht installiert werden. Calamares war nicht in der Lage, alle konfigurierten Module zu laden. Dieses Problem hängt mit der Art und Weise zusammen, wie Calamares von der jeweiligen Distribution eingesetzt wird.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Die folgenden Module konnten nicht geladen werden:
     
     
-      
+      
       Continue with setup?
       Setup fortsetzen?
     
     
-      
+      
       Continue with installation?
       Installation fortsetzen?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Das %1 Installationsprogramm ist dabei, Änderungen an Ihrer Festplatte vorzunehmen, um %2 einzurichten.<br/><strong> Sie werden diese Änderungen nicht rückgängig machen können.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Das %1 Installationsprogramm wird Änderungen an Ihrer Festplatte vornehmen, um %2 zu installieren.<br/><strong>Diese Änderungen können nicht rückgängig gemacht werden.</strong>
     
     
-      
+      
       &Set up now
       &Jetzt einrichten
     
     
-      
+      
       &Install now
       Jetzt &installieren
     
     
-      
+      
       Go &back
       Gehe &zurück
     
     
-      
+      
       &Set up
       &Einrichten
     
     
-      
+      
       &Install
       &Installieren
     
     
-      
+      
       Setup is complete. Close the setup program.
       Setup ist abgeschlossen. Schließe das Installationsprogramm.
     
     
-      
+      
       The installation is complete. Close the installer.
       Die Installation ist abgeschlossen. Schließe das Installationsprogramm.
     
     
-      
+      
       Cancel setup without changing the system.
       Installation abbrechen ohne das System zu verändern.
     
     
-      
+      
       Cancel installation without changing the system.
       Installation abbrechen, ohne das System zu verändern.
     
     
-      
+      
       &Next
       &Weiter
     
     
-      
+      
       &Back
       &Zurück
     
     
-      
+      
       &Done
       &Erledigt
     
     
-      
+      
       &Cancel
       &Abbrechen
     
     
-      
+      
       Cancel setup?
       Installation abbrechen?
     
     
-      
+      
       Cancel installation?
       Installation abbrechen?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Wollen Sie die Installation wirklich abbrechen?
 Dadurch wird das Installationsprogramm beendet und alle Änderungen gehen verloren.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Wollen Sie wirklich die aktuelle Installation abbrechen?
@@ -830,22 +828,22 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       Dieses Programm wird Ihnen einige Fragen stellen, um %2 auf Ihrem Computer zu installieren.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Willkommen bei Calamares, dem Installationsprogramm für %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Willkommen zur Installation von %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Willkommen bei Calamares, dem Installationsprogramm für %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Willkommen zum Installationsprogramm für %1</h1>
     
@@ -1710,17 +1708,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole nicht installiert
     
     
-      
+      
       Please install KDE Konsole and try again!
       Bitte installieren Sie das KDE-Programm namens Konsole und probieren Sie es erneut!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Führe Skript aus: &nbsp;<code>%1</code>
     
@@ -1785,32 +1783,32 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
       <h1>Lizenzvereinbarung</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Ich akzeptiere die obigen Allgemeinen Geschäftsbedingungen.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Bitte lesen Sie die Lizenzvereinbarungen für Endanwender (EULAs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Diese Installationsroutine wird proprietäre Software installieren, die Lizenzbedingungen unterliegt.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Wenn Sie diesen Bedingungen nicht zustimmen, kann die Installation nicht fortgesetzt werden.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Um zusätzliche Funktionen bereitzustellen und das Benutzererlebnis zu verbessern, kann diese Installationsroutine proprietäre Software installieren, die Lizenzbedingungen unterliegt.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Wenn Sie diesen Bedingungen nicht zustimmen, wird keine proprietäre Software installiert, stattdessen werden Open-Source-Alternativen verwendet.
     
@@ -2781,92 +2779,92 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sammle Systeminformationen...
     
     
-      
+      
       Partitions
       Partitionen
     
     
-      
+      
       Current:
       Aktuell:
     
     
-      
+      
       After:
       Nachher:
     
     
-      
+      
       No EFI system partition configured
       Keine EFI-Systempartition konfiguriert
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Option zur Verwendung von GPT mit BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Eine GPT-Partitionstabelle ist die beste Option für alle Systeme. Dieses Installationsprogramm unterstützt ein solches Setup auch für BIOS-Systeme.<br/><br/>Um eine GPT-Partitionstabelle mit BIOS zu konfigurieren, gehen Sie (falls noch nicht geschehen) zurück und setzen Sie die Partitionstabelle auf GPT, als nächstes erstellen Sie eine 8 MB große, unformatierte Partition mit der Markierung <strong>bios_grub</strong> aktiviert.<br/><br/>Eine unformatierte 8 MB große Partition ist erforderlich, um %1 auf einem BIOS-System mit GPT zu starten.
     
     
-      
+      
       Boot partition not encrypted
       Bootpartition nicht verschlüsselt
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Eine separate Bootpartition wurde zusammen mit einer verschlüsselten Rootpartition erstellt, die Bootpartition ist aber unverschlüsselt.<br/><br/> Dies ist sicherheitstechnisch nicht optimal, da wichtige Systemdateien auf der unverschlüsselten Bootpartition gespeichert werden.<br/>Wenn Sie wollen, können Sie fortfahren, aber das Entschlüsseln des Dateisystems wird erst später während des Systemstarts erfolgen.<br/>Um die Bootpartition zu verschlüsseln, gehen Sie zurück und erstellen Sie diese neu, indem Sie bei der Partitionierung <strong>Verschlüsseln</strong> wählen. 
     
     
-      
+      
       has at least one disk device available.
       mindestens eine Festplatte zur Verfügung hat
     
     
-      
+      
       There are no partitions to install on.
       Keine Partitionen für die Installation verfügbar.
     
@@ -3001,7 +2999,7 @@ Ausgabe:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3628,25 +3626,53 @@ Ausgabe:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Ja
+    
+    
+      
+      &No
+      &Nein
+    
+    
+      
+      &Cancel
+      &Abbrechen
+    
+    
+      
+      &Close
+      &Schließen
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Rückmeldungen zur Installation
     
     
-      
+      
       Sending installation feedback.
       Senden der Rückmeldungen zur Installation.
     
     
-      
+      
       Internal error in install-tracking.
       Interner Fehler bei der Überwachung der Installation.
     
     
-      
+      
       HTTP request timed out.
       Zeitüberschreitung bei HTTP-Anfrage
     
@@ -3654,28 +3680,28 @@ Ausgabe:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE Benutzer-Feedback
     
     
-      
+      
       Configuring KDE user feedback.
       Konfiguriere KDE Benutzer-Feedback.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Fehler bei der Konfiguration des KDE Benutzer-Feedbacks.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Konnte KDE Benutzer-Feedback nicht korrekt konfigurieren, Skriptfehler %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Konnte KDE Benutzer-Feedback nicht korrekt konfigurieren, Calamares-Fehler %1.
     
@@ -3683,28 +3709,28 @@ Ausgabe:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Feedback zum Computer
     
     
-      
+      
       Configuring machine feedback.
       Konfiguriere Feedback zum Computer.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Fehler bei der Konfiguration des Feedbacks zum Computer.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Feedback zum Computer konnte nicht korrekt konfiguriert werden, Skriptfehler %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Feedback zum Computer konnte nicht korrekt konfiguriert werden, Calamares-Fehler %1.
     
@@ -4072,45 +4098,30 @@ Ausgabe:
   
     keyboardq
     
-      
-      Keyboard Model
-      Tastaturmodell
-    
-    
-      
-      Layouts
-      Tastaturbelegungen
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Tastaturbelegung
+      
+      Keyboard Model:
+      Tastaturmodell:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Klicken Sie auf Ihr bevorzugtes Tastaturmodell, um Belegung und Variante zu wählen oder wählen Sie das Standardmodell basierend auf der vorgefundenen Hardware.
+      
+      Layouts
+      Tastaturbelegungen
     
     
-      
-      Models
-      Modelle
+      
+      Type here to test your keyboard
+      Tippen Sie hier, um die Tastaturbelegung zu testen
     
     
-      
+      
       Variants
       Varianten
     
-    
-      
-      Keyboard Variant
-      Tastaturvariante
-    
-    
-      
-      Test your keyboard
-      Testen Sie Ihre Tastatur
-    
   
   
     localeq
diff --git a/lang/calamares_el.ts b/lang/calamares_el.ts
index 31f1498aa1..23fe2160b4 100644
--- a/lang/calamares_el.ts
+++ b/lang/calamares_el.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Ολοκληρώθηκε
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Η εγκατάσταση απέτυχε
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Σφάλμα
     
     
-      
-      
+      
       &Yes
       &Ναι
     
     
-      
-      
+      
       &No
       &Όχι
     
     
-      
+      
       &Close
       &Κλείσιμο
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Η αρχικοποίηση του Calamares απέτυχε
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Συνέχεια με την εγκατάσταση;
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Το πρόγραμμα εγκατάστασης %1 θα κάνει αλλαγές στον δίσκο για να εγκαταστήσετε το %2.<br/><strong>Δεν θα είστε σε θέση να αναιρέσετε τις αλλαγές.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Εγκατάσταση τώρα
     
     
-      
+      
       Go &back
       Μετάβαση &πίσω
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Εγκατάσταση
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Η εγκτάσταση ολοκληρώθηκε. Κλείστε το πρόγραμμα εγκατάστασης.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Ακύρωση της εγκατάστασης χωρίς αλλαγές στο σύστημα.
     
     
-      
+      
       &Next
       &Επόμενο
     
     
-      
+      
       &Back
       &Προηγούμενο
     
     
-      
+      
       &Done
       &Ολοκληρώθηκε
     
     
-      
+      
       &Cancel
       &Ακύρωση
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Ακύρωση της εγκατάστασης;
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Θέλετε πραγματικά να ακυρώσετε τη διαδικασία εγκατάστασης;
@@ -824,22 +822,22 @@ The installer will quit and all changes will be lost.
       Το πρόγραμμα θα σας κάνει μερικές ερωτήσεις και θα ρυθμίσει το %2 στον υπολογιστή σας.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1704,17 +1702,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Το Konsole δεν είναι εγκατεστημένο
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Εκτελείται το σενάριο: &nbsp;<code>%1</code>
     
@@ -1779,32 +1777,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       Δέχομαι τους παραπάνω όρους και προϋποθέσεις.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2773,92 +2771,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Συλλογή πληροφοριών συστήματος...
     
     
-      
+      
       Partitions
       Κατατμήσεις
     
     
-      
+      
       Current:
       Τρέχον:
     
     
-      
+      
       After:
       Μετά:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2990,7 +2988,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3614,25 +3612,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      &Ναι
+    
+    
+      
+      &No
+      &Όχι
+    
+    
+      
+      &Cancel
+      &Ακύρωση
+    
+    
+      
+      &Close
+      &Κλείσιμο
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3640,28 +3666,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3669,28 +3695,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4042,44 +4068,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Μοντέλο πληκτρολογίου:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Πληκτρολογείστε εδώ για να δοκιμάσετε το πληκτρολόγιο σας
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index e3260355c7..884498c2ce 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Done
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Setup Failed
     
     
-      
+      
       Installation Failed
       Installation Failed
     
     
-      
+      
       Would you like to paste the install log to the web?
       Would you like to paste the install log to the web?
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
       &Yes
       &Yes
     
     
-      
-      
+      
       &No
       &No
     
     
-      
+      
       &Close
       &Close
     
     
-      
+      
       Install Log Paste URL
       Install Log Paste URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       The upload was unsuccessful. No web-paste was done.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Link copied to clipboard
     
     
-      
+      
       Calamares Initialization Failed
       Calamares Initialization Failed
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>The following modules could not be loaded:
     
     
-      
+      
       Continue with setup?
       Continue with setup?
     
     
-      
+      
       Continue with installation?
       Continue with installation?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
     
     
-      
+      
       &Set up now
       &Set up now
     
     
-      
+      
       &Install now
       &Install now
     
     
-      
+      
       Go &back
       Go &back
     
     
-      
+      
       &Set up
       &Set up
     
     
-      
+      
       &Install
       &Install
     
     
-      
+      
       Setup is complete. Close the setup program.
       Setup is complete. Close the setup program.
     
     
-      
+      
       The installation is complete. Close the installer.
       The installation is complete. Close the installer.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancel setup without changing the system.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancel installation without changing the system.
     
     
-      
+      
       &Next
       &Next
     
     
-      
+      
       &Back
       &Back
     
     
-      
+      
       &Done
       &Done
     
     
-      
+      
       &Cancel
       &Cancel
     
     
-      
+      
       Cancel setup?
       Cancel setup?
     
     
-      
+      
       Cancel installation?
       Cancel installation?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Do you really want to cancel the current install process?
@@ -829,22 +827,22 @@ The installer will quit and all changes will be lost.
       This program will ask you some questions and set up %2 on your computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Welcome to the Calamares setup program for %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Welcome to %1 setup</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Welcome to the Calamares installer for %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Welcome to the %1 installer</h1>
     
@@ -1709,17 +1707,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole not installed
     
     
-      
+      
       Please install KDE Konsole and try again!
       Please install KDE Konsole and try again!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Executing script: &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ The installer will quit and all changes will be lost.
       <h1>License Agreement</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       I accept the terms and conditions above.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Please review the End User License Agreements (EULAs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       This setup procedure will install proprietary software that is subject to licensing terms.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       If you do not agree with the terms, the setup procedure cannot continue.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
     
@@ -2780,92 +2778,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Gathering system information...
     
     
-      
+      
       Partitions
       Partitions
     
     
-      
+      
       Current:
       Current:
     
     
-      
+      
       After:
       After:
     
     
-      
+      
       No EFI system partition configured
       No EFI system partition configured
     
     
-      
+      
       EFI system partition configured incorrectly
       EFI system partition configured incorrectly
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       The filesystem must be mounted on <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
       The filesystem must have type FAT32.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       The filesystem must be at least %1 MiB in size.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       The filesystem must have flag <strong>%1</strong> set.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       You can continue without setting up an EFI system partition but your system may fail to start.
     
     
-      
+      
       Option to use GPT on BIOS
       Option to use GPT on BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
     
     
-      
+      
       Boot partition not encrypted
       Boot partition not encrypted
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
     
     
-      
+      
       has at least one disk device available.
       has at least one disk device available.
     
     
-      
+      
       There are no partitions to install on.
       There are no partitions to install on.
     
@@ -3000,7 +2998,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3627,25 +3625,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Yes
+    
+    
+      
+      &No
+      &No
+    
+    
+      
+      &Cancel
+      &Cancel
+    
+    
+      
+      &Close
+      &Close
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Installation feedback
     
     
-      
+      
       Sending installation feedback.
       Sending installation feedback.
     
     
-      
+      
       Internal error in install-tracking.
       Internal error in install-tracking.
     
     
-      
+      
       HTTP request timed out.
       HTTP request timed out.
     
@@ -3653,28 +3679,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE user feedback
     
     
-      
+      
       Configuring KDE user feedback.
       Configuring KDE user feedback.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Error in KDE user feedback configuration.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Could not configure KDE user feedback correctly, script error %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Could not configure KDE user feedback correctly, Calamares error %1.
     
@@ -3682,28 +3708,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Machine feedback
     
     
-      
+      
       Configuring machine feedback.
       Configuring machine feedback.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Error in machine feedback configuration.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Could not configure machine feedback correctly, script error %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Could not configure machine feedback correctly, Calamares error %1.
     
@@ -4071,45 +4097,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Keyboard Model
-    
-    
-      
-      Layouts
-      Layouts
+      
+      To activate keyboard preview, select a layout.
+      To activate keyboard preview, select a layout.
     
     
-      
-      Keyboard Layout
-      Keyboard Layout
+      
+      Keyboard Model:
+      Keyboard Model:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      
+      Layouts
+      Layouts
     
     
-      
-      Models
-      Models
+      
+      Type here to test your keyboard
+      Type here to test your keyboard
     
     
-      
+      
       Variants
       Variants
     
-    
-      
-      Keyboard Variant
-      Keyboard Variant
-    
-    
-      
-      Test your keyboard
-      Test your keyboard
-    
   
   
     localeq
diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts
index 937e8a65b6..6e5df1e181 100644
--- a/lang/calamares_en_GB.ts
+++ b/lang/calamares_en_GB.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Done
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Installation Failed
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
       &Yes
       &Yes
     
     
-      
-      
+      
       &No
       &No
     
     
-      
+      
       &Close
       &Close
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Calamares Initialisation Failed
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>The following modules could not be loaded:
     
     
-      
+      
       Continue with setup?
       Continue with setup?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Install now
     
     
-      
+      
       Go &back
       Go &back
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Install
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       The installation is complete. Close the installer.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Cancel installation without changing the system.
     
     
-      
+      
       &Next
       &Next
     
     
-      
+      
       &Back
       &Back
     
     
-      
+      
       &Done
       &Done
     
     
-      
+      
       &Cancel
       &Cancel
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Cancel installation?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Do you really want to cancel the current install process?
@@ -824,22 +822,22 @@ The installer will quit and all changes will be lost.
       This program will ask you some questions and set up %2 on your computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1704,17 +1702,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole not installed
     
     
-      
+      
       Please install KDE Konsole and try again!
       Please install KDE Konsole and try again!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Executing script: &nbsp;<code>%1</code>
     
@@ -1779,32 +1777,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       I accept the terms and conditions above.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2773,92 +2771,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Gathering system information...
     
     
-      
+      
       Partitions
       Partitions
     
     
-      
+      
       Current:
       Current:
     
     
-      
+      
       After:
       After:
     
     
-      
+      
       No EFI system partition configured
       No EFI system partition configured
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Boot partition not encrypted
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2993,7 +2991,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3617,25 +3615,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Yes
+    
+    
+      
+      &No
+      &No
+    
+    
+      
+      &Cancel
+      &Cancel
+    
+    
+      
+      &Close
+      &Close
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Installation feedback
     
     
-      
+      
       Sending installation feedback.
       Sending installation feedback.
     
     
-      
+      
       Internal error in install-tracking.
       Internal error in install-tracking.
     
     
-      
+      
       HTTP request timed out.
       HTTP request timed out.
     
@@ -3643,28 +3669,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3672,28 +3698,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Machine feedback
     
     
-      
+      
       Configuring machine feedback.
       Configuring machine feedback.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Error in machine feedback configuration.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Could not configure machine feedback correctly, script error %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Could not configure machine feedback correctly, Calamares error %1.
     
@@ -4045,44 +4071,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Keyboard Model:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Type here to test your keyboard
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts
index 546ff724a7..3d7a5b6d85 100644
--- a/lang/calamares_eo.ts
+++ b/lang/calamares_eo.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Finita
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Eraro
     
     
-      
-      
+      
       &Yes
       &Jes
     
     
-      
-      
+      
       &No
       &Ne
     
     
-      
+      
       &Close
       &Fermi
     
     
-      
+      
       Install Log Paste URL
       Retadreso de la alglua servilo
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Alŝuto malsukcesinta. Neniu transpoŝigis al la reto.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +343,123 @@ Link copied to clipboard
 La retadreso estis copiita al vian tondujon.
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       &Aranĝu nun
     
     
-      
+      
       &Install now
       &Instali nun
     
     
-      
+      
       Go &back
       Iru &Reen
     
     
-      
+      
       &Set up
       &Aranĝu
     
     
-      
+      
       &Install
       &Instali
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Nuligi instalado sen ŝanĝante la sistemo.
     
     
-      
+      
       &Next
       &Sekva
     
     
-      
+      
       &Back
       &Reen
     
     
-      
+      
       &Done
       &Finita
     
     
-      
+      
       &Cancel
       &Nuligi
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Nuligi instalado?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Ĉu vi vere volas nuligi la instalan procedon?
@@ -828,22 +826,22 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1708,17 +1706,17 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1783,32 +1781,32 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2777,92 +2775,92 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       Nune:
     
     
-      
+      
       After:
       Poste:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2994,7 +2992,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1(%2)
     
@@ -3618,25 +3616,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Daŭrigu
+    
+    
+      
+      &Yes
+      &Jes
+    
+    
+      
+      &No
+      &Ne
+    
+    
+      
+      &Cancel
+      &Nuligi
+    
+    
+      
+      &Close
+      &Fermi
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3644,28 +3670,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3673,28 +3699,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4046,44 +4072,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index 36e03389e1..c30894c66d 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -172,7 +172,7 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
   
     Calamares::JobThread
     
-      
+      
       Done
       Hecho
     
@@ -286,54 +286,52 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Configuración Fallida
     
     
-      
+      
       Installation Failed
       Error en la Instalación
     
     
-      
+      
       Would you like to paste the install log to the web?
       ¿Desea pegar el registro de instalación en la web?
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
       &Yes
       &Sí
     
     
-      
-      
+      
       &No
       &No
     
     
-      
+      
       &Close
       &Cerrar
     
     
-      
+      
       Install Log Paste URL
       Pegar URL Registro de Instalación
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       La carga no tuvo éxito. No se realizó pegado web.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -342,123 +340,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       La inicialización de Calamares falló
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 no se pudo instalar. Calamares no fue capaz de cargar todos los módulos configurados. Esto es un problema con la forma en que Calamares es usado por la distribución
     
     
-      
+      
       <br/>The following modules could not be loaded:
       Los siguientes módulos no se pudieron cargar:
     
     
-      
+      
       Continue with setup?
       ¿Continuar con la configuración?
     
     
-      
+      
       Continue with installation?
       Continuar con la instalación?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El programa de instalación %1 está a punto de hacer cambios en el disco con el fin de configurar %2.<br/><strong>No podrá deshacer estos cambios.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong>
     
     
-      
+      
       &Set up now
       &Configurar ahora
     
     
-      
+      
       &Install now
       &Instalar ahora
     
     
-      
+      
       Go &back
       Regresar
     
     
-      
+      
       &Set up
       &Instalar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       La instalación se ha completado. Cierre el instalador.
     
     
-      
+      
       The installation is complete. Close the installer.
       La instalación se ha completado. Cierre el instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancelar instalación sin cambiar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar instalación sin cambiar el sistema.
     
     
-      
+      
       &Next
       &Siguiente
     
     
-      
+      
       &Back
       &Atrás 
     
     
-      
+      
       &Done
       &Hecho
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       ¿Cancelar la instalación?
     
     
-      
+      
       Cancel installation?
       ¿Cancelar la instalación?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       ¿Realmente quiere cancelar el proceso de instalación?
@@ -825,22 +823,22 @@ Saldrá del instalador y se perderán todos los cambios.
       El programa le preguntará algunas cuestiones y configurará %2 en su ordenador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1705,17 +1703,17 @@ Saldrá del instalador y se perderán todos los cambios.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole no está instalada
     
     
-      
+      
       Please install KDE Konsole and try again!
       ¡Por favor, instale KDE Konsole e inténtelo de nuevo!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Ejecutando script: &nbsp;<code>%1</code>
     
@@ -1780,32 +1778,32 @@ Saldrá del instalador y se perderán todos los cambios.
       <h1>Contrato de licencia</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Acepto los términos y condiciones anteriores.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2774,92 +2772,92 @@ Saldrá del instalador y se perderán todos los cambios.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Obteniendo información del sistema...
     
     
-      
+      
       Partitions
       Particiones
     
     
-      
+      
       Current:
       Corriente
     
     
-      
+      
       After:
       Despúes:
     
     
-      
+      
       No EFI system partition configured
       No hay una partición del sistema EFI configurada
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partición de arranque no cifrada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Se estableció una partición de arranque aparte junto con una partición raíz cifrada, pero la partición de arranque no está cifrada.<br/><br/>Hay consideraciones de seguridad con esta clase de instalación, porque los ficheros de sistema importantes se mantienen en una partición no cifrada.<br/>Puede continuar si lo desea, pero el desbloqueo del sistema de ficheros ocurrirá más tarde durante el arranque del sistema.<br/>Para cifrar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Cifrar</strong> en la ventana de creación de la partición.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2994,7 +2992,7 @@ Salida:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3618,25 +3616,53 @@ Salida:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Aceptar
+    
+    
+      
+      &Yes
+      &Sí
+    
+    
+      
+      &No
+      &No
+    
+    
+      
+      &Cancel
+      &Cancelar
+    
+    
+      
+      &Close
+      &Cerrar
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Respuesta de la instalación
     
     
-      
+      
       Sending installation feedback.
       Enviar respuesta de la instalación
     
     
-      
+      
       Internal error in install-tracking.
       Error interno en el seguimiento-de-instalación.
     
     
-      
+      
       HTTP request timed out.
       La petición HTTP agotó el tiempo de espera.
     
@@ -3644,28 +3670,28 @@ Salida:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3673,28 +3699,28 @@ Salida:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Respuesta de la máquina
     
     
-      
+      
       Configuring machine feedback.
       Configurando respuesta de la máquina.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Error en la configuración de la respuesta de la máquina.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       No se pudo configurar correctamente la respuesta de la máquina, error de script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       No se pudo configurar correctamente la respuesta de la máquina, error de Calamares %1.
     
@@ -4046,44 +4072,29 @@ Salida:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Modelo de teclado:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Escriba aquí para comprobar su teclado
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts
index 80c2c36783..4720eb6cea 100644
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Hecho
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Fallo en la configuración.
     
     
-      
+      
       Installation Failed
       Instalación Fallida
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
       &Yes
       &Si
     
     
-      
-      
+      
       &No
       &No
     
     
-      
+      
       &Close
       &Cerrar
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       La inicialización de Calamares ha fallado
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 no pudo ser instalado. Calamares no pudo cargar todos los módulos configurados. Este es un problema con la forma en que Calamares esta siendo usada por la distribución.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Los siguientes módulos no pudieron ser cargados:
     
     
-      
+      
       Continue with setup?
       ¿Continuar con la instalación?
     
     
-      
+      
       Continue with installation?
       ¿Continuar con la instalación?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       El  %1 programa de instalación esta a punto de realizar cambios a su disco con el fin de establecer %2.<br/><strong>Usted no podrá deshacer estos cambios.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
        El instalador %1 va a realizar cambios en su disco para instalar %2.<br/><strong>No podrá deshacer estos cambios.</strong>
     
     
-      
+      
       &Set up now
       &Configurar ahora
     
     
-      
+      
       &Install now
       &Instalar ahora
     
     
-      
+      
       Go &back
       &Regresar
     
     
-      
+      
       &Set up
       &Configurar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       Configuración completa. Cierre el programa de instalación.
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalación completa. Cierre el instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancelar la configuración sin cambiar el sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar instalación sin cambiar el sistema.
     
     
-      
+      
       &Next
       &Siguiente
     
     
-      
+      
       &Back
       &Atrás 
     
     
-      
+      
       &Done
       &Hecho
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       ¿Cancelar la configuración?
     
     
-      
+      
       Cancel installation?
       ¿Cancelar la instalación?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       ¿Realmente desea cancelar el actual proceso de configuración?
 El programa de instalación se cerrará y todos los cambios se perderán.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       ¿Realmente desea cancelar el proceso de instalación actual?
@@ -826,22 +824,22 @@ El instalador terminará y se perderán todos los cambios.
        El programa le hará algunas preguntas y configurará %2 en su ordenador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1706,17 +1704,17 @@ El instalador terminará y se perderán todos los cambios.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole no instalado
     
     
-      
+      
       Please install KDE Konsole and try again!
       Favor instale la Konsola KDE e intentelo de nuevo!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Ejecutando script: &nbsp;<code>%1</code>
     
@@ -1781,32 +1779,32 @@ El instalador terminará y se perderán todos los cambios.
       
     
     
-      
+      
       I accept the terms and conditions above.
       Acepto los terminos y condiciones anteriores.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2775,92 +2773,92 @@ El instalador terminará y se perderán todos los cambios.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Obteniendo información del sistema...
     
     
-      
+      
       Partitions
       Particiones
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Después:
     
     
-      
+      
       No EFI system partition configured
       Sistema de partición EFI no configurada
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partición de arranque no encriptada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Se creó una partición de arranque separada junto con una partición raíz cifrada, pero la partición de arranque no está encriptada.<br/><br/> Existen problemas de seguridad con este tipo de configuración, ya que los archivos importantes del sistema se guardan en una partición no encriptada. <br/>Puede continuar si lo desea, pero el desbloqueo del sistema de archivos ocurrirá más tarde durante el inicio del sistema. <br/>Para encriptar la partición de arranque, retroceda y vuelva a crearla, seleccionando <strong>Encriptar</strong> en la ventana de creación de la partición.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2995,7 +2993,7 @@ Salida
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3620,25 +3618,53 @@ Salida
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Si
+    
+    
+      
+      &No
+      &No
+    
+    
+      
+      &Cancel
+      &Cancelar
+    
+    
+      
+      &Close
+      &Cerrar
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Retroalimentacion de la instalación
     
     
-      
+      
       Sending installation feedback.
       Envío de retroalimentación de instalación.
     
     
-      
+      
       Internal error in install-tracking.
       Error interno en el seguimiento de instalación.
     
     
-      
+      
       HTTP request timed out.
       Tiempo de espera en la solicitud HTTP agotado.
     
@@ -3646,28 +3672,28 @@ Salida
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3675,28 +3701,28 @@ Salida
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Retroalimentación de la maquina
     
     
-      
+      
       Configuring machine feedback.
       Configurando la retroalimentación de la maquina.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Error en la configuración de retroalimentación de la máquina.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       No se pudo configurar correctamente la retroalimentación de la máquina, error de script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       No se pudo configurar la retroalimentación de la máquina correctamente, Calamares error %1.
     
@@ -4048,44 +4074,29 @@ Salida
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Modelo de teclado:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Teclee aquí para probar su teclado
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_es_PE.ts b/lang/calamares_es_PE.ts
index dea7f9dd86..1bda9e5bde 100644
--- a/lang/calamares_es_PE.ts
+++ b/lang/calamares_es_PE.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_es_PR.ts b/lang/calamares_es_PR.ts
index 232c42b1e1..f1cd768c97 100644
--- a/lang/calamares_es_PR.ts
+++ b/lang/calamares_es_PR.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Hecho
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Falló la instalación
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Error
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Próximo
     
     
-      
+      
       &Back
       &Atrás
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_et.ts b/lang/calamares_et.ts
index 2f5752c871..108e7ffc55 100644
--- a/lang/calamares_et.ts
+++ b/lang/calamares_et.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Valmis
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Paigaldamine ebaõnnestus
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Viga
     
     
-      
-      
+      
       &Yes
       &Jah
     
     
-      
-      
+      
       &No
       &Ei
     
     
-      
+      
       &Close
       &Sulge
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Calamarese alglaadimine ebaõnnestus
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ei saa paigaldada. Calamares ei saanud laadida kõiki konfigureeritud mooduleid. See on distributsiooni põhjustatud Calamarese kasutamise viga.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Järgnevaid mooduleid ei saanud laadida:
     
     
-      
+      
       Continue with setup?
       Jätka seadistusega?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 paigaldaja on tegemas muudatusi sinu kettale, et paigaldada %2.<br/><strong>Sa ei saa neid muudatusi tagasi võtta.</strong>
     
     
-      
+      
       &Set up now
       &Seadista kohe
     
     
-      
+      
       &Install now
       &Paigalda kohe
     
     
-      
+      
       Go &back
       Mine &tagasi
     
     
-      
+      
       &Set up
       &Seadista
     
     
-      
+      
       &Install
       &Paigalda
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Paigaldamine on lõpetatud. Sulge paigaldaja.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Tühista paigaldamine ilma süsteemi muutmata.
     
     
-      
+      
       &Next
       &Edasi
     
     
-      
+      
       &Back
       &Tagasi
     
     
-      
+      
       &Done
       &Valmis
     
     
-      
+      
       &Cancel
       &Tühista
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Tühista paigaldamine?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Kas sa tõesti soovid tühistada praeguse paigaldusprotsessi?
@@ -824,22 +822,22 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       See programm küsib sult mõned küsimused ja seadistab %2 sinu arvutisse.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1704,17 +1702,17 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole pole paigaldatud
     
     
-      
+      
       Please install KDE Konsole and try again!
       Palun paigalda KDE Konsole ja proovi uuesti!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Käivitan skripti: &nbsp;<code>%1</code>
     
@@ -1779,32 +1777,32 @@ Paigaldaja sulgub ning kõik muutused kaovad.
       
     
     
-      
+      
       I accept the terms and conditions above.
       Ma nõustun alljärgevate tingimustega.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2773,92 +2771,92 @@ Paigaldaja sulgub ning kõik muutused kaovad.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Hangin süsteemiteavet...
     
     
-      
+      
       Partitions
       Partitsioonid
     
     
-      
+      
       Current:
       Hetkel:
     
     
-      
+      
       After:
       Pärast:
     
     
-      
+      
       No EFI system partition configured
       EFI süsteemipartitsiooni pole seadistatud
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Käivituspartitsioon pole krüptitud
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Eraldi käivituspartitsioon seadistati koos krüptitud juurpartitsiooniga, aga käivituspartitsioon ise ei ole krüptitud.<br/><br/>Selle seadistusega kaasnevad turvaprobleemid, sest tähtsad süsteemifailid hoitakse krüptimata partitsioonil.<br/>Sa võid soovi korral jätkata, aga failisüsteemi lukust lahti tegemine toimub hiljem süsteemi käivitusel.<br/>Et krüpteerida käivituspartisiooni, mine tagasi ja taasloo see, valides <strong>Krüpteeri</strong> partitsiooni loomise aknas.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2993,7 +2991,7 @@ Väljund:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3617,25 +3615,53 @@ Väljund:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Jah
+    
+    
+      
+      &No
+      &Ei
+    
+    
+      
+      &Cancel
+      &Tühista
+    
+    
+      
+      &Close
+      &Sulge
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Paigalduse tagasiside
     
     
-      
+      
       Sending installation feedback.
       Saadan paigalduse tagasisidet.
     
     
-      
+      
       Internal error in install-tracking.
       Paigaldate jälitamisel esines sisemine viga.
     
     
-      
+      
       HTTP request timed out.
       HTTP taotlusel esines ajalõpp.
     
@@ -3643,28 +3669,28 @@ Väljund:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3672,28 +3698,28 @@ Väljund:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Seadme tagasiside
     
     
-      
+      
       Configuring machine feedback.
       Seadistan seadme tagasisidet.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Masina tagasiside konfiguratsioonis esines viga.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Masina tagasisidet ei suudetud korralikult konfigureerida, skripti viga %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Masina tagasisidet ei suudetud korralikult konfigureerida, Calamares'e viga %1.
     
@@ -4045,44 +4071,29 @@ Väljund:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Klaviatuurimudel:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Kirjuta siia, et testida oma klaviatuuri
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_eu.ts b/lang/calamares_eu.ts
index 1eb901d324..22be781de7 100644
--- a/lang/calamares_eu.ts
+++ b/lang/calamares_eu.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Egina
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Instalazioak huts egin du
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Akatsa
     
     
-      
-      
+      
       &Yes
       &Bai
     
     
-      
-      
+      
       &No
       &Ez
     
     
-      
+      
       &Close
       &Itxi
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Calamares instalazioak huts egin du
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ezin da instalatu. Calamares ez da gai konfiguratutako modulu guztiak kargatzeko. Arazao hau banaketak Calamares erabiltzen duen eragatik da.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/> Ondorengo moduluak ezin izan dira kargatu:
     
     
-      
+      
       Continue with setup?
       Ezarpenarekin jarraitu?
     
     
-      
+      
       Continue with installation?
       Instalazioarekin jarraitu?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 instalatzailea zure diskoan aldaketak egitera doa %2 instalatzeko.<br/><strong>Ezingo dituzu desegin aldaketa hauek.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Instalatu orain
     
     
-      
+      
       Go &back
       &Atzera
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Instalatu
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalazioa burutu da. Itxi instalatzailea.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Instalazioa bertan behera utsi da sisteman aldaketarik gabe.
     
     
-      
+      
       &Next
       &Hurrengoa
     
     
-      
+      
       &Back
       &Atzera
     
     
-      
+      
       &Done
       E&ginda
     
     
-      
+      
       &Cancel
       &Utzi
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Bertan behera utzi instalazioa?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Ziur uneko instalazio prozesua bertan behera utzi nahi duzula?
@@ -824,22 +822,22 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       Konputagailuan %2 ezartzeko programa honek hainbat galdera egingo dizkizu.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1704,17 +1702,17 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole ez dago instalatuta
     
     
-      
+      
       Please install KDE Konsole and try again!
       Mesedez instalatu KDE kontsola eta saiatu berriz!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1779,32 +1777,32 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
       
     
     
-      
+      
       I accept the terms and conditions above.
       Goiko baldintzak onartzen ditut.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2773,92 +2771,92 @@ Instalatzailea irten egingo da eta aldaketa guztiak galduko dira.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sistemaren informazioa eskuratzen...
     
     
-      
+      
       Partitions
       Partizioak
     
     
-      
+      
       Current:
       Unekoa: 
     
     
-      
+      
       After:
       Ondoren:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2992,7 +2990,7 @@ Irteera:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3616,25 +3614,53 @@ Irteera:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Ados
+    
+    
+      
+      &Yes
+      &Bai
+    
+    
+      
+      &No
+      &Ez
+    
+    
+      
+      &Cancel
+      &Utzi
+    
+    
+      
+      &Close
+      &Itxi
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3642,28 +3668,28 @@ Irteera:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3671,28 +3697,28 @@ Irteera:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4045,45 +4071,30 @@ Irteera:
   
     keyboardq
     
-      
-      Keyboard Model
-      Teklatu modeloa
-    
-    
-      
-      Layouts
+      
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Keyboard Layout
-      
+      
+      Keyboard Model:
+      Teklatu Modeloa:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      
+      Layouts
       
     
     
-      
-      Models
-      
+      
+      Type here to test your keyboard
+      Idatzi hemen zure teklatua frogatzeko
     
     
-      
+      
       Variants
       
     
-    
-      
-      Keyboard Variant
-      
-    
-    
-      
-      Test your keyboard
-      Frogatu zure teklatua
-    
   
   
     localeq
diff --git a/lang/calamares_fa.ts b/lang/calamares_fa.ts
index 63af012b2a..ff50a49be1 100644
--- a/lang/calamares_fa.ts
+++ b/lang/calamares_fa.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       انجام شد.
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       راه‌اندازی شکست خورد.
     
     
-      
+      
       Installation Failed
       نصب شکست خورد
     
     
-      
+      
       Would you like to paste the install log to the web?
       آیا مایلید که گزارش‌ها در وب الصاق شوند؟
     
     
-      
+      
       Error
       خطا
     
     
-      
-      
+      
       &Yes
       &بله
     
     
-      
-      
+      
       &No
       &خیر
     
     
-      
+      
       &Close
       &بسته
     
     
-      
+      
       Install Log Paste URL
       Install Log Paste URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       The upload was unsuccessful. No web-paste was done.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       راه اندازی کالاماریس شکست خورد.
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 نمی‌تواند نصب شود. کالاماریس نمی‌تواند همه ماژول‌های پیکربندی را بالا بیاورد. این یک مشکل در نحوه استفاده کالاماریس توسط توزیع است.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>این ماژول  نمی‌تواند بالا بیاید:
     
     
-      
+      
       Continue with setup?
       ادامهٔ برپایی؟
     
     
-      
+      
       Continue with installation?
       نصب ادامه یابد؟
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       برنامه نصب %1 در شرف ایجاد تغییرات در دیسک شما به منظور راه‌اندازی %2 است. <br/><strong>شما قادر نخواهید بود تا این تغییرات را برگردانید.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       نصب‌کنندهٔ %1 می‌خواهد برای نصب %2 تغییراتی در دیسکتان بدهد. <br/><strong>نخواهید توانست این تغییرات را برگردانید.</strong>
     
     
-      
+      
       &Set up now
       &همین حالا راه‌انداری کنید
     
     
-      
+      
       &Install now
       &اکنون نصب شود
     
     
-      
+      
       Go &back
       &بازگشت
     
     
-      
+      
       &Set up
       &راه‌اندازی
     
     
-      
+      
       &Install
       &نصب
     
     
-      
+      
       Setup is complete. Close the setup program.
       نصب انجام شد. برنامه نصب را ببندید.
     
     
-      
+      
       The installation is complete. Close the installer.
       نصب انجام شد. نصاب را ببندید.
     
     
-      
+      
       Cancel setup without changing the system.
       لغو راه‌اندازی بدون تغییر سیستم.
     
     
-      
+      
       Cancel installation without changing the system.
       لغو نصب بدون تغییر کردن سیستم.
     
     
-      
+      
       &Next
       &بعدی
     
     
-      
+      
       &Back
       &پیشین
     
     
-      
+      
       &Done
       &انجام شد
     
     
-      
+      
       &Cancel
       &لغو
     
     
-      
+      
       Cancel setup?
       لغو راه‌اندازی؟
     
     
-      
+      
       Cancel installation?
       لغو نصب؟
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       آیا واقعا می‌خواهید روند راه‌اندازی فعلی رو لغو کنید؟
 برنامه راه اندازی ترک می شود و همه تغییرات از بین می روند.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       واقعاً می خواهید فرایند نصب فعلی را لغو کنید؟
@@ -825,22 +823,22 @@ The installer will quit and all changes will be lost.
       این برنامه تعدادی سوال از شما پرسیده و %2 را روی رایانه‌تان برپا می‌کند.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       به برنامه راه اندازی Calamares خوش آمدید برای 1٪
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>به برپاسازی %1 خوش آمدید.</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>به نصب‌کنندهٔ کالامارس برای %1 خوش آمدید.</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>به نصب‌کنندهٔ %1 خوش آمدید.</h1>
     
@@ -1705,17 +1703,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       برنامهٔ Konsole نصب نیست
     
     
-      
+      
       Please install KDE Konsole and try again!
       لطفاً Konsole کی‌دی‌ای را نصب کرده و دوباره تلاش کنید!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       در حال اجرای کدنوشته: &nbsp;<code>%1</code>
     
@@ -1780,32 +1778,32 @@ The installer will quit and all changes will be lost.
       <h1>توافق پروانه</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       شرایط و ضوابط فوق را می‌پذیرم.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       لطفاً توافق پروانهٔ کاربر نهایی (EULAs) را بازبینی کنید.
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       با این روش نصب ، نرم افزار اختصاصی نصب می شود که مشروط به شرایط مجوز است.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       اگر با شرایط موافق نباشید ، روش تنظیم ادامه نمی یابد.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       این روش راه اندازی می تواند نرم افزار اختصاصی را که مشمول شرایط صدور مجوز است نصب کند تا ویژگی های اضافی را فراهم کند و تجربه کاربر را افزایش دهد.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       اگر با این شرایط موافق نباشید ، نرم افزار اختصاصی نصب نمی شود و به جای آن از گزینه های منبع باز استفاده می شود.
     
@@ -2774,92 +2772,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       جمع‌آوری اطّلاعات سامانه…
     
     
-      
+      
       Partitions
       افرازها
     
     
-      
+      
       Current:
       فعلی:
     
     
-      
+      
       After:
       بعد از:
     
     
-      
+      
       No EFI system partition configured
       هیچ پارتیشن سیستم EFI پیکربندی نشده است
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       گزینه ای برای استفاده از GPT در BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       جدول پارتیشن GPT بهترین گزینه برای همه سیستم ها است. این نصب از چنین تنظیماتی برای سیستم های BIOS نیز پشتیبانی می کند. برای پیکربندی جدول پارتیشن GPT در BIOS ، (اگر قبلاً این کار انجام نشده است) برگردید و جدول پارتیشن را روی GPT تنظیم کنید ، سپس یک پارتیشن 8 مگابایتی بدون فرمت با پرچم bios_grub ایجاد کنید. برای راه اندازی٪ 1 سیستم BIOS با GPT ، یک پارتیشن 8 مگابایتی بدون قالب لازم است.
     
     
-      
+      
       Boot partition not encrypted
       پارتیشن بوت رمزشده نیست
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       یک پارتیشن بوت جداگانه همراه با یک پارتیشن ریشه ای رمزگذاری شده راه اندازی شده است ، اما پارتیشن بوت رمزگذاری نشده است. با این نوع تنظیمات مشکلات امنیتی وجود دارد ، زیرا پرونده های مهم سیستم در یک پارتیشن رمزگذاری نشده نگهداری می شوند. در صورت تمایل می توانید ادامه دهید ، اما باز کردن قفل سیستم فایل بعداً در هنگام راه اندازی سیستم اتفاق می افتد. برای رمزگذاری پارتیشن بوت ، به عقب برگردید و آن را دوباره ایجاد کنید ، رمزگذاری را در پنجره ایجاد پارتیشن انتخاب کنید.
     
     
-      
+      
       has at least one disk device available.
       حداقل یک دستگاه دیسک در دسترس دارد.
     
     
-      
+      
       There are no partitions to install on.
       هیچ پارتیشنی برای نصب وجود ندارد
     
@@ -2991,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3615,25 +3613,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &قبول
+    
+    
+      
+      &Yes
+      &بله
+    
+    
+      
+      &No
+      &خیر
+    
+    
+      
+      &Cancel
+      &لغو
+    
+    
+      
+      &Close
+      &بسته
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       بازخورد نصب
     
     
-      
+      
       Sending installation feedback.
       ارسال بازخورد نصب 
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       زمان درخواست HTTP به پایان رسید.
     
@@ -3641,28 +3667,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3670,28 +3696,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4043,45 +4069,30 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      مدل صفحه‌کلید
-    
-    
-      
-      Layouts
-      چینش‌ها
-    
-    
-      
-      Keyboard Layout
-      چینش صفحه‌کلید
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      مدل‌ها
+      
+      Keyboard Model:
+      مدل صفحه‌کلید:
     
     
-      
-      Variants
-      دگرگونه‌ها
+      
+      Layouts
+      چینش‌ها
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      برای آزمودن صفحه‌کلیدتان، این‌جا بنویسید
     
     
-      
-      Test your keyboard
-      صفحه‌کلیدتان را بیازمایید
+      
+      Variants
+      دگرگونه‌ها
     
   
   
diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts
index 82ed07c7c9..f08e023ac8 100644
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Valmis
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Asennus epäonnistui
     
     
-      
+      
       Installation Failed
       Asentaminen epäonnistui
     
     
-      
+      
       Would you like to paste the install log to the web?
       Haluatko liittää asennuslokin verkkoon?
     
     
-      
+      
       Error
       Virhe
     
     
-      
-      
+      
       &Yes
       &Kyllä
     
     
-      
-      
+      
       &No
       &Ei
     
     
-      
+      
       &Close
       &Sulje
     
     
-      
+      
       Install Log Paste URL
       Asenna lokiliitoksen URL-osoite
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Lähettäminen epäonnistui. Verkko-liittämistä ei tehty.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Linkki kopioitu leikepöydälle
     
     
-      
+      
       Calamares Initialization Failed
       Calamaresin alustaminen epäonnistui
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ei voi asentaa. Calamares ei voinut ladata kaikkia määritettyjä moduuleja. Ongelma on siinä, miten jakelu käyttää Calamaresia.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Seuraavia moduuleja ei voitu ladata:
     
     
-      
+      
       Continue with setup?
       Jatketaanko asennusta?
     
     
-      
+      
       Continue with installation?
       Jatka asennusta?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 asennusohjelma on aikeissa tehdä muutoksia levylle, jotta voit määrittää kohteen %2.<br/><strong>Et voi kumota näitä muutoksia.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Asennus ohjelman %1 on tehtävä muutoksia levylle, jotta %2 voidaan asentaa.<br/><strong>Et voi kumota näitä muutoksia.</strong>
     
     
-      
+      
       &Set up now
       &Määritä nyt
     
     
-      
+      
       &Install now
       &Asenna nyt
     
     
-      
+      
       Go &back
       Mene &takaisin
     
     
-      
+      
       &Set up
       &Määritä
     
     
-      
+      
       &Install
       &Asenna
     
     
-      
+      
       Setup is complete. Close the setup program.
       Asennus on valmis. Sulje asennusohjelma.
     
     
-      
+      
       The installation is complete. Close the installer.
       Asennus on valmis. Sulje asennusohjelma.
     
     
-      
+      
       Cancel setup without changing the system.
       Peruuta asennus muuttamatta järjestelmää.
     
     
-      
+      
       Cancel installation without changing the system.
       Peruuta asennus tekemättä muutoksia järjestelmään.
     
     
-      
+      
       &Next
       &Seuraava
     
     
-      
+      
       &Back
       &Takaisin
     
     
-      
+      
       &Done
       &Valmis
     
     
-      
+      
       &Cancel
       &Peruuta
     
     
-      
+      
       Cancel setup?
       Peruuta asennus?
     
     
-      
+      
       Cancel installation?
       Peruuta asennus?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Haluatko todella peruuttaa nykyisen asennuksen?
 Asennusohjelma lopetetaan ja kaikki muutokset menetetään.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Oletko varma että haluat peruuttaa käynnissä olevan asennusprosessin? 
@@ -756,7 +754,7 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.
     
       
       Set keyboard layout to %1/%2.
-      Aseta näppäimiston asetelmaksi %1/%2.
+      Aseta näppäimiston asetteluksi %1/%2.
     
     
       
@@ -830,22 +828,22 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.Tämä ohjelma kysyy joitakin kysymyksiä %2 ja asentaa tietokoneeseen.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Tervetuloa Calamares -asennusohjelmaan %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Tervetuloa %1 asennukseen</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Tervetuloa Calamares asentajaan %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Tervetuloa %1 asentajaan</h1>
     
@@ -1710,17 +1708,17 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Pääte ei asennettuna
     
     
-      
+      
       Please install KDE Konsole and try again!
       Asenna KDE konsole ja yritä uudelleen!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Suoritetaan skripti: &nbsp;<code>%1</code>
     
@@ -1785,32 +1783,32 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.<h1>Lisenssisopimus</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Hyväksyn yllä olevat ehdot ja edellytykset.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Ole hyvä ja tarkista loppukäyttäjän lisenssisopimus (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Tämä asennusohjelma asentaa patentoidun ohjelmiston, johon sovelletaan lisenssiehtoja.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Jos et hyväksy ehtoja, asennusta ei voida jatkaa.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Tämä asennus voi asentaa patentoidun ohjelmiston, johon sovelletaan lisenssiehtoja lisäominaisuuksien tarjoamiseksi ja käyttökokemuksen parantamiseksi.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Jos et hyväksy ehtoja, omaa ohjelmistoa ei asenneta, vaan sen sijaan käytetään avoimen lähdekoodin vaihtoehtoja.
     
@@ -2781,92 +2779,92 @@ hiiren vieritystä skaalaamiseen.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Kerätään järjestelmän tietoja...
     
     
-      
+      
       Partitions
       Osiot
     
     
-      
+      
       Current:
       Nykyinen:
     
     
-      
+      
       After:
       Jälkeen:
     
     
-      
+      
       No EFI system partition configured
       EFI-järjestelmäosiota ei ole määritetty
     
     
-      
+      
       EFI system partition configured incorrectly
       EFI-järjestelmäosio on määritetty väärin
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       EFI-järjestelmäosio on vaatimus käynnistääksesi %1.<br/><br/>Palaa jos haluat määrittää EFI-järjestelmäosion, valitse tai luo sopiva tiedostojärjestelmä.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       Tiedostojärjestelmä on asennettava <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
       Tiedostojärjestelmän on oltava tyyppiä FAT32.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       Tiedostojärjestelmän on oltava kooltaan vähintään %1 MiB.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       Tiedostojärjestelmässä on oltava <strong>%1</strong> lippu.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       Voit jatkaa ilman EFI-järjestelmäosion määrittämistä, mutta järjestelmä ei ehkä käynnisty.
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS:ssa mahdollisuus käyttää GPT:tä
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT-osiotaulukko on paras vaihtoehto kaikille järjestelmille. Tämä asennusohjelma tukee asennusta myös BIOS:n järjestelmään.<br/><br/>Jos haluat määrittää GPT-osiotaulukon BIOS:ssa (jos sitä ei ole jo tehty) palaa takaisin ja aseta osiotaulukkoksi GPT. Luo seuraavaksi 8 Mb alustamaton osio <strong>bios_grub</strong> lipulla käyttöön.<br/><br/>Alustamaton 8 Mb osio on tarpeen %1:n käynnistämiseksi BIOS-järjestelmässä GPT:llä.
     
     
-      
+      
       Boot partition not encrypted
       Käynnistysosiota ei ole salattu
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Erillinen käynnistysosio perustettiin yhdessä salatun juuriosion kanssa, mutta käynnistysosio ei ole salattu.<br/><br/>Tällaisissa asetuksissa on tietoturvaongelmia, koska tärkeät järjestelmätiedostot pidetään salaamattomassa osiossa.<br/>Voit jatkaa, jos haluat, mutta tiedostojärjestelmän lukituksen avaaminen tapahtuu myöhemmin järjestelmän käynnistyksen aikana.<br/>Käynnistysosion salaamiseksi siirry takaisin ja luo se uudelleen valitsemalla <strong>Salaa</strong> osion luominen -ikkunassa. 
     
     
-      
+      
       has at least one disk device available.
       on vähintään yksi levy käytettävissä.
     
     
-      
+      
       There are no partitions to install on.
       Asennettavia osioita ei ole.
     
@@ -3001,7 +2999,7 @@ Ulostulo:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3385,7 +3383,7 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</
     
       
       Set keyboard model to %1, layout to %2-%3
-      Aseta näppäimistön malliksi %1, asetelmaksi %2-%3
+      Aseta näppäimistön malliksi %1, asetteluksi %2-%3
     
     
       
@@ -3628,25 +3626,53 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Kyllä
+    
+    
+      
+      &No
+      &Ei
+    
+    
+      
+      &Cancel
+      &Peruuta
+    
+    
+      
+      &Close
+      &Sulje
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Asennuksen palaute
     
     
-      
+      
       Sending installation feedback.
       Lähetetään asennuksen palautetta.
     
     
-      
+      
       Internal error in install-tracking.
       Sisäinen virhe asennuksen seurannassa.
     
     
-      
+      
       HTTP request timed out.
       HTTP -pyyntö aikakatkaistiin.
     
@@ -3654,28 +3680,28 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE käyttäjän palaute
     
     
-      
+      
       Configuring KDE user feedback.
       Määritä KDE käyttäjän palaute.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Virhe KDE:n käyttäjän palautteen määrityksissä.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       KDE käyttäjän palautetta ei voitu määrittää oikein, komentosarjassa virhe %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       KDE käyttäjän palautetta ei voitu määrittää oikein, Calamares virhe %1.
     
@@ -3683,28 +3709,28 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Koneen palaute
     
     
-      
+      
       Configuring machine feedback.
       Konekohtaisen palautteen määrittäminen.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Virhe koneen palautteen määrityksessä.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Konekohtaista palautetta ei voitu määrittää oikein, komentosarjan virhe %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Koneen palautetta ei voitu määrittää oikein, Calamares-virhe %1.
     
@@ -4072,45 +4098,30 @@ Asennus voi jatkua, mutta jotkin toiminnot saattavat olla pois käytöstä.</
   
     keyboardq
     
-      
-      Keyboard Model
-      Näppäimistön malli
-    
-    
-      
-      Layouts
-      Asettelut
+      
+      To activate keyboard preview, select a layout.
+      Jos haluat aktivoida näppäimistön esikatselun, valitse asettelu.
     
     
-      
-      Keyboard Layout
-      Näppäimistöasettelu
+      
+      Keyboard Model:
+      Näppäimistön malli:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Valitse haluamasi näppäimistömalli tai käytä oletusmallia havaitun laitteiston perusteella.
+      
+      Layouts
+      Asettelut
     
     
-      
-      Models
-      Mallit
+      
+      Type here to test your keyboard
+      Kirjoita tähän testaksesi näppäimistöäsi.
     
     
-      
+      
       Variants
       Vaihtoehdot
     
-    
-      
-      Keyboard Variant
-      Näppäimistön vaihtoehdot
-    
-    
-      
-      Test your keyboard
-      Näppäimistön testaaminen
-    
   
   
     localeq
diff --git a/lang/calamares_fr.ts b/lang/calamares_fr.ts
index d6f5729e2b..5f4281f6d2 100644
--- a/lang/calamares_fr.ts
+++ b/lang/calamares_fr.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Fait
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Échec de la configuration
     
     
-      
+      
       Installation Failed
       L'installation a échoué
     
     
-      
+      
       Would you like to paste the install log to the web?
       Voulez-vous copier le journal d'installation sur le Web ?
     
     
-      
+      
       Error
       Erreur
     
     
-      
-      
+      
       &Yes
       &Oui
     
     
-      
-      
+      
       &No
       &Non
     
     
-      
+      
       &Close
       &Fermer
     
     
-      
+      
       Install Log Paste URL
       URL de copie du journal d'installation
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       L'envoi a échoué. La copie sur le web n'a pas été effectuée.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Lien copié dans le presse-papiers
     
     
-      
+      
       Calamares Initialization Failed
       L'initialisation de Calamares a échoué
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 n'a pas pu être installé. Calamares n'a pas pu charger tous les modules configurés. C'est un problème avec la façon dont Calamares est utilisé par la distribution.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Les modules suivants n'ont pas pu être chargés :
     
     
-      
+      
       Continue with setup?
       Poursuivre la configuration ?
     
     
-      
+      
       Continue with installation?
       Continuer avec l'installation ?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Le programme de configuration de %1 est sur le point de procéder aux changements sur le disque afin de configurer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       L'installateur %1 est sur le point de procéder aux changements sur le disque afin d'installer %2.<br/> <strong>Vous ne pourrez pas annulez ces changements.<strong>
     
     
-      
+      
       &Set up now
       &Configurer maintenant
     
     
-      
+      
       &Install now
       &Installer maintenant
     
     
-      
+      
       Go &back
       &Retour
     
     
-      
+      
       &Set up
       &Configurer
     
     
-      
+      
       &Install
       &Installer
     
     
-      
+      
       Setup is complete. Close the setup program.
       La configuration est terminée. Fermer le programme de configuration.
     
     
-      
+      
       The installation is complete. Close the installer.
       L'installation est terminée. Fermer l'installateur.
     
     
-      
+      
       Cancel setup without changing the system.
       Annuler la configuration sans toucher au système.
     
     
-      
+      
       Cancel installation without changing the system.
       Annuler l'installation sans modifier votre système.
     
     
-      
+      
       &Next
       &Suivant
     
     
-      
+      
       &Back
       &Précédent
     
     
-      
+      
       &Done
       &Terminé
     
     
-      
+      
       &Cancel
       &Annuler
     
     
-      
+      
       Cancel setup?
       Annuler la configuration ?
     
     
-      
+      
       Cancel installation?
       Abandonner l'installation ?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Voulez-vous vraiment abandonner le processus de configuration ?
 Le programme de configuration se fermera et les changements seront perdus.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Voulez-vous vraiment abandonner le processus d'installation ?
@@ -829,22 +827,22 @@ L'installateur se fermera et les changements seront perdus.
       Ce programme va vous poser quelques questions et configurer %2 sur votre ordinateur.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Bienvenue dans le programme de configuration Calamares pour %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Bienvenue dans la configuration de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Bienvenue dans l'installateur Calamares pour %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Bienvenue dans l'installateur de %1</h1>
     
@@ -1709,17 +1707,17 @@ L'installateur se fermera et les changements seront perdus.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole n'a pas été installé
     
     
-      
+      
       Please install KDE Konsole and try again!
       Veuillez installer KDE Konsole et réessayer!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Exécution en cours du script : &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ L'installateur se fermera et les changements seront perdus.
       <h1>Accord de Licence</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       J'accepte les termes et conditions ci-dessus.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Merci de lire les Contrats de Licence Utilisateur Final (CLUFs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       La procédure de configuration va installer des logiciels propriétaires qui sont soumis à des accords de licence.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Si vous ne validez pas ces accords, la procédure de configuration ne peut pas continuer.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       La procédure de configuration peut installer des logiciels propriétaires qui sont assujetti à des accords de licence afin de fournir des fonctionnalités supplémentaires et améliorer l'expérience utilisateur.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Si vous n'acceptez pas ces termes, les logiciels propriétaires ne seront pas installés, et des alternatives open source seront utilisés à la place. 
     
@@ -2780,92 +2778,92 @@ L'installateur se fermera et les changements seront perdus.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Récupération des informations système…
     
     
-      
+      
       Partitions
       Partitions
     
     
-      
+      
       Current:
       Actuel :
     
     
-      
+      
       After:
       Après :
     
     
-      
+      
       No EFI system partition configured
       Aucune partition système EFI configurée
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Option pour utiliser GPT sur le BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Une table de partition GPT est la meilleure option pour tous les systèmes. Ce programme d'installation prend également en charge une telle configuration pour les systèmes BIOS.<br/><br/>Pour configurer une table de partition GPT sur le BIOS, (si ce n'est déjà fait) revenez en arrière et définissez la table de partition sur GPT, puis créez une partition non formatée de 8 Mo avec l'indicateur <strong>bios_grub</strong> activé.<br/><br/>Une partition de 8 Mo non formatée est nécessaire pour démarrer %1 sur un système BIOS avec GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partition d'amorçage non chiffrée.
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Une partition d'amorçage distincte a été configurée avec une partition racine chiffrée, mais la partition d'amorçage n'est pas chiffrée. <br/> <br/> Il y a des problèmes de sécurité avec ce type d'installation, car des fichiers système importants sont conservés sur une partition non chiffrée <br/> Vous pouvez continuer si vous le souhaitez, mais le déverrouillage du système de fichiers se produira plus tard au démarrage du système. <br/> Pour chiffrer la partition d'amorçage, revenez en arrière et recréez-la, en sélectionnant <strong> Chiffrer </ strong> dans la partition Fenêtre de création.
     
     
-      
+      
       has at least one disk device available.
       a au moins un disque disponible.
     
     
-      
+      
       There are no partitions to install on.
       Il n'y a pas de partition pour l'installation
     
@@ -3001,7 +2999,7 @@ Sortie
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3628,25 +3626,53 @@ Sortie
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Oui
+    
+    
+      
+      &No
+      &Non
+    
+    
+      
+      &Cancel
+      &Annuler
+    
+    
+      
+      &Close
+      &Fermer
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Rapport d'installation
     
     
-      
+      
       Sending installation feedback.
       Envoi en cours du rapport d'installation.
     
     
-      
+      
       Internal error in install-tracking.
       Erreur interne dans le suivi d'installation.
     
     
-      
+      
       HTTP request timed out.
       La requête HTTP a échoué.
     
@@ -3654,28 +3680,28 @@ Sortie
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Commentaires des utilisateurs de KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Configuration des commentaires des utilisateurs de KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Erreur dans la configuration des commentaires des utilisateurs de KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Impossible de configurer correctement les commentaires des utilisateurs de KDE, erreur de script %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Impossible de configurer correctement les commentaires des utilisateurs de KDE, erreur Calamares %1.
     
@@ -3683,28 +3709,28 @@ Sortie
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Rapport de la machine
     
     
-      
+      
       Configuring machine feedback.
       Configuration en cours du rapport de la machine.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Erreur dans la configuration du rapport de la machine.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Echec pendant la configuration du rapport de machine, erreur de script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Impossible de mettre en place le rapport d'utilisateurs, erreur %1.
     
@@ -4070,45 +4096,30 @@ Sortie
   
     keyboardq
     
-      
-      Keyboard Model
-      Modèle de clavier
-    
-    
-      
-      Layouts
-      Dispositions
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Disposition du clavier
+      
+      Keyboard Model:
+      Modèle de clavier :
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Cliquer sur votre modèle de clavier préféré pour sélectionner la disposition et la variante, ou utiliser celui par défaut en fonction du matériel détecté.
+      
+      Layouts
+      Dispositions
     
     
-      
-      Models
-      Modèles
+      
+      Type here to test your keyboard
+      Saisir ici pour tester votre clavier
     
     
-      
+      
       Variants
       Variantes
     
-    
-      
-      Keyboard Variant
-      Variante de clavier
-    
-    
-      
-      Test your keyboard
-      Tester votre clavier
-    
   
   
     localeq
diff --git a/lang/calamares_fr_CH.ts b/lang/calamares_fr_CH.ts
index 4b1fed6c92..eb15ba1e8b 100644
--- a/lang/calamares_fr_CH.ts
+++ b/lang/calamares_fr_CH.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts
index 5030853da9..12682c7a73 100644
--- a/lang/calamares_fur.ts
+++ b/lang/calamares_fur.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Fat
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Configurazion falide
     
     
-      
+      
       Installation Failed
       Instalazion falide
     
     
-      
+      
       Would you like to paste the install log to the web?
       Meti sul web il regjistri di instalazion?
     
     
-      
+      
       Error
       Erôr
     
     
-      
-      
+      
       &Yes
       &Sì
     
     
-      
-      
+      
       &No
       &No
     
     
-      
+      
       &Close
       S&iere
     
     
-      
+      
       Install Log Paste URL
       URL de copie dal regjistri di instalazion
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Il cjariament sù pe rêt al è lât strucj. No je stade fate nissune copie sul web.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Inizializazion di Calamares falide
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       No si pues instalâ %1. Calamares nol è rivât a cjariâ ducj i modui configurâts. Chest probleme achì al è causât de distribuzion e di cemût che al ven doprât Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>I modui chi sot no puedin jessi cjariâts:
     
     
-      
+      
       Continue with setup?
       Continuâ cu la configurazion?
     
     
-      
+      
       Continue with installation?
       Continuâ cu la instalazion?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Il program di configurazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No si podarà tornâ indaûr e anulâ chestis modifichis.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Il program di instalazion %1 al sta par aplicâ modifichis al disc, di mût di podê instalâ %2.<br/><strong>No tu podarâs tornâ indaûr e anulâ chestis modifichis.</strong>
     
     
-      
+      
       &Set up now
       &Configure cumò
     
     
-      
+      
       &Install now
       &Instale cumò
     
     
-      
+      
       Go &back
       &Torne indaûr
     
     
-      
+      
       &Set up
       &Configure
     
     
-      
+      
       &Install
       &Instale
     
     
-      
+      
       Setup is complete. Close the setup program.
       Configurazion completade. Siere il program di configurazion.
     
     
-      
+      
       The installation is complete. Close the installer.
       La instalazion e je stade completade. Siere il program di instalazion.
     
     
-      
+      
       Cancel setup without changing the system.
       Anule la configurazion cence modificâ il sisteme.
     
     
-      
+      
       Cancel installation without changing the system.
       Anulâ la instalazion cence modificâ il sisteme.
     
     
-      
+      
       &Next
       &Sucessîf
     
     
-      
+      
       &Back
       &Indaûr
     
     
-      
+      
       &Done
       &Fat
     
     
-      
+      
       &Cancel
       &Anule
     
     
-      
+      
       Cancel setup?
       Anulâ la configurazion?
     
     
-      
+      
       Cancel installation?
       Anulâ la instalazion?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Anulâ pardabon il procès di configurazion?
 Il program di configurazion al jessarà e dutis lis modifichis a laran pierdudis.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Anulâ pardabon il procès di instalazion?
@@ -825,22 +823,22 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       Chest program al fasarà cualchi domande e al configurarà %2 sul computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Benvignûts sul program di configurazion Calamares par %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Benvignûts te configurazion di %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Benvignûts sul program di instalazion Calamares par %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Benvignûts tal program di instalazion di %1</h1>
     
@@ -1705,17 +1703,17 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole no instalade
     
     
-      
+      
       Please install KDE Konsole and try again!
       Par plasê instale KDE Konsole e torne prove!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Esecuzion script: &nbsp;<code>%1</code>
     
@@ -1780,32 +1778,32 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       <h1>Acuardi di licence</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       O aceti i tiermins e lis condizions chi parsore.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Si pree di tornâ a viodi i acuardis di licence pal utent finâl (EULAs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       La procedure di configurazion e instalarà software proprietari sometût a tiermins di licence.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Se no tu concuardis cui tiermins, la procedure di configurazion no pues continuâ.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Cheste procedure di configurazion e pues instalâ software proprietari che al è sometût a tiermins di licence par podê furnî funzionalitâts adizionâls e miorâ la esperience dal utent.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Se no tu concuardis cui tiermins, il software proprietari nol vignarà instalât e al lôr puest a vignaran dopradis lis alternativis open source.
     
@@ -2776,92 +2774,92 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Daûr a dâ dongje lis informazions dal sisteme...
     
     
-      
+      
       Partitions
       Partizions
     
     
-      
+      
       Current:
       Atuâl:
     
     
-      
+      
       After:
       Dopo:
     
     
-      
+      
       No EFI system partition configured
       Nissune partizion di sisteme EFI configurade
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Opzion par doprâ GPT su BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       La miôr opzion par ducj i sistemis e je une tabele des partizions GPT. Il program di instalazion al supuarte ancje chest gjenar di configurazion pai sistemis BIOS.<br/><br/>Par configurâ une tabele des partizions GPT su BIOS, (se nol è za stât fat) torne indaûr e met a GPT la tabele des partizions, dopo cree une partizion no formatade di 8MB cu la opzion <strong>bios_grup</strong> abilitade. <br/><br/>Une partizion no formatade di 8MB e je necessarie par inviâ %1 su sistemsi BIOS cun GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partizion di inviament no cifrade
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       E je stade configurade une partizion di inviament separade adun cuntune partizion lidrîs cifrade, ma la partizion di inviament no je cifrade.<br/><br/> A esistin problemis di sigurece cun chest gjenar di configurazion, par vie che i file di sisteme impuartants a vegnin tignûts intune partizion no cifrade.<br/>Tu puedis continuâ se tu lu desideris, ma il sbloc dal filesystem al sucedarà plui indenant tal inviament dal sisteme.<br/>Par cifrâ la partizion di inviament, torne indaûr e torne creile, selezionant <strong>Cifrâ</strong> tal barcon di creazion de partizion.
     
     
-      
+      
       has at least one disk device available.
       al à almancul une unitât disc disponibil.
     
     
-      
+      
       There are no partitions to install on.
       No son partizions dulà lâ a instalâ.
     
@@ -2996,7 +2994,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3623,25 +3621,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Va ben
+    
+    
+      
+      &Yes
+      &Sì
+    
+    
+      
+      &No
+      &No
+    
+    
+      
+      &Cancel
+      &Anule
+    
+    
+      
+      &Close
+      S&iere
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Opinion su la instalazion
     
     
-      
+      
       Sending installation feedback.
       Daûr a inviâ la opinion su la instalazion.
     
     
-      
+      
       Internal error in install-tracking.
       Erôr interni in install-tracking.
     
     
-      
+      
       HTTP request timed out.
       Richieste HTTP scjadude.
     
@@ -3649,28 +3675,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Opinion dal utent di KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Daûr a configurâ la opinione dal utent di KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Erôr te configurazion de opinion dal utent di KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Nol è stât pussibil configurâ in maniere juste la opinion dal utent di KDE, erôr di script %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Nol è stât pussibil configurâ in maniere juste la opinion dal utent di KDE, erôr di Calamares %1.
     
@@ -3678,28 +3704,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Opinion su la machine
     
     
-      
+      
       Configuring machine feedback.
       Daûr a configurâ la opinion su la machine.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Erôr inte configurazion de opinion su la machine.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Nol è stât pussibil configurâ in maniere juste la opinion su la machine, erôr di script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Nol è stât pussibil configurâ in maniere juste la opinion su la machine, erôr di Calamares %1.
     
@@ -4065,45 +4091,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Model di tastiere
-    
-    
-      
-      Layouts
-      Disposizions
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Disposizion di tastiere
+      
+      Keyboard Model:
+      Model de tastiere:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Fâs clic sul model di tastiere preferît par selezionâ la disposizion e la variante, o dopre chel predefinît basât sul hardware rilevât.
+      
+      Layouts
+      Disposizions
     
     
-      
-      Models
-      Modei
+      
+      Type here to test your keyboard
+      Scrîf achì par provâ la tastiere
     
     
-      
+      
       Variants
       Variantis
     
-    
-      
-      Keyboard Variant
-      Variante di tastiere
-    
-    
-      
-      Test your keyboard
-      Prove la tastiere
-    
   
   
     localeq
diff --git a/lang/calamares_gl.ts b/lang/calamares_gl.ts
index 59e50f402a..cf0df383dd 100644
--- a/lang/calamares_gl.ts
+++ b/lang/calamares_gl.ts
@@ -172,7 +172,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Feito
     
@@ -286,54 +286,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Erro na instalación
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Erro
     
     
-      
-      
+      
       &Yes
       &Si
     
     
-      
-      
+      
       &No
       &Non
     
     
-      
+      
       &Close
       &Pechar
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -342,123 +340,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Fallou a inicialización do Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Non é posíbel instalar %1. O calamares non foi quen de cargar todos os módulos configurados. Este é un problema relacionado con como esta distribución utiliza o Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/> Non foi posíbel cargar os módulos seguintes:
     
     
-      
+      
       Continue with setup?
       Continuar coa posta en marcha?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       O %1 instalador está a piques de realizar cambios no seu disco para instalar %2.<br/><strong>Estes cambios non poderán desfacerse.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Instalar agora
     
     
-      
+      
       Go &back
       Ir &atrás
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Completouse a instalacion. Peche o instalador
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar a instalación sen cambiar o sistema
     
     
-      
+      
       &Next
       &Seguinte
     
     
-      
+      
       &Back
       &Atrás
     
     
-      
+      
       &Done
       &Feito
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Cancelar a instalación?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Desexa realmente cancelar o proceso actual de instalación?
@@ -825,22 +823,22 @@ O instalador pecharase e perderanse todos os cambios.
       Este programa faralle algunhas preguntas mentres prepara %2 no seu ordenador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1705,17 +1703,17 @@ O instalador pecharase e perderanse todos os cambios.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole non está instalado
     
     
-      
+      
       Please install KDE Konsole and try again!
       Instale KDE Konsole e ténteo de novo!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Executando o script: &nbsp; <code>%1</code>
     
@@ -1780,32 +1778,32 @@ O instalador pecharase e perderanse todos os cambios.
       
     
     
-      
+      
       I accept the terms and conditions above.
       Acepto os termos e condicións anteriores.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2774,92 +2772,92 @@ O instalador pecharase e perderanse todos os cambios.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       A reunir a información do sistema...
     
     
-      
+      
       Partitions
       Particións
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Despois:
     
     
-      
+      
       No EFI system partition configured
       Non hai ningunha partición de sistema EFI configurada
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       A partición de arranque non está cifrada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Configurouse unha partición de arranque separada xunto cunha partición raíz cifrada, mais a partición raíz non está cifrada.<br/><br/>Con este tipo de configuración preocupa a seguranza porque nunha partición sen cifrar grávanse ficheiros de sistema importantes.<br/>Pode continuar, se así o desexa, mais o desbloqueo do sistema de ficheiros producirase máis tarde durante o arranque do sistema.<br/>Para cifrar unha partición raíz volva atrás e créea de novo, seleccionando <strong>Cifrar</strong> na xanela de creación de particións.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2994,7 +2992,7 @@ Saída:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3618,25 +3616,53 @@ Saída:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Ok
+    
+    
+      
+      &Yes
+      &Si
+    
+    
+      
+      &No
+      &Non
+    
+    
+      
+      &Cancel
+      &Cancelar
+    
+    
+      
+      &Close
+      &Pechar
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Opinións sobre a instalació
     
     
-      
+      
       Sending installation feedback.
       Enviar opinións sobre a instalación.
     
     
-      
+      
       Internal error in install-tracking.
       Produciuse un erro interno en install-tracking.
     
     
-      
+      
       HTTP request timed out.
       Esgotouse o tempo de espera de HTTP.
     
@@ -3644,28 +3670,28 @@ Saída:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3673,28 +3699,28 @@ Saída:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Información fornecida pola máquina
     
     
-      
+      
       Configuring machine feedback.
       Configuración das informacións fornecidas pola máquina.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Produciuse un erro na configuración das información fornecidas pola máquina.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Non foi posíbel configurar correctamente as informacións fornecidas pola máquina; erro de script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Non foi posíbel configurar correctamente as informacións fornecidas pola máquin; erro de Calamares %1.
     
@@ -4046,44 +4072,29 @@ Saída:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Modelo de teclado.
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Teclee aquí para comproba-lo seu teclado.
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_gu.ts b/lang/calamares_gu.ts
index 7914c2ae83..2c2263f204 100644
--- a/lang/calamares_gu.ts
+++ b/lang/calamares_gu.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index dc2baf2790..90a5fd39e8 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       סיום
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       ההתקנה נכשלה
     
     
-      
+      
       Installation Failed
       ההתקנה נכשלה
     
     
-      
+      
       Would you like to paste the install log to the web?
       להדביק את יומן ההתקנה לאינטרנט?
     
     
-      
+      
       Error
       שגיאה
     
     
-      
-      
+      
       &Yes
       &כן
     
     
-      
-      
+      
       &No
       &לא
     
     
-      
+      
       &Close
       &סגירה
     
     
-      
+      
       Install Log Paste URL
       כתובת הדבקת יומן התקנה
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       ההעלאה לא הצליחה. לא בוצעה הדבקה לאינטרנט.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -349,124 +347,124 @@ Link copied to clipboard
 הקישור הועתק ללוח הגזירים
     
     
-      
+      
       Calamares Initialization Failed
       הפעלת Calamares נכשלה
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       אין אפשרות להתקין את %1. ל־Calamares אין אפשרות לטעון את המודולים המוגדרים. מדובר בתקלה באופן בו ההפצה משתמשת ב־Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>לא ניתן לטעון את המודולים הבאים:
     
     
-      
+      
       Continue with setup?
       להמשיך בהתקנה?
     
     
-      
+      
       Continue with installation?
       להמשיך בהתקנה?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       תכנית ההתקנה של %1 עומדת לבצע שינויים בכונן הקשיח שלך לטובת התקנת %2.<br/><strong>לא תהיה לך אפשרות לבטל את השינויים האלה.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       אשף התקנת %1 עומד לבצע שינויים בכונן שלך לטובת התקנת %2.<br/><strong>לא תהיה אפשרות לבטל את השינויים הללו.</strong>
     
     
-      
+      
       &Set up now
       להת&קין כעת
     
     
-      
+      
       &Install now
       להת&קין כעת
     
     
-      
+      
       Go &back
       ח&זרה
     
     
-      
+      
       &Set up
       להת&קין
     
     
-      
+      
       &Install
       הת&קנה
     
     
-      
+      
       Setup is complete. Close the setup program.
       ההתקנה הושלמה. נא לסגור את תכנית ההתקנה.
     
     
-      
+      
       The installation is complete. Close the installer.
       ההתקנה הושלמה. נא לסגור את אשף ההתקנה.
     
     
-      
+      
       Cancel setup without changing the system.
       ביטול ההתקנה ללא ביצוע שינוי במערכת.
     
     
-      
+      
       Cancel installation without changing the system.
       ביטול ההתקנה ללא ביצוע שינוי במערכת.
     
     
-      
+      
       &Next
       &קדימה
     
     
-      
+      
       &Back
       &אחורה
     
     
-      
+      
       &Done
       &סיום
     
     
-      
+      
       &Cancel
       &ביטול
     
     
-      
+      
       Cancel setup?
       לבטל את ההתקנה?
     
     
-      
+      
       Cancel installation?
       לבטל את ההתקנה?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       האם לבטל את תהליך ההתקנה הנוכחי?
 אשף ההתקנה ייסגר וכל השינויים יאבדו.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       האם לבטל את תהליך ההתקנה הנוכחי?
@@ -833,22 +831,22 @@ The installer will quit and all changes will be lost.
       תכנית זו תשאל אותך מספר שאלות ותתקין את %2 על המחשב שלך.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>ברוך בואך לתכנית ההתקנה Calamares עבור %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>ברוך בואך להתקנת %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>ברוך בואך להתקנת %1 עם Calamares</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>ברוך בואך להתקנת %1</h1>
     
@@ -1713,17 +1711,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole לא מותקן
     
     
-      
+      
       Please install KDE Konsole and try again!
       נא להתקין את KDE Konsole ולנסות שוב!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       הסקריפט מופעל: &nbsp; <code>%1</code>
     
@@ -1788,32 +1786,32 @@ The installer will quit and all changes will be lost.
       <h1>הסכם רישוי</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       התנאים וההגבלות שלמעלה מקובלים עלי.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       נא לסקור בקפידה את הסכמי רישוי משתמש הקצה (EULAs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       תהליך התקנה זה יתקין תכנה קניינית שכפופה לתנאי רישוי.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       אם התנאים האלה אינם מקובלים עליכם, אי אפשר להמשיך בתהליך ההתקנה.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       תהליך התקנה זה יכול להתקין תכנה קניינית שכפופה לתנאי רישוי כדי לספק תכונות נוספות ולשפר את חוויית המשתמש.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       אם התנאים הללו אינם מקובלים עליכם, תוכנה קניינית לא תותקן, ובמקומן יעשה שימוש בחלופות בקוד פתוח.
     
@@ -2802,92 +2800,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       נאסף מידע על המערכת…
     
     
-      
+      
       Partitions
       מחיצות
     
     
-      
+      
       Current:
       נוכחי:
     
     
-      
+      
       After:
       לאחר:
     
     
-      
+      
       No EFI system partition configured
       לא הוגדרה מחיצת מערכת EFI
     
     
-      
+      
       EFI system partition configured incorrectly
       מחיצת המערכת EFI לא הוגדרה נכון
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       מחיצת מערכת EFI נחוצה להפעלת %1. <br/><br/>כדי להפעיל מחיצת מערכת EFI, יש לחזור ולבחור או ליצור מערכת קבצים מתאימה.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       יש לעגן את מערכת הקבצים ב־<strong>%1</strong>
     
     
-      
+      
       The filesystem must have type FAT32.
       מערכת הקבצים חייבת להיות מסוג FAT32.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       גודל מערכת הקבצים חייב להיות לפחות ‎%1 MIB.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       למערכת הקבצים חייב להיות מוגדר הדגלון <strong>%1</strong>.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       ניתן להמשיך ללא הקמת מחיצת מערכת EFI אך המערכת שלך לא תצליח להיטען.
     
     
-      
+      
       Option to use GPT on BIOS
       אפשרות להשתמש ב־GPT או ב־BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       טבלת מחיצות מסוג GPT היא האפשרות הטובה ביותר בכל המערכות. תכנית התקנה זו תומכת גם במערכות מסוג BIOS.<br/><br/>כדי להגדיר טבלת מחיצות מסוג GPT על גבי BIOS, (אם זה טרם בוצע) יש לחזור ולהגדיר את טבלת המחיצות ל־GPT, לאחר מכן יש ליצור מחיצה של 8 מ״ב ללא פירמוט עם הדגלון <strong>bios_grub</strong> פעיל.<br/><br/>מחיצה בלתי מפורמטת בגודל 8 מ״ב נחוצה לטובת הפעלת %1 על מערכת מסוג BIOS עם GPT.
     
     
-      
+      
       Boot partition not encrypted
       מחיצת האתחול (Boot) אינה מוצפנת
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       מחיצת אתחול, boot, נפרדת הוגדרה יחד עם מחיצת מערכת ההפעלה, root, מוצפנת, אך מחיצת האתחול לא הוצפנה.<br/><br/> ישנן השלכות בטיחותיות עם התצורה שהוגדרה, מכיוון שקובצי מערכת חשובים נשמרים על מחיצה לא מוצפנת.<br/>ניתן להמשיך אם זהו רצונך, אך שחרור מערכת הקבצים יתרחש מאוחר יותר כחלק מהאתחול.<br/>בכדי להצפין את מחיצת האתחול, יש לחזור וליצור אותה מחדש, על ידי בחירה ב <strong>הצפנה</strong> בחלונית יצירת המחיצה.
     
     
-      
+      
       has at least one disk device available.
       יש לפחות התקן כונן אחד זמין.
     
     
-      
+      
       There are no partitions to install on.
       אין מחיצות להתקין עליהן.
     
@@ -3022,7 +3020,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3649,25 +3647,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &אישור
+    
+    
+      
+      &Yes
+      &כן
+    
+    
+      
+      &No
+      &לא
+    
+    
+      
+      &Cancel
+      &ביטול
+    
+    
+      
+      &Close
+      &סגירה
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       משוב בנושא ההתקנה
     
     
-      
+      
       Sending installation feedback.
       שולח משוב בנושא ההתקנה.
     
     
-      
+      
       Internal error in install-tracking.
       שגיאה פנימית בעת התקנת תכונת המעקב.
     
     
-      
+      
       HTTP request timed out.
       בקשת HTTP חרגה מזמן ההמתנה המקסימאלי.
     
@@ -3675,28 +3701,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       משוב משתמש KDE
     
     
-      
+      
       Configuring KDE user feedback.
       משוב המשתמש ב־KDE מוגדר.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       שגיאה בהגדרות משוב המשתמש ב־KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       לא ניתן להגדיר את משוב המשתמש ב־KDE כראוי, שגיאת סקריפט %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       לא ניתן להגדיר את משוב המשתמש ב־KDE כראוי, שגיאת Calamares‏ %1.
     
@@ -3704,28 +3730,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       משוב בנושא עמדת המחשב
     
     
-      
+      
       Configuring machine feedback.
       מגדיר משוב בנושא עמדת המחשב.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       שגיאה בעת הגדרת המשוב בנושא עמדת המחשב.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       לא ניתן להגדיר את המשוב בנושא עמדת המחשב באופן תקין. שגיאת הרצה %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       לא ניתן להגדיר את המשוב בנושא עמדת המחשב באופן תקין. שגיאת Calamares %1.
     
@@ -4093,45 +4119,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      דגם מקלדת
-    
-    
-      
-      Layouts
-      פריסות
+      
+      To activate keyboard preview, select a layout.
+      כדי להפעיל תצוגה מקדימה של מקלדת יש לבחור בפריסה.
     
     
-      
-      Keyboard Layout
-      פריסת מקלדת
+      
+      Keyboard Model:
+      דגם מקלדת:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      נא ללחוץ על דגם המקלדת המועדף עליכם כדי לבחור בפריסה ובהגוון או להשתמש בברירת המחדל בהתאם לחומרה שזוהתה.
+      
+      Layouts
+      פריסות
     
     
-      
-      Models
-      דגמים
+      
+      Type here to test your keyboard
+      ניתן להקליד כאן כדי לבדוק את המקלדת שלך
     
     
-      
+      
       Variants
       הגוונים
     
-    
-      
-      Keyboard Variant
-      הגוון מקלדת
-    
-    
-      
-      Test your keyboard
-      בדיקת המקלדת שלך
-    
   
   
     localeq
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index 846631aa68..4e7a9b330b 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       पूर्ण
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       सेटअप विफल रहा
     
     
-      
+      
       Installation Failed
       इंस्टॉल विफल रहा।
     
     
-      
+      
       Would you like to paste the install log to the web?
       क्या आप इंस्टॉल प्रक्रिया की लॉग फ़ाइल इंटरनेट पर पेस्ट करना चाहेंगे ? 
     
     
-      
+      
       Error
       त्रुटि
     
     
-      
-      
+      
       &Yes
       हाँ (&Y)
     
     
-      
-      
+      
       &No
       नहीं (&N)
     
     
-      
+      
       &Close
       बंद करें (&C)
     
     
-      
+      
       Install Log Paste URL
       इंस्टॉल प्रक्रिया की लॉग फ़ाइल पेस्ट करें
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       अपलोड विफल रहा। इंटरनेट पर पेस्ट नहीं हो सका।
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 लिंक को क्लिपबोर्ड पर कॉपी किया गया
     
     
-      
+      
       Calamares Initialization Failed
       Calamares का आरंभीकरण विफल रहा
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 इंस्टॉल नहीं किया जा सका। Calamares सभी विन्यस्त मॉड्यूल लोड करने में विफल रहा। यह आपके लिनक्स वितरण द्वारा Calamares के उपयोग से संबंधित एक समस्या है।
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>निम्नलिखित मॉड्यूल लोड नहीं हो सकें :
     
     
-      
+      
       Continue with setup?
       सेटअप करना जारी रखें?
     
     
-      
+      
       Continue with installation?
       इंस्टॉल प्रक्रिया जारी रखें?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %2 सेटअप करने हेतु %1 सेटअप प्रोग्राम आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %2 इंस्टॉल करने के लिए %1 इंस्टॉलर आपकी डिस्क में बदलाव करने वाला है।<br/><strong>आप इन बदलावों को पूर्ववत नहीं कर पाएंगे।</strong>
     
     
-      
+      
       &Set up now
       अभी सेटअप करें (&S)
     
     
-      
+      
       &Install now
       अभी इंस्टॉल करें (&I)
     
     
-      
+      
       Go &back
       वापस जाएँ (&b)
     
     
-      
+      
       &Set up
       सेटअप करें (&S)
     
     
-      
+      
       &Install
       इंस्टॉल करें (&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       सेटअप पूर्ण हुआ। सेटअप प्रोग्राम बंद कर दें।
     
     
-      
+      
       The installation is complete. Close the installer.
       इंस्टॉल पूर्ण हुआ।अब इंस्टॉलर को बंद करें।
     
     
-      
+      
       Cancel setup without changing the system.
       सिस्टम में बदलाव किये बिना सेटअप रद्द करें।
     
     
-      
+      
       Cancel installation without changing the system.
       सिस्टम में बदलाव किये बिना इंस्टॉल रद्द करें।
     
     
-      
+      
       &Next
       आगे (&N)
     
     
-      
+      
       &Back
       वापस (&B)
     
     
-      
+      
       &Done
       हो गया (&D)
     
     
-      
+      
       &Cancel
       रद्द करें (&C)
     
     
-      
+      
       Cancel setup?
       सेटअप रद्द करें?
     
     
-      
+      
       Cancel installation?
       इंस्टॉल रद्द करें?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       क्या आप वाकई वर्तमान सेटअप प्रक्रिया रद्द करना चाहते हैं?
 सेटअप प्रोग्राम बंद हो जाएगा व सभी बदलाव नष्ट।
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       क्या आप वाकई वर्तमान इंस्टॉल प्रक्रिया रद्द करना चाहते हैं?
@@ -829,22 +827,22 @@ The installer will quit and all changes will be lost.
       यह प्रोग्राम प्रश्नावली के माध्यम से आपके कंप्यूटर पर %2 को सेट करेगा।
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 हेतु Calamares सेटअप में आपका स्वागत है</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 सेटअप में आपका स्वागत है</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 हेतु Calamares इंस्टॉलर में आपका स्वागत है</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 इंस्टॉलर में आपका स्वागत है</h1>
     
@@ -1709,17 +1707,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole इंस्टॉल नहीं है
     
     
-      
+      
       Please install KDE Konsole and try again!
       कृपया केडीई Konsole इंस्टॉल कर, पुनः प्रयास करें।
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       निष्पादित स्क्रिप्ट : &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ The installer will quit and all changes will be lost.
       <h1>लाइसेंस अनुबंध</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       मैं उपरोक्त नियम व शर्तें स्वीकार करता हूँ।
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       कृपया लक्षित उपयोक्ता लाइसेंस अनुबंधों (EULAs) की समीक्षा करें।
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       यह सेटअप प्रक्रिया लाइसेंस शर्तों के अधीन अमुक्त सॉफ्टवेयर को इंस्टॉल करेगी।
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       यदि आप शर्तों से असहमत है, तो सेटअप प्रक्रिया जारी नहीं रखी जा सकती।
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       यह सेटअप प्रक्रिया अतिरिक्त सुविधाएँ प्रदान करने व उपयोक्ता अनुभव में वृद्धि हेतु लाइसेंस शर्तों के अधीन अमुक्त सॉफ्टवेयर को इंस्टॉल कर सकती है।
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       यदि आप शर्तों से असहमत है, तो अमुक्त सॉफ्टवेयर इंस्टाल नहीं किया जाएगा व उनके मुक्त विकल्प उपयोग किए जाएँगे।
     
@@ -2780,92 +2778,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       सिस्टम की जानकारी प्राप्त की जा रही है...
     
     
-      
+      
       Partitions
       विभाजन
     
     
-      
+      
       Current:
       मौजूदा :
     
     
-      
+      
       After:
       बाद में:
     
     
-      
+      
       No EFI system partition configured
       कोई EFI सिस्टम विभाजन विन्यस्त नहीं है
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS पर GPT उपयोग करने के लिए विकल्प
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT विभाजन तालिका सभी सिस्टम हेतु सबसे उत्तम विकल्प है। यह इंस्टॉलर BIOS सिस्टम के सेटअप को भी समर्थन करता है। <br/><br/>BIOS पर GPT विभाजन तालिका को विन्यस्त करने हेतु, (अगर अब तक नहीं करा है तो) वापस जाकर विभाजन तालिका GPT पर सेट करें, फिर एक 8 MB का बिना फॉर्मेट हुआ विभाजन बनाए जिस पर <strong>bios_grub</strong> का flag हो।<br/><br/>यह बिना फॉर्मेट हुआ 8 MB का विभाजन %1 को BIOS सिस्टम पर GPT के साथ शुरू करने के लिए आवश्यक है।
     
     
-      
+      
       Boot partition not encrypted
       बूट विभाजन एन्क्रिप्टेड नहीं है
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       एन्क्रिप्टेड रुट विभाजन के साथ एक अलग बूट विभाजन भी सेट किया गया था, पर बूट विभाजन एन्क्रिप्टेड नहीं था।<br/><br/> इस तरह का सेटअप सुरक्षित नहीं होता क्योंकि सिस्टम फ़ाइल एन्क्रिप्टेड विभाजन पर होती हैं।<br/>आप चाहे तो जारी रख सकते है, पर फिर फ़ाइल सिस्टम बाद में सिस्टम स्टार्टअप के दौरान अनलॉक होगा।<br/> विभाजन को एन्क्रिप्ट करने के लिए वापस जाकर उसे दोबारा बनाएँ व विभाजन निर्माण विंडो में<strong>एन्क्रिप्ट</strong> चुनें।
     
     
-      
+      
       has at least one disk device available.
       कम-से-कम एक डिस्क डिवाइस उपलब्ध हो।
     
     
-      
+      
       There are no partitions to install on.
       इंस्टॉल हेतु कोई विभाजन नहीं हैं।
     
@@ -3000,7 +2998,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3627,25 +3625,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      ठीक है (&O)
+    
+    
+      
+      &Yes
+      हाँ (&Y)
+    
+    
+      
+      &No
+      नहीं (&N)
+    
+    
+      
+      &Cancel
+      रद्द करें (&C)
+    
+    
+      
+      &Close
+      बंद करें (&C)
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       इंस्टॉल संबंधी प्रतिक्रिया
     
     
-      
+      
       Sending installation feedback.
       इंस्टॉल संबंधी प्रतिक्रिया भेजना।
     
     
-      
+      
       Internal error in install-tracking.
       इंस्टॉल-ट्रैकिंग में आंतरिक त्रुटि।
     
     
-      
+      
       HTTP request timed out.
       एचटीटीपी अनुरोध हेतु समय समाप्त।
     
@@ -3653,28 +3679,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       केडीई उपयोक्ता प्रतिक्रिया
     
     
-      
+      
       Configuring KDE user feedback.
       केडीई उपयोक्ता प्रतिक्रिया विन्यस्त करना।
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       केडीई उपयोक्ता प्रतिक्रिया विन्यास में त्रुटि।
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       केडीई उपयोक्ता प्रतिक्रिया सही रूप से विन्यस्त नहीं की जा सकी, स्क्रिप्ट त्रुटि %1।
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       केडीई उपयोक्ता प्रतिक्रिया विन्यस्त सही रूप से विन्यस्त नहीं की जा सकी, Calamares त्रुटि %1।
     
@@ -3682,28 +3708,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       मशीन संबंधी प्रतिक्रिया
     
     
-      
+      
       Configuring machine feedback.
       मशीन संबंधी प्रतिक्रिया विन्यस्त करना।
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       मशीन संबंधी प्रतिक्रिया विन्यास में त्रुटि।
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       मशीन प्रतिक्रिया सही रूप से विन्यस्त नहीं की जा सकी, स्क्रिप्ट त्रुटि %1।
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       मशीन प्रतिक्रिया को सही रूप से विन्यस्त नहीं की जा सकी, Calamares त्रुटि %1।
     
@@ -4071,45 +4097,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      कुंजीपटल मॉडल
-    
-    
-      
-      Layouts
-      अभिन्यास
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      कुंजीपटल अभिन्यास
+      
+      Keyboard Model:
+      कुंजीपटल का मॉडल
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      इच्छित अभिन्यास व प्रकार हेतु कुंजीपटल मॉडल पर क्लिक चुनें या फिर हार्डवेयर आधारित डिफ़ॉल्ट मॉडल उपयोग करें।
+      
+      Layouts
+      अभिन्यास
     
     
-      
-      Models
-      मॉडल
+      
+      Type here to test your keyboard
+      अपना कुंजीपटल जाँचने के लिए यहां टाइप करें
     
     
-      
+      
       Variants
       भिन्न रूप
     
-    
-      
-      Keyboard Variant
-      कुंजीपटल प्रकार
-    
-    
-      
-      Test your keyboard
-      अपना कुंजीपटल जाँचें
-    
   
   
     localeq
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index 45c496da68..c9170fdc7d 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Gotovo
     
@@ -287,54 +287,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Instalacija nije uspjela
     
     
-      
+      
       Installation Failed
       Instalacija nije uspjela
     
     
-      
+      
       Would you like to paste the install log to the web?
       Želite li objaviti dnevnik instaliranja na web?
     
     
-      
+      
       Error
       Greška
     
     
-      
-      
+      
       &Yes
       &Da
     
     
-      
-      
+      
       &No
       &Ne
     
     
-      
+      
       &Close
       &Zatvori
     
     
-      
+      
       Install Log Paste URL
       URL za objavu dnevnika instaliranja
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Objava dnevnika instaliranja na web nije uspjela.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -347,124 +345,124 @@ Link copied to clipboard
 Veza je kopirana u međuspremnik
     
     
-      
+      
       Calamares Initialization Failed
       Inicijalizacija Calamares-a nije uspjela
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 se ne može se instalirati. Calamares nije mogao učitati sve konfigurirane module. Ovo je problem s načinom na koji se Calamares koristi u distribuciji.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Sljedeći moduli se nisu mogli učitati:
     
     
-      
+      
       Continue with setup?
       Nastaviti s postavljanjem?
     
     
-      
+      
       Continue with installation?
       Nastaviti sa instalacijom?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instalacijski program %1 će izvršiti promjene na vašem disku kako bi postavio %2. <br/><strong>Ne možete poništiti te promjene.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 instalacijski program će napraviti promjene na disku kako bi instalirao %2.<br/><strong>Nećete moći vratiti te promjene.</strong>
     
     
-      
+      
       &Set up now
       &Postaviti odmah
     
     
-      
+      
       &Install now
       &Instaliraj sada
     
     
-      
+      
       Go &back
       Idi &natrag
     
     
-      
+      
       &Set up
       &Postaviti
     
     
-      
+      
       &Install
       &Instaliraj
     
     
-      
+      
       Setup is complete. Close the setup program.
       Instalacija je završena. Zatvorite instalacijski program.
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalacija je završena. Zatvorite instalacijski program.
     
     
-      
+      
       Cancel setup without changing the system.
       Odustanite od instalacije bez promjena na sustavu.
     
     
-      
+      
       Cancel installation without changing the system.
       Odustanite od instalacije bez promjena na sustavu.
     
     
-      
+      
       &Next
       &Sljedeće 
     
     
-      
+      
       &Back
       &Natrag
     
     
-      
+      
       &Done
       &Gotovo
     
     
-      
+      
       &Cancel
       &Odustani
     
     
-      
+      
       Cancel setup?
       Prekinuti instalaciju?
     
     
-      
+      
       Cancel installation?
       Prekinuti instalaciju?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Stvarno želite prekinuti instalacijski proces?
 Instalacijski program će izaći i sve promjene će biti izgubljene.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Stvarno želite prekinuti instalacijski proces?
@@ -831,22 +829,22 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.Ovaj program će vam postaviti neka pitanja i instalirati %2 na vaše računalo.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Dobrodošli u Calamares instalacijski program za %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Dobrodošli u %1 instalacijski program</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Dobrodošli u Calamares instalacijski program za %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Dobrodošli u %1 instalacijski program</h1>
     
@@ -1711,17 +1709,17 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Terminal nije instaliran
     
     
-      
+      
       Please install KDE Konsole and try again!
       Molimo vas da instalirate KDE terminal i pokušajte ponovno!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Izvršavam skriptu: &nbsp;<code>%1</code>
     
@@ -1786,32 +1784,32 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.<h1>Licencni ugovor</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Prihvaćam gore navedene uvjete i odredbe.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Pregledajte Ugovore o licenci za krajnjeg korisnika (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       U ovom postupku postavljanja instalirat će se vlasnički softver koji podliježe uvjetima licenciranja.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Ako se ne slažete sa uvjetima, postupak postavljanja ne može se nastaviti.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Ovaj postupak postavljanja može instalirati vlasnički softver koji podliježe uvjetima licenciranja kako bi se pružile dodatne značajke i poboljšalo korisničko iskustvo.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Ako se ne slažete s uvjetima, vlasnički softver neće biti instaliran, a umjesto njega će se koristiti alternative otvorenog koda.
     
@@ -2791,92 +2789,92 @@ te korištenjem tipki +/- ili skrolanjem miša za zumiranje.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Skupljanje informacija o sustavu...
     
     
-      
+      
       Partitions
       Particije
     
     
-      
+      
       Current:
       Trenutni:
     
     
-      
+      
       After:
       Poslije:
     
     
-      
+      
       No EFI system partition configured
       EFI particija nije konfigurirana
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Mogućnost korištenja GPT-a na BIOS-u
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT tablica particija je najbolja opcija za sve sustave. Ovaj instalacijski program podržava takvo postavljanje i za BIOS sustave. <br/><br/>Da biste konfigurirali GPT particijsku tablicu za BIOS sustave, (ako to već nije učinjeno) vratite se natrag i postavite particijsku tablicu na GPT, a zatim stvorite neformatiranu particiju od 8 MB s omogućenom zastavicom <strong>bios_grub</strong>. <br/><br/>Neformirana particija od 8 MB potrebna je za pokretanje %1 na BIOS sustavu s GPT-om.
     
     
-      
+      
       Boot partition not encrypted
       Boot particija nije kriptirana
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Odvojena boot particija je postavljena zajedno s kriptiranom root particijom, ali boot particija nije kriptirana.<br/><br/>Zabrinuti smo za vašu sigurnost jer su važne datoteke sustava na nekriptiranoj particiji.<br/>Možete nastaviti ako želite, ali datotečni sustav će se otključati kasnije tijekom pokretanja sustava.<br/>Da bi ste kriptirali boot particiju, vratite se natrag i napravite ju, odabirom opcije <strong>Kriptiraj</strong> u prozoru za stvaranje prarticije.
     
     
-      
+      
       has at least one disk device available.
       ima barem jedan disk dostupan.
     
     
-      
+      
       There are no partitions to install on.
       Ne postoje particije na koje bi se instalirao sustav.
     
@@ -3011,7 +3009,7 @@ Izlaz:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3638,25 +3636,53 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Da
+    
+    
+      
+      &No
+      &Ne
+    
+    
+      
+      &Cancel
+      &Odustani
+    
+    
+      
+      &Close
+      &Zatvori
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Povratne informacije o instalaciji
     
     
-      
+      
       Sending installation feedback.
       Šaljem povratne informacije o instalaciji
     
     
-      
+      
       Internal error in install-tracking.
       Interna pogreška prilikom praćenja instalacije.
     
     
-      
+      
       HTTP request timed out.
       HTTP zahtjev je istekao
     
@@ -3664,28 +3690,28 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Povratne informacije korisnika KDE-a
     
     
-      
+      
       Configuring KDE user feedback.
       Konfiguriranje povratnih informacija korisnika KDE-a.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Pogreška u konfiguraciji povratnih informacija korisnika KDE-a.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Ne mogu ispravno konfigurirati povratne informacije korisnika KDE-a; pogreška skripte %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Ne mogu ispravno konfigurirati povratne informacije korisnika KDE-a; greška Calamares instalacijskog programa %1.
     
@@ -3693,28 +3719,28 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Povratna informacija o uređaju
     
     
-      
+      
       Configuring machine feedback.
       Konfiguriram povratnu informaciju o uređaju.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Greška prilikom konfiguriranja povratne informacije o uređaju.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Ne mogu ispravno konfigurirati povratnu informaciju o uređaju, greška skripte %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Ne mogu ispravno konfigurirati povratnu informaciju o uređaju, Calamares greška %1.
     
@@ -4082,45 +4108,30 @@ Postavke regije utječu na format brojeva i datuma. Trenutne postavke su <str
   
     keyboardq
     
-      
-      Keyboard Model
-      Model tipkovnice
-    
-    
-      
-      Layouts
-      Rasporedi
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Raspored tipkovnice
+      
+      Keyboard Model:
+      Tip tipkovnice:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Odaberite željeni model tipkovnice odabirom rasporeda i varijante ili upotrijebite zadani na temelju otkrivenog hardvera.
+      
+      Layouts
+      Rasporedi
     
     
-      
-      Models
-      Modeli
+      
+      Type here to test your keyboard
+      Ovdje testiraj tipkovnicu
     
     
-      
+      
       Variants
       Varijante
     
-    
-      
-      Keyboard Variant
-      Varijanta tipkovnice
-    
-    
-      
-      Test your keyboard
-      Testirajte vašu tipkovnicu
-    
   
   
     localeq
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index 5756073f56..6d7ea4daba 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Kész
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Telepítési hiba
     
     
-      
+      
       Installation Failed
       Telepítés nem sikerült
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Hiba
     
     
-      
-      
+      
       &Yes
       &Igen
     
     
-      
-      
+      
       &No
       &Nem
     
     
-      
+      
       &Close
       &Bezár
     
     
-      
+      
       Install Log Paste URL
       Telepítési napló beillesztési URL-je.
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       A Calamares előkészítése meghiúsult
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       A(z) %1 nem telepíthető. A Calamares nem tudta betölteni a konfigurált modulokat. Ez a probléma abból fakad, ahogy a disztribúció a Calamarest használja.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>A következő modulok nem tölthetőek be:
     
     
-      
+      
       Continue with setup?
       Folytatod a telepítéssel?
     
     
-      
+      
       Continue with installation?
       Folytatja a telepítést?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       A %1 telepítő változtatásokat fog végrehajtani a lemezen a %2 telepítéséhez. <br/><strong>Ezután már nem tudja visszavonni a változtatásokat.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       A %1 telepítő változtatásokat fog elvégezni, hogy telepítse a következőt: %2.<br/><strong>A változtatások visszavonhatatlanok lesznek.</strong>
     
     
-      
+      
       &Set up now
       &Telepítés most
     
     
-      
+      
       &Install now
       &Telepítés most
     
     
-      
+      
       Go &back
       Menj &vissza
     
     
-      
+      
       &Set up
       &Telepítés
     
     
-      
+      
       &Install
       &Telepítés
     
     
-      
+      
       Setup is complete. Close the setup program.
       Telepítés sikerült. Zárja be a telepítőt.
     
     
-      
+      
       The installation is complete. Close the installer.
       A telepítés befejeződött, Bezárhatod a telepítőt.
     
     
-      
+      
       Cancel setup without changing the system.
       Telepítés megszakítása a rendszer módosítása nélkül.
     
     
-      
+      
       Cancel installation without changing the system.
       Kilépés a telepítőből a rendszer megváltoztatása nélkül.
     
     
-      
+      
       &Next
       &Következő
     
     
-      
+      
       &Back
       &Vissza
     
     
-      
+      
       &Done
       &Befejez
     
     
-      
+      
       &Cancel
       &Mégse
     
     
-      
+      
       Cancel setup?
       Megszakítja a telepítést?
     
     
-      
+      
       Cancel installation?
       Abbahagyod a telepítést?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Valóban megszakítod a telepítési eljárást?
 A telepítő ki fog lépni és minden változtatás elveszik.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Biztos abba szeretnéd hagyni a telepítést?
@@ -826,22 +824,22 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>Ez a program fel fog tenni néhány kérdést és %2 -t telepíti a számítógépre.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1706,17 +1704,17 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole nincs telepítve
     
     
-      
+      
       Please install KDE Konsole and try again!
       Kérlek telepítsd a KDE Konsole-t és próbáld újra!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Script végrehajása: &nbsp;<code>%1</code>
     
@@ -1781,32 +1779,32 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a><h1>Licenszszerződés</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Elfogadom a fentebbi felhasználási feltételeket.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2775,92 +2773,92 @@ Telepítés nem folytatható. <a href="#details">Részletek...</a>
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Rendszerinformációk gyűjtése...
     
     
-      
+      
       Partitions
       Partíciók
     
     
-      
+      
       Current:
       Aktuális:
     
     
-      
+      
       After:
       Utána:
     
     
-      
+      
       No EFI system partition configured
       Nincs EFI rendszer partíció beállítva
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Indító partíció nincs titkosítva
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Egy külön indító partíció lett beállítva egy titkosított root partícióval, de az indító partíció nincs titkosítva.br/><br/>Biztonsági aggályok merülnek fel ilyen beállítás mellet, mert fontos fájlok nem titkosított partíción vannak tárolva. <br/>Ha szeretnéd, folytathatod így, de a fájlrendszer zárolása meg fog történni az indítás után. <br/> Az indító partíció titkosításához lépj vissza és az újra létrehozáskor válaszd a <strong>Titkosít</strong> opciót.
     
     
-      
+      
       has at least one disk device available.
       legalább egy lemez eszköz elérhető.
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2995,7 +2993,7 @@ Kimenet:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3619,25 +3617,53 @@ Kimenet:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Igen
+    
+    
+      
+      &No
+      &Nem
+    
+    
+      
+      &Cancel
+      &Mégse
+    
+    
+      
+      &Close
+      &Bezár
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Visszajelzés a telepítésről
     
     
-      
+      
       Sending installation feedback.
       Telepítési visszajelzés küldése.
     
     
-      
+      
       Internal error in install-tracking.
       Hiba a telepítő nyomkövetésben.
     
     
-      
+      
       HTTP request timed out.
       HTTP kérés ideje lejárt.
     
@@ -3645,28 +3671,28 @@ Kimenet:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3674,28 +3700,28 @@ Kimenet:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Gépi visszajelzés
     
     
-      
+      
       Configuring machine feedback.
       Gépi visszajelzés konfigurálása.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Hiba a gépi visszajelzés konfigurálásában.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Gépi visszajelzés konfigurálása nem megfelelő, script hiba %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Gépi visszajelzés konfigurálása nem megfelelő,.
 Calamares hiba %1.
@@ -4048,44 +4074,29 @@ Calamares hiba %1.
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Billentyűzet modell:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Gépelj itt a billentyűzet teszteléséhez
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts
index a0e651d887..ece403fcef 100644
--- a/lang/calamares_id.ts
+++ b/lang/calamares_id.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Selesai
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Pengaturan Gagal
     
     
-      
+      
       Installation Failed
       Instalasi Gagal
     
     
-      
+      
       Would you like to paste the install log to the web?
       Maukah anda untuk menempelkan log instalasi ke situs?
     
     
-      
+      
       Error
       Kesalahan
     
     
-      
-      
+      
       &Yes
       &Ya
     
     
-      
-      
+      
       &No
       &Tidak
     
     
-      
+      
       &Close
       &Tutup
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +337,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Inisialisasi Calamares Gagal
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 tidak dapat terinstal. Calamares tidak dapat memuat seluruh modul konfigurasi. Terdapat masalah dengan Calamares karena sedang digunakan oleh distribusi.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Modul berikut tidak dapat dimuat.
     
     
-      
+      
       Continue with setup?
       Lanjutkan dengan setelan ini?
     
     
-      
+      
       Continue with installation?
       Lanjutkan instalasi?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Installer %1 akan membuat perubahan ke disk Anda untuk memasang %2.<br/><strong>Anda tidak dapat membatalkan perubahan tersebut.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Instal sekarang
     
     
-      
+      
       Go &back
       &Kembali
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       &Instal
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalasi sudah lengkap. Tutup installer.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Batalkan instalasi tanpa mengubah sistem yang ada.
     
     
-      
+      
       &Next
       &Berikutnya
     
     
-      
+      
       &Back
       &Kembali
     
     
-      
+      
       &Done
       &Kelar
     
     
-      
+      
       &Cancel
       &Batal
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Batalkan instalasi?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Apakah Anda benar-benar ingin membatalkan proses instalasi ini?
@@ -823,22 +821,22 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.Program ini akan mengajukan beberapa pertanyaan dan menyetel %2 pada komputer Anda.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Selamat datang ke program Calamares untuk %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole tidak terinstal
     
     
-      
+      
       Please install KDE Konsole and try again!
       Silahkan instal KDE Konsole dan ulangi lagi!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Mengeksekusi skrip: &nbsp;<code>%1</code>
     
@@ -1778,32 +1776,32 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     
     
-      
+      
       I accept the terms and conditions above.
       Saya menyetujui segala persyaratan di atas.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2763,92 +2761,92 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Mengumpulkan informasi sistem...
     
     
-      
+      
       Partitions
       Partisi
     
     
-      
+      
       Current:
       Saat ini:
     
     
-      
+      
       After:
       Sesudah:
     
     
-      
+      
       No EFI system partition configured
       Tiada partisi sistem EFI terkonfigurasi
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partisi boot tidak dienkripsi
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Sebuah partisi tersendiri telah terset bersama dengan sebuah partisi root terenkripsi, tapi partisi boot tidak terenkripsi.<br/><br/>Ada kekhawatiran keamanan dengan jenis setup ini, karena file sistem penting tetap pada partisi tak terenkripsi.<br/>Kamu bisa melanjutkan jika kamu menghendaki, tapi filesystem unlocking akan terjadi nanti selama memulai sistem.<br/>Untuk mengenkripsi partisi boot, pergi mundur dan menciptakannya ulang, memilih <strong>Encrypt</strong> di jendela penciptaan partisi.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2983,7 +2981,7 @@ Keluaran:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3607,25 +3605,53 @@ Keluaran:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Ya
+    
+    
+      
+      &No
+      &Tidak
+    
+    
+      
+      &Cancel
+      &Batal
+    
+    
+      
+      &Close
+      &Tutup
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Umpan balik instalasi.
     
     
-      
+      
       Sending installation feedback.
       Mengirim umpan balik installasi.
     
     
-      
+      
       Internal error in install-tracking.
       Galat intern di pelacakan-instalasi.
     
     
-      
+      
       HTTP request timed out.
       Permintaan waktu HTTP habis.
     
@@ -3633,28 +3659,28 @@ Keluaran:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3662,28 +3688,28 @@ Keluaran:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Mesin umpan balik
     
     
-      
+      
       Configuring machine feedback.
       Mengkonfigurasi mesin umpan balik.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Galat di konfigurasi mesin umpan balik.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Tidak dapat mengkonfigurasi mesin umpan balik dengan benar, naskah galat %1
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Tidak dapat mengkonfigurasi mesin umpan balik dengan benar, Calamares galat %1.
     
@@ -4046,44 +4072,29 @@ Keluaran:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Model Papan Ketik:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Ketik di sini untuk mencoba papan ketik Anda
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_id_ID.ts b/lang/calamares_id_ID.ts
index 3897762722..4cef1cddcc 100644
--- a/lang/calamares_id_ID.ts
+++ b/lang/calamares_id_ID.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +337,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -821,22 +819,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1701,17 +1699,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1776,32 +1774,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2761,92 +2759,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2978,7 +2976,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3602,25 +3600,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3628,28 +3654,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3657,28 +3683,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4030,44 +4056,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_ie.ts b/lang/calamares_ie.ts
index 7a66ab148e..515ad1f68b 100644
--- a/lang/calamares_ie.ts
+++ b/lang/calamares_ie.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Finit
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Configuration ne successat
     
     
-      
+      
       Installation Failed
       Installation ne successat
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Errore
     
     
-      
-      
+      
       &Yes
       &Yes
     
     
-      
-      
+      
       &No
       &No
     
     
-      
+      
       &Close
       C&luder
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Continuar li configuration?
     
     
-      
+      
       Continue with installation?
       Continuar li installation?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       &Configurar nu
     
     
-      
+      
       &Install now
       &Installar nu
     
     
-      
+      
       Go &back
       Ear &retro
     
     
-      
+      
       &Set up
       &Configurar
     
     
-      
+      
       &Install
       &Installar
     
     
-      
+      
       Setup is complete. Close the setup program.
       Configuration es completat. Ples cluder li configurator.
     
     
-      
+      
       The installation is complete. Close the installer.
       Installation es completat. Ples cluder li installator.
     
     
-      
+      
       Cancel setup without changing the system.
       Anullar li configuration sin modificationes del sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Anullar li installation sin modificationes del sistema.
     
     
-      
+      
       &Next
       &Sequent
     
     
-      
+      
       &Back
       &Retro
     
     
-      
+      
       &Done
       &Finir
     
     
-      
+      
       &Cancel
       A&nullar
     
     
-      
+      
       Cancel setup?
       Anullar li configuration?
     
     
-      
+      
       Cancel installation?
       Anullar li installation?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Benevenit al configurator Calamares por %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Benevenit al configurator de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Benevenit al installator Calamares por %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Benevenit al installator de %1</h1>
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole ne es installat
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       <h1>Acorde de licentie</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Yo accepta li termines e condiciones ad-supra.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       Partitiones
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       Pos:
     
     
-      
+      
       No EFI system partition configured
       Null partition del sistema EFI es configurat
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       Ne existe disponibil partitiones por installation.
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3613,25 +3611,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Yes
+    
+    
+      
+      &No
+      &No
+    
+    
+      
+      &Cancel
+      A&nullar
+    
+    
+      
+      &Close
+      C&luder
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Response al installation
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,45 +4067,30 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      Modelle de tastatura
-    
-    
-      
-      Layouts
-      Arangeamentes
-    
-    
-      
-      Keyboard Layout
-      Arangeament de tastatura
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      Modelles
+      
+      Keyboard Model:
+      Modelle de tastatura:
     
     
-      
-      Variants
-      Variantes
+      
+      Layouts
+      Arangeamentes
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Tippa ti-ci por provar vor tastatura
     
     
-      
-      Test your keyboard
-      Prova vor tastatura
+      
+      Variants
+      Variantes
     
   
   
diff --git a/lang/calamares_is.ts b/lang/calamares_is.ts
index f6a98f94a9..4618682f6e 100644
--- a/lang/calamares_is.ts
+++ b/lang/calamares_is.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Búið
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Uppsetning mistókst
     
     
-      
+      
       Installation Failed
       Uppsetning mistókst
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Villa
     
     
-      
-      
+      
       &Yes
       &Já
     
     
-      
-      
+      
       &No
       &Nei
     
     
-      
+      
       &Close
       &Loka
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Calamares uppsetning mistókst
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Halda áfram með uppsetningu?
     
     
-      
+      
       Continue with installation?
       Halda áfram með uppsetningu?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 uppsetningarforritið er um það bil að gera breytingar á diskinum til að setja upp %2.<br/><strong>Þú munt ekki geta afturkallað þessar breytingar.</strong>
     
     
-      
+      
       &Set up now
       &Setja upp núna
     
     
-      
+      
       &Install now
       Setja &inn núna
     
     
-      
+      
       Go &back
       Fara til &baka
     
     
-      
+      
       &Set up
       &Setja upp
     
     
-      
+      
       &Install
       &Setja upp
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Uppsetning er lokið. Lokaðu uppsetningarforritinu.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Hætta við uppsetningu ánþess að breyta kerfinu.
     
     
-      
+      
       &Next
       &Næst
     
     
-      
+      
       &Back
       &Til baka
     
     
-      
+      
       &Done
       &Búið
     
     
-      
+      
       &Cancel
       &Hætta við
     
     
-      
+      
       Cancel setup?
       Hætta við uppsetningu?
     
     
-      
+      
       Cancel installation?
       Hætta við uppsetningu?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Viltu virkilega að hætta við núverandi uppsetningarferli?
@@ -824,22 +822,22 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       Þetta forrit mun spyrja þig nokkurra spurninga og setja upp %2 á tölvunni þinni.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1704,17 +1702,17 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole ekki uppsett
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1779,32 +1777,32 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
       
     
     
-      
+      
       I accept the terms and conditions above.
       Ég samþykki skilyrði leyfissamningsins hér að ofan.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2773,92 +2771,92 @@ Uppsetningarforritið mun hætta og allar breytingar tapast.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Söfnun kerfis upplýsingar...
     
     
-      
+      
       Partitions
       Disksneiðar
     
     
-      
+      
       Current:
       Núverandi:
     
     
-      
+      
       After:
       Eftir:
     
     
-      
+      
       No EFI system partition configured
       Ekkert EFI kerfisdisksneið stillt
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2990,7 +2988,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3614,25 +3612,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Í lagi
+    
+    
+      
+      &Yes
+      &Já
+    
+    
+      
+      &No
+      &Nei
+    
+    
+      
+      &Cancel
+      &Hætta við
+    
+    
+      
+      &Close
+      &Loka
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3640,28 +3666,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3669,28 +3695,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4042,44 +4068,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Lyklaborðs tegund:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Skrifaðu hér til að prófa lyklaborðið
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_it_IT.ts b/lang/calamares_it_IT.ts
index f1768c33dc..faae2b071b 100644
--- a/lang/calamares_it_IT.ts
+++ b/lang/calamares_it_IT.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Fatto
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Installazione fallita
     
     
-      
+      
       Installation Failed
       Installazione non riuscita
     
     
-      
+      
       Would you like to paste the install log to the web?
       Si vuole mettere il log di installazione sul web?
     
     
-      
+      
       Error
       Errore
     
     
-      
-      
+      
       &Yes
       &Si
     
     
-      
-      
+      
       &No
       &No
     
     
-      
+      
       &Close
       &Chiudi
     
     
-      
+      
       Install Log Paste URL
       URL di copia del log d'installazione
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Il caricamento è fallito. Non è stata fatta la copia sul web.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Inizializzazione di Calamares fallita
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 non può essere installato. Calamares non ha potuto caricare tutti i moduli configurati. Questo è un problema del modo in cui Calamares viene utilizzato dalla distribuzione.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>I seguenti moduli non possono essere caricati:
     
     
-      
+      
       Continue with setup?
       Procedere con la configurazione?
     
     
-      
+      
       Continue with installation?
       Continuare l'installazione?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Il programma d'installazione %1 sta per modificare il disco di per installare %2. Non sarà possibile annullare queste modifiche.
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Il programma d'installazione %1 sta per eseguire delle modifiche al tuo disco per poter installare %2.<br/><strong> Non sarà possibile annullare tali modifiche.</strong>
     
     
-      
+      
       &Set up now
       &Installa adesso
     
     
-      
+      
       &Install now
       &Installa adesso
     
     
-      
+      
       Go &back
       &Indietro
     
     
-      
+      
       &Set up
       &Installazione
     
     
-      
+      
       &Install
       &Installa
     
     
-      
+      
       Setup is complete. Close the setup program.
       Installazione completata. Chiudere il programma d'installazione.
     
     
-      
+      
       The installation is complete. Close the installer.
       L'installazione è terminata. Chiudere il programma d'installazione.
     
     
-      
+      
       Cancel setup without changing the system.
       Annulla l'installazione senza modificare il sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Annullare l'installazione senza modificare il sistema.
     
     
-      
+      
       &Next
       &Avanti
     
     
-      
+      
       &Back
       &Indietro
     
     
-      
+      
       &Done
       &Fatto
     
     
-      
+      
       &Cancel
       &Annulla
     
     
-      
+      
       Cancel setup?
       Annullare l'installazione?
     
     
-      
+      
       Cancel installation?
       Annullare l'installazione?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Si vuole annullare veramente il processo di installazione? Il programma d'installazione verrà terminato e tutti i cambiamenti saranno persi.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Si vuole davvero annullare l'installazione in corso?
@@ -824,22 +822,22 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       Questo programma chiederà alcune informazioni e configurerà %2 sul computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       Benvenuto nel programma di installazione Calamares di %1
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       Benvenuto nell'installazione di %1
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       Benvenuto nel programma di installazione Calamares di %1
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       Benvenuto nel programma di installazione di %1
     
@@ -1704,17 +1702,17 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole non installata
     
     
-      
+      
       Please install KDE Konsole and try again!
       Si prega di installare KDE Konsole e riprovare!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Esecuzione script: &nbsp;<code>%1</code>
     
@@ -1779,32 +1777,32 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
       <h1>Accordo di Licenza</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Accetto i termini e le condizioni sopra indicati.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Si prega di leggere l'Accordo di Licenza per l'Utente Finale (EULAs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Questa procedura di configurazione installerà software proprietario che è soggetto ai termini di licenza.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Se non accetti i termini, la procedura di configurazione non può continuare.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Questa procedura di configurazione installerà software proprietario sottoposto a termini di licenza, per fornire caratteristiche aggiuntive e migliorare l'esperienza utente.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Se non se ne accettano i termini, il software proprietario non verrà installato e al suo posto saranno utilizzate alternative open source. 
     
@@ -2773,92 +2771,92 @@ Il programma d'installazione sarà terminato e tutte le modifiche andranno perse
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Raccolta delle informazioni di sistema...
     
     
-      
+      
       Partitions
       Partizioni
     
     
-      
+      
       Current:
       Corrente:
     
     
-      
+      
       After:
       Dopo:
     
     
-      
+      
       No EFI system partition configured
       Nessuna partizione EFI di sistema è configurata
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Opzione per usare GPT su BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Una tabella partizioni GPT è la migliore opzione per tutti i sistemi. Comunque il programma d'installazione supporta anche la tabella di tipo BIOS. <br/><br/>Per configurare una tabella partizioni GPT su BIOS (se non già configurata) tornare indietro e impostare la tabella partizioni a GPT e creare una partizione non formattata di 8 MB con opzione <strong>bios_grub</strong> abilitata.<br/><br/>Una partizione non formattata di 8 MB è necessaria per avviare %1 su un sistema BIOS con GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partizione di avvio non criptata
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       E' stata configurata una partizione di avvio non criptata assieme ad una partizione root criptata. <br/><br/>Ci sono problemi di sicurezza con questo tipo di configurazione perchè dei file di sistema importanti sono tenuti su una partizione non criptata.<br/>Si può continuare se lo si desidera ma dopo ci sarà lo sblocco del file system, durante l'avvio del sistema.<br/>Per criptare la partizione di avvio, tornare indietro e ricrearla, selezionando <strong>Criptare</strong> nella finestra di creazione della partizione.
     
     
-      
+      
       has at least one disk device available.
       ha almeno un'unità disco disponibile.
     
     
-      
+      
       There are no partitions to install on.
       Non ci sono partizioni su cui installare.
     
@@ -2993,7 +2991,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3617,25 +3615,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Si
+    
+    
+      
+      &No
+      &No
+    
+    
+      
+      &Cancel
+      &Annulla
+    
+    
+      
+      &Close
+      &Chiudi
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Valutazione dell'installazione
     
     
-      
+      
       Sending installation feedback.
       Invio della valutazione dell'installazione.
     
     
-      
+      
       Internal error in install-tracking.
       Errore interno in install-tracking.
     
     
-      
+      
       HTTP request timed out.
       La richiesta HTTP è scaduta.
     
@@ -3643,28 +3669,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Riscontro dell'utente di KDE 
     
     
-      
+      
       Configuring KDE user feedback.
       Sto configurando il riscontro dell'utente di KDE
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3672,28 +3698,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Valutazione automatica
     
     
-      
+      
       Configuring machine feedback.
       Configurazione in corso della valutazione automatica.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Errore nella configurazione della valutazione automatica.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Non è stato possibile configurare correttamente la valutazione automatica, errore dello script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Non è stato possibile configurare correttamente la valutazione automatica, errore di Calamares %1.
     
@@ -4045,45 +4071,30 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      Modello di tastiera
-    
-    
-      
-      Layouts
-      Schemi
-    
-    
-      
-      Keyboard Layout
-      Schemi tastiere
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      Modelli
+      
+      Keyboard Model:
+      Modello della tastiera:
     
     
-      
-      Variants
-      Varianti
+      
+      Layouts
+      Schemi
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Digitare qui per provare la tastiera
     
     
-      
-      Test your keyboard
-      Provare la tastiera
+      
+      Variants
+      Varianti
     
   
   
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index aa1dbb733a..9177acec25 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       完了
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       セットアップに失敗しました。
     
     
-      
+      
       Installation Failed
       インストールに失敗
     
     
-      
+      
       Would you like to paste the install log to the web?
       インストールログをWebに貼り付けますか？
     
     
-      
+      
       Error
       エラー
     
     
-      
-      
+      
       &Yes
       はい (&Y)
     
     
-      
-      
+      
       &No
       いいえ (&N)
     
     
-      
+      
       &Close
       閉じる (&C)
     
     
-      
+      
       Install Log Paste URL
       インストールログを貼り付けるURL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       アップロードは失敗しました。 ウェブへの貼り付けは行われませんでした。
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,124 +341,124 @@ Link copied to clipboard
 クリップボードにリンクをコピーしました
     
     
-      
+      
       Calamares Initialization Failed
       Calamares によるインストールに失敗しました。
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 をインストールできません。Calamares はすべてのモジュールをロードすることをできませんでした。これは、Calamares のこのディストリビューションでの使用法による問題です。
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>以下のモジュールがロードできませんでした。:
     
     
-      
+      
       Continue with setup?
       セットアップを続行しますか？
     
     
-      
+      
       Continue with installation?
       インストールを続行しますか？
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 のセットアッププログラムは %2 のセットアップのためディスクの内容を変更します。<br/><strong>これらの変更は取り消しできません。</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 インストーラーは %2 をインストールするためディスクの内容を変更しようとしています。<br/><strong>これらの変更は取り消せません。</strong>
     
     
-      
+      
       &Set up now
       セットアップしています (&S)
     
     
-      
+      
       &Install now
       今すぐインストール (&I)
     
     
-      
+      
       Go &back
       戻る (&B)
     
     
-      
+      
       &Set up
       セットアップ （&S）
     
     
-      
+      
       &Install
       インストール (&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       セットアップが完了しました。プログラムを閉じます。
     
     
-      
+      
       The installation is complete. Close the installer.
       インストールが完了しました。インストーラーを閉じます。
     
     
-      
+      
       Cancel setup without changing the system.
       システムを変更することなくセットアップを中断します。
     
     
-      
+      
       Cancel installation without changing the system.
       システムを変更しないでインストールを中止します。
     
     
-      
+      
       &Next
       次へ (&N)
     
     
-      
+      
       &Back
       戻る (&B)
     
     
-      
+      
       &Done
       実行 (&D)
     
     
-      
+      
       &Cancel
       中止 (&C)
     
     
-      
+      
       Cancel setup?
       セットアップを中止しますか？
     
     
-      
+      
       Cancel installation?
       インストールを中止しますか？
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       本当に現在のセットアップのプロセスを中止しますか？
 すべての変更が取り消されます。
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       本当に現在の作業を中止しますか？
@@ -759,17 +757,17 @@ The installer will quit and all changes will be lost.
     
       
       Set timezone to %1/%2.
-      タイムゾーンを %1/%2 に設定します。
+      タイムゾーンを %1/%2 に設定する。
     
     
       
       The system language will be set to %1.
-      システムの言語を %1 に設定します。
+      システムの言語を %1 に設定する。
     
     
       
       The numbers and dates locale will be set to %1.
-      数値と日付のロケールを %1 に設定します。
+      数値と日付のロケールを %1 に設定する。
     
     
       
@@ -827,22 +825,22 @@ The installer will quit and all changes will be lost.
       このプログラムはあなたにいくつか質問をして、コンピュータに %2 を設定します。
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 のCalamaresセットアッププログラムへようこそ</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 のセットアップへようこそ</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 のCalamaresインストーラーへようこそ</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 インストーラーへようこそ</h1>
     
@@ -965,12 +963,12 @@ The installer will quit and all changes will be lost.
     
       
       This is an overview of what will happen once you start the setup procedure.
-      これはセットアップを開始した時に起こることの概要です。
+      これは、セットアップ開始後に行うことの概要です。
     
     
       
       This is an overview of what will happen once you start the install procedure.
-      これはインストールを開始した時に起こることの概要です。
+      これは、インストール開始後に行うことの概要です。
     
   
   
@@ -1708,17 +1706,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsoleがインストールされていません
     
     
-      
+      
       Please install KDE Konsole and try again!
       KDE Konsole をインストールして再度試してください！
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       スクリプトの実行: &nbsp;<code>%1</code>
     
@@ -1783,32 +1781,32 @@ The installer will quit and all changes will be lost.
       <h1>ライセンス契約</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       上記の項目及び条件に同意します。
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       エンドユーザーライセンス契約（EULA）を確認してください。
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       このセットアップ手順では、ライセンス条項の対象となるプロプライエタリソフトウェアをインストールします。
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       条件に同意しない場合はセットアップ手順を続行できません。
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       このセットアップ手順では、追加機能を提供し、ユーザーエクスペリエンスを向上させるために、ライセンス条項の対象となるプロプライエタリソフトウェアをインストールできます。
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       条件に同意しない場合はプロプライエタリソフトウェアがインストールされず、代わりにオープンソースの代替ソフトウェアが使用されます。
     
@@ -2771,92 +2769,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       システム情報を取得しています...
     
     
-      
+      
       Partitions
       パーティション
     
     
-      
+      
       Current:
       現在:
     
     
-      
+      
       After:
       変更後:
     
     
-      
+      
       No EFI system partition configured
       EFI システムパーティションが設定されていません
     
     
-      
+      
       EFI system partition configured incorrectly
       EFI システムパーティションが正しく設定されていません
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       %1 を起動するには EFI システムパーティションが必要です。<br/><br/>EFI システムパーティションを設定するには、戻って適切なファイルシステムを選択または作成してください。
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       ファイルシステムは <strong>%1</strong> にマウントする必要があります。
     
     
-      
+      
       The filesystem must have type FAT32.
       ファイルシステムのタイプは FAT32 にする必要があります。
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       ファイルシステムのサイズは最低でも %1 MiB である必要があります。
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       ファイルシステムにはフラグ <strong>%1</strong> を設定する必要があります。 
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       EFI システムパーティションを設定しなくても続行できますが、システムが起動しない場合があります。
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS で GPT を使用するためのオプション
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT パーティションテーブルは、すべてのシステムに最適なオプションです。このインストーラーは、BIOS システムのこのようなセットアップもサポートしています。<br/><br/>BIOS で GPT パーティションテーブルを設定するには（まだ行っていない場合）、前に戻ってパーティションテーブルを GPT に設定し、<strong>bios_grub</strong> フラグを有効にして 8 MB の未フォーマットのパーティションを作成します。GPT に設定した BIOS システムで %1 を起動するには、未フォーマットの 8 MB パーティションが必要です。
     
     
-      
+      
       Boot partition not encrypted
       ブートパーティションが暗号化されていません
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       ブートパーティションは暗号化されたルートパーティションとともにセットアップされましたが、ブートパーティションは暗号化されていません。<br/><br/>重要なシステムファイルが暗号化されていないパーティションに残されているため、このようなセットアップは安全上の懸念があります。<br/>セットアップを続行することはできますが、後でシステムの起動中にファイルシステムが解除されます。<br/>ブートパーティションを暗号化させるには、前の画面に戻って、再度パーティションを作成し、パーティション作成ウィンドウ内で<strong>Encrypt</strong> (暗号化) を選択してください。
     
     
-      
+      
       has at least one disk device available.
       は少なくとも1つのディスクデバイスを利用可能です。
     
     
-      
+      
       There are no partitions to install on.
       インストールするパーティションがありません。
     
@@ -2991,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3618,25 +3616,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      了解 (&O)
+    
+    
+      
+      &Yes
+      はい (&Y)
+    
+    
+      
+      &No
+      いいえ (&N)
+    
+    
+      
+      &Cancel
+      中止 (&C)
+    
+    
+      
+      &Close
+      閉じる (&C)
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       インストールのフィードバック
     
     
-      
+      
       Sending installation feedback.
       インストールのフィードバックを送信
     
     
-      
+      
       Internal error in install-tracking.
       インストールトラッキング中の内部エラー
     
     
-      
+      
       HTTP request timed out.
       HTTPリクエストがタイムアウトしました。
     
@@ -3644,28 +3670,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDEのユーザーフィードバック
     
     
-      
+      
       Configuring KDE user feedback.
       KDEのユーザーフィードバックを設定しています。
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       KDEのユーザーフィードバックの設定でエラー。
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       KDEのユーザーフィードバックを正しく設定できませんでした。スクリプトエラー %1。
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       KDEのユーザーフィードバックを正しく設定できませんでした。Calamaresエラー %1。
     
@@ -3673,28 +3699,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       マシンフィードバック
     
     
-      
+      
       Configuring machine feedback.
       マシンフィードバックの設定
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       マシンフィードバックの設定中のエラー
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       マシンフィードバックの設定が正確にできませんでした、スクリプトエラー %1。
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       マシンフィードバックの設定が正確にできませんでした、Calamares エラー %1。
     
@@ -4062,45 +4088,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      キーボードモデル
-    
-    
-      
-      Layouts
-      レイアウト
+      
+      To activate keyboard preview, select a layout.
+      キーボードプレビューをアクティブにするには、レイアウトを選択してください。
     
     
-      
-      Keyboard Layout
-      キーボードレイアウト
+      
+      Keyboard Model:
+      キーボードモデル:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      好みのキーボードモデルをクリックしてレイアウトとバリアントを選択するか、検出されたハードウェアに基づくデフォルトのキーボードモデルを使用してください。
+      
+      Layouts
+      レイアウト
     
     
-      
-      Models
-      モデル
+      
+      Type here to test your keyboard
+      ここでタイプしてキーボードをテストしてください
     
     
-      
+      
       Variants
       バリアント
     
-    
-      
-      Keyboard Variant
-      キーボードバリアント
-    
-    
-      
-      Test your keyboard
-      キーボードをテストしてください
-    
   
   
     localeq
diff --git a/lang/calamares_kk.ts b/lang/calamares_kk.ts
index fec656ab9a..2ee79850d3 100644
--- a/lang/calamares_kk.ts
+++ b/lang/calamares_kk.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Дайын
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Алға
     
     
-      
+      
       &Back
       А&ртқа
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       Ба&с тарту
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Орнатудан бас тарту керек пе?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      Ба&с тарту
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_kn.ts b/lang/calamares_kn.ts
index f666153afa..2468db5c35 100644
--- a/lang/calamares_kn.ts
+++ b/lang/calamares_kn.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       ಅನುಸ್ಥಾಪನೆ ವಿಫಲವಾಗಿದೆ
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       ದೋಷ
     
     
-      
-      
+      
       &Yes
       ಹೌದು
     
     
-      
-      
+      
       &No
       ಇಲ್ಲ
     
     
-      
+      
       &Close
       ಮುಚ್ಚಿರಿ
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       ಮುಂದಿನ
     
     
-      
+      
       &Back
       ಹಿಂದಿನ
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       ರದ್ದುಗೊಳಿಸು
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       ಅನುಸ್ಥಾಪನೆಯನ್ನು ರದ್ದುಮಾಡುವುದೇ?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       ಪ್ರಸಕ್ತ:
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      ಹೌದು
+    
+    
+      
+      &No
+      ಇಲ್ಲ
+    
+    
+      
+      &Cancel
+      ರದ್ದುಗೊಳಿಸು
+    
+    
+      
+      &Close
+      ಮುಚ್ಚಿರಿ
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts
index 151a230ec6..ea92efc8cd 100644
--- a/lang/calamares_ko.ts
+++ b/lang/calamares_ko.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       완료
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       설치 실패
     
     
-      
+      
       Installation Failed
       설치 실패
     
     
-      
+      
       Would you like to paste the install log to the web?
       설치 로그를 웹에 붙여넣으시겠습니까?
     
     
-      
+      
       Error
       오류
     
     
-      
-      
+      
       &Yes
       예(&Y)
     
     
-      
-      
+      
       &No
       아니오(&N)
     
     
-      
+      
       &Close
       닫기(&C)
     
     
-      
+      
       Install Log Paste URL
       로그 붙여넣기 URL 설치
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       업로드에 실패했습니다. 웹 붙여넣기가 수행되지 않았습니다.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,124 +341,124 @@ Link copied to clipboard
 링크가 클립보드에 복사되었습니다.
     
     
-      
+      
       Calamares Initialization Failed
       깔라마레스 초기화 실패
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 가 설치될 수 없습니다. 깔라마레스가 모든 구성된 모듈을 불러올 수 없었습니다. 이것은 깔라마레스가 배포판에서 사용되는 방식에서 발생한 문제입니다.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       다음 모듈 불러오기 실패:
     
     
-      
+      
       Continue with setup?
       설치를 계속하시겠습니까?
     
     
-      
+      
       Continue with installation?
       설치를 계속하시겠습니까?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 설치 프로그램이 %2을(를) 설정하기 위해 디스크를 변경하려고 하는 중입니다.<br/><strong>이러한 변경은 취소할 수 없습니다.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 설치 관리자가 %2를 설치하기 위해 사용자의 디스크의 내용을 변경하려고 합니다. <br/> <strong>이 변경 작업은 되돌릴 수 없습니다.</strong>
     
     
-      
+      
       &Set up now
       지금 설치 (&S)
     
     
-      
+      
       &Install now
       지금 설치 (&I)
     
     
-      
+      
       Go &back
       뒤로 이동 (&b)
     
     
-      
+      
       &Set up
       설치 (&S)
     
     
-      
+      
       &Install
       설치(&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       설치가 완료 되었습니다. 설치 프로그램을 닫습니다.
     
     
-      
+      
       The installation is complete. Close the installer.
       설치가 완료되었습니다. 설치 관리자를 닫습니다.
     
     
-      
+      
       Cancel setup without changing the system.
       시스템을 변경 하지 않고 설치를 취소합니다.
     
     
-      
+      
       Cancel installation without changing the system.
       시스템 변경 없이 설치를 취소합니다.
     
     
-      
+      
       &Next
       다음 (&N)
     
     
-      
+      
       &Back
       뒤로 (&B)
     
     
-      
+      
       &Done
       완료 (&D)
     
     
-      
+      
       &Cancel
       취소 (&C)
     
     
-      
+      
       Cancel setup?
       설치를 취소 하시겠습니까?
     
     
-      
+      
       Cancel installation?
       설치를 취소하시겠습니까?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       현재 설정 프로세스를 취소하시겠습니까?
 설치 프로그램이 종료되고 모든 변경 내용이 손실됩니다.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       정말로 현재 설치 프로세스를 취소하시겠습니까?
@@ -827,22 +825,22 @@ The installer will quit and all changes will be lost.
       이 프로그램은 몇 가지 질문을 하고 컴퓨터에 %2을 설정합니다.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1> 깔라마레스 설치 프로그램 %1에 오신 것을 환영합니다</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 설치에 오신 것을 환영합니다</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>깔라마레스 설치 관리자 %1에 오신 것을 환영합니다</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 설치 관리자에 오신 것을 환영합니다</h1>
     
@@ -949,12 +947,12 @@ The installer will quit and all changes will be lost.
     
       
       Install option: <strong>%1</strong>
-      
+      설치 옵션: <strong>%1</strong>
     
     
       
       None
-      
+      없음
     
     
       
@@ -1707,17 +1705,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole이 설치되지 않았음
     
     
-      
+      
       Please install KDE Konsole and try again!
       KDE Konsole을 설치한 후에 다시 시도해주세요!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       스크립트 실행: &nbsp;<code>%1</code>
     
@@ -1782,32 +1780,32 @@ The installer will quit and all changes will be lost.
       <h1>라이센스 계약</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       상기 계약 조건을 모두 동의합니다.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       최종 사용자 사용권 계약(EULA)을 검토하십시오.
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       이 설정 절차에서는 라이센스 조건에 해당하는 독점 소프트웨어를 설치합니다.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       약관에 동의하지 않으면 설치 절차를 계속할 수 없습니다.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       이 설치 절차는 추가 기능을 제공하고 사용자 환경을 향상시키기 위해 라이선스 조건에 따라 독점 소프트웨어를 설치할 수 있습니다.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       조건에 동의하지 않으면 독점 소프트웨어가 설치되지 않으며 대신 오픈 소스 대체 소프트웨어가 사용됩니다.
     
@@ -2769,92 +2767,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       시스템 정보 수집 중...
     
     
-      
+      
       Partitions
       파티션
     
     
-      
+      
       Current:
       현재:
     
     
-      
+      
       After:
       이후:
     
     
-      
+      
       No EFI system partition configured
       EFI 시스템 파티션이 설정되지 않았습니다
     
     
-      
+      
       EFI system partition configured incorrectly
-      
+      EFI 시스템 파티션이 잘못 구성됨
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
-      
+      %1을(를) 시작하려면 EFI 시스템 파티션이 필요합니다.<br/><br/>EFI 시스템 파티션을 구성하려면 돌아가서 적절한 파일 시스템을 선택하거나 생성하십시오.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
-      
+      파일 시스템은 <strong>%1</strong>에 마운트되어야 합니다.
     
     
-      
+      
       The filesystem must have type FAT32.
-      
+      파일 시스템에는 FAT32 유형이 있어야 합니다.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
-      
+      파일 시스템의 크기는 %1MiB 이상이어야 합니다.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
-      
+      파일 시스템에 플래그 <strong>%1</strong> 세트가 있어야 합니다.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
-      
+      EFI 시스템 파티션을 설정하지 않고 계속할 수 있지만 시스템이 시작되지 않을 수 있습니다.
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS에서 GPT를 사용하는 옵션
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT 파티션 테이블은 모든 시스템에 가장 적합한 옵션입니다. 이 설치 프로그램은 BIOS 시스템에 대한 이러한 설정도 지원합니다.<br/><br/>BIOS에서 GPT 파티션 테이블을 구성하려면(아직 구성되지 않은 경우) 돌아가서 파티션 테이블을 GPT로 설정한 다음, <strong>bios_grub</strong> 플래그가 사용하도록 설정된 8MB의 포맷되지 않은 파티션을 생성합니다.<br/><br/>GPT가 있는 BIOS 시스템에서 %1을 시작하려면 포맷되지 않은 8MB 파티션이 필요합니다.
     
     
-      
+      
       Boot partition not encrypted
       부트 파티션이 암호화되지 않았습니다
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       암호화된 루트 파티션과 함께 별도의 부팅 파티션이 설정되었지만 부팅 파티션은 암호화되지 않았습니다.<br/><br/>중요한 시스템 파일은 암호화되지 않은 파티션에 보관되기 때문에 이러한 설정과 관련하여 보안 문제가 있습니다.<br/>원하는 경우 계속할 수 있지만 나중에 시스템을 시작하는 동안 파일 시스템 잠금이 해제됩니다.<br/>부팅 파티션을 암호화하려면 돌아가서 다시 생성하여 파티션 생성 창에서 <strong>암호화</strong>를 선택합니다.
     
     
-      
+      
       has at least one disk device available.
       하나 이상의 디스크 장치를 사용할 수 있습니다.
     
     
-      
+      
       There are no partitions to install on.
       설치를 위한 파티션이 없습니다.
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3616,25 +3614,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      확인 (&O)
+    
+    
+      
+      &Yes
+      예(&Y)
+    
+    
+      
+      &No
+      아니오(&N)
+    
+    
+      
+      &Cancel
+      취소 (&C)
+    
+    
+      
+      &Close
+      닫기(&C)
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       설치 피드백
     
     
-      
+      
       Sending installation feedback.
       설치 피드백을 보내는 중입니다.
     
     
-      
+      
       Internal error in install-tracking.
       설치 추적중 내부 오류
     
     
-      
+      
       HTTP request timed out.
       HTTP 요청 시간이 만료되었습니다.
     
@@ -3642,28 +3668,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE 사용자 의견
     
     
-      
+      
       Configuring KDE user feedback.
       KDE 사용자 의견을 설정하는 중입니다.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       KDE 사용자 의견 설정 중에 오류가 발생했습니다.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       KDE 사용자 피드백을 올바르게 구성할 수 없습니다, 스크립트 오류 %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       KDE 사용자 피드백을 올바르게 구성할 수 없습니다. Calamares 오류 %1.
     
@@ -3671,28 +3697,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       시스템 피드백
     
     
-      
+      
       Configuring machine feedback.
       시스템 피드백을 설정하는 중입니다.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       시스템 피드백 설정 중에 오류가 발생했습니다.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       시스템 피드백을 정확하게 설정할 수 없습니다, %1 스크립트 오류.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       시스템 피드백을 정확하게 설정할 수 없습니다, %1 깔라마레스 오류.
     
@@ -4060,45 +4086,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      키보드 모델
-    
-    
-      
-      Layouts
-      레이아웃
+      
+      To activate keyboard preview, select a layout.
+      키보드 미리보기를 활성화하려면 레이아웃을 선택하세요.
     
     
-      
-      Keyboard Layout
-      키보드 레이아웃
+      
+      Keyboard Model:
+      키보드 모델:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      원하는 키보드 모델을 클릭하여 레이아웃과 변형을 선택하거나 탐지된 하드웨어를 기준으로 기본 모델을 사용하십시오.
+      
+      Layouts
+      레이아웃
     
     
-      
-      Models
-      모델
+      
+      Type here to test your keyboard
+      키보드를 테스트하기 위해 여기에 입력하세요
     
     
-      
+      
       Variants
       변형
     
-    
-      
-      Keyboard Variant
-      키보드 유형
-    
-    
-      
-      Test your keyboard
-      키보드 테스트
-    
   
   
     localeq
@@ -4124,37 +4135,38 @@ Output:
       
       LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
                     Default option.
-      
+      LibreOffice는 전 세계 수백만 명의 사람들이 사용하는 강력한 무료 오피스 제품군입니다. 여기에는 시장에서 가장 다재다능한 무료 및 오픈 소스 오피스 제품군이 되는 여러 응용 프로그램이 포함되어 있습니다.<br/>
+                    기본 옵션입니다.
     
     
       
       LibreOffice
-      
+      LibreOffice
     
     
       
       If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
-      
+      Office 제품군을 설치하지 않으려면 Office 제품군 없음을 선택하면 됩니다. 필요에 따라 나중에 설치된 시스템에 언제든지 하나(또는 그 이상)를 추가할 수 있습니다.
     
     
       
       No Office Suite
-      
+      오피스 제품군 없음
     
     
       
       Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
-      
+      최소한의 데스크탑 설치를 만들고 모든 추가 응용프로그램을 제거한 다음 나중에 시스템에 추가할 항목을 결정하십시오. 이러한 설치에 포함되지 않는 항목의 예는 Office 제품군, 미디어 플레이어, 이미지 뷰어 또는 인쇄 지원이 없을 것입니다. 그것은 단지 데스크탑, 파일 브라우저, 패키지 관리자, 텍스트 편집기 및 간단한 웹 브라우저일 것입니다.
     
     
       
       Minimal Install
-      
+      최소 설치
     
     
       
       Please select an option for your install, or use the default: LibreOffice included.
-      
+      설치 옵션을 선택하거나 기본값인 LibreOffice 포함을 사용하십시오.
     
   
   
diff --git a/lang/calamares_ko_KR.ts b/lang/calamares_ko_KR.ts
index d18a06425a..dfb236fffe 100644
--- a/lang/calamares_ko_KR.ts
+++ b/lang/calamares_ko_KR.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +337,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -821,22 +819,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1701,17 +1699,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1776,32 +1774,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2761,92 +2759,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2978,7 +2976,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3602,25 +3600,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3628,28 +3654,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3657,28 +3683,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4030,44 +4056,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_lo.ts b/lang/calamares_lo.ts
index b82c6b42cb..4f3524d3ce 100644
--- a/lang/calamares_lo.ts
+++ b/lang/calamares_lo.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +337,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -821,22 +819,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1701,17 +1699,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1776,32 +1774,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2761,92 +2759,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2978,7 +2976,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3602,25 +3600,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3628,28 +3654,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3657,28 +3683,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4030,44 +4056,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index ad87dcf96c..f4face044f 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Atlikta
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Sąranka patyrė nesėkmę
     
     
-      
+      
       Installation Failed
       Diegimas nepavyko
     
     
-      
+      
       Would you like to paste the install log to the web?
       Ar norėtumėte įdėti diegimo žurnalą į saityną?
     
     
-      
+      
       Error
       Klaida
     
     
-      
-      
+      
       &Yes
       &Taip
     
     
-      
-      
+      
       &No
       &Ne
     
     
-      
+      
       &Close
       &Užverti
     
     
-      
+      
       Install Log Paste URL
       Diegimo žurnalo įdėjimo URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Įkėlimas buvo nesėkmingas. Nebuvo atlikta jokio įdėjimo į saityną.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -349,124 +347,124 @@ Link copied to clipboard
 Nuoroda nukopijuota į iškarpinę
     
     
-      
+      
       Calamares Initialization Failed
       Calamares inicijavimas nepavyko
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Nepavyksta įdiegti %1. Calamares nepavyko įkelti visų sukonfigūruotų modulių. Tai yra problema, susijusi su tuo, kaip distribucija naudoja diegimo programą Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Nepavyko įkelti šių modulių:
     
     
-      
+      
       Continue with setup?
       Tęsti sąranką?
     
     
-      
+      
       Continue with installation?
       Tęsti diegimą?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 sąrankos programa, siekdama nustatyti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 diegimo programa, siekdama įdiegti %2, ketina atlikti pakeitimus diske.<br/><strong>Šių pakeitimų nebegalėsite atšaukti.</strong>
     
     
-      
+      
       &Set up now
       Nu&statyti dabar
     
     
-      
+      
       &Install now
       Į&diegti dabar
     
     
-      
+      
       Go &back
       &Grįžti
     
     
-      
+      
       &Set up
       Nu&statyti
     
     
-      
+      
       &Install
       Į&diegti
     
     
-      
+      
       Setup is complete. Close the setup program.
       Sąranka užbaigta. Užverkite sąrankos programą.
     
     
-      
+      
       The installation is complete. Close the installer.
       Diegimas užbaigtas. Užverkite diegimo programą.
     
     
-      
+      
       Cancel setup without changing the system.
       Atsisakyti sąrankos, nieko sistemoje nekeičiant.
     
     
-      
+      
       Cancel installation without changing the system.
       Atsisakyti diegimo, nieko sistemoje nekeičiant.
     
     
-      
+      
       &Next
       &Toliau
     
     
-      
+      
       &Back
       &Atgal
     
     
-      
+      
       &Done
       A&tlikta
     
     
-      
+      
       &Cancel
       A&tsisakyti
     
     
-      
+      
       Cancel setup?
       Atsisakyti sąrankos?
     
     
-      
+      
       Cancel installation?
       Atsisakyti diegimo?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Ar tikrai norite atsisakyti dabartinio sąrankos proceso?
 Sąrankos programa užbaigs darbą ir visi pakeitimai bus prarasti.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Ar tikrai norite atsisakyti dabartinio diegimo proceso?
@@ -833,22 +831,22 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       Programa užduos kelis klausimus ir padės įsidiegti %2.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       </h1>Jus sveikina Calamares sąrankos programa, skirta %1 sistemai.</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Jus sveikina %1 sąranka</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Jus sveikina Calamares diegimo programa, skirta %1 sistemai</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Jus sveikina %1 diegimo programa</h1>
     
@@ -1713,17 +1711,17 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole neįdiegta
     
     
-      
+      
       Please install KDE Konsole and try again!
       Įdiekite KDE Konsole ir bandykite dar kartą!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Vykdomas scenarijus: &nbsp;<code>%1</code>
     
@@ -1788,32 +1786,32 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
       <h1>Licencijos sutartis</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Sutinku su aukščiau išdėstytomis nuostatomis ir sąlygomis.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Peržiūrėkite galutinio naudotojo licencijos sutartis (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Ši sąranka įdiegs nuosavybinę programinę įrangą, kuriai yra taikomos licencijavimo nuostatos.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Jeigu nesutinkate su nuostatomis, sąrankos procedūra negali būti tęsiama.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Tam, kad pateiktų papildomas ypatybes ir pagerintų naudotojo patirtį, ši sąrankos procedūra gali įdiegti nuosavybinę programinę įrangą, kuriai yra taikomos licencijavimo nuostatos.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Jeigu nesutiksite su nuostatomis, nuosavybinė programinė įranga nebus įdiegta, o vietoj jos, bus naudojamos atvirojo kodo alternatyvos.
     
@@ -2802,92 +2800,92 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Renkama sistemos informacija...
     
     
-      
+      
       Partitions
       Skaidiniai
     
     
-      
+      
       Current:
       Dabartinis:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       No EFI system partition configured
       Nėra sukonfigūruoto EFI sistemos skaidinio
     
     
-      
+      
       EFI system partition configured incorrectly
       Neteisingai sukonfigūruotas EFI sistemos skaidinys
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       %1 paleidimui yra reikalingas EFI sistemos skaidinys.<br/><br/>Norėdami konfigūruoti EFI sistemos skaidinį, grįžkite atgal ir pasirinkite arba sukurkite tinkamą failų sistemą.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       Failų sistema privalo būti prijungta ties <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
       Failų sistema privalo būti FAT32 tipo.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       Failų sistema privalo būti bent %1 MiB dydžio.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       Failų sistema privalo turėti nustatytą <strong>%1</strong> vėliavėlę.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       Galite tęsti nenustatę EFI sistemos skaidinio, bet jūsų sistema gali nepasileisti.
     
     
-      
+      
       Option to use GPT on BIOS
       Parinktis naudoti GPT per BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT skaidinių lentelė yra geriausias variantas visoms sistemoms. Ši diegimo programa palaiko tokią sąranką taip pat ir BIOS sistemoms.<br/><br/>Norėdami konfigūruoti GPT skaidinių lentelę BIOS sistemoje, (jei dar nesate to padarę) grįžkite atgal ir nustatykite skaidinių lentelę į GPT, toliau, sukurkite 8 MB neformatuotą skaidinį su įjungta <strong>bios_grub</strong> vėliavėle.<br/><br/>Neformatuotas 8 MB skaidinys yra būtinas, norint paleisti %1 BIOS sistemoje su GPT.
     
     
-      
+      
       Boot partition not encrypted
       Paleidimo skaidinys nėra užšifruotas
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Kartu su užšifruotu šaknies skaidiniu, buvo nustatytas atskiras paleidimo skaidinys, tačiau paleidimo skaidinys nėra užšifruotas.<br/><br/>Dėl tokios sąrankos iškyla tam tikrų saugumo klausimų, kadangi svarbūs sisteminiai failai yra laikomi neužšifruotame skaidinyje.<br/>Jeigu norite, galite tęsti, tačiau failų sistemos atrakinimas įvyks vėliau, sistemos paleidimo metu.<br/>Norėdami užšifruoti paleidimo skaidinį, grįžkite atgal ir sukurkite jį iš naujo bei skaidinių kūrimo lange pažymėkite parinktį <strong>Užšifruoti</strong>.
     
     
-      
+      
       has at least one disk device available.
       turi bent vieną prieinamą disko įrenginį.
     
     
-      
+      
       There are no partitions to install on.
       Nėra skaidinių į kuriuos diegti.
     
@@ -3022,7 +3020,7 @@ Išvestis:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3649,25 +3647,53 @@ Išvestis:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Gerai
+    
+    
+      
+      &Yes
+      &Taip
+    
+    
+      
+      &No
+      &Ne
+    
+    
+      
+      &Cancel
+      A&tsisakyti
+    
+    
+      
+      &Close
+      &Užverti
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Grįžtamasis ryšys apie diegimą
     
     
-      
+      
       Sending installation feedback.
       Siunčiamas grįžtamasis ryšys apie diegimą.
     
     
-      
+      
       Internal error in install-tracking.
       Vidinė klaida diegimo sekime.
     
     
-      
+      
       HTTP request timed out.
       Baigėsi HTTP užklausos laikas.
     
@@ -3675,28 +3701,28 @@ Išvestis:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE naudotojo grįžtamasis ryšys
     
     
-      
+      
       Configuring KDE user feedback.
       Konfigūruojamas KDE naudotojo grįžtamasis ryšys.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Klaida KDE naudotojo grįžtamojo ryšio konfigūracijoje.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Nepavyko teisingai sukonfigūruoti KDE naudotojo grįžtamojo ryšio, scenarijaus klaida %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Nepavyko teisingai sukonfigūruoti KDE naudotojo grįžtamojo ryšio, Calamares klaida %1.
     
@@ -3704,28 +3730,28 @@ Išvestis:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Grįžtamasis ryšys apie kompiuterį
     
     
-      
+      
       Configuring machine feedback.
       Konfigūruojamas grįžtamasis ryšys apie kompiuterį.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Klaida grįžtamojo ryšio apie kompiuterį konfigūravime.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Nepavyko teisingai sukonfigūruoti grįžtamojo ryšio apie kompiuterį, scenarijaus klaida %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Nepavyko teisingai sukonfigūruoti grįžtamojo ryšio apie kompiuterį, Calamares klaida %1.
     
@@ -4093,45 +4119,30 @@ Išvestis:
   
     keyboardq
     
-      
-      Keyboard Model
-      Klaviatūros modelis
-    
-    
-      
-      Layouts
-      Išdėstymai
+      
+      To activate keyboard preview, select a layout.
+      Norėdami aktyvuoti klaviatūros peržiūrą, pasirinkite išdėstymą.
     
     
-      
-      Keyboard Layout
-      Klaviatūros išdėstymas
+      
+      Keyboard Model:
+      Klaviatūros modelis:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Pasirinkite pageidaujamą klaviatūros modelį, kad pasirinktumėte išdėstymą ir variantą arba naudokite numatytąjį, kuris remiasi aptikta aparatine įranga.
+      
+      Layouts
+      Išdėstymai
     
     
-      
-      Models
-      Modeliai
+      
+      Type here to test your keyboard
+      Rašykite čia ir išbandykite savo klaviatūrą
     
     
-      
+      
       Variants
       Variantai
     
-    
-      
-      Keyboard Variant
-      Klaviatūros variantas
-    
-    
-      
-      Test your keyboard
-      Išbandykite savo klaviatūrą
-    
   
   
     localeq
diff --git a/lang/calamares_lv.ts b/lang/calamares_lv.ts
index 334a442110..f27c798a9d 100644
--- a/lang/calamares_lv.ts
+++ b/lang/calamares_lv.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -287,54 +287,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -825,22 +823,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1705,17 +1703,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1780,32 +1778,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2783,92 +2781,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3000,7 +2998,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3624,25 +3622,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3650,28 +3676,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3679,28 +3705,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4052,44 +4078,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_mk.ts b/lang/calamares_mk.ts
index 80d1bf42cc..1fb5054345 100644
--- a/lang/calamares_mk.ts
+++ b/lang/calamares_mk.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Готово
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Грешка
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Инсталацијата е готова. Исклучете го инсталерот.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_ml.ts b/lang/calamares_ml.ts
index ad3b8efe76..0b0771f73d 100644
--- a/lang/calamares_ml.ts
+++ b/lang/calamares_ml.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       പൂർത്തിയായി
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       സജ്ജീകരണപ്രക്രിയ പരാജയപ്പെട്ടു
     
     
-      
+      
       Installation Failed
       ഇൻസ്റ്റളേഷൻ പരാജയപ്പെട്ടു
     
     
-      
+      
       Would you like to paste the install log to the web?
       ഇൻസ്റ്റാൾ ലോഗ് വെബിലേക്ക് പകർത്തണോ?
     
     
-      
+      
       Error
       പിശക്
     
     
-      
-      
+      
       &Yes
       വേണം (&Y)
     
     
-      
-      
+      
       &No
       വേണ്ട (&N)
     
     
-      
+      
       &Close
       അടയ്ക്കുക (&C)
     
     
-      
+      
       Install Log Paste URL
       ഇൻസ്റ്റാൾ ലോഗ് പകർപ്പിന്റെ വിലാസം
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       അപ്‌ലോഡ് പരാജയമായിരുന്നു. വെബിലേക്ക് പകർത്തിയില്ല.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       കലാമാരേസ് സമാരംഭിക്കൽ പരാജയപ്പെട്ടു
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 ഇൻസ്റ്റാൾ ചെയ്യാൻ കഴിയില്ല. ക്രമീകരിച്ച എല്ലാ മൊഡ്യൂളുകളും ലോഡുചെയ്യാൻ കാലാമറെസിന് കഴിഞ്ഞില്ല. വിതരണത്തിൽ കാലാമറെസ് ഉപയോഗിക്കുന്ന രീതിയിലുള്ള ഒരു പ്രശ്നമാണിത്.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>താഴെ പറയുന്ന മൊഡ്യൂളുകൾ ലഭ്യമാക്കാനായില്ല:
     
     
-      
+      
       Continue with setup?
       സജ്ജീകരണപ്രക്രിയ തുടരണോ?
     
     
-      
+      
       Continue with installation?
       ഇൻസ്റ്റളേഷൻ തുടരണോ?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %2 സജ്ജീകരിക്കുന്നതിന് %1 സജ്ജീകരണ പ്രോഗ്രാം നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %2 ഇൻസ്റ്റാളുചെയ്യുന്നതിന് %1 ഇൻസ്റ്റാളർ നിങ്ങളുടെ ഡിസ്കിൽ മാറ്റങ്ങൾ വരുത്താൻ പോകുന്നു.<br/><strong>നിങ്ങൾക്ക് ഈ മാറ്റങ്ങൾ പഴയപടിയാക്കാൻ കഴിയില്ല.</strong>
     
     
-      
+      
       &Set up now
       ഉടൻ സജ്ജീകരിക്കുക (&S)
     
     
-      
+      
       &Install now
       ഉടൻ ഇൻസ്റ്റാൾ ചെയ്യുക (&I)
     
     
-      
+      
       Go &back
       പുറകോട്ടു പോകുക 
     
     
-      
+      
       &Set up
       സജ്ജീകരിക്കുക (&S)
     
     
-      
+      
       &Install
       ഇൻസ്റ്റാൾ (&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       സജ്ജീകരണം പൂർത്തിയായി. പ്രയോഗം അടയ്ക്കുക.
     
     
-      
+      
       The installation is complete. Close the installer.
       ഇൻസ്റ്റളേഷൻ പൂർത്തിയായി. ഇൻസ്റ്റാളർ അടയ്ക്കുക
     
     
-      
+      
       Cancel setup without changing the system.
       സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ സജ്ജീകരണപ്രക്രിയ റദ്ദാക്കുക.
     
     
-      
+      
       Cancel installation without changing the system.
       സിസ്റ്റത്തിന് മാറ്റമൊന്നും വരുത്താതെ ഇൻസ്റ്റളേഷൻ റദ്ദാക്കുക.
     
     
-      
+      
       &Next
       അടുത്തത് (&N)
     
     
-      
+      
       &Back
       പുറകോട്ട് (&B)
     
     
-      
+      
       &Done
       ചെയ്‌തു
     
     
-      
+      
       &Cancel
       റദ്ദാക്കുക (&C)
     
     
-      
+      
       Cancel setup?
       സജ്ജീകരണം റദ്ദാക്കണോ?
     
     
-      
+      
       Cancel installation?
       ഇൻസ്റ്റളേഷൻ റദ്ദാക്കണോ?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       നിലവിലുള്ള സജ്ജീകരണപ്രക്രിയ റദ്ദാക്കണോ?
 സജ്ജീകരണപ്രയോഗം നിൽക്കുകയും എല്ലാ മാറ്റങ്ങളും നഷ്ടപ്പെടുകയും ചെയ്യും.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       നിലവിലുള്ള ഇൻസ്റ്റാൾ പ്രക്രിയ റദ്ദാക്കണോ?
@@ -825,22 +823,22 @@ The installer will quit and all changes will be lost.
       ഈ പ്രക്രിയ താങ്കളോട് ചില ചോദ്യങ്ങൾ ചോദിക്കുകയും %2 താങ്കളുടെ കമ്പ്യൂട്ടറിൽ സജ്ജീകരിക്കുകയും ചെയ്യും.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1705,17 +1703,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       കോണ്‍സോള്‍ ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടില്ല
     
     
-      
+      
       Please install KDE Konsole and try again!
       കെഡിഇ കൺസോൾ ഇൻസ്റ്റാൾ ചെയ്ത് വീണ്ടും ശ്രമിക്കുക!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       സ്ക്രിപ്റ്റ് നിർവ്വഹിക്കുന്നു:&nbsp;<code>%1</code>
     
@@ -1780,32 +1778,32 @@ The installer will quit and all changes will be lost.
       <h1>അനുമതിപത്ര നിബന്ധനകൾ</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       മുകളിലുള്ള നിബന്ധനകളും വ്യവസ്ഥകളും ഞാൻ അംഗീകരിക്കുന്നു.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       എൻഡ് യൂസർ ലൈസൻസ് എഗ്രിമെന്റുകൾ (EULAs) ദയവായി പരിശോധിക്കൂ.
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       ഈ സജ്ജീകരണപ്രക്രിയ അനുമതിപത്രനിബന്ധനകൾക്ക് കീഴിലുള്ള കുത്തക സോഫ്റ്റ്‌‌വെയറുകൾ ഇൻസ്റ്റാൾ ചെയ്യും.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       താങ്കൾ ഈ നിബന്ധനകളോട് യോജിക്കുന്നില്ലെങ്കിൽ, സജ്ജീകരണപ്രക്രിയയ്ക്ക് തുടരാനാകില്ല.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       കൂടുതൽ സവിശേഷതകൾ നൽകുന്നതിനും ഉപയോക്താവിന്റെ അനുഭവം കൂടുതൽ മികവുറ്റതാക്കുന്നതിനും ഈ സജ്ജീകരണപ്രക്രിയയ്ക്ക് അനുമതിപത്രനിബന്ധനകൾക്ക് കീഴിലുള്ള കുത്തക സോഫ്റ്റ്‌‌വെയറുകൾ ഇൻസ്റ്റാൾ ചെയ്യാം.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       താങ്കൾ ഈ നിബന്ധനകളോട് യോജിക്കുന്നില്ലെങ്കിൽ, കുത്തക സോഫ്റ്റ്‌‌വെയറുകൾ ഇൻസ്റ്റാൾ ചെയ്യപ്പെടില്ല, പകരം സ്വതന്ത്ര ബദലുകൾ ഉപയോഗിക്കും.
     
@@ -2774,92 +2772,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       സിസ്റ്റത്തെക്കുറിച്ചുള്ള വിവരങ്ങൾ ശേഖരിക്കുന്നു...
     
     
-      
+      
       Partitions
       പാർട്ടീഷനുകൾ
     
     
-      
+      
       Current:
       നിലവിലുള്ളത്:
     
     
-      
+      
       After:
       ശേഷം:
     
     
-      
+      
       No EFI system partition configured
       ഇഎഫ്ഐ സിസ്റ്റം പാർട്ടീഷനൊന്നും ക്രമീകരിച്ചിട്ടില്ല
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യപ്പെട്ടിട്ടില്ല
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       എൻക്രിപ്റ്റ് ചെയ്ത ഒരു റൂട്ട് പാർട്ടീഷനോടൊപ്പം ഒരു വേർപെടുത്തിയ ബൂട്ട് പാർട്ടീഷനും ക്രമീകരിക്കപ്പെട്ടിരുന്നു, എന്നാൽ ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യപ്പെട്ടതല്ല.<br/><br/>ഇത്തരം സജ്ജീകരണത്തിന്റെ സുരക്ഷ ഉത്കണ്ഠാജനകമാണ്, എന്തെന്നാൽ പ്രധാനപ്പെട്ട സിസ്റ്റം ഫയലുകൾ ഒരു എൻക്രിപ്റ്റ് ചെയ്യപ്പെടാത്ത പാർട്ടീഷനിലാണ് സൂക്ഷിച്ചിട്ടുള്ളത്.<br/> താങ്കൾക്ക് വേണമെങ്കിൽ തുടരാം, പക്ഷേ ഫയൽ സിസ്റ്റം തുറക്കൽ സിസ്റ്റം ആരംഭപ്രക്രിയയിൽ വൈകിയേ സംഭവിക്കൂ.<br/>ബൂട്ട് പാർട്ടീഷൻ എൻക്രിപ്റ്റ് ചെയ്യാനായി, തിരിച്ചു പോയി പാർട്ടീഷൻ നിർമ്മാണ ജാലകത്തിൽ <strong>എൻക്രിപ്റ്റ്</strong> തിരഞ്ഞെടുത്തുകൊണ്ട് അത് വീണ്ടും നിർമ്മിക്കുക.
     
     
-      
+      
       has at least one disk device available.
       ഒരു ഡിസ്ക് ഡിവൈസെങ്കിലും ലഭ്യമാണ്.
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2994,7 +2992,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3618,25 +3616,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      ശരി (&O)
+    
+    
+      
+      &Yes
+      വേണം (&Y)
+    
+    
+      
+      &No
+      വേണ്ട (&N)
+    
+    
+      
+      &Cancel
+      റദ്ദാക്കുക (&C)
+    
+    
+      
+      &Close
+      അടയ്ക്കുക (&C)
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       ഇൻസ്റ്റളേഷനെ പറ്റിയുള്ള പ്രതികരണം
     
     
-      
+      
       Sending installation feedback.
       ഇൻസ്റ്റളേഷനെ പറ്റിയുള്ള പ്രതികരണം അയയ്ക്കുന്നു.
     
     
-      
+      
       Internal error in install-tracking.
       ഇൻസ്റ്റാൾ-പിന്തുടരുന്നതിൽ ആന്തരികമായ പിഴവ്.
     
     
-      
+      
       HTTP request timed out.
       HTTP അപേക്ഷയുടെ സമയപരിധി കഴിഞ്ഞു.
     
@@ -3644,28 +3670,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3673,28 +3699,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       ഉപകരണത്തിൽ നിന്നുള്ള പ്രതികരണം
     
     
-      
+      
       Configuring machine feedback.
       ഉപകരണത്തിൽ നിന്നുള്ള പ്രതികരണം ക്രമീകരിക്കുന്നു.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       ഉപകരണത്തിൽ നിന്നുള്ള പ്രതികരണത്തിന്റെ ക്രമീകരണത്തിൽ പിഴവ്.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       ഉപകരണത്തിൽ നിന്നുള്ള പ്രതികരണം ശരിയായി ക്രമീകരിക്കാനായില്ല. സ്ക്രിപ്റ്റ് പിഴവ് %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       ഉപകരണത്തിൽ നിന്നുള്ള പ്രതികരണം ശരിയായി ക്രമീകരിക്കാനായില്ല. കലാമാരേസ് പിഴവ് %1.
     
@@ -4046,44 +4072,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      കീബോഡ് മാതൃക:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      നിങ്ങളുടെ കീബോർഡ് പരിശോധിക്കുന്നതിന് ഇവിടെ ടൈപ്പുചെയ്യുക
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_mr.ts b/lang/calamares_mr.ts
index c58aa46eb0..c26f4ec658 100644
--- a/lang/calamares_mr.ts
+++ b/lang/calamares_mr.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       पूर्ण झाली
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       अधिष्ठापना अयशस्वी झाली
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       त्रुटी
     
     
-      
-      
+      
       &Yes
       &होय
     
     
-      
-      
+      
       &No
       &नाही
     
     
-      
+      
       &Close
       &बंद करा
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &आता अधिष्ठापित करा
     
     
-      
+      
       Go &back
       &मागे जा
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       अधिष्ठापना संपूर्ण झाली. अधिष्ठापक बंद करा.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       प्रणालीत बदल न करता अधिष्टापना रद्द करा.
     
     
-      
+      
       &Next
       &पुढे
     
     
-      
+      
       &Back
       &मागे
     
     
-      
+      
       &Done
       &पूर्ण झाली
     
     
-      
+      
       &Cancel
       &रद्द करा
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       अधिष्ठापना रद्द करायचे?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       सद्या :
     
     
-      
+      
       After:
       नंतर :
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      &होय
+    
+    
+      
+      &No
+      &नाही
+    
+    
+      
+      &Cancel
+      &रद्द करा
+    
+    
+      
+      &Close
+      &बंद करा
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_nb.ts b/lang/calamares_nb.ts
index 4e4fc585cc..c2b03cca70 100644
--- a/lang/calamares_nb.ts
+++ b/lang/calamares_nb.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Ferdig
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Installasjon feilet
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Feil
     
     
-      
-      
+      
       &Yes
       &Ja
     
     
-      
-      
+      
       &No
       &Nei
     
     
-      
+      
       &Close
       &Lukk
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Fortsette å sette opp?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 vil nå gjøre endringer på harddisken, for å installere %2. <br/><strong>Du vil ikke kunne omgjøre disse endringene.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Installer nå
     
     
-      
+      
       Go &back
       Gå &tilbake
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Installasjonen er fullført. Lukk installeringsprogrammet.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Neste
     
     
-      
+      
       &Back
       &Tilbake
     
     
-      
+      
       &Done
       &Ferdig
     
     
-      
+      
       &Cancel
       &Avbryt
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Avbryte installasjon?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Vil du virkelig avbryte installasjonen?
@@ -824,22 +822,22 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1704,17 +1702,17 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1779,32 +1777,32 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2773,92 +2771,92 @@ Installasjonsprogrammet vil avsluttes og alle endringer vil gå tapt.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2990,7 +2988,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3614,25 +3612,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Ja
+    
+    
+      
+      &No
+      &Nei
+    
+    
+      
+      &Cancel
+      &Avbryt
+    
+    
+      
+      &Close
+      &Lukk
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3640,28 +3666,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3669,28 +3695,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4042,44 +4068,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Tastaturmodell:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Skriv her for å teste tastaturet ditt
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_ne.ts b/lang/calamares_ne.ts
index 1e704c4a56..2e0826c914 100644
--- a/lang/calamares_ne.ts
+++ b/lang/calamares_ne.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_ne_NP.ts b/lang/calamares_ne_NP.ts
index 63ce77baf5..a02ab78ff0 100644
--- a/lang/calamares_ne_NP.ts
+++ b/lang/calamares_ne_NP.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       सकियो
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       सेटअप सकियो । सेटअप प्रोग्राम बन्द गर्नु होस 
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       %1 को लागि Calamares Setup Programमा स्वागत छ । 
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       %1 को Setupमा स्वागत छ । 
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       %1 को लागि Calamares Installerमा स्वागत छ । 
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       %1 को Installerमा स्वागत छ । 
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts
index 38023c4748..738bb72a39 100644
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Gereed
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Voorbereiding mislukt
     
     
-      
+      
       Installation Failed
       Installatie Mislukt
     
     
-      
+      
       Would you like to paste the install log to the web?
       Wil je het installatielogboek plakken naar het web?
     
     
-      
+      
       Error
       Fout
     
     
-      
-      
+      
       &Yes
       &ja
     
     
-      
-      
+      
       &No
       &Nee
     
     
-      
+      
       &Close
       &Sluiten
     
     
-      
+      
       Install Log Paste URL
       URL voor het verzenden van het installatielogboek
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Het uploaden is mislukt. Web-plakken niet gedaan.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Link gekopieerd naar klembord
     
     
-      
+      
       Calamares Initialization Failed
       Calamares Initialisatie mislukt
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 kan niet worden geïnstalleerd. Calamares kon niet alle geconfigureerde modules laden. Dit is een probleem met hoe Calamares wordt gebruikt door de distributie.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>The volgende modules konden niet worden geladen:
     
     
-      
+      
       Continue with setup?
       Doorgaan met installatie?
     
     
-      
+      
       Continue with installation?
       Doorgaan met installatie?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Het %1 voorbereidingsprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Het %1 installatieprogramma zal nu aanpassingen maken aan je schijf om %2 te installeren.<br/><strong>Deze veranderingen kunnen niet ongedaan gemaakt worden.</strong>
     
     
-      
+      
       &Set up now
       Nu &Inrichten
     
     
-      
+      
       &Install now
       Nu &installeren
     
     
-      
+      
       Go &back
       Ga &terug
     
     
-      
+      
       &Set up
       &Inrichten
     
     
-      
+      
       &Install
       &Installeer
     
     
-      
+      
       Setup is complete. Close the setup program.
       De voorbereiding is voltooid. Sluit het voorbereidingsprogramma.
     
     
-      
+      
       The installation is complete. Close the installer.
       De installatie is voltooid. Sluit het installatie-programma.
     
     
-      
+      
       Cancel setup without changing the system.
       Voorbereiding afbreken zonder aanpassingen aan het systeem.
     
     
-      
+      
       Cancel installation without changing the system.
       Installatie afbreken zonder aanpassingen aan het systeem.
     
     
-      
+      
       &Next
       &Volgende
     
     
-      
+      
       &Back
       &Terug
     
     
-      
+      
       &Done
       Voltooi&d
     
     
-      
+      
       &Cancel
       &Afbreken
     
     
-      
+      
       Cancel setup?
       Voorbereiding afbreken?
     
     
-      
+      
       Cancel installation?
       Installatie afbreken?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Wil je het huidige voorbereidingsproces echt afbreken?
 Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Wil je het huidige installatieproces echt afbreken?
@@ -829,22 +827,22 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       Dit programma stelt je enkele vragen en installeert %2 op jouw computer.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Welkom in het Calamares voorbereidingsprogramma voor %1.</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Welkom in het %1 voorbereidingsprogramma.</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Welkom in het Calamares installatieprogramma voor %1.</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Welkom in het %1 installatieprogramma.</h1>
     
@@ -1709,17 +1707,17 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole is niet geïnstalleerd
     
     
-      
+      
       Please install KDE Konsole and try again!
       Gelieve KDE Konsole te installeren en opnieuw te proberen!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Script uitvoeren: &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
       <h1>Licentieovereenkomst</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Ik aanvaard de bovenstaande algemene voorwaarden.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Lees de gebruikersovereenkomst (EULA's).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Deze voorbereidingsprocedure zal propriëtaire software installeren waarop licentievoorwaarden van toepassing zijn.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Indien je niet akkoord gaat met deze voorwaarden kan de installatie niet doorgaan.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Deze voorbereidingsprocedure zal propriëtaire software installeren waarop licentievoorwaarden van toepassing zijn, om extra features aan te bieden en de gebruikerservaring te verbeteren.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Indien je de voorwaarden niet aanvaardt zal de propriëtaire software vervangen worden door opensource alternatieven.
     
@@ -2778,92 +2776,92 @@ Het installatieprogramma zal afsluiten en alle wijzigingen zullen verloren gaan.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Systeeminformatie verzamelen...
     
     
-      
+      
       Partitions
       Partities
     
     
-      
+      
       Current:
       Huidig:
     
     
-      
+      
       After:
       Na:
     
     
-      
+      
       No EFI system partition configured
       Geen EFI systeempartitie geconfigureerd
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Optie om GPT te gebruiken in BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Een GPT-partitie is de beste optie voor alle systemen. Dit installatieprogramma ondersteund ook zulke installatie voor BIOS systemen.<br/><br/>Om een GPT-partitie te configureren, (als dit nog niet gedaan is) ga terug en stel de partitietavel in als GPT en maak daarna een 8 MB ongeformateerde partitie aan met de <strong>bios_grub</strong>-vlag ingesteld.<br/><br/>Een ongeformateerde 8 MB partitie is nodig om %1 te starten op BIOS-systemen met GPT. 
     
     
-      
+      
       Boot partition not encrypted
       Bootpartitie niet versleuteld
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Een aparte bootpartitie was ingesteld samen met een versleutelde rootpartitie, maar de bootpartitie zelf is niet versleuteld.<br/><br/>Dit is niet volledig veilig, aangezien belangrijke systeembestanden bewaard worden op een niet-versleutelde partitie.<br/>Je kan doorgaan als je wil, maar het ontgrendelen van bestandssystemen zal tijdens het opstarten later plaatsvinden.<br/>Om de bootpartitie toch te versleutelen: keer terug en maak de bootpartitie opnieuw, waarbij je <strong>Versleutelen</strong> aanvinkt in het venster partitie aanmaken. 
     
     
-      
+      
       has at least one disk device available.
       tenminste één schijfapparaat beschikbaar.
     
     
-      
+      
       There are no partitions to install on.
       Er zijn geen partities om op te installeren.
     
@@ -2998,7 +2996,7 @@ Uitvoer:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3623,25 +3621,53 @@ De installatie kan niet doorgaan.
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &ja
+    
+    
+      
+      &No
+      &Nee
+    
+    
+      
+      &Cancel
+      &Afbreken
+    
+    
+      
+      &Close
+      &Sluiten
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Installatiefeedback
     
     
-      
+      
       Sending installation feedback.
       Installatiefeedback opsturen.
     
     
-      
+      
       Internal error in install-tracking.
       Interne fout in de installatie-tracking.
     
     
-      
+      
       HTTP request timed out.
       HTTP request is verlopen.
     
@@ -3649,28 +3675,28 @@ De installatie kan niet doorgaan.
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE gebruikersfeedback
     
     
-      
+      
       Configuring KDE user feedback.
       KDE gebruikersfeedback configureren.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Fout in de KDE gebruikersfeedback configuratie.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Kon de KDE gebruikersfeedback niet correct instellen, scriptfout %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Kon de KDE gebruikersfeedback niet correct instellen, Calamaresfout %1.
     
@@ -3678,28 +3704,28 @@ De installatie kan niet doorgaan.
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Machinefeedback
     
     
-      
+      
       Configuring machine feedback.
       Instellen van machinefeedback.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Fout in de configuratie van de machinefeedback.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Kon de machinefeedback niet correct instellen, scriptfout %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Kon de machinefeedback niet correct instellen, Calamares-fout %1.
     
@@ -4056,45 +4082,30 @@ De systeemstijdinstellingen beïnvloeden de cijfer- en datumsformaat. De huidige
   
     keyboardq
     
-      
-      Keyboard Model
-      Toetensbord model
-    
-    
-      
-      Layouts
-      Indeling
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Toetesenbord indeling
+      
+      Keyboard Model:
+      Toetsenbord model:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Kies je voorkeurstoetsenbordmodel om lay-out en variant te selecteren, of gebruik het standaardmodel op de gedetecteerde hardware.
+      
+      Layouts
+      Indeling
     
     
-      
-      Models
-      Modellen
+      
+      Type here to test your keyboard
+      Typ hier om uw toetsenbord te testen
     
     
-      
+      
       Variants
       Varianten
     
-    
-      
-      Keyboard Variant
-      Toetsenbord Variant
-    
-    
-      
-      Test your keyboard
-      Test je toetsenbord
-    
   
   
     localeq
diff --git a/lang/calamares_pl.ts b/lang/calamares_pl.ts
index 2c436d5c55..bee6313b21 100644
--- a/lang/calamares_pl.ts
+++ b/lang/calamares_pl.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Ukończono
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Nieudane ustawianie
     
     
-      
+      
       Installation Failed
       Wystąpił błąd instalacji
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Błąd
     
     
-      
-      
+      
       &Yes
       &Tak
     
     
-      
-      
+      
       &No
       &Nie
     
     
-      
+      
       &Close
       Zam&knij
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +343,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Błąd inicjacji programu Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 nie może zostać zainstalowany. Calamares nie mógł wczytać wszystkich skonfigurowanych modułów. Jest to problem ze sposobem, w jaki Calamares jest używany przez dystrybucję.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Następujące moduły nie mogły zostać wczytane:
     
     
-      
+      
       Continue with setup?
       Kontynuować z programem instalacyjnym?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instalator %1 zamierza przeprowadzić zmiany na Twoim dysku, aby zainstalować %2.<br/><strong>Nie będziesz mógł cofnąć tych zmian.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Zainstaluj teraz
     
     
-      
+      
       Go &back
       &Cofnij się
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       Za&instaluj
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalacja ukończona pomyślnie. Możesz zamknąć instalator.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Anuluj instalację bez dokonywania zmian w systemie.
     
     
-      
+      
       &Next
       &Dalej
     
     
-      
+      
       &Back
       &Wstecz
     
     
-      
+      
       &Done
       &Ukończono
     
     
-      
+      
       &Cancel
       &Anuluj
     
     
-      
+      
       Cancel setup?
       Anulować ustawianie?
     
     
-      
+      
       Cancel installation?
       Anulować instalację?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Czy na pewno chcesz anulować obecny proces instalacji?
@@ -828,22 +826,22 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.Ten program zada Ci garść pytań i ustawi %2 na Twoim komputerze.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1708,17 +1706,17 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole jest niezainstalowany
     
     
-      
+      
       Please install KDE Konsole and try again!
       Zainstaluj KDE Konsole i spróbuj ponownie!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Wykonywanie skryptu: &nbsp;<code>%1</code>
     
@@ -1783,32 +1781,32 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     
     
-      
+      
       I accept the terms and conditions above.
       Akceptuję powyższe warunki korzystania.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2795,92 +2793,92 @@ Instalator zostanie zamknięty i wszystkie zmiany zostaną utracone.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Zbieranie informacji o systemie...
     
     
-      
+      
       Partitions
       Partycje
     
     
-      
+      
       Current:
       Bieżący:
     
     
-      
+      
       After:
       Po:
     
     
-      
+      
       No EFI system partition configured
       Nie skonfigurowano partycji systemowej EFI
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Niezaszyfrowana partycja rozruchowa
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Oddzielna partycja rozruchowa została skonfigurowana razem z zaszyfrowaną partycją roota, ale partycja rozruchowa nie jest szyfrowana.<br/><br/>Nie jest to najbezpieczniejsze rozwiązanie, ponieważ ważne pliki systemowe znajdują się na niezaszyfrowanej partycji.<br/>Możesz kontynuować, ale odblokowywanie systemu nastąpi później, w trakcie uruchamiania.<br/>Aby zaszyfrować partycję rozruchową, wróć i utwórz ją ponownie zaznaczając opcję <strong>Szyfruj</strong> w oknie tworzenia partycji.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3015,7 +3013,7 @@ Wyjście:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3640,25 +3638,53 @@ i nie uruchomi się
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Tak
+    
+    
+      
+      &No
+      &Nie
+    
+    
+      
+      &Cancel
+      &Anuluj
+    
+    
+      
+      &Close
+      Zam&knij
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Informacja zwrotna o instalacji
     
     
-      
+      
       Sending installation feedback.
       Wysyłanie informacji zwrotnej o instalacji.
     
     
-      
+      
       Internal error in install-tracking.
       Błąd wewnętrzny śledzenia instalacji.
     
     
-      
+      
       HTTP request timed out.
       Wyczerpano limit czasu żądania HTTP.
     
@@ -3666,28 +3692,28 @@ i nie uruchomi się
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3695,28 +3721,28 @@ i nie uruchomi się
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Maszynowa informacja zwrotna
     
     
-      
+      
       Configuring machine feedback.
       Konfiguracja mechanizmu informacji zwrotnej.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Błąd w konfiguracji maszynowej informacji zwrotnej.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Nie można poprawnie skonfigurować maszynowej informacji zwrotnej, błąd skryptu %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Nie można poprawnie skonfigurować maszynowej informacji zwrotnej, błąd Calamares %1.
     
@@ -4068,44 +4094,29 @@ i nie uruchomi się
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Model klawiatury:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Napisz coś tutaj, aby sprawdzić swoją klawiaturę
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index b5a504adf8..26ec8441f0 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Concluído
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       A Configuração Falhou
     
     
-      
+      
       Installation Failed
       Falha na Instalação
     
     
-      
+      
       Would you like to paste the install log to the web?
       Deseja colar o registro de instalação na web?
     
     
-      
+      
       Error
       Erro
     
     
-      
-      
+      
       &Yes
       &Sim
     
     
-      
-      
+      
       &No
       &Não
     
     
-      
+      
       &Close
       &Fechar
     
     
-      
+      
       Install Log Paste URL
       Colar URL de Registro de Instalação
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Não foi possível fazer o upload. Nenhuma colagem foi feita na web.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Link copiado para a área de transferência
     
     
-      
+      
       Calamares Initialization Failed
       Falha na inicialização do Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 não pôde ser instalado. O Calamares não conseguiu carregar todos os módulos configurados. Este é um problema com o modo em que o Calamares está sendo utilizado pela distribuição.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Os seguintes módulos não puderam ser carregados:
     
     
-      
+      
       Continue with setup?
       Continuar com configuração?
     
     
-      
+      
       Continue with installation?
       Continuar com a instalação?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       O programa de configuração %1 está prestes a fazer mudanças no seu disco de modo a configurar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       O instalador %1 está prestes a fazer alterações no disco a fim de instalar %2.<br/><strong>Você não será capaz de desfazer estas mudanças.</strong>
     
     
-      
+      
       &Set up now
       &Configurar agora
     
     
-      
+      
       &Install now
       &Instalar agora
     
     
-      
+      
       Go &back
       &Voltar
     
     
-      
+      
       &Set up
       &Configurar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       A configuração está completa. Feche o programa de configuração.
     
     
-      
+      
       The installation is complete. Close the installer.
       A instalação está completa. Feche o instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancelar configuração sem alterar o sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar instalação sem modificar o sistema.
     
     
-      
+      
       &Next
       &Próximo
     
     
-      
+      
       &Back
       &Voltar
     
     
-      
+      
       &Done
       &Concluído
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       Cancelar a configuração?
     
     
-      
+      
       Cancel installation?
       Cancelar a instalação?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Você realmente quer cancelar o processo atual de configuração?
 O programa de configuração será fechado e todas as mudanças serão perdidas.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Você deseja realmente cancelar a instalação atual?
@@ -829,22 +827,22 @@ O instalador será fechado e todas as alterações serão perdidas.Este programa irá fazer-lhe algumas perguntas e configurar %2 no computador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Bem-vindo ao programa de configuração Calamares para %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Bem-vindo à configuração de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Bem-vindo ao instalador Calamares para %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Bem-vindo ao instalador de %1</h1>
     
@@ -1709,17 +1707,17 @@ O instalador será fechado e todas as alterações serão perdidas.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole não instalado
     
     
-      
+      
       Please install KDE Konsole and try again!
       Por favor, instale o Konsole do KDE e tente novamente!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Executando script: &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ O instalador será fechado e todas as alterações serão perdidas.<h1>Contrato de Licença</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Aceito os termos e condições acima.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Revise o contrato de licença de usuário final (EULAs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Este procedimento de configuração irá instalar software proprietário que está sujeito aos termos de licença.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Se não concordar com os termos, o procedimento de configuração não poderá continuar.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Este procedimento de configuração pode instalar software proprietário sujeito a termos de licenciamento para fornecer recursos adicionais e aprimorar a experiência do usuário.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Se você não concordar com os termos, o software proprietário não será instalado e serão utilizadas as alternativas de código aberto.
     
@@ -2780,92 +2778,92 @@ O instalador será fechado e todas as alterações serão perdidas.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Coletando informações do sistema...
     
     
-      
+      
       Partitions
       Partições
     
     
-      
+      
       Current:
       Atualmente:
     
     
-      
+      
       After:
       Depois:
     
     
-      
+      
       No EFI system partition configured
       Nenhuma partição de sistema EFI configurada
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Opção para usar GPT no BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Uma tabela de partições GPT é a melhor opção para todos os sistemas. Este instalador suporta tal configuração para sistemas BIOS também.<br/><br/>Para configurar uma tabela de partições GPT no BIOS, (caso não tenha sido feito ainda) volte e defina a tabela de partições como GPT, depois crie uma partição sem formatação de 8 MB com o marcador <strong>bios_grub</strong> ativado.<br/><br/>Uma partição não formatada de 8 MB é necessária para iniciar %1 num sistema BIOS com o GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partição de inicialização não criptografada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Uma partição de inicialização separada foi configurada juntamente com uma partição raiz criptografada, mas a partição de inicialização não é criptografada.<br/><br/>Há preocupações de segurança quanto a esse tipo de configuração, porque arquivos de sistema importantes são mantidos em uma partição não criptografada.<br/>Você pode continuar se quiser, mas o desbloqueio do sistema de arquivos acontecerá mais tarde durante a inicialização do sistema.<br/>Para criptografar a partição de inicialização, volte e recrie-a, selecionando <strong>Criptografar</strong>  na janela de criação da partição.
     
     
-      
+      
       has at least one disk device available.
       tem pelo menos um dispositivo de disco disponível.
     
     
-      
+      
       There are no partitions to install on.
       Não há partições para instalar.
     
@@ -3000,7 +2998,7 @@ Saída:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3627,25 +3625,53 @@ Saída:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Sim
+    
+    
+      
+      &No
+      &Não
+    
+    
+      
+      &Cancel
+      &Cancelar
+    
+    
+      
+      &Close
+      &Fechar
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Feedback da instalação
     
     
-      
+      
       Sending installation feedback.
       Enviando feedback da instalação.
     
     
-      
+      
       Internal error in install-tracking.
       Erro interno no install-tracking.
     
     
-      
+      
       HTTP request timed out.
       A solicitação HTTP expirou.
     
@@ -3653,28 +3679,28 @@ Saída:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Feedback de usuário KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Configurando feedback de usuário KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Erro na configuração do feedback de usuário KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Não foi possível configurar o feedback de usuário KDE corretamente, erro de script %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Não foi possível configurar o feedback de usuário KDE corretamente, erro do Calamares %1.
     
@@ -3682,28 +3708,28 @@ Saída:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Feedback da máquina
     
     
-      
+      
       Configuring machine feedback.
       Configurando feedback da máquina.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Erro na configuração de feedback da máquina.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Não foi possível configurar o feedback da máquina corretamente, erro de script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Não foi possível configurar o feedback da máquina corretamente, erro do Calamares %1.
     
@@ -4071,45 +4097,30 @@ Saída:
   
     keyboardq
     
-      
-      Keyboard Model
-      Modelo de Teclado
-    
-    
-      
-      Layouts
-      Layouts
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Layout do Teclado
+      
+      Keyboard Model:
+      Modelo de teclado:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Clique no seu modelo de teclado preferido para selecionar o layout e a variante, ou use o padrão baseado no hardware detectado.
+      
+      Layouts
+      Layouts
     
     
-      
-      Models
-      Modelos
+      
+      Type here to test your keyboard
+      Escreva aqui para testar o seu teclado
     
     
-      
+      
       Variants
       Variantes
     
-    
-      
-      Keyboard Variant
-      Variante do Teclado
-    
-    
-      
-      Test your keyboard
-      Teste seu teclado
-    
   
   
     localeq
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index d2b2bb3338..624f569691 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Concluído
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Falha de Instalação
     
     
-      
+      
       Installation Failed
       Falha na Instalação
     
     
-      
+      
       Would you like to paste the install log to the web?
       Deseja colar o registo de instalação na Web?
     
     
-      
+      
       Error
       Erro
     
     
-      
-      
+      
       &Yes
       &Sim
     
     
-      
-      
+      
       &No
       &Não
     
     
-      
+      
       &Close
       &Fechar
     
     
-      
+      
       Install Log Paste URL
       Instalar o Registo Colar URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       O carregamento não teve êxito. Nenhuma pasta da web foi feita.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Ligação copiada para a área de transferência
     
     
-      
+      
       Calamares Initialization Failed
       Falha na Inicialização do Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 não pode ser instalado. O Calamares não foi capaz de carregar todos os módulos configurados. Isto é um problema da maneira como o Calamares é usado pela distribuição.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Os módulos seguintes não puderam ser carregados:
     
     
-      
+      
       Continue with setup?
       Continuar com a configuração?
     
     
-      
+      
       Continue with installation?
       Continuar com a instalação?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       O programa de instalação %1 está prestes a fazer alterações no seu disco para configurar o %2.<br/><strong>Você não poderá desfazer essas alterações.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       O %1 instalador está prestes a fazer alterações ao seu disco em ordem para instalar %2.<br/><strong>Não será capaz de desfazer estas alterações.</strong>
     
     
-      
+      
       &Set up now
       &Instalar agora
     
     
-      
+      
       &Install now
       &Instalar agora
     
     
-      
+      
       Go &back
       Voltar &atrás
     
     
-      
+      
       &Set up
       &Instalar
     
     
-      
+      
       &Install
       &Instalar
     
     
-      
+      
       Setup is complete. Close the setup program.
       Instalação completa. Feche o programa de instalação.
     
     
-      
+      
       The installation is complete. Close the installer.
       A instalação está completa. Feche o instalador.
     
     
-      
+      
       Cancel setup without changing the system.
       Cancelar instalação sem alterar o sistema.
     
     
-      
+      
       Cancel installation without changing the system.
       Cancelar instalar instalação sem modificar o sistema.
     
     
-      
+      
       &Next
       &Próximo
     
     
-      
+      
       &Back
       &Voltar
     
     
-      
+      
       &Done
       &Feito
     
     
-      
+      
       &Cancel
       &Cancelar
     
     
-      
+      
       Cancel setup?
       Cancelar instalação?
     
     
-      
+      
       Cancel installation?
       Cancelar a instalação?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Quer mesmo cancelar o processo de instalação atual?
 O programa de instalação irá fechar todas as alterações serão perdidas.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Tem a certeza que pretende cancelar o atual processo de instalação?
@@ -829,22 +827,22 @@ O instalador será encerrado e todas as alterações serão perdidas.Este programa vai fazer-lhe algumas perguntas e configurar o %2 no seu computador.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Bem-vindo ao programa de configuração do Calamares para %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Bem-vindo à configuração de %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Bem-vindo ao instalador do Calamares para %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Bem-vindo ao instalador do %1</h1>
     
@@ -1709,17 +1707,17 @@ O instalador será encerrado e todas as alterações serão perdidas.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole não instalado
     
     
-      
+      
       Please install KDE Konsole and try again!
       Por favor instale a consola KDE e tente novamente!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       A executar script: &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ O instalador será encerrado e todas as alterações serão perdidas.<h1>Acordo de Licença</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Aceito os termos e condições acima descritos.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Reveja o contrato de licença de utilizador final (EULAs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Este procedimento de configuração irá instalar software proprietário que está sujeito aos termos de licença.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Se não concordar com os termos, o procedimento de configuração não poderá continuar.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Este procedimento de configuração pode instalar software proprietário sujeito a termos de licenciamento para fornecer recursos adicionais e aprimorar a experiência do utilizador.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Se não concordar com os termos, o software proprietário não será instalado e serão utilizadas as alternativas de código aberto.
     
@@ -2780,92 +2778,92 @@ O instalador será encerrado e todas as alterações serão perdidas.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       A recolher informações do sistema...
     
     
-      
+      
       Partitions
       Partições
     
     
-      
+      
       Current:
       Atual:
     
     
-      
+      
       After:
       Depois:
     
     
-      
+      
       No EFI system partition configured
       Nenhuma partição de sistema EFI configurada
     
     
-      
+      
       EFI system partition configured incorrectly
       Partição de sistema EFI configurada incorretamente
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       Uma partição de sistema EFI é necessária para iniciar o %1. <br/><br/>Para configurar uma partição de sistema EFI, volte atrás e selecione ou crie um sistema de ficheiros adequado.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       O sistema de ficheiros deve ser montado em <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
       O sistema de ficheiros deve ter o tipo FAT32.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Opção para utilizar GPT no BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Uma tabela de partições GPT é a melhor opção para todos os sistemas. Este instalador suporta tal configuração para sistemas BIOS também.<br/><br/>Para configurar uma tabela de partições GPT no BIOS, (caso não tenha sido feito ainda) volte atrás e defina a tabela de partições como GPT, depois crie uma partição sem formatação de 8 MB com o marcador <strong>bios_grub</strong> ativado.<br/><br/>Uma partição não formatada de 8 MB é necessária para iniciar %1 num sistema BIOS com o GPT.
     
     
-      
+      
       Boot partition not encrypted
       Partição de arranque não encriptada
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Foi preparada uma partição de arranque separada juntamente com uma partição root encriptada, mas a partição de arranque não está encriptada.<br/><br/>Existem preocupações de segurança com este tipo de configuração, por causa de importantes ficheiros de sistema serem guardados numa partição não encriptada.<br/>Se desejar pode continuar, mas o destrancar do sistema de ficheiros irá ocorrer mais tarde durante o arranque do sistema.<br/>Para encriptar a partição de arranque, volte atrás e recrie-a, e selecione <strong>Encriptar</strong> na janela de criação de partições.
     
     
-      
+      
       has at least one disk device available.
       tem pelo menos um dispositivo de disco disponível.
     
     
-      
+      
       There are no partitions to install on.
       Não há partições para instalar.
     
@@ -3000,7 +2998,7 @@ Saída de Dados:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3627,25 +3625,53 @@ Saída de Dados:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Sim
+    
+    
+      
+      &No
+      &Não
+    
+    
+      
+      &Cancel
+      &Cancelar
+    
+    
+      
+      &Close
+      &Fechar
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Relatório da Instalação
     
     
-      
+      
       Sending installation feedback.
       A enviar relatório da instalação.
     
     
-      
+      
       Internal error in install-tracking.
       Erro interno no rastreio da instalação.
     
     
-      
+      
       HTTP request timed out.
       Expirou o tempo para o pedido de HTTP.
     
@@ -3653,28 +3679,28 @@ Saída de Dados:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Feedback de utilizador KDE
     
     
-      
+      
       Configuring KDE user feedback.
       A configurar feedback de utilizador KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Erro na configuração do feedback de utilizador KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Não foi possível configurar o feedback de utilizador KDE corretamente, erro de script %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Não foi possível configurar o feedback de utilizadoro KDE corretamente, erro do Calamares %1.
     
@@ -3682,28 +3708,28 @@ Saída de Dados:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Relatório da máquina
     
     
-      
+      
       Configuring machine feedback.
       A configurar relatório da máquina.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Erro na configuração do relatório da máquina.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Não foi possível configurar corretamente o relatório da máquina, erro de script %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Não foi possível configurar corretamente o relatório da máquina, erro do Calamares %1.
     
@@ -4071,45 +4097,30 @@ Saída de Dados:
   
     keyboardq
     
-      
-      Keyboard Model
-      Modelo de teclado
-    
-    
-      
-      Layouts
-      Disposições
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Disposição do teclado
+      
+      Keyboard Model:
+      Modelo do Teclado:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Clique no seu modelo de teclado preferido para selecionar a disposição e a variante, ou utilize o padrão baseado no hardware detectado.
+      
+      Layouts
+      Disposições
     
     
-      
-      Models
-      Modelos
+      
+      Type here to test your keyboard
+      Escreva aqui para testar a configuração do teclado
     
     
-      
+      
       Variants
       Variantes
     
-    
-      
-      Keyboard Variant
-      Variante do teclado
-    
-    
-      
-      Test your keyboard
-      Teste o seu teclado
-    
   
   
     localeq
diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts
index 42109ffb81..a424b5d854 100644
--- a/lang/calamares_ro.ts
+++ b/lang/calamares_ro.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Gata
     
@@ -287,54 +287,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Instalare eșuată
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Eroare
     
     
-      
-      
+      
       &Yes
       &Da
     
     
-      
-      
+      
       &No
       &Nu
     
     
-      
+      
       &Close
       În&chide
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Continuați configurarea?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Programul de instalare %1 este pregătit să facă schimbări pe discul dumneavoastră pentru a instala %2.<br/><strong>Nu veți putea anula aceste schimbări.</strong>
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Instalează acum
     
     
-      
+      
       Go &back
       Î&napoi
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       Instalează
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalarea este completă. Închide instalatorul.
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       Anulează instalarea fără schimbarea sistemului.
     
     
-      
+      
       &Next
       &Următorul
     
     
-      
+      
       &Back
       &Înapoi
     
     
-      
+      
       &Done
       &Gata
     
     
-      
+      
       &Cancel
       &Anulează
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Anulez instalarea?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Doriți să anulați procesul curent de instalare?
@@ -826,22 +824,22 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.Acest program vă va pune mai multe întrebări și va seta %2 pe calculatorul dumneavoastră.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1706,17 +1704,17 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole nu este instalat
     
     
-      
+      
       Please install KDE Konsole and try again!
       Trebuie să instalezi KDE Konsole și să încerci din nou!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Se execută scriptul: &nbsp;<code>%1</code>
     
@@ -1781,32 +1779,32 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     
     
-      
+      
       I accept the terms and conditions above.
       Sunt de acord cu termenii și condițiile de mai sus.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2787,92 +2785,92 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute.
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Se adună informații despre sistem...
     
     
-      
+      
       Partitions
       Partiții
     
     
-      
+      
       Current:
       Actual:
     
     
-      
+      
       After:
       După:
     
     
-      
+      
       No EFI system partition configured
       Nicio partiție de sistem EFI nu a fost configurată
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       Partiția de boot nu este criptată
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       A fost creată o partiție de boot împreună cu o partiție root criptată, dar partiția de boot nu este criptată.<br/><br/>Sunt potențiale probleme de securitate cu un astfel de aranjament deoarece importante fișiere de sistem sunt păstrate pe o partiție necriptată.<br/>Puteți continua dacă doriți, dar descuierea sistemului se va petrece mai târziu în timpul pornirii.<br/>Pentru a cripta partiția de boot, reveniți și recreați-o, alegând opțiunea <strong>Criptează</strong> din fereastra de creare de partiții.
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3007,7 +3005,7 @@ Output
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3631,25 +3629,53 @@ Output
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      %Ok
+    
+    
+      
+      &Yes
+      &Da
+    
+    
+      
+      &No
+      &Nu
+    
+    
+      
+      &Cancel
+      &Anulează
+    
+    
+      
+      &Close
+      În&chide
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Feedback pentru instalare
     
     
-      
+      
       Sending installation feedback.
       Trimite feedback pentru instalare
     
     
-      
+      
       Internal error in install-tracking.
       Eroare internă în gestionarea instalării.
     
     
-      
+      
       HTTP request timed out.
       Requestul HTTP a atins time out.
     
@@ -3657,28 +3683,28 @@ Output
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3686,28 +3712,28 @@ Output
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Feedback pentru mașină
     
     
-      
+      
       Configuring machine feedback.
       Se configurează feedback-ul pentru mașină
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Eroare în configurația de feedback pentru mașină.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Nu s-a putut configura feedback-ul pentru mașină în mod corect, eroare de script %1
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Nu s-a putut configura feedback-ul pentru mașină în mod corect, eroare Calamares %1.
     
@@ -4059,44 +4085,29 @@ Output
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Modelul tastaturii:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Tastați aici pentru a testa tastatura
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts
index f94a148162..d137ed6840 100644
--- a/lang/calamares_ru.ts
+++ b/lang/calamares_ru.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Готово
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Сбой установки
     
     
-      
+      
       Installation Failed
       Установка завершилась неудачей
     
     
-      
+      
       Would you like to paste the install log to the web?
       Разместить журнал установки в интернете?
     
     
-      
+      
       Error
       Ошибка
     
     
-      
-      
+      
       &Yes
       &Да
     
     
-      
-      
+      
       &No
       &Нет
     
     
-      
+      
       &Close
       &Закрыть
     
     
-      
+      
       Install Log Paste URL
       Адрес для отправки журнала установки
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Загрузка не удалась. Веб-вставка не была завершена.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Ошибка инициализации Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Не удалось установить %1. Calamares не удалось загрузить все сконфигурированные модули. Эта проблема вызвана тем, как ваш дистрибутив использует Calamares.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Не удалось загрузить следующие модули:
     
     
-      
+      
       Continue with setup?
       Продолжить установку?
     
     
-      
+      
       Continue with installation?
       Продолжить установку?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Программа установки %1 готова внести изменения на Ваш диск, чтобы установить %2.<br/><strong>Отменить эти изменения будет невозможно.</strong>
     
     
-      
+      
       &Set up now
       &Настроить сейчас
     
     
-      
+      
       &Install now
       Приступить к &установке
     
     
-      
+      
       Go &back
       &Назад
     
     
-      
+      
       &Set up
       &Настроить
     
     
-      
+      
       &Install
       &Установить
     
     
-      
+      
       Setup is complete. Close the setup program.
       Установка завершена. Закройте программу установки.
     
     
-      
+      
       The installation is complete. Close the installer.
       Установка завершена. Закройте установщик.
     
     
-      
+      
       Cancel setup without changing the system.
       Отменить установку без изменения системы.
     
     
-      
+      
       Cancel installation without changing the system.
       Отменить установку без изменения системы.
     
     
-      
+      
       &Next
       &Далее
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       &Готово
     
     
-      
+      
       &Cancel
       О&тмена
     
     
-      
+      
       Cancel setup?
       Отменить установку?
     
     
-      
+      
       Cancel installation?
       Отменить установку?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Прервать процесс установки?
 Программа установки прекратит работу и все изменения будут потеряны.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Действительно прервать процесс установки? Программа установки сразу прекратит работу, все изменения будут потеряны.
@@ -828,22 +826,22 @@ The installer will quit and all changes will be lost.
       Эта программа задаст вам несколько вопросов и поможет установить %2 на ваш компьютер.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Добро пожаловать в программу установки Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Добро пожаловать в программу установки %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Добро пожаловать в программу установки Calamares для %1 .</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Добро пожаловать в программу установки %1 .</h1>
     
@@ -1708,17 +1706,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Программа Konsole не установлена
     
     
-      
+      
       Please install KDE Konsole and try again!
       Установите KDE Konsole и попробуйте ещё раз!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Выполняется сценарий: &nbsp;<code>%1</code>
     
@@ -1783,32 +1781,32 @@ The installer will quit and all changes will be lost.
       <h1>Лицензионное соглашение</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Я принимаю приведенные выше условия.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Пожалуйста, ознакомьтесь с лицензионным соглашением (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       В ходе этой процедуры установки будет установлено проприетарное программное обеспечение, на которое распространяются условия лицензирования.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       если вы не согласны с условиями, процедура установки не может быть продолжена.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Эта процедура установки может установить проприетарное программное обеспечение, на которое распространяются условия лицензирования, чтобы предоставить дополнительные функции и улучшить взаимодействие с пользователем.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Если вы не согласны с условиями, проприетарное программное обеспечение не будет установлено, и вместо него будут использованы альтернативы с открытым исходным кодом.
     
@@ -2795,92 +2793,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Сбор информации о системе...
     
     
-      
+      
       Partitions
       Разделы
     
     
-      
+      
       Current:
       Текущий:
     
     
-      
+      
       After:
       После:
     
     
-      
+      
       No EFI system partition configured
       Нет настроенного системного раздела EFI
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Возможность для использования GPT в BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Таблица разделов GPT - наилучший вариант для всех систем. Этот установщик позволяет использовать таблицу разделов GPT для систем с BIOS. <br/> <br/> Чтобы установить таблицу разделов как GPT (если это еще не сделано) вернитесь назад и создайте таблицу разделов GPT, затем создайте 8 МБ Не форматированный раздел с включенным флагом <strong> bios-grub</strong> </ strong>. <br/> <br/> Не форматированный раздел в 8 МБ необходим для запуска %1 на системе с BIOS и таблицей разделов GPT.
     
     
-      
+      
       Boot partition not encrypted
       Загрузочный раздел не зашифрован
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Включено шифрование корневого раздела, но использован отдельный загрузочный раздел без шифрования.<br/><br/>При такой конфигурации возникают проблемы с безопасностью, потому что важные системные файлы хранятся на разделе без шифрования.<br/>Если хотите, можете продолжить, но файловая система будет разблокирована позднее во время загрузки системы.<br/>Чтобы включить шифрование загрузочного раздела, вернитесь назад и снова создайте его, отметив <strong>Шифровать</strong> в окне создания раздела.
     
     
-      
+      
       has at least one disk device available.
       имеет как минимум одно доступное дисковое устройство.
     
     
-      
+      
       There are no partitions to install on.
       Нет разделов для установки.
     
@@ -3015,7 +3013,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3640,25 +3638,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &ОК
+    
+    
+      
+      &Yes
+      &Да
+    
+    
+      
+      &No
+      &Нет
+    
+    
+      
+      &Cancel
+      &Отмена
+    
+    
+      
+      &Close
+      &Закрыть
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Отчёт об установке
     
     
-      
+      
       Sending installation feedback.
       Отправка отчёта об установке.
     
     
-      
+      
       Internal error in install-tracking.
       Внутренняя ошибка в install-tracking.
     
     
-      
+      
       HTTP request timed out.
       Тайм-аут запроса HTTP.
     
@@ -3666,28 +3692,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Отзывы пользователей KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Настройка обратной связи KDE
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Ошибка в настройке обратной связи KDE
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3695,28 +3721,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Не удалось настроить отзывы о компьютере, ошибка сценария %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Не удалось настроить отзывы о компьютере, ошибка Calamares %1.
     
@@ -4069,45 +4095,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Модель клавиатуры
-    
-    
-      
-      Layouts
-      Раскладки
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Раскладка клавиатуры
+      
+      Keyboard Model:
+      Тип клавиатуры:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Выберете предпочитаемую модель клавиатуры, чтобы выбрать раскладку и вариант, или используйте модель по умолчанию в зависимости от обнаруженного оборудования.
+      
+      Layouts
+      Раскладки
     
     
-      
-      Models
-      Модели
+      
+      Type here to test your keyboard
+      Эта область - для тестирования клавиатуры
     
     
-      
+      
       Variants
       Варианты
     
-    
-      
-      Keyboard Variant
-      Вариант клавиатуры
-    
-    
-      
-      Test your keyboard
-      Проверьте свою клавиатуру
-    
   
   
     localeq
diff --git a/lang/calamares_ru_RU.ts b/lang/calamares_ru_RU.ts
index f556cdf737..fbd17a1822 100644
--- a/lang/calamares_ru_RU.ts
+++ b/lang/calamares_ru_RU.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +343,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -827,22 +825,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1707,17 +1705,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1782,32 +1780,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2794,92 +2792,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3011,7 +3009,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3635,25 +3633,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3661,28 +3687,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3690,28 +3716,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4063,44 +4089,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_si.ts b/lang/calamares_si.ts
index 2858bcbd2c..13c382c2ae 100644
--- a/lang/calamares_si.ts
+++ b/lang/calamares_si.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       ඔව් (Y)
     
     
-      
-      
+      
       &No
       නැහැ (N)
     
     
-      
+      
       &Close
       වසන්න (C)
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       ආපසු යන්න
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       ආපසු (B)
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       ස්ථාපනය අවලංගු කරනවාද?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       වත්මන්:
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      ඔව් (Y)
+    
+    
+      
+      &No
+      නැහැ (N)
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      වසන්න (C)
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,44 +4067,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index 6c074662e4..916912ca12 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Hotovo
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Inštalácia zlyhala
     
     
-      
+      
       Installation Failed
       Inštalácia zlyhala
     
     
-      
+      
       Would you like to paste the install log to the web?
       Chceli by ste vložiť záznam z inštalácie na web?
     
     
-      
+      
       Error
       Chyba
     
     
-      
-      
+      
       &Yes
       Án&o
     
     
-      
-      
+      
       &No
       &Nie
     
     
-      
+      
       &Close
       &Zavrieť
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Odovzdanie nebolo úspešné. Nebolo dokončené žiadne webové vloženie.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Zlyhala inicializácia inštalátora Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       Nie je možné nainštalovať %1. Calamares nemohol načítať všetky konfigurované moduly. Je problém s tým, ako sa Calamares používa pri distribúcii.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Nebolo možné načítať nasledujúce moduly
     
     
-      
+      
       Continue with setup?
       Pokračovať v inštalácii?
     
     
-      
+      
       Continue with installation?
       Pokračovať v inštalácii?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Inštalačný program distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Inštalátor distribúcie %1 sa chystá vykonať zmeny na vašom disku, aby nainštaloval distribúciu %2. <br/><strong>Tieto zmeny nebudete môcť vrátiť späť.</strong>
     
     
-      
+      
       &Set up now
       &Inštalovať teraz
     
     
-      
+      
       &Install now
       &Inštalovať teraz
     
     
-      
+      
       Go &back
       Prejsť s&päť
     
     
-      
+      
       &Set up
       &Inštalovať
     
     
-      
+      
       &Install
       &Inštalovať
     
     
-      
+      
       Setup is complete. Close the setup program.
       Inštalácia je dokončená. Zavrite inštalačný program.
     
     
-      
+      
       The installation is complete. Close the installer.
       Inštalácia je dokončená. Zatvorí inštalátor.
     
     
-      
+      
       Cancel setup without changing the system.
       Zrušenie inštalácie bez zmien v systéme.
     
     
-      
+      
       Cancel installation without changing the system.
       Zruší inštaláciu bez zmeny systému.
     
     
-      
+      
       &Next
       Ď&alej
     
     
-      
+      
       &Back
       &Späť
     
     
-      
+      
       &Done
       &Dokončiť
     
     
-      
+      
       &Cancel
       &Zrušiť
     
     
-      
+      
       Cancel setup?
       Zrušiť inštaláciu?
     
     
-      
+      
       Cancel installation?
       Zrušiť inštaláciu?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Naozaj chcete zrušiť aktuálny priebeh inštalácie?
 Inštalačný program bude ukončený a zmeny budú stratené.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Skutočne chcete zrušiť aktuálny priebeh inštalácie?
@@ -830,22 +828,22 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       Tento program vám položí niekoľko otázok a nainštaluje distribúciu %2 do vášho počítača.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Vitajte v inštalačnom programe Calamares pre distribúciu %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Vitajte pri inštalácii distribúcie %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Vitajte v aplikácii Calamares, inštalátore distribúcie %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Vitajte v inštalátore distribúcie %1</h1>
     
@@ -1710,17 +1708,17 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Aplikácia Konsole nie je nainštalovaná
     
     
-      
+      
       Please install KDE Konsole and try again!
       Prosím, nainštalujte Konzolu prostredia KDE a skúste to znovu!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Spúšťa sa skript: &nbsp;<code>%1</code>
     
@@ -1785,32 +1783,32 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
       <h1>Licenčné podmienky</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Prijímam podmienky vyššie.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Prosím, prezrite si licenčné podmienky koncového používateľa (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Touto inštalačnou procedúrou sa nainštaluje uzavretý softvér, ktorý je predmetom licenčných podmienok.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Bez súhlasu podmienok nemôže inštalačná procedúra pokračovať.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Tento proces inštalácie môže nainštalovať uzavretý softvér, ktorý je predmetom licenčných podmienok v rámci poskytovania dodatočných funkcií a vylepšenia používateľských skúseností.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Ak nesúhlasíte s podmienkami, uzavretý softvér nebude nainštalovaný a namiesto neho budú použité alternatívy s otvoreným zdrojom.
     
@@ -2798,92 +2796,92 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Zbierajú sa informácie o počítači...
     
     
-      
+      
       Partitions
       Oddiely
     
     
-      
+      
       Current:
       Teraz:
     
     
-      
+      
       After:
       Potom:
     
     
-      
+      
       No EFI system partition configured
       Nie je nastavený žiadny oddiel systému EFI
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Voľba na použitie tabuľky GPT s BIOSom
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Tabuľka oddielov GPT je najlepšou voľbou pre všetky systémy. Inštalátor podporuje taktiež inštaláciu pre systémy s BIOSom.<br/><br/>Pre nastavenie tabuľky oddielov GPT s BIOSom, (ak ste tak už neučinili) prejdite späť a nastavte tabuľku oddielov na GPT, a potom vytvorte nenaformátovaný oddiel o veľkosti 8 MB s povoleným príznakom <strong>bios_grub</strong>.<br/><br/>Nenaformátovaný oddiel o veľkosti 8 MB je potrebný na spustenie distribúcie %1 na systéme s BIOSom a tabuľkou GPT.
     
     
-      
+      
       Boot partition not encrypted
       Zavádzací oddiel nie je zašifrovaný
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Spolu so zašifrovaným koreňovým oddielom bol nainštalovaný oddelený zavádzací oddiel, ktorý ale nie je zašifrovaný.<br/><br/>S týmto typom inštalácie je ohrozená bezpečnosť, pretože dôležité systémové súbory sú uchovávané na nezašifrovanom oddieli.<br/>Ak si to želáte, môžete pokračovať, ale neskôr, počas spúšťania systému sa vykoná odomknutie systému súborov.<br/>Na zašifrovanie zavádzacieho oddielu prejdite späť a vytvorte ju znovu vybraním voľby <strong>Zašifrovať</strong> v okne vytvárania oddielu.
     
     
-      
+      
       has at least one disk device available.
       má dostupné aspoň jedno diskové zariadenie.
     
     
-      
+      
       There are no partitions to install on.
       Neexistujú žiadne oddiely, na ktoré je možné vykonať inštaláciu.
     
@@ -3018,7 +3016,7 @@ Výstup:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3645,25 +3643,53 @@ Výstup:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      Án&o
+    
+    
+      
+      &No
+      &Nie
+    
+    
+      
+      &Cancel
+      &Zrušiť
+    
+    
+      
+      &Close
+      &Zavrieť
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Spätná väzba inštalácie
     
     
-      
+      
       Sending installation feedback.
       Odosiela sa spätná väzba inštalácie.
     
     
-      
+      
       Internal error in install-tracking.
       Interná chyba príkazu install-tracking.
     
     
-      
+      
       HTTP request timed out.
       Požiadavka HTTP vypršala.
     
@@ -3671,28 +3697,28 @@ Výstup:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Používateľská spätná väzba prostredia KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Nastavuje sa používateľská spätná väzba prostredia KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Chyba pri nastavovaní používateľskej spätnej väzby prostredia KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Nepodarilo sa správne nastaviť používateľskú spätnú väzbu prostredia KDE. Chyba %1 skriptu.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Nepodarilo sa správne nastaviť používateľskú spätnú väzbu prostredia KDE. Chyba %1 inštalátora Calamares.
     
@@ -3700,28 +3726,28 @@ Výstup:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Spätná väzba počítača
     
     
-      
+      
       Configuring machine feedback.
       Nastavuje sa spätná väzba počítača.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Chyba pri nastavovaní spätnej väzby počítača.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Nepodarilo sa správne nastaviť spätnú väzbu počítača. Chyba skriptu %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Nepodarilo sa správne nastaviť spätnú väzbu počítača. Chyba inštalátora Calamares %1.
     
@@ -4087,45 +4113,30 @@ Výstup:
   
     keyboardq
     
-      
-      Keyboard Model
-      Model klávesnice
-    
-    
-      
-      Layouts
-      Rozloženia
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Rozloženie klávesnice
+      
+      Keyboard Model:
+      Model klávesnice:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Kliknutím na preferovaný model klávesnice vyberiete rozloženie, alebo použite predvolený, ktorý bol vybraný podľa rozpoznaného hardvéru.
+      
+      Layouts
+      Rozloženia
     
     
-      
-      Models
-      Modely
+      
+      Type here to test your keyboard
+      Tu môžete písať na odskúšanie vašej klávesnice
     
     
-      
+      
       Variants
       Varianty
     
-    
-      
-      Keyboard Variant
-      Varianta klávesnice
-    
-    
-      
-      Test your keyboard
-      Vyskúšajte vašu klávesnicu
-    
   
   
     localeq
diff --git a/lang/calamares_sl.ts b/lang/calamares_sl.ts
index a22f9b56ee..c762ddcc75 100644
--- a/lang/calamares_sl.ts
+++ b/lang/calamares_sl.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Končano
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Namestitev je spodletela
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Napaka
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +343,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Naprej
     
     
-      
+      
       &Back
       &Nazaj
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Preklic namestitve?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Ali res želite preklicati trenutni namestitveni proces?
@@ -828,22 +826,22 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1708,17 +1706,17 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1783,32 +1781,32 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2795,92 +2793,92 @@ Namestilni program se bo končal in vse spremembe bodo izgubljene.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Zbiranje informacij o sistemu ...
     
     
-      
+      
       Partitions
       Razdelki
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       Potem:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3012,7 +3010,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3636,25 +3634,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3662,28 +3688,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3691,28 +3717,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4064,44 +4090,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Model tipkovnice:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Tipkajte tukaj za testiranje tipkovnice
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_sq.ts b/lang/calamares_sq.ts
index 815017f67c..f2b5e2f51d 100644
--- a/lang/calamares_sq.ts
+++ b/lang/calamares_sq.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       U bë
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Rregullimi Dështoi
     
     
-      
+      
       Installation Failed
       Instalimi Dështoi
     
     
-      
+      
       Would you like to paste the install log to the web?
       Do të donit të hidhet në web regjistri i instalimit?
     
     
-      
+      
       Error
       Gabim
     
     
-      
-      
+      
       &Yes
       &Po
     
     
-      
-      
+      
       &No
       &Jo
     
     
-      
+      
       &Close
       &Mbylle
     
     
-      
+      
       Install Log Paste URL
       URL Ngjitjeje Regjistri Instalimi
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Ngarkimi s’qe i suksesshëm. S’u bë hedhje në web.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 Lidhja u kopjua në të papastër
     
     
-      
+      
       Calamares Initialization Failed
       Gatitja e Calamares-it Dështoi
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 s’mund të instalohet. Calamares s’qe në gjendje të ngarkonte krejt modulet e formësuar. Ky është një problem që lidhet me mënyrën se si përdoret Calamares nga shpërndarja.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>S’u ngarkuan dot modulet vijues:
     
     
-      
+      
       Continue with setup?
       Të vazhdohet me rregullimin?
     
     
-      
+      
       Continue with installation?
       Të vazhdohet me instalimin?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Programi i rregullimit %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të rregullojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Instaluesi %1 është një hap larg nga bërja e ndryshimeve në diskun tuaj, që të mund të instalojë %2.<br/><strong>S’do të jeni në gjendje t’i zhbëni këto ndryshime.</strong>
     
     
-      
+      
       &Set up now
       &Rregulloje tani
     
     
-      
+      
       &Install now
       &Instaloje tani
     
     
-      
+      
       Go &back
       Kthehu &mbrapsht
     
     
-      
+      
       &Set up
       &Rregulloje
     
     
-      
+      
       &Install
       &Instaloje
     
     
-      
+      
       Setup is complete. Close the setup program.
       Rregullimi është i plotë. Mbylleni programin e rregullimit.
     
     
-      
+      
       The installation is complete. Close the installer.
       Instalimi u plotësua. Mbylleni instaluesin.
     
     
-      
+      
       Cancel setup without changing the system.
       Anuloje rregullimin pa ndryshuar sistemin.
     
     
-      
+      
       Cancel installation without changing the system.
       Anuloje instalimin pa ndryshuar sistemin.
     
     
-      
+      
       &Next
       Pas&uesi
     
     
-      
+      
       &Back
       &Mbrapsht
     
     
-      
+      
       &Done
       &U bë
     
     
-      
+      
       &Cancel
       &Anuloje
     
     
-      
+      
       Cancel setup?
       Të anulohet rregullimi?
     
     
-      
+      
       Cancel installation?
       Të anulohet instalimi?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Doni vërtet të anulohet procesi i tanishëm i rregullimit?
 Programi i rregullimit do të mbyllet dhe krejt ndryshimet do të humbin.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Doni vërtet të anulohet procesi i tanishëm i instalimit?
@@ -829,22 +827,22 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       Ky program do t’ju bëjë disa pyetje dhe do të rregullojë %2 në kompjuterin tuaj.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Mirë se vini te programi i ujdisjes së Calamares për</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Mirë se vini te udjisja e %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Mirë se vini te instaluesi Calamares për %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Mirë se vini te instaluesi i %1</h1>
     
@@ -1709,17 +1707,17 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsol e painstaluar
     
     
-      
+      
       Please install KDE Konsole and try again!
       Ju lutemi, instaloni KDE Konsole dhe riprovoni!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Po përmbushet programthi: &nbsp;<code>%1</code>
     
@@ -1784,32 +1782,32 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
       <h1>Marrëveshje Licence</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       I pranoj termat dhe kushtet më sipër.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Ju lutemi, shqyrtoni Marrëveshjet e Licencave për Përdorues të Thjeshtë (EULAs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Kjo procedurë ujdisjeje do të instalojë software pronësor që është subjekt kushtesh licencimi.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Nëse nuk pajtoheni me kushtet, procedura e ujdisjes s’do të vazhdojë.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Që të furnizojë veçori shtesë dhe të përmirësojë punën e përdoruesit, kjo procedurë ujdisjeje mundet të instalojë software pronësor që është subjekt kushtesh licencimi.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Nëse nuk pajtohemi me kushtet, nuk do të instalohet software pronësor, dhe në vend të tij do të përdoren alternativa nga burimi i hapët.
     
@@ -2778,92 +2776,92 @@ Instaluesi do të mbyllet dhe krejt ndryshimet do të hidhen tej.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Po grumbullohen të dhëna mbi sistemin…
     
     
-      
+      
       Partitions
       Pjesë
     
     
-      
+      
       Current:
       E tanishmja:
     
     
-      
+      
       After:
       Më Pas:
     
     
-      
+      
       No EFI system partition configured
       S’ka të formësuar pjesë sistemi EFI
     
     
-      
+      
       EFI system partition configured incorrectly
       Pjesë EFI sistemi e formësuar pasaktësisht
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       Që të niset %1, është e nevojshme një pjesë EFI sistemi.<br/><br/>Që të formësoni një pjesë sistemi EFI, kthehuni nbrapsht dhe përzgjidhni ose krijoni një sistem të përshtatshëm kartelash.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       Sistemi i kartelave duhet të montohet te <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
       Sistemi i kartelave duhet të jetë i llojit FAT32.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       Sistemi i kartelave duhet të jetë të paktën %1 MiB i madh.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       Sistemi i kartelave duhet të ketë të përzgjedhur parametrin <strong>%1</strong>.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       Mund të vazhdoni pa ujdisur një pjesë EFI sistemi, por sistemi juaj mund të mos arrijë të niset.
     
     
-      
+      
       Option to use GPT on BIOS
       Mundësi për përdorim GTP-je në BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Një tabelë pjesësh GPT është mundësia më e mirë për krejt sistemet. Ky instalues mbulon gjithashtu një ujdisje të tillë edhe për sisteme BIOS.<br/><br/>Që të formësoni një tabelë pjesësh GPT në BIOS, (nëse s’është bërë ende) kthehuni dhe ujdiseni tabelën e pjesëve si  GPT, më pas krijoni një ndarje të paformatuar 8 MB me shenjën <strong>bios_grub</strong> të aktivizuar.<br/><br/>Një pjesë e paformatuar 8 MB është e nevojshme për të nisur %1 në një sistem BIOS me GPT.
     
     
-      
+      
       Boot partition not encrypted
       Pjesë nisjesh e pafshehtëzuar
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Tok me pjesën e fshehtëzuar <em>root</em> qe rregulluar edhe një pjesë <em>boot</em> veçmas, por pjesa <em>boot</em> s’është e fshehtëzuar.<br/><br/>Ka preokupime mbi sigurinë e këtij lloj rregullimi, ngaqë kartela të rëndësishme sistemi mbahen në një pjesë të pafshehtëzuar.<br/>Mund të vazhdoni, nëse doni, por shkyçja e sistemit të kartelave do të ndodhë më vonë, gjatë nisjes së sistemit.<br/>Që të fshehtëzoni pjesën <em>boot</em>, kthehuni mbrapsht dhe rikrijojeni, duke përzgjedhur te skena e krijimit të pjesës <strong>Fshehtëzoje</strong>.
     
     
-      
+      
       has at least one disk device available.
       ka të paktën një pajisje disku për përdorim.
     
     
-      
+      
       There are no partitions to install on.
       S’ka pjesë ku të instalohet.
     
@@ -2998,7 +2996,7 @@ Përfundim:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3625,25 +3623,53 @@ Përfundim:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Po
+    
+    
+      
+      &No
+      &Jo
+    
+    
+      
+      &Cancel
+      &Anuloje
+    
+    
+      
+      &Close
+      &Mbylle
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Përshtypje mbi instalimin
     
     
-      
+      
       Sending installation feedback.
       Po dërgohen përshtypjet mbi instalimin.
     
     
-      
+      
       Internal error in install-tracking.
       Gabim i brendshëm në shquarjen e instalimit.
     
     
-      
+      
       HTTP request timed out.
       Kërkesës HTTP i mbaroi koha.
     
@@ -3651,28 +3677,28 @@ Përfundim:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Përshtypje nga përdorues të KDE-së
     
     
-      
+      
       Configuring KDE user feedback.
       Formësim përshtypjesh nga përdorues të KDE-së.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Gabim në formësimin e përshtypjeve nga përdorues të KDE-së.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Përshtypjet nga përdorues të KDE-së s’u formësuan dot saktë, gabim programthi %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       S’u formësuan dot saktë përshtypjet nga përdorues të KDE-së, gabim Calamares %1.
     
@@ -3680,28 +3706,28 @@ Përfundim:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Të dhëna nga makina
     
     
-      
+      
       Configuring machine feedback.
       Po formësohet moduli Të dhëna nga makina.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Gabim në formësimin e modulit Të dhëna nga makina.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       S’u formësua dot si duhet moduli Të dhëna nga makina, gabim programthi %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       S’u formësua dot si duhet moduli Të dhëna nga makina, gabim Calamares %1.
     
@@ -4069,45 +4095,30 @@ Përfundim:
   
     keyboardq
     
-      
-      Keyboard Model
-      Model Tastiere
-    
-    
-      
-      Layouts
-      Skema
+      
+      To activate keyboard preview, select a layout.
+      Që të aktivizohet paraparje tastiere, përzgjidhni një skemë.
     
     
-      
-      Keyboard Layout
-      Skemë Tastiere
+      
+      Keyboard Model:
+      Model Tastiere:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Klikoni mbi modelin tuaj të parapëlqyer të tastierës që të përzgjidhni skemën dhe variantin, ose përdorni atë parazgjedhje bazuar në tastierën e pikasur nga programi.
+      
+      Layouts
+      Skema
     
     
-      
-      Models
-      Modele
+      
+      Type here to test your keyboard
+      Që të provoni tastierën tuaj, shtypni këtu
     
     
-      
+      
       Variants
       Variante
     
-    
-      
-      Keyboard Variant
-      Variant Tastiere
-    
-    
-      
-      Test your keyboard
-      Testoni tastierën tuaj
-    
   
   
     localeq
diff --git a/lang/calamares_sr.ts b/lang/calamares_sr.ts
index 7a2886ee68..bdf938e111 100644
--- a/lang/calamares_sr.ts
+++ b/lang/calamares_sr.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Завршено
     
@@ -287,54 +287,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Инсталација није успела
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Грешка
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       Наставити са подешавањем?
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       &Инсталирај сада
     
     
-      
+      
       Go &back
       Иди &назад
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Следеће
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       &Откажи
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Отказати инсталацију?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Да ли стварно желите да прекинете текући процес инсталације?
@@ -826,22 +824,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1706,17 +1704,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1781,32 +1779,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2784,92 +2782,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       Тренутно:
     
     
-      
+      
       After:
       После:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3001,7 +2999,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3625,25 +3623,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      &Откажи
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3651,28 +3677,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3680,28 +3706,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4053,44 +4079,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      куцајте овде да тестирате тастатуру
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_sr@latin.ts b/lang/calamares_sr@latin.ts
index 5ea152d690..2e4649735e 100644
--- a/lang/calamares_sr@latin.ts
+++ b/lang/calamares_sr@latin.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Gotovo
     
@@ -287,54 +287,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       Neuspješna instalacija
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       Greška
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &Dalje
     
     
-      
+      
       &Back
       &Nazad
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       &Prekini
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       Prekini instalaciju?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Da li stvarno želite prekinuti trenutni proces instalacije?
@@ -826,22 +824,22 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1706,17 +1704,17 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1781,32 +1779,32 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2784,92 +2782,92 @@ Instaler će se zatvoriti i sve promjene će biti izgubljene.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       Particije
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       Poslije:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -3001,7 +2999,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3625,25 +3623,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      &Prekini
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3651,28 +3677,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3680,28 +3706,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4053,44 +4079,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      
+      
+      Keyboard Model:
+      Model tastature:
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
-      
+      
+      Type here to test your keyboard
+      Test tastature
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 63c9cef84c..605ad0538a 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Klar
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Inställningarna misslyckades
     
     
-      
+      
       Installation Failed
       Installationen misslyckades
     
     
-      
+      
       Would you like to paste the install log to the web?
       Vill du ladda upp installationsloggen på webben?
     
     
-      
+      
       Error
       Fel
     
     
-      
-      
+      
       &Yes
       &Ja
     
     
-      
-      
+      
       &No
       &Nej
     
     
-      
+      
       &Close
       &Stäng
     
     
-      
+      
       Install Log Paste URL
       URL till installationslogg
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Sändningen misslyckades. Ingenting sparades på webbplatsen.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,123 +343,123 @@ Link copied to clipboard
 Länken kopierades till urklipp
     
     
-      
+      
       Calamares Initialization Failed
       Initieringen av Calamares misslyckades
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 kan inte installeras. Calamares kunde inte ladda alla konfigurerade moduler. Detta är ett problem med hur Calamares används av distributionen.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Följande moduler kunde inte hämtas:
     
     
-      
+      
       Continue with setup?
       Fortsätt med installation?
     
     
-      
+      
       Continue with installation?
       Vill du fortsätta med installationen?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1-installeraren är på väg att göra ändringar på disk för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1-installeraren är på väg att göra ändringar för att installera %2.<br/><strong>Du kommer inte att kunna ångra dessa ändringar.</strong>
     
     
-      
+      
       &Set up now
       &Installera nu 
     
     
-      
+      
       &Install now
       &Installera nu
     
     
-      
+      
       Go &back
       Gå &bakåt
     
     
-      
+      
       &Set up
       &Installera
     
     
-      
+      
       &Install
       &Installera
     
     
-      
+      
       Setup is complete. Close the setup program.
       Installationen är klar. Du kan avsluta installationsprogrammet.
     
     
-      
+      
       The installation is complete. Close the installer.
       Installationen är klar. Du kan avsluta installationshanteraren.
     
     
-      
+      
       Cancel setup without changing the system.
       Avbryt inställningarna utan att förändra systemet.
     
     
-      
+      
       Cancel installation without changing the system.
       Avbryt installationen utan att förändra systemet.
     
     
-      
+      
       &Next
       &Nästa
     
     
-      
+      
       &Back
       &Bakåt
     
     
-      
+      
       &Done
       &Klar
     
     
-      
+      
       &Cancel
       Avbryt
     
     
-      
+      
       Cancel setup?
       Avbryt inställningarna?
     
     
-      
+      
       Cancel installation?
       Avbryt installation?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Vill du verkligen avbryta den nuvarande uppstartsprocessen? Uppstartsprogrammet kommer avsluta och alla ändringar kommer förloras.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Är du säker på att du vill avsluta installationen i förtid?
@@ -828,22 +826,22 @@ Alla ändringar kommer att gå förlorade.
       Detta program kommer att ställa dig några frågor och installera %2 på din dator.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Välkommen till Calamares installationsprogram för %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Välkommen till %1 installation</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Välkommen till Calamares installationsprogram för %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Välkommen till %1-installeraren</h1>
     
@@ -1708,17 +1706,17 @@ Alla ändringar kommer att gå förlorade.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole inte installerat
     
     
-      
+      
       Please install KDE Konsole and try again!
       Installera KDE Konsole och försök igen!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Kör skript: &nbsp;<code>%1</code>
     
@@ -1783,32 +1781,32 @@ Alla ändringar kommer att gå förlorade.
       <h1>Licensavtal</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Jag accepterar villkoren och avtalet ovan.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Vänligen läs igenom licensavtalen för slutanvändare (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Denna installationsprocess kommer installera proprietär mjukvara för vilken särskilda licensvillkor gäller.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Om du inte accepterar villkoren kan inte installationsproceduren fortsätta.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Denna installationsprocess kan installera proprietär mjukvara för vilken särskilda licensvillkor gäller, för att kunna erbjuda ytterligare funktionalitet och förbättra användarupplevelsen.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Om du inte godkänner villkoren kommer inte proprietär mjukvara att installeras, och alternativ med öppen källkod kommer användas istället.
     
@@ -2780,92 +2778,92 @@ Sök på kartan genom att dra
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Samlar systeminformation...
     
     
-      
+      
       Partitions
       Partitioner
     
     
-      
+      
       Current:
       Nuvarande:
     
     
-      
+      
       After:
       Efter:
     
     
-      
+      
       No EFI system partition configured
       Ingen EFI system partition konfigurerad
     
     
-      
+      
       EFI system partition configured incorrectly
       EFI-systempartitionen felaktigt konfigurerad
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       En EFI-systempartition krävs för att starta %1 <br/><br/>För att konfigurera en EFI-systempartition, gå tillbaka och välj eller skapa ett lämpligt filsystem.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       Filsystemet måste vara monterat på <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
       Filsystemet måste vara av typ FAT32.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       Filsystemet måste vara minst %1 MiB i storlek.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       Filsystemet måste ha flagga <strong>%1</strong> satt.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       Du kan fortsätta utan att ställa in en EFI-systempartition men ditt system kanske inte startar.
     
     
-      
+      
       Option to use GPT on BIOS
       Alternativ för att använda GPT på BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       En GPT-partitionstabell är det bästa alternativet för alla system. Detta installationsprogram stödjer det för system med BIOS också.<br/><br/>För att konfigurera en GPT-partitionstabell på BIOS (om det inte redan är gjort), gå tillbaka och sätt partitionstabell till GPT, skapa sedan en oformaterad partition på 8MB med <strong>bios_grub</strong>-flaggan satt.<br/><br/>En oformaterad partition på 8MB är nödvändig för att starta %1 på ett BIOS-system med GPT.
     
     
-      
+      
       Boot partition not encrypted
       Boot partition inte krypterad
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       En separat uppstartspartition skapades tillsammans med den krypterade rootpartitionen, men uppstartspartitionen är inte krypterad.<br/><br/>Det finns säkerhetsproblem med den här inställningen, eftersom viktiga systemfiler sparas på en okrypterad partition.<br/>Du kan fortsätta om du vill, men upplåsning av filsystemet kommer hända senare under uppstart av systemet.<br/>För att kryptera uppstartspartitionen, gå tillbaka och återskapa den, och välj <strong>Kryptera</strong> i fönstret när du skapar partitionen.
     
     
-      
+      
       has at least one disk device available.
       har åtminstone en diskenhet tillgänglig.
     
     
-      
+      
       There are no partitions to install on.
       Det finns inga partitioner att installera på.
     
@@ -3000,7 +2998,7 @@ Utdata:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3627,25 +3625,53 @@ Installationen kan inte fortsätta.</p>
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &Okej
+    
+    
+      
+      &Yes
+      &Ja
+    
+    
+      
+      &No
+      &Nej
+    
+    
+      
+      &Cancel
+      &Avsluta
+    
+    
+      
+      &Close
+      &Stäng
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Installationsåterkoppling
     
     
-      
+      
       Sending installation feedback.
       Skickar installationsåterkoppling
     
     
-      
+      
       Internal error in install-tracking.
       Internt fel i install-tracking.
     
     
-      
+      
       HTTP request timed out.
       HTTP-begäran tog för lång tid.
     
@@ -3653,28 +3679,28 @@ Installationen kan inte fortsätta.</p>
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE användarfeedback 
     
     
-      
+      
       Configuring KDE user feedback.
       Konfigurerar KDE användarfeedback.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Fel vid konfigurering av KDE användarfeedback.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Kunde inte konfigurera KDE användarfeedback korrekt, script fel %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Kunde inte konfigurera KDE användarfeedback korrekt, Calamares fel  %1.
     
@@ -3682,28 +3708,28 @@ Installationen kan inte fortsätta.</p>
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Maskin feedback
     
     
-      
+      
       Configuring machine feedback.
       Konfigurerar maskin feedback
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Fel vid konfigurering av maskin feedback
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Kunde inte konfigurera maskin feedback korrekt, script fel %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Kunde inte konfigurera maskin feedback korrekt, Calamares fel  %1.
     
@@ -4071,45 +4097,30 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
   
     keyboardq
     
-      
-      Keyboard Model
-      Tangentbordsmodell
-    
-    
-      
-      Layouts
-      Layouter
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Tangentbordslayout
+      
+      Keyboard Model:
+      Tangentbordsmodell:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Välj din föredragna tangentbordsmodell för att välja layout och variant, eller använd ett förval baserat på vilken hårdvara vi känt av.
+      
+      Layouts
+      Layouter
     
     
-      
-      Models
-      Modeller
+      
+      Type here to test your keyboard
+      Skriv här för att testa ditt tangentbord
     
     
-      
+      
       Variants
       Varianter
     
-    
-      
-      Keyboard Variant
-      Tangentbordsvariant
-    
-    
-      
-      Test your keyboard
-      Testa ditt tangentbord
-    
   
   
     localeq
diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts
index 2c95a3e054..8c354686e4 100644
--- a/lang/calamares_te.ts
+++ b/lang/calamares_te.ts
@@ -173,7 +173,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి
   
     Calamares::JobThread
     
-      
+      
       Done
       ముగించు 
     
@@ -287,54 +287,52 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       లోపం
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,123 +341,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -825,22 +823,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1705,17 +1703,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1780,32 +1778,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2774,92 +2772,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2991,7 +2989,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3615,25 +3613,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3641,28 +3667,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3670,28 +3696,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4043,44 +4069,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts
index 545605aeb7..7382e63705 100644
--- a/lang/calamares_tg.ts
+++ b/lang/calamares_tg.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Анҷоми кор
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Танзимкунӣ қатъ шуд
     
     
-      
+      
       Installation Failed
       Насбкунӣ қатъ шуд
     
     
-      
+      
       Would you like to paste the install log to the web?
       Шумо мехоҳед, ки сабти рӯйдодҳои насбро ба шабака нусха бардоред?
     
     
-      
+      
       Error
       Хато
     
     
-      
-      
+      
       &Yes
       &Ҳа
     
     
-      
-      
+      
       &No
       &Не
     
     
-      
+      
       &Close
       &Пӯшидан
     
     
-      
+      
       Install Log Paste URL
       Гузоштани нишонии URL-и сабти рӯйдодҳои насб
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Боркунӣ иҷро нашуд. Гузариш ба шабака иҷро нашуд.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,124 +339,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Омодашавии Calamares қатъ шуд
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 насб карда намешавад. Calamares ҳамаи модулҳои танзимкардашударо бор карда натавонист. Ин мушкилие мебошад, ки бо ҳамин роҳ Calamares дар дистрибутиви ҷорӣ кор мекунад.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Модулҳои зерин бор карда намешаванд:
     
     
-      
+      
       Continue with setup?
       Танзимкуниро идома медиҳед?
     
     
-      
+      
       Continue with installation?
       Насбкуниро идома медиҳед?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Барномаи танзимкунии %1 барои танзим кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Насбкунандаи %1 барои насб кардани %2 ба диски компютери шумо тағйиротро ворид мекунад.<br/><strong>Шумо ин тағйиротро ботил карда наметавонед.</strong>
     
     
-      
+      
       &Set up now
       &Ҳозир танзим карда шавад
     
     
-      
+      
       &Install now
       &Ҳозир насб карда шавад
     
     
-      
+      
       Go &back
       &Бозгашт
     
     
-      
+      
       &Set up
       &Танзим кардан
     
     
-      
+      
       &Install
       &Насб кардан
     
     
-      
+      
       Setup is complete. Close the setup program.
       Танзим ба анҷом расид. Барномаи танзимкуниро пӯшед.
     
     
-      
+      
       The installation is complete. Close the installer.
       Насб ба анҷом расид. Барномаи насбкуниро пӯшед.
     
     
-      
+      
       Cancel setup without changing the system.
       Бекор кардани танзимкунӣ бе тағйирдиҳии низом.
     
     
-      
+      
       Cancel installation without changing the system.
       Бекор кардани насбкунӣ бе тағйирдиҳии низом.
     
     
-      
+      
       &Next
       &Навбатӣ
     
     
-      
+      
       &Back
       &Ба қафо
     
     
-      
+      
       &Done
       &Анҷоми кор
     
     
-      
+      
       &Cancel
       &Бекор кардан
     
     
-      
+      
       Cancel setup?
       Танзимкуниро бекор мекунед?
     
     
-      
+      
       Cancel installation?
       Насбкуниро бекор мекунед?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Шумо дар ҳақиқат мехоҳед, ки раванди танзимкунии ҷориро бекор намоед?
 Барномаи танзимкунӣ хомӯш карда мешавад ва ҳамаи тағйирот гум карда мешаванд.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Шумо дар ҳақиқат мехоҳед, ки раванди насбкунии ҷориро бекор намоед?
@@ -825,22 +823,22 @@ The installer will quit and all changes will be lost.
       Ин барнома аз Шумо якчанд савол мепурсад ва %2-ро дар компютери шумо танзим мекунад.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Хуш омадед ба барномаи танзимкунии Calamares барои %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Хуш омадед ба танзимкунии %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Хуш омадед ба насбкунандаи Calamares барои %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Хуш омадед ба насбкунандаи %1</h1>
     
@@ -1705,17 +1703,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole насб нашудааст
     
     
-      
+      
       Please install KDE Konsole and try again!
       Лутфан, KDE Konsole-ро насб намуда, аз нав кӯшиш кунед!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Иҷрокунии нақши: &nbsp;<code>%1</code>
     
@@ -1780,32 +1778,32 @@ The installer will quit and all changes will be lost.
       <h1>Созишномаи иҷозатномавӣ</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Ман шарту шароитҳои дар боло зикршударо қабул мекунам.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Лутфан, Созишномаҳои иҷозатномавии корбари ниҳоиро (EULA-ҳо) мутолиа намоед.
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Раванди танзимкунӣ нармафзори патентдореро, ки дорои шартҳои иҷозатномавӣ мебошад, насб мекунад.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Агар шумо шартҳоро қабул накунед, раванди насбкунӣ бояд идома дода нашавад.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Раванди танзимкунӣ метавонад нармафзори патентдореро насб кунад, ки дорои шартҳои иҷозатномавӣ барои таъмини хусусиятҳои иловагӣ ва беҳтар кардани таҷрибаи корбарӣ мебошад.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Агар шумо шартҳоро қабул накунед, нармафзори патентдор насб карда намешавад, аммо ба ҷояш нармафзори имконпазири ройгон истифода бурда мешавад.
     
@@ -2776,92 +2774,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Ҷамъкунии иттилооти низомӣ...
     
     
-      
+      
       Partitions
       Қисмҳои диск
     
     
-      
+      
       Current:
       Танзимоти ҷорӣ:
     
     
-      
+      
       After:
       Баъд аз тағйир:
     
     
-      
+      
       No EFI system partition configured
       Ягон қисми диски низомии EFI танзим нашуд
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Имкони истифодаи GPT дар BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Ҷадвали қисми диски GPT барои ҳамаи низомҳо интихоби беҳтарин мебошад. Насбкунандаи ҷорӣ инчунин барои низомҳои BIOS чунин танзимро дастгирӣ менамояд.<br/><br/>Барои танзим кардани ҷадвали қисми диски GPT дар BIOS, (агар то ҳол танзим накарда бошед) як қадам ба қафо гузаред ва ҷадвали қисми дискро ба GPT танзим кунед, пас қисми диски шаклбандинашударо бо ҳаҷми 8 МБ бо нишони фаъолшудаи <strong>bios_grub</strong> эҷод намоед.<br/><br/>Қисми диски шаклбандинашуда бо ҳаҷми 8 МБ барои оғоз кардани %1 дар низоми BIOS бо GPT лозим аст.
     
     
-      
+      
       Boot partition not encrypted
       Қисми диски роҳандозӣ рамзгузорӣ нашудааст
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Қисми диски роҳандозии алоҳида дар як ҷой бо қисми диски реша (root)-и рамзгузоришуда танзим карда шуд, аммо қисми диски роҳандозӣ рамзгузорӣ нашудааст.<br/><br/>Барои ҳамин навъи танзимкунӣ масъалаи амниятӣ аҳамият дорад, зеро ки файлҳои низомии муҳим дар қисми диски рамзгузоринашуда нигоҳ дошта мешаванд.<br/>Агар шумо хоҳед, метавонед идома диҳед, аммо қулфкушоии низоми файлӣ дертар ҳангоми оғози кори низом иҷро карда мешавад.<br/>Барои рамзгзорӣ кардани қисми диски роҳандозӣ ба қафо гузаред ва бо интихоби тугмаи <strong>Рамзгузорӣ</strong> дар равзанаи эҷодкунии қисми диск онро аз нав эҷод намоед.
     
     
-      
+      
       has at least one disk device available.
       ақаллан як дастгоҳи диск дастрас аст.
     
     
-      
+      
       There are no partitions to install on.
       Ягон қисми диск барои насб вуҷуд надорад.
     
@@ -2996,7 +2994,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3623,25 +3621,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &ХУБ
+    
+    
+      
+      &Yes
+      &Ҳа
+    
+    
+      
+      &No
+      &Не
+    
+    
+      
+      &Cancel
+      &Бекор кардан
+    
+    
+      
+      &Close
+      &Пӯшидан
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Алоқаи бозгашти насбкунӣ
     
     
-      
+      
       Sending installation feedback.
       Фиристодани алоқаи бозгашти насбкунӣ.
     
     
-      
+      
       Internal error in install-tracking.
       Хатои дохилӣ дар пайгирии насб.
     
     
-      
+      
       HTTP request timed out.
       Вақти дархости HTTP ба анҷом расид.
     
@@ -3649,28 +3675,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Изҳори назари корбари KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Танзимкунии изҳори назари корбари KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Хато дар танзимкунии изҳори назари корбари KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Изҳори назари корбари KDE ба таври дуруст танзим карда нашуд. Хатои нақш: %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Изҳори назари корбари KDE ба таври дуруст танзим карда нашуд. Хатои Calamares: %1.
     
@@ -3678,28 +3704,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Низоми изҳори назар ва алоқаи бозгашт
     
     
-      
+      
       Configuring machine feedback.
       Танзимкунии алоқаи бозгашти компютерӣ.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Хато дар танзимкунии алоқаи бозгашти компютерӣ.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Алоқаи бозгашти компютерӣ ба таври дуруст танзим карда нашуд. Хатои нақш: %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Алоқаи бозгашти компютерӣ ба таври дуруст танзим карда нашуд. Хатои Calamares: %1.
     
@@ -4065,45 +4091,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Намунаи клавиатура
-    
-    
-      
-      Layouts
-      Тарҳбандиҳо
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Тарҳбандии клавиатура
+      
+      Keyboard Model:
+      Намунаи клавиатура:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Намунаи клавиатураи пазируфтаи худро барои танзими тарҳбандӣ ва варианти он интихоб кунед ё клавиатураи муқаррареро дар асоси сахтафзори муайяншуда истифода баред.
+      
+      Layouts
+      Тарҳбандиҳо
     
     
-      
-      Models
-      Намунаҳо
+      
+      Type here to test your keyboard
+      Барои санҷидани клавиатура ҳарфҳоро дар ин сатр ворид намоед
     
     
-      
+      
       Variants
       Имконот
     
-    
-      
-      Keyboard Variant
-      Вариантҳои клавиатура
-    
-    
-      
-      Test your keyboard
-      Клавиатураи худро санҷед
-    
   
   
     localeq
diff --git a/lang/calamares_th.ts b/lang/calamares_th.ts
index 6455fcf7ac..3f64d84f63 100644
--- a/lang/calamares_th.ts
+++ b/lang/calamares_th.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       เสร็จสิ้น
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       การตั้งค่าล้มเหลว
     
     
-      
+      
       Installation Failed
       การติดตั้งล้มเหลว
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       ข้อผิดพลาด
     
     
-      
-      
+      
       &Yes
       &ใช่
     
     
-      
-      
+      
       &No
       &ไม่
     
     
-      
+      
       &Close
       ปิ&ด
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +337,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       ดำเนินการติดตั้งต่อหรือไม่?
     
     
-      
+      
       Continue with installation?
       ดำเนินการติดตั้งต่อหรือไม่?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       ตัวติดตั้ง %1 กำลังพยายามที่จะทำการเปลี่ยนแปลงในดิสก์ของคุณเพื่อติดตั้ง %2<br/><strong>คุณจะไม่สามารถยกเลิกการเปลี่ยนแปลงเหล่านี้ได้</strong>
     
     
-      
+      
       &Set up now
       ตั้&งค่าตอนนี้
     
     
-      
+      
       &Install now
       &ติดตั้งตอนนี้
     
     
-      
+      
       Go &back
       กลั&บไป
     
     
-      
+      
       &Set up
       ตั้&งค่า
     
     
-      
+      
       &Install
       ติ&ดตั้ง
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       &N ถัดไป
     
     
-      
+      
       &Back
       &B ย้อนกลับ
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       &C ยกเลิก
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       ยกเลิกการติดตั้ง?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       คุณต้องการยกเลิกกระบวนการติดตั้งที่กำลังดำเนินการอยู่หรือไม่?
@@ -822,22 +820,22 @@ The installer will quit and all changes will be lost.
       โปรแกรมนี้จะถามคำถามต่าง ๆ เพื่อติดตั้ง %2 ลงในคอมพิวเตอร์ของคุณ
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>ยินดีต้อนรับสู่ตัวตั้งค่า %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>ยินดีต้อนรับสู่ตัวติดตั้ง Calamares สำหรับ %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>ยินดีต้อนรับสู่ตัวติดตั้ง %1</h1>
     
@@ -1702,17 +1700,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       ไม่ได้ติดตั้ง Konsole
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1777,32 +1775,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2762,92 +2760,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       กำลังรวบรวมข้อมูลของระบบ...
     
     
-      
+      
       Partitions
       พาร์ทิชัน
     
     
-      
+      
       Current:
       ปัจจุบัน:
     
     
-      
+      
       After:
       หลัง:
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2979,7 +2977,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3603,25 +3601,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &O ตกลง
+    
+    
+      
+      &Yes
+      &ใช่
+    
+    
+      
+      &No
+      &ไม่
+    
+    
+      
+      &Cancel
+      &C ยกเลิก
+    
+    
+      
+      &Close
+      ปิ&ด
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3629,28 +3655,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3658,28 +3684,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4032,45 +4058,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
+      
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Keyboard Layout
-      
+      
+      Keyboard Model:
+      โมเดลแป้นพิมพ์:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      
+      Layouts
       
     
     
-      
-      Models
-      
+      
+      Type here to test your keyboard
+      พิมพ์ที่นี่เพื่อทดสอบแป้นพิมพ์ของคุณ
     
     
-      
+      
       Variants
       
     
-    
-      
-      Keyboard Variant
-      
-    
-    
-      
-      Test your keyboard
-      ทดสอบคีย์บอร์ด
-    
   
   
     localeq
diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts
index ce058f5178..cedfceea83 100644
--- a/lang/calamares_tr_TR.ts
+++ b/lang/calamares_tr_TR.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Sistem kurulumu tamamlandı, kurulum aracından çıkabilirsiniz.
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Kurulum Başarısız
     
     
-      
+      
       Installation Failed
       Kurulum Başarısız
     
     
-      
+      
       Would you like to paste the install log to the web?
       Kurulum günlüğünü web'e yapıştırmak ister misiniz?
     
     
-      
+      
       Error
       Hata
     
     
-      
-      
+      
       &Yes
       &Evet
     
     
-      
-      
+      
       &No
       &Hayır
     
     
-      
+      
       &Close
       &Kapat
     
     
-      
+      
       Install Log Paste URL
       Günlük Yapıştırma URL'sini Yükle
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Yükleme başarısız oldu. Web yapıştırması yapılmadı.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -345,124 +343,124 @@ Link copied to clipboard
 link panoya kopyalandı 
     
     
-      
+      
       Calamares Initialization Failed
       Calamares Başlatılamadı
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 yüklenemedi. Calamares yapılandırılmış modüllerin bazılarını yükleyemedi. Bu, Calamares'in kullandığınız dağıtıma uyarlamasından kaynaklanan bir sorundur.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Aşağıdaki modüller yüklenemedi:
     
     
-      
+      
       Continue with setup?
       Kuruluma devam et?
     
     
-      
+      
       Continue with installation?
       Kurulum devam etsin mi?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 sistem kurulum uygulaması,%2 ayarlamak için diskinizde değişiklik yapmak üzere. <br/><strong>Bu değişiklikleri geri alamayacaksınız.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 sistem yükleyici %2 yüklemek için diskinizde değişiklik yapacak.<br/><strong>Bu değişiklikleri geri almak mümkün olmayacak.</strong>
     
     
-      
+      
       &Set up now
       &Şimdi kur
     
     
-      
+      
       &Install now
       &Şimdi yükle
     
     
-      
+      
       Go &back
       Geri &git
     
     
-      
+      
       &Set up
       &Kur
     
     
-      
+      
       &Install
       &Yükle
     
     
-      
+      
       Setup is complete. Close the setup program.
       Kurulum tamamlandı. Kurulum programını kapatın.
     
     
-      
+      
       The installation is complete. Close the installer.
       Yükleme işi tamamlandı. Sistem yükleyiciyi kapatın.
     
     
-      
+      
       Cancel setup without changing the system.
       Sistemi değiştirmeden kurulumu iptal edin.
     
     
-      
+      
       Cancel installation without changing the system.
       Sistemi değiştirmeden kurulumu iptal edin.
     
     
-      
+      
       &Next
       &Sonraki
     
     
-      
+      
       &Back
       &Geri
     
     
-      
+      
       &Done
       &Tamam
     
     
-      
+      
       &Cancel
       &Vazgeç
     
     
-      
+      
       Cancel setup?
       Kurulum iptal edilsin mi?
     
     
-      
+      
       Cancel installation?
       Yüklemeyi iptal et?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Mevcut kurulum işlemini gerçekten iptal etmek istiyor musunuz?
 Kurulum uygulaması sonlandırılacak ve tüm değişiklikler kaybedilecek.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Yükleme işlemini gerçekten iptal etmek istiyor musunuz?
@@ -832,22 +830,22 @@ Kurulum devam edebilir fakat bazı özellikler devre dışı kalabilir.Bu program size bazı sorular soracak ve bilgisayarınıza %2 kuracak.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>%1 için Calamares kurulum programına hoş geldiniz</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>%1 kurulumuna hoşgeldiniz</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>%1 Calamares Sistem Yükleyiciye Hoşgeldiniz</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>%1 Sistem Yükleyiciye Hoşgeldiniz</h1>
     
@@ -1713,17 +1711,17 @@ Sistem güç kaynağına bağlı değil.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole uygulaması yüklü değil
     
     
-      
+      
       Please install KDE Konsole and try again!
       Lütfen KDE Konsole yükle ve tekrar dene!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Komut durumu: &nbsp;<code>%1</code>
     
@@ -1788,32 +1786,32 @@ Sistem güç kaynağına bağlı değil.
       <h1>Lisans Anlaşması</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Yukarıdaki şartları ve koşulları kabul ediyorum.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Lütfen Son Kullanıcı Lisans Sözleşmelerini (EULA) inceleyin.
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Bu kurulum prosedürü, lisanslama koşullarına tabi olan tescilli yazılımı kuracaktır.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Koşulları kabul etmiyorsanız kurulum prosedürü devam edemez.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Bu kurulum prosedürü, ek özellikler sağlamak ve kullanıcı deneyimini geliştirmek için lisans koşullarına tabi olan özel yazılımlar yükleyebilir.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Koşulları kabul etmiyorsanız, tescilli yazılım yüklenmeyecek ve bunun yerine açık kaynak alternatifleri kullanılacaktır.
     
@@ -2784,93 +2782,93 @@ Sistem güç kaynağına bağlı değil.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Sistem bilgileri toplanıyor...
     
     
-      
+      
       Partitions
       Disk Bölümleme
     
     
-      
+      
       Current:
       Geçerli:
     
     
-      
+      
       After:
       Sonra:
     
     
-      
+      
       No EFI system partition configured
       EFI sistem bölümü yapılandırılmamış
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       BIOS'ta GPT kullanma seçeneği
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT disk bölümü tablosu tüm sistemler için en iyi seçenektir. Bu yükleyici klasik BIOS sistemler için de böyle bir kurulumu destekler. <br/><br/>Klasik BIOS sistemlerde disk bölümü tablosu GPT tipinde yapılandırmak için (daha önce yapılmadıysa) geri gidin ve disk bölümü tablosu GPT olarak ayarlayın ve ardından <strong>bios_grub</strong> bayrağı ile etiketlenmiş 8 MB biçimlendirilmemiş bir disk bölümü oluşturun.<br/> <br/>GPT disk yapısı ile kurulan klasik BIOS sistemi %1 başlatmak için biçimlendirilmemiş 8 MB bir disk bölümü gereklidir.
     
     
-      
+      
       Boot partition not encrypted
       Önyükleme yani boot diski şifrelenmedi
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Ayrı bir önyükleme yani boot disk bölümü, şifrenmiş bir kök bölüm ile birlikte ayarlandı, fakat önyükleme bölümü şifrelenmedi.<br/><br/>Bu tip kurulumun güvenlik endişeleri vardır, çünkü önemli sistem dosyaları şifrelenmemiş bir bölümde saklanır.<br/>İsterseniz kuruluma devam edebilirsiniz, fakat dosya sistemi kilidi daha sonra sistem başlatılırken açılacak.<br/>
 Önyükleme bölümünü şifrelemek için geri dönün ve bölüm oluşturma penceresinde <strong>Şifreleme</strong>seçeneği ile yeniden oluşturun.
     
     
-      
+      
       has at least one disk device available.
       Mevcut en az bir disk aygıtı var.
     
     
-      
+      
       There are no partitions to install on.
       Kurulacak disk bölümü yok.
     
@@ -3005,7 +3003,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3632,25 +3630,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &TAMAM
+    
+    
+      
+      &Yes
+      &Evet
+    
+    
+      
+      &No
+      &Hayır
+    
+    
+      
+      &Cancel
+      &Vazgeç
+    
+    
+      
+      &Close
+      &Kapat
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Kurulum geribildirimi
     
     
-      
+      
       Sending installation feedback.
       Kurulum geribildirimi gönderiliyor.
     
     
-      
+      
       Internal error in install-tracking.
       Kurulum izlemede dahili hata.
     
     
-      
+      
       HTTP request timed out.
       HTTP isteği zaman aşımına uğradı.
     
@@ -3658,28 +3684,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE kullanıcı geri bildirimi
     
     
-      
+      
       Configuring KDE user feedback.
       KDE kullanıcı geri bildirimleri yapılandırılıyor.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       KDE kullanıcı geri bildirimi yapılandırmasında hata.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       KDE kullanıcı geri bildirimi doğru yapılandırılamadı, komut dosyası hatası %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       KDE kullanıcı geri bildirimi doğru şekilde yapılandırılamadı, %1 Calamares hatası.
     
@@ -3687,28 +3713,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Makine geri bildirimi
     
     
-      
+      
       Configuring machine feedback.
       Makine geribildirimini yapılandırma.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Makine geri bildirim yapılandırma hatası var.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Makine geribildirimi doğru yapılandırılamadı, betik hatası %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Makine geribildirimini doğru bir şekilde yapılandıramadı, Calamares hata %1.
     
@@ -4076,45 +4102,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Klavye Modeli
-    
-    
-      
-      Layouts
-      Düzenler
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Klavye Düzeni
+      
+      Keyboard Model:
+      Klavye Modeli:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Yerleşim ve türevi seçmek için tercih ettiğiniz klavye modeline tıklayın veya algılanan donanıma göre varsayılanı kullanın.
+      
+      Layouts
+      Düzenler
     
     
-      
-      Models
-      Modeller
+      
+      Type here to test your keyboard
+      Klavye seçiminizi burada test edebilirsiniz
     
     
-      
+      
       Variants
       Türevler
     
-    
-      
-      Keyboard Variant
-      Klavye Türevi
-    
-    
-      
-      Test your keyboard
-      Klavyeni test et
-    
   
   
     localeq
diff --git a/lang/calamares_uk.ts b/lang/calamares_uk.ts
index 5ce140eae8..57a75a70e7 100644
--- a/lang/calamares_uk.ts
+++ b/lang/calamares_uk.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Готово
     
@@ -289,54 +289,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Помилка встановлення
     
     
-      
+      
       Installation Failed
       Помилка під час встановлення
     
     
-      
+      
       Would you like to paste the install log to the web?
       Хочете викласти журнал встановлення у мережі?
     
     
-      
+      
       Error
       Помилка
     
     
-      
-      
+      
       &Yes
       &Так
     
     
-      
-      
+      
       &No
       &Ні
     
     
-      
+      
       &Close
       &Закрити
     
     
-      
+      
       Install Log Paste URL
       Адреса для вставлення журналу встановлення
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Не вдалося вивантажити дані.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -349,124 +347,124 @@ Link copied to clipboard
 Посилання скопійовано до буфера обміну
     
     
-      
+      
       Calamares Initialization Failed
       Помилка ініціалізації Calamares
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 неможливо встановити. Calamares не зміг завантажити всі налаштовані модулі. Ця проблема зв'язана з тим, як Calamares використовується дистрибутивом.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>Не вдалося завантажити наступні модулі:
     
     
-      
+      
       Continue with setup?
       Продовжити встановлення?
     
     
-      
+      
       Continue with installation?
       Продовжити встановлення?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Програма налаштування %1 збирається внести зміни до вашого диска, щоб налаштувати %2. <br/><strong> Ви не зможете скасувати ці зміни.</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Засіб встановлення %1 має намір внести зміни до розподілу вашого диска, щоб встановити %2.<br/><strong>Ці зміни неможливо буде скасувати.</strong>
     
     
-      
+      
       &Set up now
       &Налаштувати зараз
     
     
-      
+      
       &Install now
       &Встановити зараз
     
     
-      
+      
       Go &back
       Перейти &назад
     
     
-      
+      
       &Set up
       &Налаштувати
     
     
-      
+      
       &Install
       &Встановити
     
     
-      
+      
       Setup is complete. Close the setup program.
       Встановлення виконано. Закрити програму встановлення.
     
     
-      
+      
       The installation is complete. Close the installer.
       Встановлення виконано. Завершити роботу засобу встановлення.
     
     
-      
+      
       Cancel setup without changing the system.
       Скасувати налаштування без зміни системи.
     
     
-      
+      
       Cancel installation without changing the system.
       Скасувати встановлення без зміни системи.
     
     
-      
+      
       &Next
       &Вперед
     
     
-      
+      
       &Back
       &Назад
     
     
-      
+      
       &Done
       &Закінчити
     
     
-      
+      
       &Cancel
       &Скасувати
     
     
-      
+      
       Cancel setup?
       Скасувати налаштування?
     
     
-      
+      
       Cancel installation?
       Скасувати встановлення?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Ви насправді бажаєте скасувати поточну процедуру налаштовування?
 Роботу програми для налаштовування буде завершено, а усі зміни буде втрачено.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Чи ви насправді бажаєте скасувати процес встановлення?
@@ -833,22 +831,22 @@ The installer will quit and all changes will be lost.
       Ця програма поставить кілька питань та встановить %2 на ваш комп'ютер.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Вітаємо у програмі налаштовування Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Вітаємо у програмі для налаштовування %1</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Ласкаво просимо до засобу встановлення Calamares для %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Ласкаво просимо до засобу встановлення %1</h1>
     
@@ -1713,17 +1711,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole не встановлено
     
     
-      
+      
       Please install KDE Konsole and try again!
       Будь ласка встановіть KDE Konsole і спробуйте знову!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Виконується скрипт: &nbsp;<code>%1</code>
     
@@ -1788,32 +1786,32 @@ The installer will quit and all changes will be lost.
       <h1>Ліцензійна угода</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Я приймаю положення та умови, що наведені вище.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Будь ласка, перегляньте ліцензійні угоди із кінцевим користувачем (EULA).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Під час цієї процедури налаштовування буде встановлено закрите програмне забезпечення, використання якого передбачає згоду із умовами ліцензійної угоди.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Якщо ви не погодитеся із умовами, виконання подальшої процедури налаштовування стане неможливим.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Під час цієї процедури налаштовування може бути встановлено закрите програмне забезпечення з метою забезпечення реалізації та розширення додаткових можливостей. Використання цього програмного забезпечення передбачає згоду із умовами ліцензійної угоди.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Якщо ви не погодитеся із умовами ліцензування, закрите програмне забезпечення не буде встановлено. Замість нього буде використано альтернативи із відкритим кодом.
     
@@ -2803,92 +2801,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Збір інформації про систему...
     
     
-      
+      
       Partitions
       Розділи
     
     
-      
+      
       Current:
       Зараз:
     
     
-      
+      
       After:
       Після:
     
     
-      
+      
       No EFI system partition configured
       Не налаштовано жодного системного розділу EFI
     
     
-      
+      
       EFI system partition configured incorrectly
       Системний розділ EFI налаштовано неправильно
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       Для запуску %1 потрібен системний розділ EFI.<br/><br/>Щоб налаштувати системний розділ EFI, поверніться до попередніх пунктів і виберіть створення відповідної файлової системи.
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       Файлову систему має бути змоновано до <strong>%1</strong>.
     
     
-      
+      
       The filesystem must have type FAT32.
       Файлова система має належати до типу FAT32.
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       Розмір файлової системи має бути не меншим за %1 МіБ.
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       Для файлової системи має бути встановлено прапорець <strong>%1</strong>.
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       Ви можете продовжити без встановлення системного розділу EFI, але це може призвести до неможливості запуску вашої операційної системи.
     
     
-      
+      
       Option to use GPT on BIOS
       Варіант із використанням GPT на BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Таблиця розділів GPT є найкращим варіантом для усіх систем. У цьому засобі встановлення передбачено підтримку відповідних налаштувань і для систем BIOS.<br/><br/>Щоб скористатися таблицею розділів GPT у системі з BIOS, (якщо цього ще не було зроблено) поверніться назад і встановіть для таблиці розділів значення GPT, далі створіть неформатований розділ розміром 8 МБ з увімкненим прапорцем <strong>bios_grub</strong>.<br/><br/>Неформатований розділ розміром 8 МБ потрібен для запуску %1 на системі з BIOS за допомогою GPT.
     
     
-      
+      
       Boot partition not encrypted
       Завантажувальний розділ незашифрований
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Було налаштовано окремий завантажувальний розділ поряд із зашифрованим кореневим розділом, але завантажувальний розділ незашифрований.<br/><br/>Існують проблеми з безпекою такого типу, оскільки важливі системні файли зберігаються на незашифрованому розділі.<br/>Ви можете продовжувати, якщо бажаєте, але розблокування файлової системи відбудеться пізніше під час запуску системи.<br/>Щоб зашифрувати завантажувальний розділ, поверніться і створіть його знов, обравши <strong>Зашифрувати</strong> у вікні створення розділів.
     
     
-      
+      
       has at least one disk device available.
       має принаймні один доступний дисковий пристрій.
     
     
-      
+      
       There are no partitions to install on.
       Немає розділів для встановлення.
     
@@ -3023,7 +3021,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3650,25 +3648,53 @@ Output:
       %L1 з %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Так
+    
+    
+      
+      &No
+      &Ні
+    
+    
+      
+      &Cancel
+      &Скасувати
+    
+    
+      
+      &Close
+      &Закрити
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Відгуки щодо встановлення
     
     
-      
+      
       Sending installation feedback.
       Надсилання відгуків щодо встановлення.
     
     
-      
+      
       Internal error in install-tracking.
       Внутрішня помилка під час стеження за встановленням.
     
     
-      
+      
       HTTP request timed out.
       Перевищено час очікування на обробку запиту HTTP.
     
@@ -3676,28 +3702,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Зворотних зв'язок для користувачів KDE
     
     
-      
+      
       Configuring KDE user feedback.
       Налаштовування зворотного зв'язку для користувачів KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Помилка у налаштуваннях зворотного зв'язку користувачів KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Не вдалося налаштувати належним чином зворотний зв'язок для користувачів KDE. Помилка скрипту %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Не вдалося налаштувати належним чином зворотний зв'язок для користувачів KDE. Помилка Calamares %1.
     
@@ -3705,28 +3731,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Дані щодо комп'ютера
     
     
-      
+      
       Configuring machine feedback.
       Налаштовування надсилання даних щодо комп'ютера.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Помилка у налаштуваннях надсилання даних щодо комп'ютера.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Не вдалося налаштувати надсилання даних щодо комп'ютера належним чином. Помилка скрипту: %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Не вдалося налаштувати надсилання даних щодо комп'ютера належним чином. Помилка у Calamares: %1.
     
@@ -4093,45 +4119,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Модель клавіатури
-    
-    
-      
-      Layouts
-      Розкладки
+      
+      To activate keyboard preview, select a layout.
+      Щоб активувати перегляд клавіатури, виберіть розкладку.
     
     
-      
-      Keyboard Layout
-      Розкладка клавіатури
+      
+      Keyboard Model:
+      Модель клавіатури:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Клацніть на пункті бажаної для вас моделі клавіатури, щоб вибрати розкладку і варіант, або скористайтеся типовою, визначеною на основі виявленого обладнання
+      
+      Layouts
+      Розкладки
     
     
-      
-      Models
-      Моделі
+      
+      Type here to test your keyboard
+      Напишіть тут, щоб перевірити клавіатуру
     
     
-      
+      
       Variants
       Варіанти
     
-    
-      
-      Keyboard Variant
-      Варіант клавіатури
-    
-    
-      
-      Test your keyboard
-      Перевірте вашу клавіатуру
-    
   
   
     localeq
diff --git a/lang/calamares_ur.ts b/lang/calamares_ur.ts
index a86dd94cc2..bad7f3e70f 100644
--- a/lang/calamares_ur.ts
+++ b/lang/calamares_ur.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -285,54 +285,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -341,123 +339,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -823,22 +821,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1703,17 +1701,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1778,32 +1776,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2772,92 +2770,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3613,25 +3611,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3639,28 +3665,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3668,28 +3694,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4041,45 +4067,30 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      کی بورڈ کے نمونے
-    
-    
-      
-      Layouts
-       لے آؤٹ
-    
-    
-      
-      Keyboard Layout
-      کی بورڈ لے آؤٹ
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
-      نمونے
+      
+      Keyboard Model:
+      
     
     
-      
-      Variants
-      متغیرات
+      
+      Layouts
+       لے آؤٹ
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
-      اپنے کی بورڈ کی جانچ کریں
+      
+      Variants
+      متغیرات
     
   
   
diff --git a/lang/calamares_uz.ts b/lang/calamares_uz.ts
index ae70f3f376..3edbeeea63 100644
--- a/lang/calamares_uz.ts
+++ b/lang/calamares_uz.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +337,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -821,22 +819,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1701,17 +1699,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1776,32 +1774,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2761,92 +2759,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2978,7 +2976,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3602,25 +3600,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3628,28 +3654,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3657,28 +3683,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4030,44 +4056,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts
index 7c3b412581..e662622513 100644
--- a/lang/calamares_vi.ts
+++ b/lang/calamares_vi.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Xong
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       Thiết lập không thành công
     
     
-      
+      
       Installation Failed
       Cài đặt thất bại
     
     
-      
+      
       Would you like to paste the install log to the web?
       Bạn có muốn gửi nhật ký cài đặt lên web không?
     
     
-      
+      
       Error
       Lỗi
     
     
-      
-      
+      
       &Yes
       &Có
     
     
-      
-      
+      
       &No
       &Không
     
     
-      
+      
       &Close
       Đón&g
     
     
-      
+      
       Install Log Paste URL
       URL để gửi nhật ký cài đặt
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       Tải lên không thành công. Không có quá trình gửi lên web nào được thực hiện.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,124 +337,124 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       Khởi tạo không thành công
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 không thể được cài đặt.Không thể tải tất cả các mô-đun đã định cấu hình. Đây là vấn đề với cách phân phối sử dụng.
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/> Không thể tải các mô-đun sau:
     
     
-      
+      
       Continue with setup?
       Tiếp tục thiết lập?
     
     
-      
+      
       Continue with installation?
       Tiếp tục cài đặt?
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       Chương trình thiết lập %1 sắp thực hiện các thay đổi đối với đĩa của bạn để thiết lập %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       Trình cài đặt %1 sắp thực hiện các thay đổi đối với đĩa của bạn để cài đặt %2. <br/> <strong> Bạn sẽ không thể hoàn tác các thay đổi này. </strong>
     
     
-      
+      
       &Set up now
       &Thiết lập ngay
     
     
-      
+      
       &Install now
       &Cài đặt ngay
     
     
-      
+      
       Go &back
       &Quay lại
     
     
-      
+      
       &Set up
       &Thiết lập
     
     
-      
+      
       &Install
       &Cài đặt
     
     
-      
+      
       Setup is complete. Close the setup program.
       Thiết lập hoàn tất. Đóng chương trình cài đặt.
     
     
-      
+      
       The installation is complete. Close the installer.
       Quá trình cài đặt hoàn tất. Đóng trình cài đặt.
     
     
-      
+      
       Cancel setup without changing the system.
       Hủy thiết lập mà không thay đổi hệ thống.
     
     
-      
+      
       Cancel installation without changing the system.
       Hủy cài đặt mà không thay đổi hệ thống.
     
     
-      
+      
       &Next
       &Tiếp
     
     
-      
+      
       &Back
       &Quay lại
     
     
-      
+      
       &Done
       &Xong
     
     
-      
+      
       &Cancel
       &Hủy
     
     
-      
+      
       Cancel setup?
       Hủy thiết lập?
     
     
-      
+      
       Cancel installation?
       Hủy cài đặt?
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       Bạn có thực sự muốn hủy quá trình thiết lập hiện tại không?
 Chương trình thiết lập sẽ thoát và tất cả các thay đổi sẽ bị mất.
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       Bạn có thực sự muốn hủy quá trình cài đặt hiện tại không?
@@ -823,22 +821,22 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       Chương trình này sẽ hỏi bạn vài câu hỏi và thiết lập %2 trên máy tính của bạn.
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>Chào mừng đến với chương trình Calamares để thiết lập %1</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>Chào mừng đến với thiết lập %1 </h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>Chào mừng đến với chương trình Calamares để cài đặt %1</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>Chào mừng đến với bộ cài đặt %1 </h1>
     
@@ -1703,17 +1701,17 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       Konsole chưa được cài đặt
     
     
-      
+      
       Please install KDE Konsole and try again!
       Vui lòng cài đặt KDE Konsole rồi thử lại!
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       Đang thực thi kịch bản: &nbsp;<code>%1</code>
     
@@ -1778,32 +1776,32 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
       <h1>Điều khoản giấy phép</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       Tôi đồng ý với điều khoản và điều kiện trên.
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       Vui lòng đọc thoả thuận giấy phép người dùng cuối (EULAs).
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       Quy trình thiết lập này sẽ cài đặt phần mềm độc quyền tuân theo các điều khoản cấp phép.
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       Nếu bạn không đồng ý với các điều khoản, quy trình thiết lập không thể tiếp tục.
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       Quy trình thiết lập này có thể cài đặt phần mềm độc quyền tuân theo các điều khoản cấp phép để cung cấp các tính năng bổ sung và nâng cao trải nghiệm người dùng.
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       Nếu bạn không đồng ý với các điều khoản, phần mềm độc quyền sẽ không được cài đặt và các giải pháp thay thế nguồn mở sẽ được sử dụng thay thế.
     
@@ -2765,92 +2763,92 @@ Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.<
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       Thu thập thông tin hệ thống ...
     
     
-      
+      
       Partitions
       Phân vùng
     
     
-      
+      
       Current:
       Hiện tại:
     
     
-      
+      
       After:
       Sau:
     
     
-      
+      
       No EFI system partition configured
       Không có hệ thống phân vùng EFI được cài đặt
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       Lựa chọn dùng GPT trên BIOS
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       Bảng phân vùng GPT là lựa chọn tốt nhất cho tất cả các hệ thống. Trình cài đặt này cũng hỗ trợ thiết lập như vậy cho các hệ thống BIOS. <br/> <br/> Để định cấu hình bảng phân vùng GPT trên BIOS, (nếu chưa thực hiện xong) hãy quay lại và đặt bảng phân vùng thành GPT, tiếp theo tạo 8 MB phân vùng chưa định dạng với cờ <strong> bios_grub </strong> được bật. <br/> <br/> Cần có phân vùng 8 MB chưa được định dạng để khởi động %1 trên hệ thống BIOS có GPT.
     
     
-      
+      
       Boot partition not encrypted
       Phân vùng khởi động không được mã hóa
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       Một phân vùng khởi động riêng biệt đã được thiết lập cùng với một phân vùng gốc được mã hóa, nhưng phân vùng khởi động không được mã hóa. <br/> <br/> Có những lo ngại về bảo mật với loại thiết lập này, vì các tệp hệ thống quan trọng được lưu giữ trên một phân vùng không được mã hóa . <br/> Bạn có thể tiếp tục nếu muốn, nhưng việc mở khóa hệ thống tệp sẽ diễn ra sau trong quá trình khởi động hệ thống. <br/> Để mã hóa phân vùng khởi động, hãy quay lại và tạo lại nó, chọn <strong> Mã hóa </strong> trong phân vùng cửa sổ tạo.
     
     
-      
+      
       has at least one disk device available.
       có sẵn ít nhất một thiết bị đĩa.
     
     
-      
+      
       There are no partitions to install on.
       Không có phân vùng để cài đặt.
     
@@ -2985,7 +2983,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3612,25 +3610,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &OK
+    
+    
+      
+      &Yes
+      &Có
+    
+    
+      
+      &No
+      &Không
+    
+    
+      
+      &Cancel
+      &Huỷ bỏ
+    
+    
+      
+      &Close
+      Đón&g
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       Phản hồi cài đặt
     
     
-      
+      
       Sending installation feedback.
       Gửi phản hồi cài đặt.
     
     
-      
+      
       Internal error in install-tracking.
       Lỗi nội bộ trong theo dõi cài đặt.
     
     
-      
+      
       HTTP request timed out.
       Yêu cầu HTTP đã hết thời gian chờ.
     
@@ -3638,28 +3664,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       Người dùng KDE phản hồi
     
     
-      
+      
       Configuring KDE user feedback.
       Định cấu hình phản hồi của người dùng KDE.
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       Lỗi trong cấu hình phản hồi của người dùng KDE.
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       Không thể định cấu hình phản hồi của người dùng KDE một cách chính xác, lỗi tập lệnh %1.
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       Không thể định cấu hình phản hồi của người dùng KDE một cách chính xác, lỗi Calamares %1.
     
@@ -3667,28 +3693,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       Phản hồi máy
     
     
-      
+      
       Configuring machine feedback.
       Cấu hình phản hồi máy.
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       Lỗi cấu hình phản hồi máy.
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       Không thể cấu hình phản hồi máy chính xác, kịch bản lỗi %1.
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       Không thể cấu hình phản hồi máy chính xác, lỗi %1.
     
@@ -4053,45 +4079,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      Mẫu bàn phím
-    
-    
-      
-      Layouts
-      Bố cục
+      
+      To activate keyboard preview, select a layout.
+      
     
     
-      
-      Keyboard Layout
-      Bố cục bàn phím
+      
+      Keyboard Model:
+      Mẫu bàn phím:
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      Nhấp vào kiểu bàn phím ưa thích của bạn để chọn bố cục và biến thể hoặc sử dụng kiểu mặc định dựa trên phần cứng được phát hiện.
+      
+      Layouts
+      Bố cục
     
     
-      
-      Models
-      Mẫu
+      
+      Type here to test your keyboard
+      Gõ vào đây để thử bàn phím
     
     
-      
+      
       Variants
       Các biến thể
     
-    
-      
-      Keyboard Variant
-      Các biến thể bàn phím
-    
-    
-      
-      Test your keyboard
-      Thử bàn phím
-    
   
   
     localeq
diff --git a/lang/calamares_zh.ts b/lang/calamares_zh.ts
index b9a8ae8154..7de03283d1 100644
--- a/lang/calamares_zh.ts
+++ b/lang/calamares_zh.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +337,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -821,22 +819,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1701,17 +1699,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1776,32 +1774,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2761,92 +2759,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2978,7 +2976,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3602,25 +3600,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3628,28 +3654,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3657,28 +3683,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4030,44 +4056,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts
index 941b934903..4449b5d093 100644
--- a/lang/calamares_zh_CN.ts
+++ b/lang/calamares_zh_CN.ts
@@ -172,7 +172,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       完成
     
@@ -284,54 +284,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       安装失败
     
     
-      
+      
       Installation Failed
       安装失败
     
     
-      
+      
       Would you like to paste the install log to the web?
       需要将安装日志粘贴到网页吗？
     
     
-      
+      
       Error
       错误
     
     
-      
-      
+      
       &Yes
       &是
     
     
-      
-      
+      
       &No
       &否
     
     
-      
+      
       &Close
       &关闭
     
     
-      
+      
       Install Log Paste URL
       安装日志粘贴 URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       上传失败，未完成网页粘贴。
     
     
-      
+      
       Install log posted to
 
 %1
@@ -344,124 +342,124 @@ Link copied to clipboard
 的链接已保存至剪贴板 
     
     
-      
+      
       Calamares Initialization Failed
       Calamares初始化失败
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       ％1无法安装。 Calamares无法加载所有已配置的模块。这个问题是发行版配置Calamares不当导致的。
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>无法加载以下模块：
     
     
-      
+      
       Continue with setup?
       要继续安装吗？
     
     
-      
+      
       Continue with installation?
       继续安装？
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       为了安装%2, %1 安装程序即将对磁盘进行更改。<br/><strong>这些更改无法撤销。</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 安装程序将在您的磁盘上做出变更以安装 %2。<br/><strong>您将无法复原这些变更。</strong>
     
     
-      
+      
       &Set up now
       现在安装(&S)
     
     
-      
+      
       &Install now
       现在安装 (&I)
     
     
-      
+      
       Go &back
       返回 (&B)
     
     
-      
+      
       &Set up
       安装(&S)
     
     
-      
+      
       &Install
       安装(&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       安装完成。关闭安装程序。
     
     
-      
+      
       The installation is complete. Close the installer.
       安装已完成。请关闭安装程序。
     
     
-      
+      
       Cancel setup without changing the system.
       取消安装，保持系统不变。
     
     
-      
+      
       Cancel installation without changing the system.
       取消安装，并不做任何更改。
     
     
-      
+      
       &Next
       下一步(&N)
     
     
-      
+      
       &Back
       后退(&B)
     
     
-      
+      
       &Done
       &完成
     
     
-      
+      
       &Cancel
       取消(&C)
     
     
-      
+      
       Cancel setup?
       取消安装？
     
     
-      
+      
       Cancel installation?
       取消安装？
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       确定要取消当前安装吗?
 安装程序将会退出，所有修改都会丢失。
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       确定要取消当前的安装吗？
@@ -830,22 +828,22 @@ The installer will quit and all changes will be lost.
       本程序将会问您一些问题并在您的电脑上安装及设置 %2 。
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>欢迎使用 %1 的 Calamares 安装程序</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>欢迎使用 %1 设置</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>欢迎使用 %1 的 Calamares 安装程序</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>欢迎使用 %1 安装程序</h1>
     
@@ -952,12 +950,12 @@ The installer will quit and all changes will be lost.
     
       
       Install option: <strong>%1</strong>
-      
+      安装选项：<strong>%1</strong>
     
     
       
       None
-      
+      无
     
     
       
@@ -1076,7 +1074,7 @@ The installer will quit and all changes will be lost.
     
       
       Create new %1MiB partition on %3 (%2) with entries %4.
-      
+      在 %3 (%2) 上使用 %4 建立新的 %1MiB 分区。
     
     
       
@@ -1091,7 +1089,7 @@ The installer will quit and all changes will be lost.
     
       
       Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
-      
+      在 <strong>%3</strong> (%2) 上使用 <em>%4</em> 建立新的 <strong>%1MiB</strong> 分区。
     
     
       
@@ -1455,7 +1453,7 @@ The installer will quit and all changes will be lost.
     
       
       Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
-      
+      在有 <em>%3</em> 特性的<strong>新</strong> %2 系統分区上安裝 %1
     
     
       
@@ -1465,7 +1463,7 @@ The installer will quit and all changes will be lost.
     
       
       Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
-      
+      设置 <strong>新的</strong> 含挂载点 <strong>%1</strong>%3 的 %2 分区。
     
     
       
@@ -1480,7 +1478,7 @@ The installer will quit and all changes will be lost.
     
       
       Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
-      
+      为分区 %3  <strong>%1</strong> 设定挂载点 <strong>%2</strong> 与特性 <em>%4</em>。
     
     
       
@@ -1711,17 +1709,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       未安装 Konsole
     
     
-      
+      
       Please install KDE Konsole and try again!
       请安装 KDE Konsole 后重试！
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       正在运行脚本：&nbsp;<code>%1</code>
     
@@ -1786,32 +1784,32 @@ The installer will quit and all changes will be lost.
       <h1>许可证</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       我同意如上条款。
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       请查阅最终用户许可协议 (EULAs)。
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       此安装过程会安装受许可条款约束的专有软件。
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       如果您不同意这些条款，安装过程将无法继续。
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       此安装过程会安装受许可条款约束的专有软件，用于提供额外功能和提升用户体验。
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       如果您不同意这些条款，专有软件不会被安装，相应的开源软件替代品将被安装。
     
@@ -2773,92 +2771,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       正在收集系统信息...
     
     
-      
+      
       Partitions
       分区
     
     
-      
+      
       Current:
       当前：
     
     
-      
+      
       After:
       之后：
     
     
-      
+      
       No EFI system partition configured
       未配置 EFI 系统分区
     
     
-      
+      
       EFI system partition configured incorrectly
-      
+      EFI系统分区配置错误
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
-      
+      启动 %1 必须需要 EFI 系統分区。<br/><br/>要設定 EFI 系统分区，返回并选择或者建立符合要求的分区。
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
-      
+      文件系统必须挂载于 <strong>%1</strong>。
     
     
-      
+      
       The filesystem must have type FAT32.
-      
+      此文件系统必须为FAT32
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
-      
+      文件系统必须要有%1 MiB 的大小。
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
-      
+      文件系统必须有 <strong>%1</strong> 标志设定。
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
-      
+      您可以在不设置EFI系统分区的情况下继续，但您的系統可能无法启动。
     
     
-      
+      
       Option to use GPT on BIOS
       在 BIOS 上使用 GPT
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT 分区表对于所有系统来说都是最佳选项。本安装程序支持在 BIOS 模式下设置 GPT 分区表。<br/><br/>要在 BIOS 模式下配置 GPT 分区表，（若你尚未配置好）返回并设置分区表为 GPT，然后创建一个 8MB 的、未经格式化的、启用<strong>bios_grub</strong> 标记的分区。<br/><br/>一个未格式化的 8MB 的分区对于在 BIOS 模式下使用 GPT 启动 %1 来说是非常有必要的。
     
     
-      
+      
       Boot partition not encrypted
       引导分区未加密
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       您尝试用单独的引导分区配合已加密的根分区使用，但引导分区未加密。<br/><br/>这种配置方式可能存在安全隐患，因为重要的系统文件存储在了未加密的分区上。<br/>您可以继续保持此配置，但是系统解密将在系统启动时而不是引导时进行。<br/>要加密引导分区，请返回上一步并重新创建此分区，并在分区创建窗口选中 <strong>加密</strong> 选项。
     
     
-      
+      
       has at least one disk device available.
       有至少一个可用的磁盘设备。
     
     
-      
+      
       There are no partitions to install on.
       无可用于安装的分区。
     
@@ -2993,7 +2991,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1（%2）
     
@@ -3620,25 +3618,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      &确定
+    
+    
+      
+      &Yes
+      &是
+    
+    
+      
+      &No
+      &否
+    
+    
+      
+      &Cancel
+      取消(&C)
+    
+    
+      
+      &Close
+      &关闭
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       安装反馈
     
     
-      
+      
       Sending installation feedback.
       发送安装反馈。
     
     
-      
+      
       Internal error in install-tracking.
       在 install-tracking 步骤发生内部错误。
     
     
-      
+      
       HTTP request timed out.
       HTTP 请求超时。
     
@@ -3646,28 +3672,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE 用户反馈
     
     
-      
+      
       Configuring KDE user feedback.
       配置 KDE 用户反馈。
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       KDE 用户反馈配置中存在错误。
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       无法正确 KDE 用户反馈，脚本错误代码 %1。
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       无法正确 KDE 用户反馈，Calamares 错误代码 %1。
     
@@ -3675,28 +3701,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       机器反馈
     
     
-      
+      
       Configuring machine feedback.
       正在配置机器反馈。
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       机器反馈配置中存在错误。
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       无法正确配置机器反馈，脚本错误代码 %1。
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       无法正确配置机器反馈，Calamares 错误代码 %1。
     
@@ -4064,45 +4090,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      键盘型号
-    
-    
-      
-      Layouts
-      布局
+      
+      To activate keyboard preview, select a layout.
+      要启用键盘预览，请选择一个键盘布局
     
     
-      
-      Keyboard Layout
-      键盘布局
+      
+      Keyboard Model:
+      键盘型号：
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      单击您的首选键盘型号以选择布局和变体，或根据检测到的硬件使用默认键盘。
+      
+      Layouts
+      布局
     
     
-      
-      Models
-      型号
+      
+      Type here to test your keyboard
+      在此处数据以测试键盘
     
     
-      
+      
       Variants
       变体
     
-    
-      
-      Keyboard Variant
-      键盘变体
-    
-    
-      
-      Test your keyboard
-      测试您的键盘
-    
   
   
     localeq
@@ -4128,37 +4139,38 @@ Output:
       
       LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
                     Default option.
-      
+      LibreOffice 是強大且自由的辦办公软件，世界上有百万级别的用户量。其中包括多种组件模块使其成为世界上最强大的开源并自由的办公软件。<br/>
+                    预设选项。
     
     
       
       LibreOffice
-      
+      LibreOffice
     
     
       
       If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
-      
+      如果你不想安装办公软件，请选择不安装办公软件的选项即可。稍后您可以在安装好的系统上根据个人喜好自行选择安装办公软件与否。您可以随时在安装好的系统上添加一个（或多个）办公软件。
     
     
       
       No Office Suite
-      
+      无办公软件
     
     
       
       Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
-      
+      建立最小化的桌面安装，移除所有的附加应用。在稍后自行选择需要安装至系统的应用。同时不会有任何的模板和例子可供选择。无办公软件，无媒体播放器，无图片查看器或者打印支持。仅仅有一个桌面，文件管理器，包管理器，文本编辑器和一个网页浏览器。
     
     
       
       Minimal Install
-      
+      最小化安装
     
     
       
       Please select an option for your install, or use the default: LibreOffice included.
-      
+      请为你的安装指定一个选项，或者使用默认选项：安装LibreOffice
     
   
   
diff --git a/lang/calamares_zh_HK.ts b/lang/calamares_zh_HK.ts
index 1805ddc41b..4ef2f473ba 100644
--- a/lang/calamares_zh_HK.ts
+++ b/lang/calamares_zh_HK.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       
     
     
-      
+      
       Installation Failed
       
     
     
-      
+      
       Would you like to paste the install log to the web?
       
     
     
-      
+      
       Error
       
     
     
-      
-      
+      
       &Yes
       
     
     
-      
-      
+      
       &No
       
     
     
-      
+      
       &Close
       
     
     
-      
+      
       Install Log Paste URL
       
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       
     
     
-      
+      
       Install log posted to
 
 %1
@@ -339,123 +337,123 @@ Link copied to clipboard
       
     
     
-      
+      
       Calamares Initialization Failed
       
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       
     
     
-      
+      
       <br/>The following modules could not be loaded:
       
     
     
-      
+      
       Continue with setup?
       
     
     
-      
+      
       Continue with installation?
       
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       
     
     
-      
+      
       &Set up now
       
     
     
-      
+      
       &Install now
       
     
     
-      
+      
       Go &back
       
     
     
-      
+      
       &Set up
       
     
     
-      
+      
       &Install
       
     
     
-      
+      
       Setup is complete. Close the setup program.
       
     
     
-      
+      
       The installation is complete. Close the installer.
       
     
     
-      
+      
       Cancel setup without changing the system.
       
     
     
-      
+      
       Cancel installation without changing the system.
       
     
     
-      
+      
       &Next
       
     
     
-      
+      
       &Back
       
     
     
-      
+      
       &Done
       
     
     
-      
+      
       &Cancel
       
     
     
-      
+      
       Cancel setup?
       
     
     
-      
+      
       Cancel installation?
       
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       
@@ -821,22 +819,22 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       
     
@@ -1701,17 +1699,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       
     
     
-      
+      
       Please install KDE Konsole and try again!
       
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       
     
@@ -1776,32 +1774,32 @@ The installer will quit and all changes will be lost.
       
     
     
-      
+      
       I accept the terms and conditions above.
       
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       
     
@@ -2761,92 +2759,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       
     
     
-      
+      
       Partitions
       
     
     
-      
+      
       Current:
       
     
     
-      
+      
       After:
       
     
     
-      
+      
       No EFI system partition configured
       
     
     
-      
+      
       EFI system partition configured incorrectly
       
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       
     
     
-      
+      
       The filesystem must have type FAT32.
       
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       
     
     
-      
+      
       Option to use GPT on BIOS
       
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       
     
     
-      
+      
       Boot partition not encrypted
       
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       
     
     
-      
+      
       has at least one disk device available.
       
     
     
-      
+      
       There are no partitions to install on.
       
     
@@ -2978,7 +2976,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       
     
@@ -3602,25 +3600,53 @@ Output:
       
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      
+    
+    
+      
+      &Yes
+      
+    
+    
+      
+      &No
+      
+    
+    
+      
+      &Cancel
+      
+    
+    
+      
+      &Close
+      
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       
     
     
-      
+      
       Sending installation feedback.
       
     
     
-      
+      
       Internal error in install-tracking.
       
     
     
-      
+      
       HTTP request timed out.
       
     
@@ -3628,28 +3654,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       
     
     
-      
+      
       Configuring KDE user feedback.
       
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       
     
@@ -3657,28 +3683,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       
     
     
-      
+      
       Configuring machine feedback.
       
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       
     
@@ -4030,44 +4056,29 @@ Output:
   
   
     keyboardq
-    
-      
-      Keyboard Model
-      
-    
-    
-      
-      Layouts
-      
-    
-    
-      
-      Keyboard Layout
-      
-    
     
       
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
+      To activate keyboard preview, select a layout.
       
     
     
-      
-      Models
+      
+      Keyboard Model:
       
     
     
-      
-      Variants
+      
+      Layouts
       
     
     
-      
-      Keyboard Variant
+      
+      Type here to test your keyboard
       
     
     
-      
-      Test your keyboard
+      
+      Variants
       
     
   
diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts
index bca1ae1a98..ccd786aa07 100644
--- a/lang/calamares_zh_TW.ts
+++ b/lang/calamares_zh_TW.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       完成
     
@@ -283,54 +283,52 @@
   
     Calamares::ViewManager
     
-      
+      
       Setup Failed
       設定失敗
     
     
-      
+      
       Installation Failed
       安裝失敗
     
     
-      
+      
       Would you like to paste the install log to the web?
       想要將安裝紀錄檔貼到網路上嗎？
     
     
-      
+      
       Error
       錯誤
     
     
-      
-      
+      
       &Yes
       是(&Y)
     
     
-      
-      
+      
       &No
       否(&N)
     
     
-      
+      
       &Close
       關閉(&C)
     
     
-      
+      
       Install Log Paste URL
       安裝紀錄檔張貼 URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       上傳不成功。並未完成網路張貼。
     
     
-      
+      
       Install log posted to
 
 %1
@@ -343,124 +341,124 @@ Link copied to clipboard
 連結已複製到剪貼簿
     
     
-      
+      
       Calamares Initialization Failed
       Calamares 初始化失敗
     
     
-      
+      
       %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.
       %1 無法安裝。Calamares 無法載入所有已設定的模組。散佈版使用 Calamares 的方式有問題。
     
     
-      
+      
       <br/>The following modules could not be loaded:
       <br/>以下的模組無法載入：
     
     
-      
+      
       Continue with setup?
       繼續安裝？
     
     
-      
+      
       Continue with installation?
       繼續安裝？
     
     
-      
+      
       The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 設定程式將在您的磁碟上做出變更以設定 %2。<br/><strong>您將無法復原這些變更。</strong>
     
     
-      
+      
       The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong>
       %1 安裝程式將在您的磁碟上做出變更以安裝 %2。<br/><strong>您將無法復原這些變更。</strong>
     
     
-      
+      
       &Set up now
       馬上進行設定 (&S)
     
     
-      
+      
       &Install now
       現在安裝 (&I)
     
     
-      
+      
       Go &back
       上一步 (&B)
     
     
-      
+      
       &Set up
       設定 (&S)
     
     
-      
+      
       &Install
       安裝(&I)
     
     
-      
+      
       Setup is complete. Close the setup program.
       設定完成。關閉設定程式。
     
     
-      
+      
       The installation is complete. Close the installer.
       安裝完成。關閉安裝程式。
     
     
-      
+      
       Cancel setup without changing the system.
       取消安裝，不更改系統。
     
     
-      
+      
       Cancel installation without changing the system.
       不變更系統並取消安裝。
     
     
-      
+      
       &Next
       下一步 (&N)
     
     
-      
+      
       &Back
       返回 (&B)
     
     
-      
+      
       &Done
       完成(&D)
     
     
-      
+      
       &Cancel
       取消(&C)
     
     
-      
+      
       Cancel setup?
       取消設定？
     
     
-      
+      
       Cancel installation?
       取消安裝？
     
     
-      
+      
       Do you really want to cancel the current setup process?
 The setup program will quit and all changes will be lost.
       真的想要取消目前的設定程序嗎？
 設定程式將會結束，所有變更都將會遺失。
     
     
-      
+      
       Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.
       您真的想要取消目前的安裝程序嗎？
@@ -827,22 +825,22 @@ The installer will quit and all changes will be lost.
       本程式會問您一些問題，然後在您的電腦安裝及設定 %2。
     
     
-      
+      
       <h1>Welcome to the Calamares setup program for %1</h1>
       <h1>歡迎使用 %1 的 Calamares 安裝程式</h1>
     
     
-      
+      
       <h1>Welcome to %1 setup</h1>
       <h1>歡迎使用 %1 安裝程式</h1>
     
     
-      
+      
       <h1>Welcome to the Calamares installer for %1</h1>
       <h1>歡迎使用 %1 的 Calamares 安裝程式</h1>
     
     
-      
+      
       <h1>Welcome to the %1 installer</h1>
       <h1>歡迎使用 %1 安裝程式</h1>
     
@@ -1707,17 +1705,17 @@ The installer will quit and all changes will be lost.
   
     InteractiveTerminalPage
     
-      
+      
       Konsole not installed
       未安裝 Konsole
     
     
-      
+      
       Please install KDE Konsole and try again!
       請安裝 KDE Konsole 並再試一次！
     
     
-      
+      
       Executing script: &nbsp;<code>%1</code>
       正在執行指令稿：&nbsp;<code>%1</code>
     
@@ -1782,32 +1780,32 @@ The installer will quit and all changes will be lost.
       <h1>授權條款</h1>
     
     
-      
+      
       I accept the terms and conditions above.
       我接受上述的條款與條件。
     
     
-      
+      
       Please review the End User License Agreements (EULAs).
       請審閱終端使用者授權條款 (EULAs)。
     
     
-      
+      
       This setup procedure will install proprietary software that is subject to licensing terms.
       此設定過程將會安裝需要同意其授權條款的專有軟體。
     
     
-      
+      
       If you do not agree with the terms, the setup procedure cannot continue.
       如果您不同意此條款，安裝程序就無法繼續。
     
     
-      
+      
       This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.
       此設定過程會安裝需要同意授權條款的專有軟體以提供附加功能並強化使用者體驗。
     
     
-      
+      
       If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.
       如果您不同意條款，就不會安裝專有軟體，而將會使用開放原始碼的替代方案。
     
@@ -2769,92 +2767,92 @@ The installer will quit and all changes will be lost.
   
     PartitionViewStep
     
-      
+      
       Gathering system information...
       蒐集系統資訊中...
     
     
-      
+      
       Partitions
       分割區
     
     
-      
+      
       Current:
       目前：
     
     
-      
+      
       After:
       之後：
     
     
-      
+      
       No EFI system partition configured
       未設定 EFI 系統分割區
     
     
-      
+      
       EFI system partition configured incorrectly
       EFI 系統分割區設定不正確
     
     
-      
+      
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
       要啟動 %1 必須要有 EFI 系統分割區。<br/><br/>要設定 EFI 系統分割區，返回並選取或建立適合的檔案系統。
     
     
-      
+      
       The filesystem must be mounted on <strong>%1</strong>.
       檔案系統必須掛載於 <strong>%1</strong>。
     
     
-      
+      
       The filesystem must have type FAT32.
       檔案系統必須有類型 FAT32。
     
     
-      
+      
       The filesystem must be at least %1 MiB in size.
       檔案系統必須至少有 %1 MiB 的大小。
     
     
-      
+      
       The filesystem must have flag <strong>%1</strong> set.
       檔案系統必須有旗標 <strong>%1</strong> 設定。
     
     
-      
+      
       You can continue without setting up an EFI system partition but your system may fail to start.
       您可以在不設定 EFI 系統分割區的情況下繼續，但您的系統可能無法啟動。
     
     
-      
+      
       Option to use GPT on BIOS
       在 BIOS 上使用 GPT 的選項
     
     
-      
+      
       A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.
       GPT 分割表對所有系統都是最佳選項。此安裝程式同時也支援 BIOS 系統。<br/><br/>要在 BIOS 上設定 GPT 分割表，（如果還沒有完成的話）請回上一步並將分割表設定為 GPT，然後建立 8 MB 的未格式化分割區，並啟用 <strong>bios_grub</strong> 旗標。<br/>要在 BIOS 系統上使用 GPT 分割區啟動 %1 則必須使用未格式化的 8MB 分割區。
     
     
-      
+      
       Boot partition not encrypted
       開機分割區未加密
     
     
-      
+      
       A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window.
       設定了單獨的開機分割區以及加密的根分割區，但是開機分割區並不會被加密。<br/><br/>這種設定可能會造成安全問題，因為重要的系統檔案是放在未加密的分割區中。<br/>您也可以繼續，但是檔案系統的解鎖會在系統啟動後才發生。<br/>要加密開機分割區，回到上一頁並重新建立它，並在分割區建立視窗選取<strong>加密</strong>。
     
     
-      
+      
       has at least one disk device available.
       有至少一個可用的磁碟裝置。
     
     
-      
+      
       There are no partitions to install on.
       沒有可用於安裝的分割區。
     
@@ -2989,7 +2987,7 @@ Output:
   
     QObject
     
-      
+      
       %1 (%2)
       %1 (%2)
     
@@ -3616,25 +3614,53 @@ Output:
       %L1 / %L2
     
   
+  
+    StandardButtons
+    
+      
+      &OK
+      確定(&O)
+    
+    
+      
+      &Yes
+      是(&Y)
+    
+    
+      
+      &No
+      否(&N)
+    
+    
+      
+      &Cancel
+      取消(&C)
+    
+    
+      
+      &Close
+      關閉(&C)
+    
+  
   
     TrackingInstallJob
     
-      
+      
       Installation feedback
       安裝回饋
     
     
-      
+      
       Sending installation feedback.
       傳送安裝回饋
     
     
-      
+      
       Internal error in install-tracking.
       在安裝追蹤裡的內部錯誤。
     
     
-      
+      
       HTTP request timed out.
       HTTP 請求逾時。
     
@@ -3642,28 +3668,28 @@ Output:
   
     TrackingKUserFeedbackJob
     
-      
+      
       KDE user feedback
       KDE 使用者回饋
     
     
-      
+      
       Configuring KDE user feedback.
       設定 KDE 使用者回饋。
     
     
-      
-      
+      
+      
       Error in KDE user feedback configuration.
       KDE 使用者回饋設定錯誤。
     
     
-      
+      
       Could not configure KDE user feedback correctly, script error %1.
       無法正確設定 KDE 使用者回饋，指令稿錯誤 %1。
     
     
-      
+      
       Could not configure KDE user feedback correctly, Calamares error %1.
       無法正確設定 KDE 使用者回饋，Calamares 錯誤 %1。
     
@@ -3671,28 +3697,28 @@ Output:
   
     TrackingMachineUpdateManagerJob
     
-      
+      
       Machine feedback
       機器回饋
     
     
-      
+      
       Configuring machine feedback.
       設定機器回饋。
     
     
-      
-      
+      
+      
       Error in machine feedback configuration.
       在機器回饋設定中的錯誤。
     
     
-      
+      
       Could not configure machine feedback correctly, script error %1.
       無法正確設定機器回饋，指令稿錯誤 %1。
     
     
-      
+      
       Could not configure machine feedback correctly, Calamares error %1.
       無法正確設定機器回饋，Calamares 錯誤 %1。
     
@@ -4060,45 +4086,30 @@ Output:
   
     keyboardq
     
-      
-      Keyboard Model
-      鍵盤型號
-    
-    
-      
-      Layouts
-      佈局
+      
+      To activate keyboard preview, select a layout.
+      要啟用鍵盤預覽，請選取佈局。
     
     
-      
-      Keyboard Layout
-      鍵盤佈局
+      
+      Keyboard Model:
+      鍵盤型號：
     
     
-      
-      Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.
-      點擊您偏好的鍵盤型號來選擇佈局與變體，或是使用以偵測到的硬體為基礎的預設值。
+      
+      Layouts
+      佈局
     
     
-      
-      Models
-      型號
+      
+      Type here to test your keyboard
+      在此輸入以測試您的鍵盤
     
     
-      
+      
       Variants
       變種
     
-    
-      
-      Keyboard Variant
-      鍵盤變體
-    
-    
-      
-      Test your keyboard
-      測試您的鍵盤
-    
   
   
     localeq

From 34b4661268b6bcf7ffb8966fbdd1e965ed010cd9 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Mon, 13 Sep 2021 12:53:36 +0200
Subject: [PATCH 430/492] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python.pot                               | 476 ++++++++---------
 lang/python/ar/LC_MESSAGES/python.po          | 408 +++++++--------
 lang/python/as/LC_MESSAGES/python.po          | 452 ++++++++--------
 lang/python/ast/LC_MESSAGES/python.po         | 430 +++++++--------
 lang/python/az/LC_MESSAGES/python.po          | 482 ++++++++---------
 lang/python/az_AZ/LC_MESSAGES/python.po       | 482 ++++++++---------
 lang/python/be/LC_MESSAGES/python.po          | 456 ++++++++--------
 lang/python/bg/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/bn/LC_MESSAGES/python.po          | 392 +++++++-------
 lang/python/ca/LC_MESSAGES/python.po          | 480 ++++++++---------
 lang/python/ca@valencia/LC_MESSAGES/python.po | 464 ++++++++---------
 lang/python/cs_CZ/LC_MESSAGES/python.po       | 486 ++++++++---------
 lang/python/da/LC_MESSAGES/python.po          | 460 ++++++++--------
 lang/python/de/LC_MESSAGES/python.po          | 488 ++++++++---------
 lang/python/el/LC_MESSAGES/python.po          | 378 +++++++-------
 lang/python/en_GB/LC_MESSAGES/python.po       | 390 +++++++-------
 lang/python/eo/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/es/LC_MESSAGES/python.po          | 470 ++++++++---------
 lang/python/es_MX/LC_MESSAGES/python.po       | 462 +++++++++--------
 lang/python/es_PE/LC_MESSAGES/python.po       | 376 +++++++-------
 lang/python/es_PR/LC_MESSAGES/python.po       | 376 +++++++-------
 lang/python/et/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/eu/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/fa/LC_MESSAGES/python.po          | 444 ++++++++--------
 lang/python/fi_FI/LC_MESSAGES/python.po       | 468 ++++++++---------
 lang/python/fr/LC_MESSAGES/python.po          | 468 ++++++++---------
 lang/python/fr_CH/LC_MESSAGES/python.po       | 376 +++++++-------
 lang/python/fur/LC_MESSAGES/python.po         | 464 ++++++++---------
 lang/python/gl/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/gu/LC_MESSAGES/python.po          | 376 +++++++-------
 lang/python/he/LC_MESSAGES/python.po          | 468 ++++++++---------
 lang/python/hi/LC_MESSAGES/python.po          | 466 ++++++++---------
 lang/python/hr/LC_MESSAGES/python.po          | 478 ++++++++---------
 lang/python/hu/LC_MESSAGES/python.po          | 458 ++++++++--------
 lang/python/id/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/id_ID/LC_MESSAGES/python.po       | 372 ++++++-------
 lang/python/ie/LC_MESSAGES/python.po          | 420 +++++++--------
 lang/python/is/LC_MESSAGES/python.po          | 382 +++++++-------
 lang/python/it_IT/LC_MESSAGES/python.po       | 466 ++++++++---------
 lang/python/ja/LC_MESSAGES/python.po          | 458 ++++++++--------
 lang/python/kk/LC_MESSAGES/python.po          | 376 +++++++-------
 lang/python/kn/LC_MESSAGES/python.po          | 376 +++++++-------
 lang/python/ko/LC_MESSAGES/python.po          | 458 ++++++++--------
 lang/python/ko_KR/LC_MESSAGES/python.po       | 372 ++++++-------
 lang/python/lo/LC_MESSAGES/python.po          | 372 ++++++-------
 lang/python/lt/LC_MESSAGES/python.po          | 480 ++++++++---------
 lang/python/lv/LC_MESSAGES/python.po          | 380 +++++++-------
 lang/python/mk/LC_MESSAGES/python.po          | 386 +++++++-------
 lang/python/ml/LC_MESSAGES/python.po          | 380 +++++++-------
 lang/python/mr/LC_MESSAGES/python.po          | 376 +++++++-------
 lang/python/nb/LC_MESSAGES/python.po          | 378 +++++++-------
 lang/python/ne/LC_MESSAGES/python.po          | 376 +++++++-------
 lang/python/ne_NP/LC_MESSAGES/python.po       | 376 +++++++-------
 lang/python/nl/LC_MESSAGES/python.po          | 468 ++++++++---------
 lang/python/pl/LC_MESSAGES/python.po          | 478 ++++++++---------
 lang/python/pt_BR/LC_MESSAGES/python.po       | 484 ++++++++---------
 lang/python/pt_PT/LC_MESSAGES/python.po       | 484 ++++++++---------
 lang/python/ro/LC_MESSAGES/python.po          | 390 +++++++-------
 lang/python/ru/LC_MESSAGES/python.po          | 428 +++++++--------
 lang/python/ru_RU/LC_MESSAGES/python.po       | 384 +++++++-------
 lang/python/si/LC_MESSAGES/python.po          | 382 +++++++-------
 lang/python/sk/LC_MESSAGES/python.po          | 440 ++++++++--------
 lang/python/sl/LC_MESSAGES/python.po          | 384 +++++++-------
 lang/python/sq/LC_MESSAGES/python.po          | 482 ++++++++---------
 lang/python/sr/LC_MESSAGES/python.po          | 398 +++++++-------
 lang/python/sr@latin/LC_MESSAGES/python.po    | 380 +++++++-------
 lang/python/sv/LC_MESSAGES/python.po          | 480 ++++++++---------
 lang/python/te/LC_MESSAGES/python.po          | 376 +++++++-------
 lang/python/tg/LC_MESSAGES/python.po          | 466 ++++++++---------
 lang/python/th/LC_MESSAGES/python.po          | 372 ++++++-------
 lang/python/tr_TR/LC_MESSAGES/python.po       | 462 +++++++++--------
 lang/python/uk/LC_MESSAGES/python.po          | 490 +++++++++---------
 lang/python/ur/LC_MESSAGES/python.po          | 376 +++++++-------
 lang/python/uz/LC_MESSAGES/python.po          | 372 ++++++-------
 lang/python/vi/LC_MESSAGES/python.po          | 452 ++++++++--------
 lang/python/zh/LC_MESSAGES/python.po          | 372 ++++++-------
 lang/python/zh_CN/LC_MESSAGES/python.po       | 456 ++++++++--------
 lang/python/zh_HK/LC_MESSAGES/python.po       | 372 ++++++-------
 lang/python/zh_TW/LC_MESSAGES/python.po       | 456 ++++++++--------
 79 files changed, 16820 insertions(+), 16662 deletions(-)

diff --git a/lang/python.pot b/lang/python.pot
index b7ce4cbad8..335a89206b 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -18,21 +18,137 @@ msgstr ""
 "Language: \n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Mounting partitions."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Configuration Error"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No partitions are defined for 
    {!s}
     to use."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure systemd services"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Cannot modify service"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Cannot enable systemd service {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Cannot enable systemd target {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Cannot disable systemd target {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Cannot mask systemd unit {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount file systems."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Filling up filesystems."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync failed with error code {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Unpacking image {}/{}, file {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Starting to unpack {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Failed to unpack image \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No mount point for root partition"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Bad mount point for root partition"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Bad unsquash configuration"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "The source filesystem \"{}\" does not exist"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "The destination \"{}\" in the target system is not a directory"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -90,103 +206,79 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Display manager configuration was incomplete"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creating initramfs with dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Failed to run dracut on the target"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "The exit code was {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Writing fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Configuration Error"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configuring mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "No root mount point is given for 
    {!s}
     to use."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configuring encrypted swap."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installing data."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Configure OpenRC services"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Cannot add service {name!s} to run-level {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Cannot remove service {name!s} from run-level {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Target runlevel does not exist"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Target service does not exist"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure Plymouth theme"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -241,165 +333,75 @@ msgstr ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure Plymouth theme"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installing data."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configure OpenRC services"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Cannot add service {name!s} to run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Cannot remove service {name!s} from run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Cannot modify service"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Target runlevel does not exist"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Target service does not exist"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure systemd services"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Cannot enable systemd service {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Cannot enable systemd target {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Install bootloader."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Bootloader installation error"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount file systems."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Setting hardware clock."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creating initramfs with mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Failed to run mkinitfs on the target"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "The exit code was {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creating initramfs with dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Failed to run dracut on the target"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configuring initramfs."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuring OpenRC dmcrypt service."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Writing fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuring locales."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Saving network configuration."
diff --git a/lang/python/ar/LC_MESSAGES/python.po b/lang/python/ar/LC_MESSAGES/python.po
index c92ff98cb4..0696c896bb 100644
--- a/lang/python/ar/LC_MESSAGES/python.po
+++ b/lang/python/ar/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: aboodilankaboot, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/calamares/teams/20061/ar/)\n"
@@ -22,18 +22,131 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "تثبيت محمل الإقلاع"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "جاري تركيب الأقسام"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "خطأ في الضبط"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "تعديل خدمات systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "لا يمكن تعديل الخدمة"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "الغاء تحميل ملف النظام"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "جاري ملئ أنظمة الملفات"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "فشل rsync مع رمز الخطأ {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -90,102 +203,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "إعداد مدير العرض لم يكتمل"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "كود الخروج كان {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "عملية بايثون دميه"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "عملية  دميه خطوه بايثون {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "خطأ في الضبط"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "جاري إعداد ساعة الهاردوير"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "الـ runlevel الهدف غير موجود"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "جاري تركيب الأقسام"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "الخدمة الهدف غير موجودة"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "جاري حفظ الإعدادات"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -243,153 +325,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "لا يمكن تعديل الخدمة"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "الـ runlevel الهدف غير موجود"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "الخدمة الهدف غير موجودة"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "تثبيت محمل الإقلاع"
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "تعديل خدمات systemd"
-
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "جاري إعداد ساعة الهاردوير"
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "الغاء تحميل ملف النظام"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "جاري ملئ أنظمة الملفات"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "فشل rsync مع رمز الخطأ {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "كود الخروج كان {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "عملية بايثون دميه"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "عملية  دميه خطوه بايثون {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "جاري حفظ الإعدادات"
diff --git a/lang/python/as/LC_MESSAGES/python.po b/lang/python/as/LC_MESSAGES/python.po
index 91c4017272..d7886ee5d4 100644
--- a/lang/python/as/LC_MESSAGES/python.po
+++ b/lang/python/as/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Deep Jyoti Choudhury , 2020\n"
 "Language-Team: Assamese (https://www.transifex.com/calamares/teams/20061/as/)\n"
@@ -21,19 +21,136 @@ msgstr ""
 "Language: as\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB কনফিগাৰ কৰক।"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "বিভাজন মাউন্ট্ কৰা।"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "কনফিগাৰেচন ত্ৰুটি"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
    ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
+"অজ্ঞাত systemd কমাণ্ড্।"
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ফাইল চিছটেম​বোৰ মাউণ্টৰ পৰা আতৰাওক।"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ফাইল চিছটেম​বোৰ পূৰণ কৰা হৈ আছে।"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync ক্ৰুটি কোড {}ৰ সৈতে বিফল হ'ল।"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "ইমেজ \"{}\" খোলাত ব্যৰ্থ হ'ল"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "ৰুট বিভাজনত কোনো মাউণ্ট পইণ্ট্ নাই"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ত rootMountPoint key নাই, একো কৰিব পৰা নাযায়"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "মুল বিভাজনৰ বাবে বেয়া মাউন্ট্ পইন্ট্"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint হ'ল \"{}\", যিটো উপস্থিত নাই, একো কৰিব পৰা নাযায়"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "বেয়া unsquash কনফিগাৰেচন"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" ফাইল চিছটেম উপস্থিত নাই"
+
+#: src/modules/unpackfs/main.py:465
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"unsquashfs বিচৰাত ব্যৰ্থ হ'ল, নিশ্চিত কৰক যে আপুনি squashfs-tools ইন্স্তল "
+"কৰিছে"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -89,103 +206,75 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "ডিস্প্লে প্ৰবন্ধক কন্ফিগাৰেচন অসমাপ্ত"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "এক্সিড্ কোড্ আছিল {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "ডামী Pythonৰ কায্য"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "ডামী Pythonৰ পদক্ষেপ {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab লিখি আছে।"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "কনফিগাৰেচন ত্ৰুটি"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
    ৰ ব্যৱহাৰৰ বাবে কোনো বিভাজনৰ বৰ্ণনা দিয়া হোৱা নাই।"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "ব্যৱহাৰৰ বাবে 
    {!s}
    ৰ কোনো মাউন্ট্ পাইন্ট্ দিয়া হোৱা নাই।"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "এন্ক্ৰিপ্টেড স্ৱেপ কন্ফিগাৰ কৰি আছে।"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB কনফিগাৰ কৰক।"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "ডাটা ইন্স্তল কৰি আছে।"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC সেৱা সমুহ কনফিগাৰ কৰক"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio কনফিগাৰ কৰি আছে।"
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "ৰাণ-লেভেল {level!s}ত সেৱা {name!s} যোগ কৰিব নোৱাৰি।"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "ৰাণ-লেভেল {level!s}ৰ পৰা সেৱা {name!s} আতৰাব নোৱাৰি।"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"ৰান-লেভেল {level!s}ত সেৱা {name!s}ৰ বাবে অজ্ঞাত সেৱা কাৰ্য্য "
+"{arg!s} ।"
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "এন্ক্ৰিপ্টেড স্ৱেপ কন্ফিগাৰ কৰি আছে।"
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootত rc-update {arg!s} call ক্ৰুটি কোড {num!s}।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "গন্তব্য ৰাণলেভেল উপস্থিত নাই।"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
+"{level!s} ৰাণলেভেলৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "বিভাজন মাউন্ট্ কৰা।"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "গন্তব্য সেৱা উপস্থিত নাই।"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -234,160 +323,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth theme কন্ফিগাৰ কৰি আছে।​"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "ডাটা ইন্স্তল কৰি আছে।"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC সেৱা সমুহ কনফিগাৰ কৰক"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "ৰাণ-লেভেল {level!s}ত সেৱা {name!s} যোগ কৰিব নোৱাৰি।"
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "ৰাণ-লেভেল {level!s}ৰ পৰা সেৱা {name!s} আতৰাব নোৱাৰি।"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"ৰান-লেভেল {level!s}ত সেৱা {name!s}ৰ বাবে অজ্ঞাত সেৱা কাৰ্য্য "
-"{arg!s} ।"
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "সেৱা সমুহৰ সংশোধন কৰিব নোৱাৰি"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chrootত rc-update {arg!s} call ক্ৰুটি কোড {num!s}।"
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "গন্তব্য ৰাণলেভেল উপস্থিত নাই।"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "বুতলোডাৰ ইন্স্তল কৰক।"
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"{level!s} ৰাণলেভেলৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "গন্তব্য সেৱা উপস্থিত নাই।"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "{name!s}ৰ বাবে পথ হ'ল {path!s} যিটো উপস্থিত নাই।"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd সেৱা সমুহ কনফিগাৰ কৰক"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chrootত systemctl {arg!s}ৰ call ক্ৰুটি কোড {num!s}।"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd সেৱা {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} সক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd গন্তব্য স্থান {name!s} নিষ্ক্ৰিয় কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd একক {name!s} মাস্ক্ কৰিব নোৱাৰি।"
-
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"একক {name!s}ৰ বাবে {command!s} আৰু {suffix!s} "
-"অজ্ঞাত systemd কমাণ্ড্।"
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ফাইল চিছটেম​বোৰ মাউণ্টৰ পৰা আতৰাওক।"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ফাইল চিছটেম​বোৰ পূৰণ কৰা হৈ আছে।"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync ক্ৰুটি কোড {}ৰ সৈতে বিফল হ'ল।"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "হাৰ্ডৱেৰৰ ঘড়ী চেত্ কৰি আছে।"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "ইমেজ \"{}\" খোলাত ব্যৰ্থ হ'ল"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "এক্সিড্ কোড্ আছিল {}"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "ৰুট বিভাজনত কোনো মাউণ্ট পইণ্ট্ নাই"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracutৰ সৈতে initramfs বনাই আছে।"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ত rootMountPoint key নাই, একো কৰিব পৰা নাযায়"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "গন্তব্য স্থানত dracut চলোৱাত বিফল হ'ল"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "মুল বিভাজনৰ বাবে বেয়া মাউন্ট্ পইন্ট্"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs কন্ফিগাৰ কৰি আছে।"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint হ'ল \"{}\", যিটো উপস্থিত নাই, একো কৰিব পৰা নাযায়"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt সেৱা কন্ফিগাৰ কৰি আছে।"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "বেয়া unsquash কনফিগাৰেচন"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab লিখি আছে।"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" ফাইল চিছটেম উপস্থিত নাই"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "ডামী Pythonৰ কায্য"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"unsquashfs বিচৰাত ব্যৰ্থ হ'ল, নিশ্চিত কৰক যে আপুনি squashfs-tools ইন্স্তল "
-"কৰিছে"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "ডামী Pythonৰ পদক্ষেপ {}"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "লক্ষ্যৰ চিছটেম গন্তব্য স্থান \"{}\" এটা ডিৰেক্টৰী নহয়"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "স্থানীয়বোৰ কন্ফিগাৰ কৰি আছে।"
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "নেটৱৰ্ক কন্ফিগাৰ জমা কৰি আছে।"
diff --git a/lang/python/ast/LC_MESSAGES/python.po b/lang/python/ast/LC_MESSAGES/python.po
index 71e48d1843..4372045e39 100644
--- a/lang/python/ast/LC_MESSAGES/python.po
+++ b/lang/python/ast/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: enolp , 2020\n"
 "Language-Team: Asturian (https://www.transifex.com/calamares/teams/20061/ast/)\n"
@@ -21,20 +21,136 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalando'l xestor d'arrinque."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nun pue modificase'l serviciu"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontaxe de sistemes de ficheros."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Rellenando los sistemes de ficheros."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falló col códigu de fallu {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Fallu al desempaquetar la imaxe «{}»"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nun hai un puntu de montaxe pa la partición del raigañu"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nun contién una clave «rootMountPoint». Nun va facese nada"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "El puntu de montaxe ye incorreutu pa la partición del raigañu"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "La configuración d'espardimientu ye incorreuta"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de ficheros d'orixe «{}» nun esiste"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Fallu al alcontrar unsquashfs, asegúrate que tienes instaláu'l paquete "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu"
+
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
 msgstr "Nun pue escribise'l ficheru de configuración de KDM"
@@ -89,104 +205,74 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del xestor de pantalles nun se completó"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Fallu al executar dracut nel destín"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El códigu de salida foi {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabayu maniquín en Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pasu maniquín {} en Python"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurando l'intercambéu cifráu."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando datos."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando'l reló de hardware."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Nun pue amestase'l serviciu {name!s} al nivel d'execución {level!s}."
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"Nun pue desaniciase'l serviciu {name!s} del nivel d'execución {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locales."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configurando l'intercambéu cifráu."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivel d'execución de destín nun esiste"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El serviciu de destín nun esiste"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
-
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
 msgid "Install packages."
@@ -234,157 +320,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando datos."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Nun pue amestase'l serviciu {name!s} al nivel d'execución {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"Nun pue desaniciase'l serviciu {name!s} del nivel d'execución {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Nun pue modificase'l serviciu"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivel d'execución de destín nun esiste"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalando'l xestor d'arrinque."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El serviciu de destín nun esiste"
-
-#: src/modules/services-openrc/main.py:111
+#: src/modules/bootloader/main.py:509
 msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando'l reló de hardware."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El códigu de salida foi {}"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr ""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Fallu al executar dracut nel destín"
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontaxe de sistemes de ficheros."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Rellenando los sistemes de ficheros."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falló col códigu de fallu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando'l serviciu dmcrypt d'OpenRC."
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Fallu al desempaquetar la imaxe «{}»"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nun hai un puntu de montaxe pa la partición del raigañu"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"globalstorage nun contién una clave «rootMountPoint». Nun va facese nada"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "El puntu de montaxe ye incorreutu pa la partición del raigañu"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint ye «{}» que nun esiste. Nun va facese nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "La configuración d'espardimientu ye incorreuta"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabayu maniquín en Python."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pasu maniquín {} en Python"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de ficheros d'orixe «{}» nun esiste"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locales."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
-"Fallu al alcontrar unsquashfs, asegúrate que tienes instaláu'l paquete "
-"squashfs-tools"
-
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destín «{}» nel sistema de destín nun ye un direutoriu"
diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index d284319d67..f4c40e5ab2 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: xxmn77 , 2021\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
@@ -21,21 +21,141 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Tənzimləmə xətası"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
-"{!s} ilə cavab verdi."
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fayl sistemini ayırmaq."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fayl sistemlərini doldurmaq."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync uğursuz oldu, xəta kodu: {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
+"{}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Tərkiblərini açmağa başladılır {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
+"əməliyyat getmir"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash xətalı tənzimlənməsi"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,106 +213,78 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ilə initramfs yaratmaq."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hədəfdə dracut başladılmadı"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Tənzimləmə xətası"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
-"göstərilməyib."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Quraşdırılma tarixi."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC xidmətlərini tənzimləmək"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "{name!s} xidməti {level!s} işləmə səviyyəsinə əlavə edilə bilmir."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "{name!s} xidməti {level!s} iş səviyyəsindən silinə bilmir."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
+"{arg!s} xidmət fəaliyyəti."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} chroot-da çağırışına {num!s} xəta kodu ilə "
+"cavab verildi."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Hədəf işləmə səviyyəsi mövcud deyil"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"{level!s} işləmə səviyyəsi üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Hədəf xidməti mövcud deyil"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -247,167 +339,77 @@ msgstr ""
 "Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
    {!s}
     "
 "əmri xəta kodu {!s} ilə cavab verdi."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Quraşdırılma tarixi."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC xidmətlərini tənzimləmək"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "{name!s} xidməti {level!s} işləmə səviyyəsinə əlavə edilə bilmir."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "{name!s} xidməti {level!s} iş səviyyəsindən silinə bilmir."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
-"{arg!s} xidmət fəaliyyəti."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} chroot-da çağırışına {num!s} xəta kodu ilə "
-"cavab verildi."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Hədəf işləmə səviyyəsi mövcud deyil"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"{level!s} işləmə səviyyəsi üçün {path!s} yolu mövcud deyil."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Hədəf xidməti mövcud deyil"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
+"{!s} ilə cavab verdi."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fayl sistemini ayırmaq."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fayl sistemlərini doldurmaq."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync uğursuz oldu, xəta kodu: {}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ilə initramfs yaratmaq."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
-"{}/{}"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hədəfdə dracut başladılmadı"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Tərkiblərini açmağa başladılır {}"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs tənzimlənir."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab yazılır."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
-"əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash xətalı tənzimlənməsi"
+"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
+"göstərilməyib."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index cb387be383..2d57f0d4ba 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: xxmn77 , 2021\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
@@ -21,21 +21,141 @@ msgstr ""
 "Language: az_AZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükləyici qurulur."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB tənzimləmələri"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Önyükləyicinin quraşdırılmasında xəta"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölmələri qoşulur."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Tənzimləmə xətası"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd xidmətini tənzimləmək"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
-"{!s} ilə cavab verdi."
+"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s} systemd xidməti aktiv edilmədi."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "{name!s} systemd hədəfi aktiv edilmədi"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "{name!s} systemd hədfi sönsürülmədi."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "{name!s} systemd vahidi maskalanmır."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Naməlum systemd əmrləri {command!s} və {suffix!s} "
+"{name!s} vahidi üçün."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fayl sistemini ayırmaq."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fayl sistemlərini doldurmaq."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync uğursuz oldu, xəta kodu: {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
+"{}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Tərkiblərini açmağa başladılır {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
+"əməliyyat getmir"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash xətalı tənzimlənməsi"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,106 +213,78 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran meneceri tənzimləmələri başa çatmadı"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ilə initramfs yaratmaq."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hədəfdə dracut başladılmadı"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıxış kodu {} idi"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python işi."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "{} Dummy python addımı"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab yazılır."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Tənzimləmə xətası"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     istifadə etmək üçün bölmələr təyin edilməyib"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio tənzimlənir."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     istifadə etmək üçün kök qoşulma nöqtəsi təyin edilməyib."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
-"göstərilməyib."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB tənzimləmələri"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Quraşdırılma tarixi."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Aparat saatını ayarlamaq."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC xidmətlərini tənzimləmək"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio tənzimlənir."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "{name!s} xidməti {level!s} işləmə səviyyəsinə əlavə edilə bilmir."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs tənzimlənir."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "{name!s} xidməti {level!s} iş səviyyəsindən silinə bilmir."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Lokallaşma tənzimlənir."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
+"{arg!s} xidmət fəaliyyəti."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Çifrələnmiş mübadilə sahəsi - swap tənzimlənir."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} chroot-da çağırışına {num!s} xəta kodu ilə "
+"cavab verildi."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Hədəf işləmə səviyyəsi mövcud deyil"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"{level!s} işləmə səviyyəsi üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölmələri qoşulur."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Hədəf xidməti mövcud deyil"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Şəbəkə ayarları saxlanılır."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt xidməti tənzimlənir."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth mövzusu tənzimlənməsi"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -247,167 +339,77 @@ msgstr ""
 "Paket meneceri dəyişiklikləri sistemə tətbiq edə bilmədi. 
    {!s}
     "
 "əmri xəta kodu {!s} ilə cavab verdi."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth mövzusu tənzimlənməsi"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Quraşdırılma tarixi."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC xidmətlərini tənzimləmək"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "{name!s} xidməti {level!s} işləmə səviyyəsinə əlavə edilə bilmir."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "{name!s} xidməti {level!s} iş səviyyəsindən silinə bilmir."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"{level!s} işləmə səviyyəsindəki {name!s} xidməti üçün naməlum "
-"{arg!s} xidmət fəaliyyəti."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Xidmətdə dəyişiklik etmək mümkün olmadı"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} chroot-da çağırışına {num!s} xəta kodu ilə "
-"cavab verildi."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Hədəf işləmə səviyyəsi mövcud deyil"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"{level!s} işləmə səviyyəsi üçün {path!s} yolu mövcud deyil."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Hədəf xidməti mövcud deyil"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "{name!s} üçün {path!s} yolu mövcud deyil."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükləyici qurulur."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd xidmətini tənzimləmək"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Önyükləyicinin quraşdırılmasında xəta"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} chroot çağırışına xəta kodu ilə cavab verdi "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s} systemd xidməti aktiv edilmədi."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "{name!s} systemd hədəfi aktiv edilmədi"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "{name!s} systemd hədfi sönsürülmədi."
+"Önyükləyici quraşdırıla bilmədi. Quraşdırma əmri 
    {!s}
    , xəta kodu "
+"{!s} ilə cavab verdi."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "{name!s} systemd vahidi maskalanmır."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Aparat saatını ayarlamaq."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Naməlum systemd əmrləri {command!s} və {suffix!s} "
-"{name!s} vahidi üçün."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs ilə initramfs yaradılır"
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fayl sistemini ayırmaq."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fayl sistemlərini doldurmaq."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıxış kodu {} idi"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync uğursuz oldu, xəta kodu: {}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ilə initramfs yaratmaq."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr ""
-"Tərkibi çıxarılan quraşdırma faylı - image {}/{}, çıxarılan faylların sayı "
-"{}/{}"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hədəfdə dracut başladılmadı"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Tərkiblərini açmağa başladılır {}"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs tənzimlənir."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" quraşdırma faylının tərkibini çıxarmaq alınmadı"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt xidməti tənzimlənir."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kök bölməsi üçün qoşulma nöqtəsi yoxdur"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab yazılır."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"globalstorage tərkibində bir \"rootMountPoint\" açarı yoxdur, heç bir "
-"əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök bölməsi üçün xətalı qoşulma nöqtəsi"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" mövcud deyil, heç bir əməliyyat getmir"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash xətalı tənzimlənməsi"
+"İstifadə etmək üçün, 
    {!s}
     tənzimləməsi, 
    {!s}
     üçün "
+"göstərilməyib."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) fayl sistemi sizin nüvəniz tərəfindən dəstəklənmir"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python işi."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" mənbə fayl sistemi mövcud deyil"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "{} Dummy python addımı"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"unsquashfs tapılmadı, squashfs-tools paketinin quraşdırıldığına əmin olun"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Lokallaşma tənzimlənir."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hədəf sistemində təyin edilən \"{}\", qovluq deyil"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Şəbəkə ayarları saxlanılır."
diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po
index 00feffa8ee..ac0742a684 100644
--- a/lang/python/be/LC_MESSAGES/python.po
+++ b/lang/python/be/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Źmicier Turok , 2020\n"
 "Language-Team: Belarusian (https://www.transifex.com/calamares/teams/20061/be/)\n"
@@ -21,19 +21,136 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Усталяваць загрузчык."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Наладзіць GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Мантаванне раздзелаў."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Памылка канфігурацыі"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Раздзелы для 
    {!s}
     не вызначаныя."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Наладзіць службы systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Немагчыма наладзіць службу"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Немагчыма ўключыць службу systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Немагчыма ўключыць мэту systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Немагчыма выключыць мэту systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Невядомыя systemd загады {command!s} і {suffix!s} "
+"для адзінкі {name!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Адмантаваць файлавыя сістэмы."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Запаўненне файлавых сістэм."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "памылка rsync з кодам {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Распакоўванне вобраза {}/{}, файл {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Запуск распакоўвання {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Не атрымалася распакаваць вобраз \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Для каранёвага раздзела няма пункта мантавання"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage не змяшчае ключа \"rootMountPoint\", нічога не выконваецца"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Хібны пункт мантавання для каранёвага раздзела"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\" не існуе, нічога не выконваецца"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Хібная канфігурацыя unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Файлавая сістэма для \"{}\" ({}) не падтрымліваецца вашым бягучым ядром"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Зыходная файлавая сістэма \"{}\" не існуе"
+
+#: src/modules/unpackfs/main.py:465
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Не атрымалася знайсці unsquashfs, праверце ці ўсталяваны ў вас пакунак "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,103 +208,75 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Наладка дысплейнага кіраўніка не завершаная."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Стварэнне initramfs з dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не атрымалася запусціць dracut у пункце прызначэння"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхаду {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Задача Dummy python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Крок Dummy python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запіс fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Памылка канфігурацыі"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Раздзелы для 
    {!s}
     не вызначаныя."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Наладка mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Каранёвы пункт мантавання для
    {!s}
     не пададзены."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Наладка зашыфраванага swap."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Наладзіць GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Усталёўка даных."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Наладка апаратнага гадзінніка."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Наладзіць службы OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Наладка mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Не атрымалася дадаць службу {name!s} на ўзровень запуску  {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Наладка initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Не атрымалася выдаліць службу {name!s} з узроўню запуску {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Наладка лакаляў."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Невядомае дзеянне {arg!s} для службы {name!s} на ўзроўні "
+"запуску {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Наладка зашыфраванага swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} пад chroot вярнуўся з кодам памылкі {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Стварэнне initramfs праз mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Мэтавы ўзровень запуску не існуе"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "Шлях {path!s} да ўзроўня запуску {level!s} не існуе."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Мантаванне раздзелаў."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Мэтавая служба не існуе"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Захаванне сеткавай канфігурацыі."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "Шлях {path!s} да службы {level!s} не існуе."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Наладка OpenRC dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Наладзіць тэму Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -240,160 +329,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Наладзіць тэму Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Усталёўка даных."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Наладзіць службы OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Не атрымалася дадаць службу {name!s} на ўзровень запуску  {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Не атрымалася выдаліць службу {name!s} з узроўню запуску {level!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Усталяваць загрузчык."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
-"Невядомае дзеянне {arg!s} для службы {name!s} на ўзроўні "
-"запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Немагчыма наладзіць службу"
 
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:509
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"rc-update {arg!s} пад chroot вярнуўся з кодам памылкі {num!s}."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Мэтавы ўзровень запуску не існуе"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "Шлях {path!s} да ўзроўня запуску {level!s} не існуе."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Наладка апаратнага гадзінніка."
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Мэтавая служба не існуе"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Стварэнне initramfs праз mkinitfs."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "Шлях {path!s} да службы {level!s} не існуе."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Наладзіць службы systemd"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхаду {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} у chroot вярнуў код памылкі {num!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Стварэнне initramfs з dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Немагчыма ўключыць службу systemd {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не атрымалася запусціць dracut у пункце прызначэння"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Немагчыма ўключыць мэту systemd {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Наладка initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Немагчыма выключыць мэту systemd {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Наладка OpenRC dmcrypt."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Немагчыма замаскаваць адзінку systemd {name!s}. "
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Запіс fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Невядомыя systemd загады {command!s} і {suffix!s} "
-"для адзінкі {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Адмантаваць файлавыя сістэмы."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Запаўненне файлавых сістэм."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "памылка rsync з кодам {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Распакоўванне вобраза {}/{}, файл {}/{}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Запуск распакоўвання {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Не атрымалася распакаваць вобраз \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Для каранёвага раздзела няма пункта мантавання"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage не змяшчае ключа \"rootMountPoint\", нічога не выконваецца"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Хібны пункт мантавання для каранёвага раздзела"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\" не існуе, нічога не выконваецца"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Хібная канфігурацыя unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Файлавая сістэма для \"{}\" ({}) не падтрымліваецца вашым бягучым ядром"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Задача Dummy python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Зыходная файлавая сістэма \"{}\" не існуе"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Крок Dummy python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Не атрымалася знайсці unsquashfs, праверце ці ўсталяваны ў вас пакунак "
-"squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Наладка лакаляў."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Пункт прызначэння \"{}\" у мэтавай сістэме не з’яўляецца каталогам"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Захаванне сеткавай канфігурацыі."
diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po
index 69e58be068..ba6ac533a3 100644
--- a/lang/python/bg/LC_MESSAGES/python.po
+++ b/lang/python/bg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Georgi Georgiev (Жоро) , 2020\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтирай файловите системи."
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фиктивна задача на python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фиктивна стъпка на python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Инсталирай пакетите."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Обработване на пакетите (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Инсталиране на един пакет."
-msgstr[1] "Инсталиране на %(num)d пакети."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Премахване на един пакет."
-msgstr[1] "Премахване на %(num)d пакети."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:639
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Инсталирай пакетите."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Обработване на пакетите (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Инсталиране на един пакет."
+msgstr[1] "Инсталиране на %(num)d пакети."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Премахване на един пакет."
+msgstr[1] "Премахване на %(num)d пакети."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтирай файловите системи."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фиктивна задача на python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фиктивна стъпка на python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/bn/LC_MESSAGES/python.po b/lang/python/bn/LC_MESSAGES/python.po
index 05b51ae52e..90f0c32d93 100644
--- a/lang/python/bn/LC_MESSAGES/python.po
+++ b/lang/python/bn/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 508a8b0ef95404aa3dc5178f0ccada5e_017b8a4 , 2020\n"
 "Language-Team: Bengali (https://www.transifex.com/calamares/teams/20061/bn/)\n"
@@ -21,18 +21,132 @@ msgstr ""
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "কনফিগার করুন জিআরইউবি।"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "মাউন্ট করছে পার্টিশনগুলো।"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "কনফিগারেশন ত্রুটি"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
    {!এস}
     ব্যবহার করার জন্য।"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "সেবা পরিবর্তন করতে পারে না"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "আনপ্যাক করা শুরু করছে {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,102 +203,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "কনফিগারেশন ত্রুটি"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "কোন পার্টিশন নির্দিষ্ট করা হয়নি
    {!এস}
     ব্যবহার করার জন্য।"
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "কনফিগার করুন জিআরইউবি।"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "মাউন্ট করছে পার্টিশনগুলো।"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -234,154 +317,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "সেবা পরিবর্তন করতে পারে না"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "কনফিগার করুন সিস্টেমডি সেবাগুলি"
-
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"সিস্টেমসিটিএল {এআরজি!এস}সিএইচরুট ফেরত ত্রুটি কোড দে{NUM! গুলি}।"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "আনমাউন্ট ফাইল সিস্টেমগুলি করুন।"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ফাইলসিস্টেমগুলিপূরণ করছে।"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "ত্রুটি কোড সহ আরসিঙ্ক ব্যর্থ হয়েছে {}।"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "চিত্র আনপ্যাক করছে {} / {}, ফাইল {} / {}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "আনপ্যাক করা শুরু করছে {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "চিত্র আনপ্যাক করতে ব্যর্থ হয়েছে \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po
index 53e42f43f3..3fc48b291c 100644
--- a/lang/python/ca/LC_MESSAGES/python.po
+++ b/lang/python/ca/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Davidmp , 2021\n"
 "Language-Team: Catalan (https://www.transifex.com/calamares/teams/20061/ca/)\n"
@@ -21,21 +21,138 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "S'instal·la el carregador d'arrencada."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Error d'instal·lació del carregador d'arrencada"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Es munten les particions."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Error de configuració"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No s'han definit particions perquè les usi 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
-"
    {!s}
    ha retornat el codi d'error {!s}."
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ordres desconegudes de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmunta els sistemes de fitxers."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "S'omplen els sistemes de fitxers."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Ha fallat rsync amb el codi d'error {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Es desempaqueta la imatge {}/{}, fitxer {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Es comença a desempaquetar {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ha fallat desempaquetar la imatge \"{}\"."
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No hi ha punt de muntatge per a la partició d'arrel."
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punt de muntatge incorrecte per a la partició d'arrel"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "El punt de muntatge d'arrel és \"{}\", que no existeix. No es fa res."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuració incorrecta d'unsquash."
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "El sistema de fitxers per a {} ({}) no és admès pel nucli actual."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de fitxers font \"{}\" no existeix."
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ha fallat trobar unsquashfs, assegureu-vos que tingueu el paquet squashfs-"
+"tools instal·lat."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -94,105 +211,81 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Es creen initramfs amb dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Ha fallat executar dracut a la destinació."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi de sortida ha estat {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python fictícia."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python fitctici {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "S'escriu fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Error de configuració"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No s'han definit particions perquè les usi 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Es configura mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No s'ha proporcionat el punt de muntatge perquè l'usi 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"No hi ha cap configuració de 
    {!s}
     perquè la usi 
    {!s}
    ."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Es configura l'intercanvi encriptat."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "S'instal·len dades."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "S'estableix el rellotge del maquinari."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Configura els serveis d'OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Es configura mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "No es pot afegir el servei {name!s} al nivell d'execució {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"No es pot suprimir el servei {name!s} del nivell d'execució {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Es configuren les llengües."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Servei - acció desconeguda {arg!s} per al servei {name!s} al "
+"nivell d'execució {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Es configura l'intercanvi encriptat."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"La crida de rc-update {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Es creen initramfs amb mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivell d'execució de destinació no existeix."
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ha fallat executar mkinitfs a la destinació."
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"El camí per al nivell d'execució {level!s} és {path!s}, però no"
+" existeix."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Es munten les particions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El servei de destinació no existeix."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Es desa la configuració de la xarxa."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Es configura el sevei OpenRC dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -247,167 +340,76 @@ msgstr ""
 "El gestor de paquets no ha pogut fer canvis al sistema instal·lat. L'ordre "
 "
    {!s}
     ha retornat el codi d'error {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "S'instal·len dades."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configura els serveis d'OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "No es pot afegir el servei {name!s} al nivell d'execució {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"No es pot suprimir el servei {name!s} del nivell d'execució {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Servei - acció desconeguda {arg!s} per al servei {name!s} al "
-"nivell d'execució {level!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "S'instal·la el carregador d'arrencada."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Error d'instal·lació del carregador d'arrencada"
 
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:509
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"La crida de rc-update {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivell d'execució de destinació no existeix."
+"No s'ha pogut instal·lar el carregador d'arrencada. L'ordre d'instal·lació "
+"
    {!s}
    ha retornat el codi d'error {!s}."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"El camí per al nivell d'execució {level!s} és {path!s}, però no"
-" existeix."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "S'estableix el rellotge del maquinari."
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El servei de destinació no existeix."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Es creen initramfs amb mkinitfs."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"El camí per al servei {name!s} és {path!s}, però no existeix."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ha fallat executar mkinitfs a la destinació."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi de sortida ha estat {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Es creen initramfs amb dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Ha fallat executar dracut a la destinació."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Es configuren initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Es configura el sevei OpenRC dmcrypt."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "S'escriu fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Ordres desconegudes de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmunta els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "S'omplen els sistemes de fitxers."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Ha fallat rsync amb el codi d'error {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Es desempaqueta la imatge {}/{}, fitxer {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Es comença a desempaquetar {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ha fallat desempaquetar la imatge \"{}\"."
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No hi ha punt de muntatge per a la partició d'arrel."
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage no conté cap clau de \"rootMountPoint\". No es fa res."
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punt de muntatge incorrecte per a la partició d'arrel"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "El punt de muntatge d'arrel és \"{}\", que no existeix. No es fa res."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuració incorrecta d'unsquash."
+"No hi ha cap configuració de 
    {!s}
     perquè la usi 
    {!s}
    ."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "El sistema de fitxers per a {} ({}) no és admès pel nucli actual."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python fictícia."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de fitxers font \"{}\" no existeix."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python fitctici {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Ha fallat trobar unsquashfs, assegureu-vos que tingueu el paquet squashfs-"
-"tools instal·lat."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Es configuren les llengües."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinació \"{}\" al sistema de destinació no és un directori."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Es desa la configuració de la xarxa."
diff --git a/lang/python/ca@valencia/LC_MESSAGES/python.po b/lang/python/ca@valencia/LC_MESSAGES/python.po
index 024b13dba5..1b4ff596b6 100644
--- a/lang/python/ca@valencia/LC_MESSAGES/python.po
+++ b/lang/python/ca@valencia/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Raul , 2021\n"
 "Language-Team: Catalan (Valencian) (https://www.transifex.com/calamares/teams/20061/ca@valencia/)\n"
@@ -21,19 +21,140 @@ msgstr ""
 "Language: ca@valencia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instal·la el carregador d'arrancada."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura el GRUB"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "S'estan muntant les particions."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "S'ha produït un error en la configuració."
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No s'han definit particions perquè les use 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura els serveis de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No es pot modificar el servei."
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La crida de systemctl {arg!s} a chroot ha retornat el codi "
+"d'error {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No es pot habilitar el servei de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No es pot habilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Es desconeixen les ordres de systemd: {command!s} i "
+"{suffix!s}, per a la unitat {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmunta els sistemes de fitxers."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "S'estan emplenant els sistemes de fitxers."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Ha fallat rsync amb el codi d'error {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "S’està començant a desempaquetar {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No s’ha pogut desempaquetar la imatge \"{}\"."
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No hi ha cap punt de muntatge per a la partició d'arrel."
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"globalstorage no conté cap clau de \"rootMountPoint\". No s'està fent res."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "El punt de muntatge per a la partició d'arrel és incorrecte."
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"El punt de muntatge d'arrel és \"{}\", que no existeix. No s’està fent res."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "La configuració d'unsquash és incorrecta."
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "El nucli actual no admet el sistema de fitxers per a \"{}\" ({})."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de fitxers font \"{}\" no existeix."
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"No s’ha pogut trobar unsquashfs. Assegureu-vos que teniu el paquet squashfs-"
+"tools instal·lat."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinació \"{}\" en el sistema de destinació no és un directori."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,156 +213,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuració del gestor de pantalla no era completa."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creació d’initramfs amb dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "No s’ha pogut executar dracut en la destinació."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El codi d'eixida ha estat {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tasca de python de proves."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Pas de python de proves {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escriptura d’fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "S'ha produït un error en la configuració."
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No s'han definit particions perquè les use 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "S'està configurant mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No s'ha proporcionat el punt de muntatge perquè l'use 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura el GRUB"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuració del rellotge del maquinari."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "S'està configurant mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Es configuren initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuració d’idioma."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "S’està configurant l'intercanvi encriptat."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creació d’initramfs amb mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No s’ha pogut executar mkinitfs en la destinació."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "S'estan muntant les particions."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "S'està guardant la configuració de la xarxa."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuració del servei OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instal·la els paquets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "S'està instal·lant un paquet."
-msgstr[1] "S'està instal·lant %(num)d paquets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "S’està eliminant un paquet."
-msgstr[1] "S’està eliminant %(num)d paquets."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura el tema del Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "S'estan instal·lant les dades."
@@ -267,11 +255,6 @@ msgstr ""
 "Servei - acció desconeguda {arg!s} per al servei {name!s} al "
 "nivell d'execució {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "No es pot modificar el servei."
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -302,105 +285,124 @@ msgid ""
 msgstr ""
 "El camí per al servei {name!s} és {path!s}, però no existeix."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura els serveis de systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura el tema del Plymouth"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instal·la els paquets."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "S'estan processant els paquets (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "S'està instal·lant un paquet."
+msgstr[1] "S'està instal·lant %(num)d paquets."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "S’està eliminant un paquet."
+msgstr[1] "S’està eliminant %(num)d paquets."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"La crida de systemctl {arg!s} a chroot ha retornat el codi "
-"d'error {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No es pot habilitar el servei de systemd {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No es pot habilitar la destinació de systemd {name!s}."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No es pot inhabilitar la destinació de systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instal·la el carregador d'arrancada."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No es pot emmascarar la unitat de systemd {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Es desconeixen les ordres de systemd: {command!s} i "
-"{suffix!s}, per a la unitat {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmunta els sistemes de fitxers."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuració del rellotge del maquinari."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "S'estan emplenant els sistemes de fitxers."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creació d’initramfs amb mkinitfs."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Ha fallat rsync amb el codi d'error {}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No s’ha pogut executar mkinitfs en la destinació."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "S’està desempaquetant la imatge {}/{}, fitxer {}/{}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El codi d'eixida ha estat {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "S’està començant a desempaquetar {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creació d’initramfs amb dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No s’ha pogut desempaquetar la imatge \"{}\"."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "No s’ha pogut executar dracut en la destinació."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No hi ha cap punt de muntatge per a la partició d'arrel."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Es configuren initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage no conté cap clau de \"rootMountPoint\". No s'està fent res."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuració del servei OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "El punt de muntatge per a la partició d'arrel és incorrecte."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escriptura d’fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"El punt de muntatge d'arrel és \"{}\", que no existeix. No s’està fent res."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "La configuració d'unsquash és incorrecta."
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "El nucli actual no admet el sistema de fitxers per a \"{}\" ({})."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tasca de python de proves."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de fitxers font \"{}\" no existeix."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Pas de python de proves {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"No s’ha pogut trobar unsquashfs. Assegureu-vos que teniu el paquet squashfs-"
-"tools instal·lat."
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuració d’idioma."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinació \"{}\" en el sistema de destinació no és un directori."
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "S'està guardant la configuració de la xarxa."
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index 28780a9970..6305ba7fb3 100644
--- a/lang/python/cs_CZ/LC_MESSAGES/python.po
+++ b/lang/python/cs_CZ/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pavel Borecki , 2021\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
@@ -23,21 +23,139 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalace zavaděče systému."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Nastavování zavaděče GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Chyba při instalaci zavaděče systému"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Připojování oddílů."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Chyba nastavení"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Pro 
    {!s}
     nejsou zadány žádné oddíly."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Nastavit služby systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Službu se nedaří upravit"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz 
    {!s} "
-"vrátil chybový kód {!s}."
+"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedaří se zapnout systemd službu {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedaří se vypnout systemd cíl {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedaří se maskovat systemd jednotku {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Neznámé systemd příkazy {command!s} a {suffix!s} "
+"pro jednotku {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojit souborové systémy."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Naplňování souborových systémů."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync se nezdařilo s chybových kódem {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbalování obrazu {}/{}, soubor {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Zahajování rozbalení {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepodařilo se rozbalit obraz „{}“"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Žádný přípojný bot pro kořenový oddíl"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage neobsahuje klíč „rootMountPoint“ – nic se nebude dělat"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Chybný přípojný bod pro kořenový oddíl"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "kořenovýPřípojnýBod je „{}“, který neexistuje – nic se nebude dělat"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Chybná nastavení unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Souborový systém „{}“ ({}) není jádrem systému, které právě používáte, "
+"podporován"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový souborový systém „{}“ neexistuje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nepodařilo se nalézt unsquashfs – ověřte, že máte nainstalovaný balíček "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Cíl „{}“ v cílovém systému není složka"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,105 +213,81 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Nastavení správce displeje nebylo úplné"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Vytváření initramfs s dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Na cíli se nepodařilo spustit dracut"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Návratový kód byl {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testovací úloha python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testovací krok {} python."
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisování fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Chyba nastavení"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Pro 
    {!s}
     nejsou zadány žádné oddíly."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Nastavování mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Pro 
    {!s}
     není zadán žádný přípojný bod."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Pro 
    {!s}
     není zadáno žádné nastavení 
    {!s}
    , které "
-"použít. "
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Nastavování šifrovaného prostoru pro odkládání stránek paměti."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Nastavování zavaděče GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalace dat."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavování hardwarových hodin."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Nastavit OpenRC služby"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Nastavování mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+"Nedaří se přidat službu {name!s} do úrovně chodu (runlevel) {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Nastavování initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+"Nedaří se odebrat službu {name!s} z úrovně chodu (runlevel) {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Nastavování místních a jazykových nastavení."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Neznámá akce služby {arg!s} pro službu {name!s} v úrovni chodu "
+"(runlevel) {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Nastavování šifrovaného prostoru pro odkládání stránek paměti."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} volání v chroot vrátilo kód chyby {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Vytváření initramfs nástrojem mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Cílová úroveň chodu (runlevel) neexistuje"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Na cíli se nepodařilo spustit mkinitfs"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Popis umístění pro úroveň chodu (runlevel) {level!s} je "
+"{path!s}, keterá neexistuje."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Připojování oddílů."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Cílová služba neexistuje"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ukládání nastavení sítě."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Popis umístění pro službu {name!s} je {path!s}, která "
+"neexistuje."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Nastavování služby OpenRC dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Nastavit téma vzhledu pro Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -252,169 +346,77 @@ msgstr ""
 "Nástroji pro správu balíčků se nepodařilo udělat změny v nainstalovaném "
 "systému. Příkaz 
    {!s}
     vrátil chybový kód {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Nastavit téma vzhledu pro Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalace dat."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Nastavit OpenRC služby"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-"Nedaří se přidat službu {name!s} do úrovně chodu (runlevel) {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-"Nedaří se odebrat službu {name!s} z úrovně chodu (runlevel) {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Neznámá akce služby {arg!s} pro službu {name!s} v úrovni chodu "
-"(runlevel) {level!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalace zavaděče systému."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Službu se nedaří upravit"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Chyba při instalaci zavaděče systému"
 
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:509
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"rc-update {arg!s} volání v chroot vrátilo kód chyby {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Cílová úroveň chodu (runlevel) neexistuje"
+"Zavaděč systému se nepodařilo nainstalovat. Instalační příkaz 
    {!s} "
+"vrátil chybový kód {!s}."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Popis umístění pro úroveň chodu (runlevel) {level!s} je "
-"{path!s}, keterá neexistuje."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavování hardwarových hodin."
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Cílová služba neexistuje"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Vytváření initramfs nástrojem mkinitfs."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Popis umístění pro službu {name!s} je {path!s}, která "
-"neexistuje."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Na cíli se nepodařilo spustit mkinitfs"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Nastavit služby systemd"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Návratový kód byl {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Volání systemctl {arg!s} v chroot vrátilo chybový kód {num!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváření initramfs s dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Na cíli se nepodařilo spustit dracut"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedaří se zapnout systemd službu {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Nastavování initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedaří se vypnout systemd cíl {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Nastavování služby OpenRC dmcrypt."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedaří se maskovat systemd jednotku {name!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisování fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Neznámé systemd příkazy {command!s} a {suffix!s} "
-"pro jednotku {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odpojit souborové systémy."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Naplňování souborových systémů."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync se nezdařilo s chybových kódem {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Rozbalování obrazu {}/{}, soubor {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Zahajování rozbalení {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Nepodařilo se rozbalit obraz „{}“"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Žádný přípojný bot pro kořenový oddíl"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage neobsahuje klíč „rootMountPoint“ – nic se nebude dělat"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Chybný přípojný bod pro kořenový oddíl"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "kořenovýPřípojnýBod je „{}“, který neexistuje – nic se nebude dělat"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Chybná nastavení unsquash"
+"Pro 
    {!s}
     není zadáno žádné nastavení 
    {!s}
    , které "
+"použít. "
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Souborový systém „{}“ ({}) není jádrem systému, které právě používáte, "
-"podporován"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testovací úloha python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Zdrojový souborový systém „{}“ neexistuje"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testovací krok {} python."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Nepodařilo se nalézt unsquashfs – ověřte, že máte nainstalovaný balíček "
-"squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Nastavování místních a jazykových nastavení."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Cíl „{}“ v cílovém systému není složka"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukládání nastavení sítě."
diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po
index b448ddb94e..f267baf408 100644
--- a/lang/python/da/LC_MESSAGES/python.po
+++ b/lang/python/da/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: scootergrisen, 2020\n"
 "Language-Team: Danish (https://www.transifex.com/calamares/teams/20061/da/)\n"
@@ -22,19 +22,137 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installér bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurer GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterer partitioner."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Fejl ved konfiguration"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Der er ikke angivet nogle partitioner som 
    {!s}
     kan bruge."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurer systemd-tjenester"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Kan ikke redigere tjeneste"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kan ikke aktivere systemd-målet {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kan ikke deaktivere systemd-målet {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan ikke maskere systemd-enheden {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Ukendte systemd-kommandoer {command!s} og "
+"{suffix!s} til enheden {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Afmonter filsystemer."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Udfylder filsystemer."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync mislykkede med fejlkoden {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Udpakker aftrykket {}/{}, filen {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Begynder at udpakke {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Kunne ikke udpakke aftrykket \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Intet monteringspunkt til rodpartition"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage indeholder ikke en \"rootMountPoint\"-nøgle, gør intet"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Dårligt monteringspunkt til rodpartition"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dårlig unsquash-konfiguration"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Filsystemet til \"{}\" ({}) understøttes ikke af din nuværende kerne"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Kildefilsystemet \"{}\" findes ikke"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Kunne ikke finde unsquashfs, sørg for at pakken squashfs-tools er "
+"installeret"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,156 +211,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Displayhåndtering-konfiguration er ikke komplet"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Opretter initramfs med dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Kunne ikke køre dracut på målet"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Afslutningskoden var {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python-job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python-trin {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Fejl ved konfiguration"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Der er ikke angivet nogle partitioner som 
    {!s}
     kan bruge."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerer mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Der er ikke angivet noget rodmonteringspunkt som 
    {!s}
     kan bruge."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurer GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Indstiller hardwareur."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerer mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerer initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerer lokaliteter."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurerer krypteret swap."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Opretter initramfs med mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Kunne ikke køre mkinitfs på målet"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Monterer partitioner."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Gemmer netværkskonfiguration."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installér pakker."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Forarbejder pakker (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installerer én pakke."
-msgstr[1] "Installerer %(num)d pakker."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjerner én pakke."
-msgstr[1] "Fjerner %(num)d pakker."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurer Plymouth-tema"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installerer data."
@@ -267,11 +252,6 @@ msgstr ""
 "Ukendt tjenestehandling {arg!s} til tjenesten {name!s} i "
 "kørselsniveauet {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Kan ikke redigere tjeneste"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -301,102 +281,124 @@ msgid ""
 msgstr ""
 "Stien til tjenesten {name!s} er {path!s}, som ikke findes."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurer systemd-tjenester"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurer Plymouth-tema"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s}-kald i chroot returnerede fejlkoden {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installér pakker."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kan ikke aktivere systemd-tjenesten {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Forarbejder pakker (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kan ikke aktivere systemd-målet {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installerer én pakke."
+msgstr[1] "Installerer %(num)d pakker."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kan ikke deaktivere systemd-målet {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjerner én pakke."
+msgstr[1] "Fjerner %(num)d pakker."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan ikke maskere systemd-enheden {name!s}."
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:639
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Ukendte systemd-kommandoer {command!s} og "
-"{suffix!s} til enheden {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Afmonter filsystemer."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Udfylder filsystemer."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync mislykkede med fejlkoden {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installér bootloader."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Udpakker aftrykket {}/{}, filen {}/{}"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Begynder at udpakke {}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Kunne ikke udpakke aftrykket \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Indstiller hardwareur."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Intet monteringspunkt til rodpartition"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Opretter initramfs med mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage indeholder ikke en \"rootMountPoint\"-nøgle, gør intet"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kunne ikke køre mkinitfs på målet"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Dårligt monteringspunkt til rodpartition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Afslutningskoden var {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint er \"{}\", hvilket ikke findes, gør intet"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Opretter initramfs med dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Dårlig unsquash-konfiguration"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Kunne ikke køre dracut på målet"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Filsystemet til \"{}\" ({}) understøttes ikke af din nuværende kerne"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerer initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Kildefilsystemet \"{}\" findes ikke"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerer OpenRC dmcrypt-tjeneste."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Kunne ikke finde unsquashfs, sørg for at pakken squashfs-tools er "
-"installeret"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinationen \"{}\" i målsystemet er ikke en mappe"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python-job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python-trin {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerer lokaliteter."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Gemmer netværkskonfiguration."
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index 3e57487f86..11f6d6075b 100644
--- a/lang/python/de/LC_MESSAGES/python.po
+++ b/lang/python/de/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Gustav Gyges, 2021\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
@@ -23,21 +23,141 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installiere Bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurieren."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Fehler beim Installieren des Bootloaders"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Hänge Partitionen ein."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Konfigurationsfehler"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Für 
    {!s}
     sind keine zu verwendenden Partitionen definiert."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriere systemd-Dienste"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Der Dienst kann nicht geändert werden."
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
-"
    {!s}
     erzeugte Fehlercode {!s}."
+"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
+"zurück."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Unbekannte systemd-Befehle {command!s} und "
+"{suffix!s} für Einheit {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dateisysteme aushängen."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Befüllen von Dateisystemen."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync fehlgeschlagen mit Fehlercode {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Beginn des Entpackens {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Kein Einhängepunkt für die Root-Partition"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage enthält keinen Schlüssel namens \"rootMountPoint\", tue nichts"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ungültiger Einhängepunkt für die Root-Partition"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ungültige unsquash-Konfiguration"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Das Dateisystem für \"{}\" ({}) wird von Ihrem aktuellen Kernel nicht "
+"unterstützt"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Das Quelldateisystem \"{}\" existiert nicht"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Konnte unsquashfs nicht finden, stellen Sie sicher, dass Sie das Paket "
+"namens squashfs-tools installiert haben"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,107 +215,82 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Die Konfiguration des Displaymanager war unvollständig."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Erstelle initramfs mit dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Ausführen von dracut auf dem Ziel schlug fehl"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Der Exit-Code war {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy Python-Job"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy Python-Schritt {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Schreibe fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Konfigurationsfehler"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Für 
    {!s}
     sind keine zu verwendenden Partitionen definiert."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriere mkinitcpio. "
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Für 
    {!s}
     wurde kein Einhängepunkt für die Root-Partition "
 "angegeben."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Keine 
    {!s}
     Konfiguration gegeben die 
    {!s}
     benutzen "
-"könnte."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfiguriere verschlüsselten Auslagerungsspeicher."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurieren."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installiere Daten."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Einstellen der Hardware-Uhr."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfiguriere OpenRC-Dienste"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriere mkinitcpio. "
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Kann den Dienst {name!s} nicht zu Runlevel {level!s} hinzufügen."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriere initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Kann den Dienst {name!s} nicht aus Runlevel {level!s} entfernen."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriere Lokalisierungen."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Unbekannte Aktion {arg!s} für Dienst {name!s} in Runlevel "
+"{level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfiguriere verschlüsselten Auslagerungsspeicher."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
+"zurück."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Erstelle initramfs mit mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Vorgesehenes Runlevel existiert nicht"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Der Pfad für Runlevel {level!s} ist {path!s}, welcher nicht "
+"existiert."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Hänge Partitionen ein."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Der vorgesehene Dienst existiert nicht"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Speichere Netzwerkkonfiguration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Der Pfad für den Dienst {name!s} is {path!s}, welcher nicht "
+"existiert."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguriere Plymouth-Thema"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -250,170 +345,77 @@ msgstr ""
 "Der Paketmanager konnte das installierte System nicht verändern. Der Befehl "
 "
    {!s}
     erzeugte Fehlercode {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguriere Plymouth-Thema"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installiere Daten."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfiguriere OpenRC-Dienste"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Kann den Dienst {name!s} nicht zu Runlevel {level!s} hinzufügen."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Kann den Dienst {name!s} nicht aus Runlevel {level!s} entfernen."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Unbekannte Aktion {arg!s} für Dienst {name!s} in Runlevel "
-"{level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Der Dienst kann nicht geändert werden."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
-"zurück."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Vorgesehenes Runlevel existiert nicht"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Der Pfad für Runlevel {level!s} ist {path!s}, welcher nicht "
-"existiert."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Der vorgesehene Dienst existiert nicht"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Der Pfad für den Dienst {name!s} is {path!s}, welcher nicht "
-"existiert."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installiere Bootloader."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriere systemd-Dienste"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Fehler beim Installieren des Bootloaders"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} Aufruf in chroot lieferte Fehlercode {num!s} "
-"zurück."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Der systemd-Dienst {name!s} kann nicht aktiviert werden."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht aktiviert werden."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Das systemd-Ziel {name!s} kann nicht deaktiviert werden."
+"Der Bootloader konnte nicht installiert werden. Der Installationsbefehl "
+"
    {!s}
     erzeugte Fehlercode {!s}."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Die systemd-Einheit {name!s} kann nicht maskiert werden."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Einstellen der Hardware-Uhr."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"Unbekannte systemd-Befehle {command!s} und "
-"{suffix!s} für Einheit {name!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Erstelle initramfs mit mkinitfs."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dateisysteme aushängen."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Ausführung von mkinitfs auf dem Ziel fehlgeschlagen."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Befüllen von Dateisystemen."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Der Exit-Code war {}"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync fehlgeschlagen mit Fehlercode {}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Erstelle initramfs mit dracut."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Abbilddatei Entpacken {}/{}, Datei {}/{}"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Ausführen von dracut auf dem Ziel schlug fehl"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Beginn des Entpackens {}"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriere initramfs."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Entpacken der Abbilddatei \"{}\" fehlgeschlagen"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriere den dmcrypt-Dienst von OpenRC."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Kein Einhängepunkt für die Root-Partition"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Schreibe fstab."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"globalstorage enthält keinen Schlüssel namens \"rootMountPoint\", tue nichts"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ungültiger Einhängepunkt für die Root-Partition"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint ist \"{}\", welcher nicht existiert, tue nichts"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Ungültige unsquash-Konfiguration"
+"Keine 
    {!s}
     Konfiguration gegeben die 
    {!s}
     benutzen "
+"könnte."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Das Dateisystem für \"{}\" ({}) wird von Ihrem aktuellen Kernel nicht "
-"unterstützt"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy Python-Job"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Das Quelldateisystem \"{}\" existiert nicht"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy Python-Schritt {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Konnte unsquashfs nicht finden, stellen Sie sicher, dass Sie das Paket "
-"namens squashfs-tools installiert haben"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriere Lokalisierungen."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Das Ziel \"{}\" im Zielsystem ist kein Verzeichnis"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Speichere Netzwerkkonfiguration."
diff --git a/lang/python/el/LC_MESSAGES/python.po b/lang/python/el/LC_MESSAGES/python.po
index 251383e3a2..9f51ecda64 100644
--- a/lang/python/el/LC_MESSAGES/python.po
+++ b/lang/python/el/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Efstathios Iosifidis , 2017\n"
 "Language-Team: Greek (https://www.transifex.com/calamares/teams/20061/el/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "εγκατάσταση πακέτων."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "εγκατάσταση πακέτων."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index 7096e5ced4..2ab98df1b5 100644
--- a/lang/python/en_GB/LC_MESSAGES/python.po
+++ b/lang/python/en_GB/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jason Collins , 2018\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount file systems."
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Install packages."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:639
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Install packages."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processing packages (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installing one package."
+msgstr[1] "Installing %(num)d packages."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removing one package."
+msgstr[1] "Removing %(num)d packages."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/eo/LC_MESSAGES/python.po b/lang/python/eo/LC_MESSAGES/python.po
index b978e272d1..804772892c 100644
--- a/lang/python/eo/LC_MESSAGES/python.po
+++ b/lang/python/eo/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kurt Ankh Phoenix , 2018\n"
 "Language-Team: Esperanto (https://www.transifex.com/calamares/teams/20061/eo/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demeti dosieraj sistemoj."
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Formala python laboro."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Formala python paŝo {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instali pakaĵoj."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalante unu pakaĵo."
-msgstr[1] "Instalante %(num)d pakaĵoj."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
 
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Forigante unu pakaĵo."
-msgstr[1] "Forigante %(num)d pakaĵoj."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:639
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instali pakaĵoj."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Prilaborante pakaĵoj (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalante unu pakaĵo."
+msgstr[1] "Instalante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Forigante unu pakaĵo."
+msgstr[1] "Forigante %(num)d pakaĵoj."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Demeti dosieraj sistemoj."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Formala python laboro."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Formala python paŝo {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/es/LC_MESSAGES/python.po b/lang/python/es/LC_MESSAGES/python.po
index bfb0a7723e..cb05fd2a4f 100644
--- a/lang/python/es/LC_MESSAGES/python.po
+++ b/lang/python/es/LC_MESSAGES/python.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Pier Jose Gotta Perez , 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
@@ -26,19 +26,143 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar gestor de arranque."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB - menú de arranque multisistema -"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones"
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No hay definidas particiones en 1{!s}1 para usar."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar servicios de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La orden  systemctl {arg!s}  en chroot  devolvió el código de "
+"error  {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede activar el servicio de systemd  {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No se puede activar el objetivo de systemd  {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "No se puede desactivar el objetivo de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Órdenes desconocidas de systemd  {command!s} y "
+"{suffix!s} para la/s unidad /es {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivos."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Rellenando los sistemas de archivos."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Falló la sincronización  mediante rsync  con el código de error {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Iniciando el desempaquetado {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No se pudo desempaquetar la imagen «{}»"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+"No especificó un punto de montaje para la  partición raíz - / o root -"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"No se hace nada porque el almacenamiento no contiene una clave de  "
+"\"rootMountPoint\" punto de montaje para la raíz."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punto de montaje no válido para una partición raíz,"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "Como el punto de montaje raíz es \"{}\", y no existe, no se hace nada"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuración de \"unsquash\" no válida"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
+"actual"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos de origen  \"{}\" no existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"No se encontró unsquashfs; cerciórese de que tenga instalado el paquete "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destino \"{}\" en el sistema escogido  no es una carpeta"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -96,157 +220,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-"Creando initramfs - sistema de arranque - con dracut - su constructor -."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Falló en ejecutar dracut - constructor de arranques - en el objetivo"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarea de python ficticia."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso {} de python ficticio"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiendo la tabla de particiones fstab"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Error de configuración"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No hay definidas particiones en 1{!s}1 para usar."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio - sistema de arranque básico -."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "No se facilitó un punto de montaje raíz utilizable para 
    {!s}
     "
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB - menú de arranque multisistema -"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj de la computadora."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio - sistema de arranque básico -."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs - sistema de inicio -."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando especificaciones locales o regionales."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando la memoria de intercambio - swap - encriptada."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando particiones"
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Guardando la  configuración de red."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar paquetes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Procesando paquetes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando un paquete."
-msgstr[1] "Instalando %(num)d paquetes."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Eliminando un paquete."
-msgstr[1] "Eliminando %(num)d paquetes."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure el tema de Plymouth - menú de bienvenida."
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando datos."
@@ -275,11 +265,6 @@ msgstr ""
 "Acción desconocida d/e el/los servicio/s {arg!s} para el/los "
 "servicio/s {name!s} en el/los rango/s de ejecución {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -310,108 +295,125 @@ msgstr ""
 "La ruta hacia el/los servicio/s {name!s} es {path!s}, y no "
 "existe."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar servicios de systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure el tema de Plymouth - menú de bienvenida."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La orden  systemctl {arg!s}  en chroot  devolvió el código de "
-"error  {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar paquetes."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede activar el servicio de systemd  {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Procesando paquetes (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No se puede activar el objetivo de systemd  {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando un paquete."
+msgstr[1] "Instalando %(num)d paquetes."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "No se puede desactivar el objetivo de systemd {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Eliminando un paquete."
+msgstr[1] "Eliminando %(num)d paquetes."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No se puede enmascarar la unidad de systemd {name!s}."
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:639
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Órdenes desconocidas de systemd  {command!s} y "
-"{suffix!s} para la/s unidad /es {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de archivos."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Rellenando los sistemas de archivos."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Falló la sincronización  mediante rsync  con el código de error {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar gestor de arranque."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Desempaquetando la imagen {}/{}, archivo {}/{}"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Iniciando el desempaquetado {}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No se pudo desempaquetar la imagen «{}»"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj de la computadora."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
-"No especificó un punto de montaje para la  partición raíz - / o root -"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
-"No se hace nada porque el almacenamiento no contiene una clave de  "
-"\"rootMountPoint\" punto de montaje para la raíz."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punto de montaje no válido para una partición raíz,"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "Como el punto de montaje raíz es \"{}\", y no existe, no se hace nada"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+"Creando initramfs - sistema de arranque - con dracut - su constructor -."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuración de \"unsquash\" no válida"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Falló en ejecutar dracut - constructor de arranques - en el objetivo"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"El sistema de archivos para \"{}\" ({}) no es compatible con su kernel "
-"actual"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs - sistema de inicio -."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de archivos de origen  \"{}\" no existe"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio   - de arranque encriptado -. OpenRC dmcrypt"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiendo la tabla de particiones fstab"
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"No se encontró unsquashfs; cerciórese de que tenga instalado el paquete "
-"squashfs-tools"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destino \"{}\" en el sistema escogido  no es una carpeta"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarea de python ficticia."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso {} de python ficticio"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando especificaciones locales o regionales."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando la  configuración de red."
diff --git a/lang/python/es_MX/LC_MESSAGES/python.po b/lang/python/es_MX/LC_MESSAGES/python.po
index bf88de046b..7b0a08a1d0 100644
--- a/lang/python/es_MX/LC_MESSAGES/python.po
+++ b/lang/python/es_MX/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Erland Huaman , 2021\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/calamares/teams/20061/es_MX/)\n"
@@ -23,19 +23,142 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar el cargador de arranque."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando particiones."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Error de configuración"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No hay particiones definidas para que 
    {!s}
     use."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura los servicios de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "No se puede modificar el servicio."
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La llamada de: systemctl {arg!s} en chroot retorna código de "
+"error {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "No se puede habilitar el servicio {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "No se puede habilitar el objetivo {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"No se puede deshabilitar el objetivo {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "No se puede enmascarar la unidad {name!s} de systemd."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"systemd no reconoce los comandos {command!s} y "
+"{suffix!s}para la unidad {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de archivo."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Llenando sistema de archivos."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falló con código de error {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Iniciando a desempaquetar {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Se falló en la desempaquetización de la imagen \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "No existe punto de montaje para la partición raíz"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Mal punto de montaje para la partición raíz"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mala configuración del paquete unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
+"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" "
+"({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "El sistema de archivos fuente \"{}\" no existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools "
+"instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,103 +216,72 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuración del gestor de pantalla estaba incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creando initramfs con dracut"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Se falló al intentar correr dracut en el objetivo"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "El código de salida fue {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Trabajo python ficticio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso python ficticio {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escribiento fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Error de configuración"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No hay particiones definidas para que 
    {!s}
     use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Configurando la swap encriptada."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instalando data."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando el reloj del hardware."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Configura los servicios de OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio"
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configurando la swap encriptada."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Creando initramfs con mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "El nivel de ejecución del objetivo no existe"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Se falló al intentar correr mkinitfs en el objetivo"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando particiones."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "El servicio objetivo no existe"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Guardando configuración de red."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando el servicio OpenRc dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurando el tema de Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -238,163 +330,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurando el tema de Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instalando data."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configura los servicios de OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "No se puede modificar el servicio."
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "El nivel de ejecución del objetivo no existe"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "El servicio objetivo no existe"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar el cargador de arranque."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura los servicios de systemd"
-
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La llamada de: systemctl {arg!s} en chroot retorna código de "
-"error {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "No se puede habilitar el servicio {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "No se puede habilitar el objetivo {name!s} de systemd."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"No se puede deshabilitar el objetivo {name!s} de systemd."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "No se puede enmascarar la unidad {name!s} de systemd."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando el reloj del hardware."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"systemd no reconoce los comandos {command!s} y "
-"{suffix!s}para la unidad {name!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Creando initramfs con mkinitfs."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de archivo."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Se falló al intentar correr mkinitfs en el objetivo"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Llenando sistema de archivos."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "El código de salida fue {}"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falló con código de error {}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creando initramfs con dracut"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Desempaquetando imagen {}/{}, archivo {}/{}"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Se falló al intentar correr dracut en el objetivo"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Iniciando a desempaquetar {}"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Se falló en la desempaquetización de la imagen \"{}\""
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando el servicio OpenRc dmcrypt."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "No existe punto de montaje para la partición raíz"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escribiento fstab."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"el globalstorage no contiene una llave \"rootMountPoint\", no se hace nada"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Mal punto de montaje para la partición raíz"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint es \"{}\", el cual no existe, no se hace nada"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Mala configuración del paquete unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Tu kernel actual no tiene soporte para el sistema de archivos para \"{}\" "
-"({})"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Trabajo python ficticio."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "El sistema de archivos fuente \"{}\" no existe"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso python ficticio {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Falla buscando unsquashfs, asegúrate de tener el paquete squashfs-tools "
-"instalado"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locales."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "El destino \"{}\" en el sistema objetivo no es un directorio"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Guardando configuración de red."
diff --git a/lang/python/es_PE/LC_MESSAGES/python.po b/lang/python/es_PE/LC_MESSAGES/python.po
index 2ad6b0e0e0..2dffb08d6a 100644
--- a/lang/python/es_PE/LC_MESSAGES/python.po
+++ b/lang/python/es_PE/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Spanish (Peru) (https://www.transifex.com/calamares/teams/20061/es_PE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/es_PR/LC_MESSAGES/python.po b/lang/python/es_PR/LC_MESSAGES/python.po
index af5f27c77f..1a2e6f6ed0 100644
--- a/lang/python/es_PR/LC_MESSAGES/python.po
+++ b/lang/python/es_PR/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Spanish (Puerto Rico) (https://www.transifex.com/calamares/teams/20061/es_PR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: es_PR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/et/LC_MESSAGES/python.po b/lang/python/et/LC_MESSAGES/python.po
index 4aa5969fc6..891f3cf81f 100644
--- a/lang/python/et/LC_MESSAGES/python.po
+++ b/lang/python/et/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Madis Otenurm, 2019\n"
 "Language-Team: Estonian (https://www.transifex.com/calamares/teams/20061/et/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Haagi failisüsteemid lahti."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,102 +202,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testiv python'i töö."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testiv python'i aste {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -234,153 +316,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Haagi failisüsteemid lahti."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testiv python'i töö."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testiv python'i aste {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/eu/LC_MESSAGES/python.po b/lang/python/eu/LC_MESSAGES/python.po
index 7539cf9d8a..388b04a2c1 100644
--- a/lang/python/eu/LC_MESSAGES/python.po
+++ b/lang/python/eu/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Ander Elortondo, 2019\n"
 "Language-Team: Basque (https://www.transifex.com/calamares/teams/20061/eu/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fitxategi sistemak desmuntatu."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -90,102 +203,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Pantaila kudeatzaile konfigurazioa osotu gabe"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python lana."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python urratsa {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -235,153 +317,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fitxategi sistemak desmuntatu."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python lana."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python urratsa {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/fa/LC_MESSAGES/python.po b/lang/python/fa/LC_MESSAGES/python.po
index 50682fe625..4d919b8b8a 100644
--- a/lang/python/fa/LC_MESSAGES/python.po
+++ b/lang/python/fa/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: alireza jamshidi , 2020\n"
 "Language-Team: Persian (https://www.transifex.com/calamares/teams/20061/fa/)\n"
@@ -22,19 +22,136 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "نصب بارکنندهٔ راه‌اندازی."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "در حال پیکربندی گراب."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "در حال سوار کردن افرازها."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "خطای پیکربندی"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "هیچ افرازی برای استفادهٔ 
    {!s}
     تعریف نشده."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "در حال پیکربندی خدمات سیستم‌دی"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "نمی‌توان خدمت را دستکاری کرد"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
+"برگرداند."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
+"{suffix!s} برای واحد {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "پیاده کردن سامانه‌های پرونده."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "در حال پر کردن سامانه‌پرونده‌ها."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "آرسینک با رمز خطای {} شکست خورد."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "در حال بسته‌گشایی تصویر {}/{}، پروندهٔ {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "در حال شروع بسته‌گشایی {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "شکست در بسته‌گشایی تصویر {}"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمی‌شود"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمی‌شود"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "پیکربندی بد unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "کرنل کنونیتان از سامانه‌پروندهٔ {} ({}) پشتیبانی نمی‌کند"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "شکست در یافتن unsquashfs. مطمئن شوید بستهٔ squashfs-tools نصب است"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -90,103 +207,72 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "پیکربندی مدیر نمایش کامل نبود"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "در حال ایجاد initramfs با dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "شکست در اجرای dracut روی هدف"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "رمز خروج {} بود"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "کار پایتونی الکی."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "گام پایتونی الکی {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "در حال نوشتن fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "خطای پیکربندی"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "هیچ افرازی برای استفادهٔ 
    {!s}
     تعریف نشده."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "پیکربندی mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "هیچ نقطهٔ اتّصال ریشه‌ای برای استفادهٔ 
    {!s}
     داده نشده."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "در حال پیکربندی گراب."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "در حال پیکربندی مبادلهٔ رمزشده."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "در حال تنظیم ساعت سخت‌افزاری."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "داده‌های نصب"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "پیکربندی mkinitcpio."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "پیکربندی خدمات OpenRC"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "در حال پیکربندی initramfs."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "نمی‌توان خدمت {name!s} را به سطح اجرایی {level!s} افزود."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "پیکربندی مکانها"
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "نمی‌توان خدمت {name!s} را از سطح اجرایی {level!s} برداشت."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "در حال پیکربندی مبادلهٔ رمزشده."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "سطح اجرایی هدف وجود ندارد."
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "در حال سوار کردن افرازها."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "خدمت هدف وجود ندارد"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "در حال ذخیرهٔ پیکربندی شبکه."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -235,157 +321,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "در حال پیکربندی زمینهٔ پلی‌موث"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "داده‌های نصب"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "پیکربندی خدمات OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "نمی‌توان خدمت {name!s} را به سطح اجرایی {level!s} افزود."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "نمی‌توان خدمت {name!s} را از سطح اجرایی {level!s} برداشت."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "نصب بارکنندهٔ راه‌اندازی."
 
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "نمی‌توان خدمت را دستکاری کرد"
-
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:509
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "سطح اجرایی هدف وجود ندارد."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "در حال تنظیم ساعت سخت‌افزاری."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "خدمت هدف وجود ندارد"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "در حال پیکربندی خدمات سیستم‌دی"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "رمز خروج {} بود"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"فراخوانی systemctl {arg!s} در chroot رمز خطای {num!s} را "
-"برگرداند."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "در حال ایجاد initramfs با dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را به کار انداخت."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "شکست در اجرای dracut روی هدف"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "نمی‌توان هدف سیستم‌دی {name!s} را به کار انداخت."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "در حال پیکربندی initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "نمی‌توان خدمت سیستم‌دی {name!s} را از کار انداخت."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "در حال پیکربندی خدمت dmcrypt OpenRC."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "نمی‌توان واحد سیستم‌دی {name!s} را پوشاند."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "در حال نوشتن fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"دستورات ناشناختهٔ سیستم‌دی {command!s} و "
-"{suffix!s} برای واحد {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "پیاده کردن سامانه‌های پرونده."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "در حال پر کردن سامانه‌پرونده‌ها."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "آرسینک با رمز خطای {} شکست خورد."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "در حال بسته‌گشایی تصویر {}/{}، پروندهٔ {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "در حال شروع بسته‌گشایی {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "شکست در بسته‌گشایی تصویر {}"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "هیچ نقطهٔ اتّصالی برای افراز ریشه وجود ندارد"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage کلید rootMountPoint را ندارد. کاری انجام نمی‌شود"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "نقطهٔ اتّصال بد برای افراز ریشه"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "نقطهٔ اتّصال ریشه {} است که وجود ندارد. کاری انجام نمی‌شود"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "پیکربندی بد unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "کرنل کنونیتان از سامانه‌پروندهٔ {} ({}) پشتیبانی نمی‌کند"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "کار پایتونی الکی."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "سامانهٔ پروندهٔ مبدأ {} وجود ندارد"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "گام پایتونی الکی {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "شکست در یافتن unsquashfs. مطمئن شوید بستهٔ squashfs-tools نصب است"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "پیکربندی مکانها"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "مقصد {} در سامانهٔ هدف، یک شاخه نیست"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "در حال ذخیرهٔ پیکربندی شبکه."
diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po
index 733bc72196..98b130e9cf 100644
--- a/lang/python/fi_FI/LC_MESSAGES/python.po
+++ b/lang/python/fi_FI/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kimmo Kujansuu , 2021\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
@@ -21,21 +21,136 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Asenna bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Määritä GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Bootloader asennusvirhe"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Yhdistä osiot."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Määritysvirhe"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Ei ole määritetty käyttämään osioita 
    {!s}
     ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Määritä systemd palvelut"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Palvelua ei voi muokata"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd-palvelua ei saa käyttöön {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd-kohdetta ei saa käyttöön {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd-kohdetta ei-voi poistaa käytöstä {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ei voi peittää systemd-yksikköä {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"Bootloaderia ei voitu asentaa. Asennuskomento 
    {!s}
     palautti "
-"virhekoodin {!s}."
+"Tuntematon systemd komento {command!s} ja "
+"{suffix!s} laite {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Irrota tiedostojärjestelmät käytöstä."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Paikannetaan tiedostojärjestelmiä."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync epäonnistui virhekoodilla {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Pakkauksen purkaminen alkaa {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Kuvan purkaminen epäonnistui \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ei liitoskohtaa juuri root osiolle"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ei sisällä \"rootMountPoint\" avainta, eikä tee mitään"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Huono kiinnityspiste root-osioon"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint on \"{}\", jota ei ole, eikä tee mitään"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Huono epäpuhdas kokoonpano"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Tiedostojärjestelmä \"{}\" ({}) ei tue sinun nykyistä kerneliä "
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Lähde tiedostojärjestelmää \"{}\" ei ole olemassa"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti "
+"asennettuna"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Kohdejärjestelmän \"{}\" kohde ei ole hakemisto"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,104 +208,77 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Näytönhallinnan kokoonpano oli puutteellinen"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Initramfs luominen dracut:lla."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Dracut-ohjelman suorittaminen ei onnistunut"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Poistumiskoodi oli {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Harjoitus python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Harjoitus python vaihe {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab kirjoittaminen."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Määritysvirhe"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Ei ole määritetty käyttämään osioita 
    {!s}
     ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Määritetään mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Root-juuri kiinnityspistettä  
    {!s}
     ei ole annettu käytettäväksi."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "Ei 
    {!s}
     määritys annetaan 
    {!s}
     varten."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Salatun swapin määrittäminen."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Määritä GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Asennetaan tietoja."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Laitteiston kellon asettaminen."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Määritä OpenRC-palvelut"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Määritetään mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Palvelua {name!s} ei-voi lisätä suorituksen tasolle {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Määritetään initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Ei voi poistaa palvelua {name!s} ajo-tasolla {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Määritetään locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Tuntematon  huoltotoiminto{arg!s} palvelun {name!s} "
+"palvelutasolle  {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Salatun swapin määrittäminen."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} palautti chrootissa virhekoodin {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Initramfs luominen mkinitfs avulla."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Kohde runlevel ei ole olemassa"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Kohteen mkinitfs-suoritus epäonnistui."
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "Ajotason polku {level!s} on {path!s}, jota ei ole."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Yhdistä osiot."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Kohdepalvelua ei ole"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Tallennetaan verkon määrityksiä."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Palvelun polku {name!s} on {path!s},  jota ei ole olemassa."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt-palvelun määrittäminen."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Määritä Plymouthin teema"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -245,161 +333,75 @@ msgstr ""
 "Paketinhallinta ei voinut tehdä muutoksia asennettuun järjestelmään. Komento"
 " 
    {!s}
     palautti virhekoodin {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Määritä Plymouthin teema"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Asennetaan tietoja."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Määritä OpenRC-palvelut"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Palvelua {name!s} ei-voi lisätä suorituksen tasolle {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Ei voi poistaa palvelua {name!s} ajo-tasolla {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Tuntematon  huoltotoiminto{arg!s} palvelun {name!s} "
-"palvelutasolle  {level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Palvelua ei voi muokata"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} palautti chrootissa virhekoodin {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Kohde runlevel ei ole olemassa"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "Ajotason polku {level!s} on {path!s}, jota ei ole."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Kohdepalvelua ei ole"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Palvelun polku {name!s} on {path!s},  jota ei ole olemassa."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Määritä systemd palvelut"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "systemctl {arg!s} chroot palautti virhe koodin {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd-palvelua ei saa käyttöön {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd-kohdetta ei saa käyttöön {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd-kohdetta ei-voi poistaa käytöstä {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Asenna bootloader."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ei voi peittää systemd-yksikköä {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Bootloader asennusvirhe"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Tuntematon systemd komento {command!s} ja "
-"{suffix!s} laite {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Irrota tiedostojärjestelmät käytöstä."
+"Bootloaderia ei voitu asentaa. Asennuskomento 
    {!s}
     palautti "
+"virhekoodin {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Paikannetaan tiedostojärjestelmiä."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Laitteiston kellon asettaminen."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync epäonnistui virhekoodilla {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Initramfs luominen mkinitfs avulla."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Kohteen mkinitfs-suoritus epäonnistui."
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Pakkauksen purkaminen alkaa {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Poistumiskoodi oli {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Kuvan purkaminen epäonnistui \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Initramfs luominen dracut:lla."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ei liitoskohtaa juuri root osiolle"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Dracut-ohjelman suorittaminen ei onnistunut"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ei sisällä \"rootMountPoint\" avainta, eikä tee mitään"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Määritetään initramfs."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Huono kiinnityspiste root-osioon"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt-palvelun määrittäminen."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint on \"{}\", jota ei ole, eikä tee mitään"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab kirjoittaminen."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Huono epäpuhdas kokoonpano"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "Ei 
    {!s}
     määritys annetaan 
    {!s}
     varten."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Tiedostojärjestelmä \"{}\" ({}) ei tue sinun nykyistä kerneliä "
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Harjoitus python job."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Lähde tiedostojärjestelmää \"{}\" ei ole olemassa"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Harjoitus python vaihe {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Ei löytynyt unsquashfs, varmista, että sinulla on squashfs-tools paketti "
-"asennettuna"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Määritetään locales."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Kohdejärjestelmän \"{}\" kohde ei ole hakemisto"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Tallennetaan verkon määrityksiä."
diff --git a/lang/python/fr/LC_MESSAGES/python.po b/lang/python/fr/LC_MESSAGES/python.po
index b495c28c5a..63a28659e0 100644
--- a/lang/python/fr/LC_MESSAGES/python.po
+++ b/lang/python/fr/LC_MESSAGES/python.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: roxfr , 2021\n"
 "Language-Team: French (https://www.transifex.com/calamares/teams/20061/fr/)\n"
@@ -30,19 +30,141 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installation du bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configuration du GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montage des partitions."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Erreur de configuration"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
+"Aucune partition n'est définie pour être utilisée par 
    {!s}
    ."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurer les services systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impossible de modifier le service"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
+"{num!s}"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossible d'activer le service systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossible d'activer la cible systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Impossible de désactiver la cible systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossible de masquer l'unit systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Commandes systemd {command!s} et {suffix!s} "
+"inconnues pour l'unit {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Démonter les systèmes de fichiers"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Remplir les systèmes de fichiers."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync a échoué avec le code d'erreur {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Décompression de l'image {}/{}, fichier {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Commencer à décompresser {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Impossible de décompresser l'image \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Pas de point de montage pour la partition racine"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ne contient pas de clé \"rootMountPoint\", ne fait rien"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Mauvais point de montage pour la partition racine"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint est \"{}\", ce qui n'existe pas, ne fait rien"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Mauvaise configuration unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Le système de fichiers pour \"{}\" ({}) n'est pas pris en charge par votre "
+"noyau actuel"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Le système de fichiers source \"{}\" n'existe pas"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Échec de la recherche de unsquashfs, assurez-vous que le paquetage squashfs-"
+"tools est installé."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -102,158 +224,24 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configuration du gestionnaire d'affichage était incomplète"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Configuration du initramfs avec dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Erreur d'exécution de dracut sur la cible."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Le code de sortie était {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tâche factice de python"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Étape factice de python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Écriture du fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Erreur de configuration"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr ""
-"Aucune partition n'est définie pour être utilisée par 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configuration de mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Aucun point de montage racine n'a été donné pour être utilisé par "
 "
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configuration du GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configuration de l'horloge matériel."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configuration de mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configuration du initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configuration des locales."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configuration du swap chiffrée."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Création d'initramfs avec mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Échec de l'exécution de mkinitfs sur la cible"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montage des partitions."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sauvegarde de la configuration du réseau en cours."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuration du service OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installer les paquets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Traitement des paquets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installation d'un paquet."
-msgstr[1] "Installation de %(num)d paquets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Suppression d'un paquet."
-msgstr[1] "Suppression de %(num)d paquets."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurer le thème Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installation de données."
@@ -278,11 +266,6 @@ msgstr ""
 "Service-action {arg!s} inconnue pour le service {name!s} dans "
 "le run-level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Impossible de modifier le service"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -314,105 +297,124 @@ msgstr ""
 "Le chemin pour le service {name!s} est {path!s}, qui n'existe "
 "pas."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurer les services systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurer le thème Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"L'appel systemctl {arg!s} en chroot a renvoyé le code d'erreur "
-"{num!s}"
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installer les paquets."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossible d'activer le service systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Traitement des paquets (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossible d'activer la cible systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installation d'un paquet."
+msgstr[1] "Installation de %(num)d paquets."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Impossible de désactiver la cible systemd {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Suppression d'un paquet."
+msgstr[1] "Suppression de %(num)d paquets."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossible de masquer l'unit systemd {name!s}."
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:639
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Commandes systemd {command!s} et {suffix!s} "
-"inconnues pour l'unit {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Démonter les systèmes de fichiers"
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Remplir les systèmes de fichiers."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync a échoué avec le code d'erreur {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installation du bootloader."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Décompression de l'image {}/{}, fichier {}/{}"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Commencer à décompresser {}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Impossible de décompresser l'image \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configuration de l'horloge matériel."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Pas de point de montage pour la partition racine"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Création d'initramfs avec mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ne contient pas de clé \"rootMountPoint\", ne fait rien"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Échec de l'exécution de mkinitfs sur la cible"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Mauvais point de montage pour la partition racine"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Le code de sortie était {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint est \"{}\", ce qui n'existe pas, ne fait rien"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Configuration du initramfs avec dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Mauvaise configuration unsquash"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Erreur d'exécution de dracut sur la cible."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Le système de fichiers pour \"{}\" ({}) n'est pas pris en charge par votre "
-"noyau actuel"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configuration du initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Le système de fichiers source \"{}\" n'existe pas"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configuration du service OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Écriture du fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Échec de la recherche de unsquashfs, assurez-vous que le paquetage squashfs-"
-"tools est installé."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destination \"{}\" dans le système cible n'est pas un répertoire"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tâche factice de python"
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Étape factice de python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configuration des locales."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sauvegarde de la configuration du réseau en cours."
diff --git a/lang/python/fr_CH/LC_MESSAGES/python.po b/lang/python/fr_CH/LC_MESSAGES/python.po
index 1f26b91c0f..b8660efc2a 100644
--- a/lang/python/fr_CH/LC_MESSAGES/python.po
+++ b/lang/python/fr_CH/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: French (Switzerland) (https://www.transifex.com/calamares/teams/20061/fr_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: fr_CH\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po
index c3bc380c5d..7b2b423f84 100644
--- a/lang/python/fur/LC_MESSAGES/python.po
+++ b/lang/python/fur/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Fabio Tomat , 2020\n"
 "Language-Team: Friulian (https://www.transifex.com/calamares/teams/20061/fur/)\n"
@@ -21,19 +21,140 @@ msgstr ""
 "Language: fur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instale il bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configure GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaç des partizions."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Erôr di configurazion"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "No je stade definide nissune partizion di doprâ par 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configure i servizis di systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impussibil modificâ il servizi"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
+"erôr {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impussibil disabilitâ la destinazion di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comants di systemd {command!s} e {suffix!s} no "
+"cognossûts pe unitât {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dismonte i file-systems."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Daûr a jemplâ i filesystems."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Sincronizazion cun rsync falide cun codiç di erôr {}. "
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazion imagjin {}/{}, file {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Daûr a scomençâ la estrazion {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "No si è rivâts a estrai la imagjin \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nissun pont di montaç pe partizion lidrîs"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
+"globalstorage nol conten une clâf \"rootMountPoint\", duncje no si fâs nuie"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Pont di montaç sbaliât pe partizion lidrîs"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint al è \"{}\", che nol esist, duncje no si fâs nuie"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazion di \"unsquash\" sbaliade"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Il filesystem par \"{}\" ({}) nol è supuartât dal to kernel atuâl"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorzint \"{}\" nol esist"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"No si è rivâts a cjatâ unsquashfs, controle di vê instalât il pachet "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,156 +212,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazion dal gjestôr dai visôrs no jere complete"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Daûr a creâ initramfs cun dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "No si è rivâts a eseguî dracut su la destinazion"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codiç di jessude al jere {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Lavôr di python pustiç."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passaç di python pustiç {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Daûr a scrivi fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Erôr di configurazion"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No je stade definide nissune partizion di doprâ par 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Daûr a configurâ di mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nol è stât indicât nissun pont di montaç di doprâ par 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configure GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Daûr a configurâ l'orloi hardware."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Daûr a configurâ di mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Daûr a configurâ initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Daûr a configurâ la localizazion."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Daûr a configurâ la memorie di scambi (swap) cifrade."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Daûr a creâ il initramfs cun mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montaç des partizions."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvament de configurazion di rêt."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instale pachets."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Daûr a instalâ un pachet."
-msgstr[1] "Daûr a instalâ %(num)d pachets."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Daûr a gjavâ un pachet."
-msgstr[1] "Daûr a gjavâ %(num)d pachets."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configure il teme di Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Daûr a instalâ i dâts."
@@ -265,11 +253,6 @@ msgstr ""
 "Azion dal servizi {arg!s} no cognossude pal servizi {name!s} "
 "tal run-level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Impussibil modificâ il servizi"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -299,105 +282,124 @@ msgid ""
 msgstr ""
 "Il percors pal servizi {name!s} al è {path!s}, che nol esist."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configure i servizis di systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configure il teme di Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La clamade systemctl {arg!s} in chroot e à tornât il codiç di "
-"erôr {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instale pachets."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impussibil abilitâ il servizi di systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazion dai pachets (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impussibil abilitâ la destinazion di systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Daûr a instalâ un pachet."
+msgstr[1] "Daûr a instalâ %(num)d pachets."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Daûr a gjavâ un pachet."
+msgstr[1] "Daûr a gjavâ %(num)d pachets."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
-"Impussibil disabilitâ la destinazion di systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impussibil mascarâ la unitât di systemd {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:651
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
-"Comants di systemd {command!s} e {suffix!s} no "
-"cognossûts pe unitât {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dismonte i file-systems."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Daûr a jemplâ i filesystems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instale il bootloader."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Sincronizazion cun rsync falide cun codiç di erôr {}. "
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Estrazion imagjin {}/{}, file {}/{}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Daûr a scomençâ la estrazion {}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Daûr a configurâ l'orloi hardware."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "No si è rivâts a estrai la imagjin \"{}\""
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Daûr a creâ il initramfs cun mkinitfs."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nissun pont di montaç pe partizion lidrîs"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "No si è rivâts a eseguî mkinitfs su la destinazion"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nol conten une clâf \"rootMountPoint\", duncje no si fâs nuie"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codiç di jessude al jere {}"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Pont di montaç sbaliât pe partizion lidrîs"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Daûr a creâ initramfs cun dracut."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint al è \"{}\", che nol esist, duncje no si fâs nuie"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "No si è rivâts a eseguî dracut su la destinazion"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configurazion di \"unsquash\" sbaliade"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Daûr a configurâ initramfs."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Il filesystem par \"{}\" ({}) nol è supuartât dal to kernel atuâl"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Daûr a configurâ il servizi dmcrypt di OpenRC."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Il filesystem sorzint \"{}\" nol esist"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Daûr a scrivi fstab."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"No si è rivâts a cjatâ unsquashfs, controle di vê instalât il pachet "
-"squashfs-tools"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinazion \"{}\" tal sisteme che si va a creâ no je une cartele"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Lavôr di python pustiç."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passaç di python pustiç {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Daûr a configurâ la localizazion."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvament de configurazion di rêt."
diff --git a/lang/python/gl/LC_MESSAGES/python.po b/lang/python/gl/LC_MESSAGES/python.po
index e58a670367..009f4d259d 100644
--- a/lang/python/gl/LC_MESSAGES/python.po
+++ b/lang/python/gl/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Xosé, 2018\n"
 "Language-Team: Galician (https://www.transifex.com/calamares/teams/20061/gl/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -90,102 +203,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuración do xestor de pantalla foi incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa parva de python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Paso parvo de python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -235,153 +317,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de ficheiros."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa parva de python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Paso parvo de python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/gu/LC_MESSAGES/python.po b/lang/python/gu/LC_MESSAGES/python.po
index 77b46e939d..e71e257dce 100644
--- a/lang/python/gu/LC_MESSAGES/python.po
+++ b/lang/python/gu/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Gujarati (https://www.transifex.com/calamares/teams/20061/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/he/LC_MESSAGES/python.po b/lang/python/he/LC_MESSAGES/python.po
index 2d87361a51..75427fdeae 100644
--- a/lang/python/he/LC_MESSAGES/python.po
+++ b/lang/python/he/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yaron Shahrabani , 2021\n"
 "Language-Team: Hebrew (https://www.transifex.com/calamares/teams/20061/he/)\n"
@@ -23,21 +23,135 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "התקנת מנהל אתחול."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "הגדרת GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "שגיאת התקנת מנהל אתחול"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "מחיצות מעוגנות."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "שגיאת הגדרות"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "לא הוגדרו מחיצות לשימוש של 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "הגדרת שירותי systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "לא ניתן לשנות את השירות"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
    {!s}
     החזירה את קוד "
-"השגיאה {!s}."
+"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"פקודות לא ידועות של systemd‏ {command!s} "
+"ו־{suffix!s} עבור היחידה {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ניתוק עיגון מערכות קבצים."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "מערכות הקבצים מתמלאות."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync נכשל עם קוד השגיאה {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "קובץ הדמות נפרס {}/{}, קובץ {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "הפריסה של {} מתחילה"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "פריסת קובץ הדמות \"{}\" נכשלה"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "אין נקודת עגינה למחיצת העל"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "נקודת העגינה של מחיצת השורה שגויה"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "תצורת unsquash שגויה"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "מערכת הקבצים עבור „{}” ‏({}) אינה נתמכת על ידי הליבה הנוכחית שלך."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "מערכת הקבצים במקור „{}” אינה קיימת"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "איתור unsquashfs לא צלח, נא לוודא שהחבילה squashfs-tools מותקנת"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,103 +209,77 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "תצורת מנהל התצוגה אינה שלמה"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "נוצר initramfs עם dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "הרצת dracut על היעד נכשלה"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "קוד היציאה היה {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "משימת דמה של Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "צעד דמה של Python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab נכתב."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "שגיאת הגדרות"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "לא הוגדרו מחיצות לשימוש של 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio מותקן."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "לא סופקה נקודת עגינת שורש לשימוש של 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "לא סופקה תצורת 
    {!s}
     לשימוש 
    {!s}
    ."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "מוגדר שטח החלפה מוצפן."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "הגדרת GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "הנתונים מותקנים."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "שעון החומרה מוגדר."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "הגדרת שירותי OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio מותקן."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "לא ניתן להוסיף את השירות {name!s} לשכבת ההפעלה {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs מוגדר."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "לא ניתן להסיר את השירות {name!s} משכבת ההפעלה {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "השפות מוגדרות."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"service-action‏ (פעולת שירות) {arg!s} בלתי ידועה עבור השירות "
+"{name!s} בשכבת ההפעלה {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "מוגדר שטח החלפה מוצפן."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"הקריאה rc-update {arg!s} במצב chroot החזירה את קוד השגיאה "
+"{num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "initramfs נוצר בעזרת mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "יעד שכבת ההפעלה אינו קיים"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "הרצת mkinitfs על היעד נכשלה"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"הנתיב לשכבת ההפעלה {level!s} הוא {path!s} ונתיב זה אינו קיים."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "מחיצות מעוגנות."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "שירות היעד אינו קיים"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "הגדרות הרשת נשמרות."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "שירות dmcrypt ל־OpenRC מוגדר."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "הגדרת ערכת עיצוב של Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -250,161 +338,75 @@ msgstr ""
 "מנהל החבילות לא הצליח לערוך שינויים במערכת המותקנת. הפקודה 
    {!s}
     "
 "החזירה את קוד השגיאה {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "הגדרת ערכת עיצוב של Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "הנתונים מותקנים."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "הגדרת שירותי OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "לא ניתן להוסיף את השירות {name!s} לשכבת ההפעלה {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "לא ניתן להסיר את השירות {name!s} משכבת ההפעלה {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"service-action‏ (פעולת שירות) {arg!s} בלתי ידועה עבור השירות "
-"{name!s} בשכבת ההפעלה {level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "לא ניתן לשנות את השירות"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"הקריאה rc-update {arg!s} במצב chroot החזירה את קוד השגיאה "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "יעד שכבת ההפעלה אינו קיים"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"הנתיב לשכבת ההפעלה {level!s} הוא {path!s} ונתיב זה אינו קיים."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "שירות היעד אינו קיים"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "הנתיב לשירות {name!s} הוא {path!s}, שאינו קיים."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "הגדרת שירותי systemd"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} הקריאה ב־chroot החזירה את קוד השגיאה {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "לא ניתן להפעיל את השירות הבא של systemd:‏ {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "לא ניתן להפעיל את היעד של systemd בשם {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "לא ניתן להשבית את היעד של systemd בשם  {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "התקנת מנהל אתחול."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "לא ניתן למסך את היחידה של systemd בשם  {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "שגיאת התקנת מנהל אתחול"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"פקודות לא ידועות של systemd‏ {command!s} "
-"ו־{suffix!s} עבור היחידה {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ניתוק עיגון מערכות קבצים."
+"לא ניתן להתקין את מנהל האתחול. פקודת ההתקנה 
    {!s}
     החזירה את קוד "
+"השגיאה {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "מערכות הקבצים מתמלאות."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "שעון החומרה מוגדר."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync נכשל עם קוד השגיאה {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "initramfs נוצר בעזרת mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "קובץ הדמות נפרס {}/{}, קובץ {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "הרצת mkinitfs על היעד נכשלה"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "הפריסה של {} מתחילה"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "קוד היציאה היה {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "פריסת קובץ הדמות \"{}\" נכשלה"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "נוצר initramfs עם dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "אין נקודת עגינה למחיצת העל"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "הרצת dracut על היעד נכשלה"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "ב־globalstorage אין את המפתח „rootMountPoint”, לא תתבצע אף פעולה"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs מוגדר."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "נקודת העגינה של מחיצת השורה שגויה"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "שירות dmcrypt ל־OpenRC מוגדר."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint מוגדרת בתור „{}”, שאינו קיים, לא תתבצע אף פעולה"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab נכתב."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "תצורת unsquash שגויה"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "לא סופקה תצורת 
    {!s}
     לשימוש 
    {!s}
    ."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "מערכת הקבצים עבור „{}” ‏({}) אינה נתמכת על ידי הליבה הנוכחית שלך."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "משימת דמה של Python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "מערכת הקבצים במקור „{}” אינה קיימת"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "צעד דמה של Python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "איתור unsquashfs לא צלח, נא לוודא שהחבילה squashfs-tools מותקנת"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "השפות מוגדרות."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "היעד „{}” במערכת הקבצים המיועדת אינו תיקייה"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "הגדרות הרשת נשמרות."
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index dc8c9c3e49..3fd2e9ade6 100644
--- a/lang/python/hi/LC_MESSAGES/python.po
+++ b/lang/python/hi/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Panwar108 , 2021\n"
 "Language-Team: Hindi (https://www.transifex.com/calamares/teams/20061/hi/)\n"
@@ -21,21 +21,135 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "बूट लोडर इंस्टॉल करना।"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB विन्यस्त करना।"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "बूट लोडर इंस्टॉल त्रुटि"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "विभाजन माउंट करना।"
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "विन्यास त्रुटि"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd सेवाएँ विन्यस्त करना"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "सेवा को संशोधित नहीं किया जा सकता"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
-"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड 
    {!s}
     हेतु त्रुटि कोड "
-"{!s} प्राप्त।"
+"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
+"{suffix!s}।"
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "फ़ाइल सिस्टम माउंट से हटाना।"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "फाइल सिस्टम भरना।"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync त्रुटि कोड {} के साथ विफल।"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "इमेज फ़ाइल {}/{}, फ़ाइल {}/{} सम्पीड़ित की जा रही है"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} हेतु संपीड़न प्रक्रिया आरंभ हो रही है "
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "इमेज फ़ाइल \"{}\" को खोलने में विफल"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "रुट विभाजन हेतु कोई माउंट पॉइंट नहीं है"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage में \"rootMountPoint\" कुंजी नहीं है, कुछ नहीं किया जाएगा"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "रुट विभाजन हेतु ख़राब माउंट पॉइंट"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "रुट माउंट पॉइंट \"{}\" है, जो कि मौजूद नहीं है, कुछ नहीं किया जाएगा"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "ख़राब unsquash विन्यास सेटिंग्स"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) हेतु फ़ाइल सिस्टम आपके वर्तमान कर्नेल द्वारा समर्थित नहीं है"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" स्रोत फ़ाइल सिस्टम मौजूद नहीं है"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल है"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,106 +207,76 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "डिस्प्ले प्रबंधक विन्यास अधूरा था"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracut के साथ initramfs बनाना।"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "लक्ष्य पर dracut निष्पादन विफल"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "त्रुटि कोड  {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "डमी पाइथन प्रक्रिया ।"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab पर राइट करना।"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "विन्यास त्रुटि"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     के उपयोग हेतु कोई विभाजन परिभाषित नहीं हैं।"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpio को विन्यस्त करना।"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "
    {!s}
     के उपयोग हेतु कोई रुट माउंट पॉइंट प्रदान नहीं किया गया।"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"कोई 
    {!s}
     विन्यास प्रदान नहीं किया गया 
    {!s}
     के उपयोग "
-"हेतु।"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "एन्क्रिप्टेड स्वैप को विन्यस्त करना।"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB विन्यस्त करना।"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "डाटा इंस्टॉल करना।"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "हार्डवेयर घड़ी सेट करना।"
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRC सेवाएँ विन्यस्त करना"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpio को विन्यस्त करना।"
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "रन-लेवल {level!s} में सेवा {name!s} को जोड़ा नहीं जा सका।"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs को विन्यस्त करना। "
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "रन-लेवल {level!s} में सेवा {name!s} को हटाया नहीं जा सका।"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "स्थानिकी को विन्यस्त करना।"
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"रन-लेवल {level!s} में सेवा {name!s} हेतु अज्ञात सेवा-कार्य "
+"{arg!s}।"
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "एन्क्रिप्टेड स्वैप को विन्यस्त करना।"
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot में  rc-update {arg!s} कॉल त्रुटि कोड {num!s}।"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs के साथ initramfs बनाना।"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "लक्षित रनलेवल मौजूद नहीं है"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"रनलेवल {level!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "विभाजन माउंट करना।"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "लक्षित सेवा मौजूद नहीं है"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth थीम विन्यस्त करना "
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -247,159 +331,77 @@ msgstr ""
 "पैकेज प्रबंधक द्वारा इंस्टॉल हो रखें सिस्टम पर परिवर्तन करना विफल। कमांड "
 "
    {!s}
     हेतु त्रुटि कोड {!s} प्राप्त।"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth थीम विन्यस्त करना "
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "डाटा इंस्टॉल करना।"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRC सेवाएँ विन्यस्त करना"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "रन-लेवल {level!s} में सेवा {name!s} को जोड़ा नहीं जा सका।"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "बूट लोडर इंस्टॉल करना।"
 
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "रन-लेवल {level!s} में सेवा {name!s} को हटाया नहीं जा सका।"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "बूट लोडर इंस्टॉल त्रुटि"
 
-#: src/modules/services-openrc/main.py:61
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"रन-लेवल {level!s} में सेवा {name!s} हेतु अज्ञात सेवा-कार्य "
-"{arg!s}।"
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "सेवा को संशोधित नहीं किया जा सकता"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot में  rc-update {arg!s} कॉल त्रुटि कोड {num!s}।"
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "लक्षित रनलेवल मौजूद नहीं है"
+"बूट लोडर इंस्टॉल करना विफल। इंस्टॉल कमांड 
    {!s}
     हेतु त्रुटि कोड "
+"{!s} प्राप्त।"
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"रनलेवल {level!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "हार्डवेयर घड़ी सेट करना।"
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "लक्षित सेवा मौजूद नहीं है"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs के साथ initramfs बनाना।"
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "सेवा {name!s} हेतु पथ {path!s} है, जो कि मौजूद नहीं है।"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "लक्ष्य पर mkinitfs निष्पादन विफल"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd सेवाएँ विन्यस्त करना"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "त्रुटि कोड  {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot में systemctl {arg!s} कॉल त्रुटि कोड {num!s}।"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracut के साथ initramfs बनाना।"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "systemd सेवा {name!s} को सक्रिय नहीं किया जा सकता।"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "लक्ष्य पर dracut निष्पादन विफल"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s}सक्रिय करना विफल।"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs को विन्यस्त करना। "
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd लक्ष्य {name!s} निष्क्रिय करना विफल।"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt सेवा विन्यस्त करना।"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd यूनिट {name!s} को मास्क नहीं किया जा सकता।"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab पर राइट करना।"
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"यूनिट {name!s} हेतु अज्ञात systemd कमांड {command!s} व "
-"{suffix!s}।"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "फ़ाइल सिस्टम माउंट से हटाना।"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "फाइल सिस्टम भरना।"
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync त्रुटि कोड {} के साथ विफल।"
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "इमेज फ़ाइल {}/{}, फ़ाइल {}/{} सम्पीड़ित की जा रही है"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} हेतु संपीड़न प्रक्रिया आरंभ हो रही है "
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "इमेज फ़ाइल \"{}\" को खोलने में विफल"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "रुट विभाजन हेतु कोई माउंट पॉइंट नहीं है"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage में \"rootMountPoint\" कुंजी नहीं है, कुछ नहीं किया जाएगा"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "रुट विभाजन हेतु ख़राब माउंट पॉइंट"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "रुट माउंट पॉइंट \"{}\" है, जो कि मौजूद नहीं है, कुछ नहीं किया जाएगा"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "ख़राब unsquash विन्यास सेटिंग्स"
+"कोई 
    {!s}
     विन्यास प्रदान नहीं किया गया 
    {!s}
     के उपयोग "
+"हेतु।"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) हेतु फ़ाइल सिस्टम आपके वर्तमान कर्नेल द्वारा समर्थित नहीं है"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "डमी पाइथन प्रक्रिया ।"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" स्रोत फ़ाइल सिस्टम मौजूद नहीं है"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "डमी पाइथन प्रक्रिया की चरण संख्या {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल है"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "स्थानिकी को विन्यस्त करना।"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "लक्षित सिस्टम में \"{}\" स्थान कोई डायरेक्टरी नहीं है"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "नेटवर्क विन्यास सेटिंग्स संचित करना।"
diff --git a/lang/python/hr/LC_MESSAGES/python.po b/lang/python/hr/LC_MESSAGES/python.po
index 36c7749bfb..b28d93dd9f 100644
--- a/lang/python/hr/LC_MESSAGES/python.po
+++ b/lang/python/hr/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lovro Kudelić , 2021\n"
 "Language-Team: Croatian (https://www.transifex.com/calamares/teams/20061/hr/)\n"
@@ -21,21 +21,138 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instaliram bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurirajte GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Greška prilikom instalacije bootloadera"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montiranje particija."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Greška konfiguracije"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nema definiranih particija za 
    {!s}
     korištenje."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguriraj systemd servise"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Ne mogu modificirati servis"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Bootloader nije mogao biti instaliran. Instalacijska naredba 
    {!s}
    "
-" je vratila kod pogreške {!s}."
+"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne mogu omogućiti systemd servis {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Ne mogu omogućiti systemd cilj {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Nepoznata systemd naredba {command!s} i {suffix!s}"
+" za jedinicu {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontiraj datotečne sustave."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Popunjavanje datotečnih sustava."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync nije uspio s kodom pogreške {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Otpakiravanje slike {}/{}, datoteka {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Početak raspakiravanja {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Otpakiravnje slike nije uspjelo \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nema točke montiranja za root particiju"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage ne sadrži ključ \"rootMountPoint\", ne radi ništa"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Neispravna točka montiranja za root particiju"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Neispravna unsquash konfiguracija"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Datotečni sustav za \"{}\" ({}) nije podržan na vašem trenutnom kernelu"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Izvorni datotečni sustav \"{}\" ne postoji"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Neuspješno pronalaženje unsquashfs, provjerite imate li instaliran paket "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,104 +210,80 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracija upravitelja zaslona nije bila potpuna"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Stvaranje initramfs s dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Izlazni kod bio je {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Testni python posao."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Testni python korak {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisujem fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Greška konfiguracije"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nema definiranih particija za 
    {!s}
     korištenje."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfiguriranje mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nijedna root točka montiranja nije definirana za 
    {!s}
     korištenje."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "Nije dana konfiguracija 
    {!s}
     za 
    {!s}
     upotrebu."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfiguriranje šifriranog swapa."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurirajte GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Instaliranje podataka."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Postavljanje hardverskog sata."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigurirajte OpneRC servise"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfiguriranje mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Ne mogu dodati servis {name!s} u run-level {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfiguriranje initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Ne mogu ukloniti servis {name!s} iz run-level-a {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfiguriranje lokalizacije."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Nepoznat service-action {arg!s} za servis {name!s} u run-level "
+"{level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfiguriranje šifriranog swapa."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} poziv u chroot-u vratio je kod pogreške "
+"{num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Stvaranje initramfs s mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Ciljni runlevel ne postoji"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Putanja za runlevel {level!s} je {path!s}, međutim ona ne "
+"postoji."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montiranje particija."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Ciljni servis ne postoji"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Spremanje mrežne konfiguracije."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Putanja servisa  {name!s} je {path!s}, međutim ona ne postoji."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfiguriranje servisa OpenRC dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurirajte Plymouth temu"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -247,166 +340,75 @@ msgstr ""
 "Upravitelj paketa nije mogao izvršiti promjene na instaliranom sustavu. "
 "Naredba 
    {!s}
     je vratila kôd pogreške {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurirajte Plymouth temu"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Instaliranje podataka."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigurirajte OpneRC servise"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Ne mogu dodati servis {name!s} u run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Ne mogu ukloniti servis {name!s} iz run-level-a {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Nepoznat service-action {arg!s} za servis {name!s} u run-level "
-"{level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Ne mogu modificirati servis"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"rc-update {arg!s} poziv u chroot-u vratio je kod pogreške "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Ciljni runlevel ne postoji"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Putanja za runlevel {level!s} je {path!s}, međutim ona ne "
-"postoji."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Ciljni servis ne postoji"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Putanja servisa  {name!s} je {path!s}, međutim ona ne postoji."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguriraj systemd servise"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} poziv u chroot-u vratio je kod pogreške "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne mogu omogućiti systemd servis {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Ne mogu omogućiti systemd cilj {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Ne mogu onemogućiti systemd cilj {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instaliram bootloader."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Ne mogu maskirati systemd jedinicu {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Greška prilikom instalacije bootloadera"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nepoznata systemd naredba {command!s} i {suffix!s}"
-" za jedinicu {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odmontiraj datotečne sustave."
+"Bootloader nije mogao biti instaliran. Instalacijska naredba 
    {!s}
    "
+" je vratila kod pogreške {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Popunjavanje datotečnih sustava."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Postavljanje hardverskog sata."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync nije uspio s kodom pogreške {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Stvaranje initramfs s mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Otpakiravanje slike {}/{}, datoteka {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Pokretanje mkinitfs na ciljanom sustavu nije uspjelo"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Početak raspakiravanja {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Izlazni kod bio je {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Otpakiravnje slike nije uspjelo \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Stvaranje initramfs s dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nema točke montiranja za root particiju"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nije uspjelo pokretanje dracuta na ciljanom sustavu"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage ne sadrži ključ \"rootMountPoint\", ne radi ništa"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfiguriranje initramfs."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Neispravna točka montiranja za root particiju"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfiguriranje servisa OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint je \"{}\", što ne postoji, ne radi ništa"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisujem fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Neispravna unsquash konfiguracija"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "Nije dana konfiguracija 
    {!s}
     za 
    {!s}
     upotrebu."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Datotečni sustav za \"{}\" ({}) nije podržan na vašem trenutnom kernelu"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Testni python posao."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Izvorni datotečni sustav \"{}\" ne postoji"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Testni python korak {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Neuspješno pronalaženje unsquashfs, provjerite imate li instaliran paket "
-"squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfiguriranje lokalizacije."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Odredište \"{}\" u ciljnom sustavu nije direktorij"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Spremanje mrežne konfiguracije."
diff --git a/lang/python/hu/LC_MESSAGES/python.po b/lang/python/hu/LC_MESSAGES/python.po
index 3b2b63b3dc..6a1cf2e7fb 100644
--- a/lang/python/hu/LC_MESSAGES/python.po
+++ b/lang/python/hu/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Lajos Pasztor , 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/calamares/teams/20061/hu/)\n"
@@ -24,19 +24,139 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Rendszerbetöltő telepítése."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB konfigurálása."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partíciók csatolása."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Konfigurációs hiba"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nincsenek partíciók meghatározva a 
    {!s}
     használatához."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd szolgáltatások beállítása"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "a szolgáltatást nem lehet módosítani"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nem sikerült a systemd cél {name!s} letiltása."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nem maszkolható systemd egység: {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Ismeretlen systemd parancsok {command!s} és "
+"{suffix!s} a {name!s} egységhez. "
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Fájlrendszerek leválasztása."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Fájlrendszerek betöltése."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "az rsync elhalt a(z) {} hibakóddal"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kép kicsomagolása nem sikerült"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nincs betöltési pont a root partíciónál"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nem tartalmaz \"rootMountPoint\" kulcsot, semmi nem történik"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Rossz betöltési pont a root partíciónál"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint is \"{}\", ami nem létezik, semmi nem történik"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Rossz unsquash konfiguráció"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "A forrás fájlrendszer \"{}\" nem létezik"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"unsquashfs nem található, győződj meg róla a squashfs-tools csomag telepítve"
+" van."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,155 +212,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A kijelzőkezelő konfigurációja hiányos volt"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "initramfs létrehozása ezzel: dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "dracut futtatása nem sikerült a célon."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "A kilépési kód {} volt."
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Hamis Python feladat."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hamis {}. Python lépés"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab írása."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Konfigurációs hiba"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nincsenek partíciók meghatározva a 
    {!s}
     használatához."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Nincs root csatolási pont megadva a 
    {!s}
     használatához."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB konfigurálása."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Rendszeridő beállítása."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "mkinitcpio konfigurálása."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs konfigurálása."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "nyelvi értékek konfigurálása."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Nincs root csatolási pont megadva a 
    {!s}
     használatához."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Titkosított swap konfigurálása."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr ""
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr ""
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Partíciók csatolása."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Hálózati konfiguráció mentése."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Csomagok telepítése."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Egy csomag telepítése."
-msgstr[1] "%(num)d csomag telepítése."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Egy csomag eltávolítása."
-msgstr[1] "%(num)d csomag eltávolítása."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth téma beállítása"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Adatok telepítése."
@@ -265,11 +252,6 @@ msgstr ""
 "Ismeretlen service-action {arg!s} a szolgáltatáshoz {name!s} in"
 " run-level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "a szolgáltatást nem lehet módosítani"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -299,104 +281,124 @@ msgid ""
 msgstr ""
 "A szolgáltatás {name!s} elérési útja {path!s}, nem létezik."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd szolgáltatások beállítása"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth téma beállítása"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} hívás a chroot-ban hibakódot okozott {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Csomagok telepítése."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-"Nem sikerült a systemd szolgáltatást engedélyezni: {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Csomagok feldolgozása (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nem sikerült a systemd célt engedélyezni: {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Egy csomag telepítése."
+msgstr[1] "%(num)d csomag telepítése."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nem sikerült a systemd cél {name!s} letiltása."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Egy csomag eltávolítása."
+msgstr[1] "%(num)d csomag eltávolítása."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nem maszkolható systemd egység: {name!s}."
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:639
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Ismeretlen systemd parancsok {command!s} és "
-"{suffix!s} a {name!s} egységhez. "
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Fájlrendszerek leválasztása."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Fájlrendszerek betöltése."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "az rsync elhalt a(z) {} hibakóddal"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Rendszerbetöltő telepítése."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" kép kicsomagolása nem sikerült"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Rendszeridő beállítása."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nincs betöltési pont a root partíciónál"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
-"globalstorage nem tartalmaz \"rootMountPoint\" kulcsot, semmi nem történik"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Rossz betöltési pont a root partíciónál"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "A kilépési kód {} volt."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", ami nem létezik, semmi nem történik"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "initramfs létrehozása ezzel: dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Rossz unsquash konfiguráció"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "dracut futtatása nem sikerült a célon."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs konfigurálása."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "A forrás fájlrendszer \"{}\" nem létezik"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt szolgáltatás konfigurálása."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab írása."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"unsquashfs nem található, győződj meg róla a squashfs-tools csomag telepítve"
-" van."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Az elérés \"{}\" nem létező könyvtár a cél rendszerben"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Hamis Python feladat."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hamis {}. Python lépés"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "nyelvi értékek konfigurálása."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Hálózati konfiguráció mentése."
diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po
index 3ab952bc99..adb7016334 100644
--- a/lang/python/id/LC_MESSAGES/python.po
+++ b/lang/python/id/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Drajat Hasan , 2021\n"
 "Language-Team: Indonesian (https://www.transifex.com/calamares/teams/20061/id/)\n"
@@ -24,18 +24,131 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Kesalahan Konfigurasi"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Lepaskan sistem berkas."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -92,102 +205,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurasi display manager belum rampung"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tugas dumi python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Langkah {} dumi python"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Kesalahan Konfigurasi"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -235,153 +317,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Lepaskan sistem berkas."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tugas dumi python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Langkah {} dumi python"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/id_ID/LC_MESSAGES/python.po b/lang/python/id_ID/LC_MESSAGES/python.po
index 81cb79a023..834e99cde2 100644
--- a/lang/python/id_ID/LC_MESSAGES/python.po
+++ b/lang/python/id_ID/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/calamares/teams/20061/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ie/LC_MESSAGES/python.po b/lang/python/ie/LC_MESSAGES/python.po
index 17c8b0ae38..94e10c1f29 100644
--- a/lang/python/ie/LC_MESSAGES/python.po
+++ b/lang/python/ie/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Caarmi, 2020\n"
 "Language-Team: Interlingue (https://www.transifex.com/calamares/teams/20061/ie/)\n"
@@ -21,18 +21,133 @@ msgstr ""
 "Language: ie\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installante li bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurante GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montente partitiones."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Errore de configuration"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Null partition es definit por usa de 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurante servicios de systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Invocation de systemctl {arg!s} in chroot retrodat li code "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Ne successat activar li servicio de systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ne successat depaccar li image \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Ínvalid configuration de unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,104 +204,75 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Li code de termination esset {}"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurante mkinitcpio."
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrition de fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Errore de configuration"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installante li data."
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Null partition es definit por usa de 
    {!s}
    ."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Configurante servicios de OpenRC"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurante GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurante mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurante initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurante locales."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Invocation de rc-update {arg!s} in chroot retrodat li code "
+"{num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montente partitiones."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurante li tema de Plymouth"
+
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
 msgid "Install packages."
@@ -234,157 +320,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurante li tema de Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installante li data."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Configurante servicios de OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Invocation de rc-update {arg!s} in chroot retrodat li code "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installante li bootloader."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurante servicios de systemd"
-
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Invocation de systemctl {arg!s} in chroot retrodat li code "
-"{num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Ne successat activar li servicio de systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Li code de termination esset {}"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ne successat depaccar li image \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurante initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrition de fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Ínvalid configuration de unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurante locales."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/is/LC_MESSAGES/python.po b/lang/python/is/LC_MESSAGES/python.po
index dfee8b9be1..786eb811bb 100644
--- a/lang/python/is/LC_MESSAGES/python.po
+++ b/lang/python/is/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Kristján Magnússon, 2018\n"
 "Language-Team: Icelandic (https://www.transifex.com/calamares/teams/20061/is/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
-msgstr ""
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Aftengja skráarkerfi."
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Setja upp pakka."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Vinnslupakkar (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Setja upp einn pakka."
-msgstr[1] "Setur upp %(num)d pakka."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Fjarlægi einn pakka."
-msgstr[1] "Fjarlægi %(num)d pakka."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:639
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Setja upp pakka."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Vinnslupakkar (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Setja upp einn pakka."
+msgstr[1] "Setur upp %(num)d pakka."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Fjarlægi einn pakka."
+msgstr[1] "Fjarlægi %(num)d pakka."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Aftengja skráarkerfi."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/it_IT/LC_MESSAGES/python.po b/lang/python/it_IT/LC_MESSAGES/python.po
index 26f6253a0f..9990499fbb 100644
--- a/lang/python/it_IT/LC_MESSAGES/python.po
+++ b/lang/python/it_IT/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Giuseppe Pignataro , 2021\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/calamares/teams/20061/it_IT/)\n"
@@ -24,19 +24,141 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installa il bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configura GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montaggio partizioni."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Errore di Configurazione"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nessuna partizione definita per l'uso con 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configura servizi  systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Impossibile modificare il servizio"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
+" di errore {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Impossibile abilitare il servizio systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Impossibile abilitare la destinazione systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+"Impossibile disabilitare la destinazione systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Impossibile mascherare l'unità systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandi systemd sconosciuti {command!s} "
+"e{suffix!s} per l'unità {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Smonta i file system."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Copia dei file system."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync fallita con codice d'errore {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Estrazione immagine {}/{}, file {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Avvio dell'estrazione {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Estrazione dell'immagine \"{}\" fallita"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nessun punto di montaggio per la partizione di root"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage non contiene una chiave \"rootMountPoint\", nessuna azione "
+"prevista"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Punto di montaggio per la partizione di root errato"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint è \"{}\" ma non esiste, nessuna azione prevista"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configurazione unsquash errata"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Il filesystem per \"{}\" ({}) non è supportato dal kernel corrente"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Il filesystem sorgente \"{}\" non esiste"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Impossibile trovare unsquashfs, assicurarsi di aver installato il pacchetto "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "La destinazione del sistema \"{}\" non è una directory"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,155 +217,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "La configurazione del display manager è incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Creazione di initramfs con dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Impossibile eseguire dracut sulla destinazione"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Il codice di uscita era {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fittizio."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Python step {} fittizio"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Scrittura di fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Errore di Configurazione"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nessuna partizione definita per l'uso con 
    {!s}
    ."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Nessun punto di mount root è dato in l'uso per 
    {!s}
    "
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configura GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Impostazione del clock hardware."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Configurazione di mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurazione di initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurazione della localizzazione."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Nessun punto di mount root è dato in l'uso per 
    {!s}
    "
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurazione per lo swap cifrato."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Sto creando initramfs con mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Impossibile eseguire mkinitfs sulla destinazione"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montaggio partizioni."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvataggio della configurazione di rete."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurazione del servizio OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installa pacchetti."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installando un pacchetto."
-msgstr[1] "Installazione di %(num)d pacchetti."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Rimuovendo un pacchetto."
-msgstr[1] "Rimozione di %(num)d pacchetti."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configura il tema Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Installazione dei dati."
@@ -268,11 +257,6 @@ msgstr ""
 "Service-action sconosciuta {arg!s} per il servizio {name!s} nel"
 " run-level {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Impossibile modificare il servizio"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -302,106 +286,124 @@ msgid ""
 msgstr ""
 "Il percorso del servizio {name!s} è {path!s}, ma non esiste."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configura servizi  systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configura il tema Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"La chiamata systemctl {arg!s} in chroot ha restituito il codice"
-" di errore {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installa pacchetti."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Impossibile abilitare il servizio systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Elaborazione dei pacchetti (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Impossibile abilitare la destinazione systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Installando un pacchetto."
+msgstr[1] "Installazione di %(num)d pacchetti."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Rimuovendo un pacchetto."
+msgstr[1] "Rimozione di %(num)d pacchetti."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
-"Impossibile disabilitare la destinazione systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Impossibile mascherare l'unità systemd {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:651
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
-"Comandi systemd sconosciuti {command!s} "
-"e{suffix!s} per l'unità {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Smonta i file system."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Copia dei file system."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installa il bootloader."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync fallita con codice d'errore {}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Estrazione immagine {}/{}, file {}/{}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Avvio dell'estrazione {}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Impostazione del clock hardware."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Estrazione dell'immagine \"{}\" fallita"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Sto creando initramfs con mkinitfs."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nessun punto di montaggio per la partizione di root"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Impossibile eseguire mkinitfs sulla destinazione"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage non contiene una chiave \"rootMountPoint\", nessuna azione "
-"prevista"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Il codice di uscita era {}"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Punto di montaggio per la partizione di root errato"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Creazione di initramfs con dracut."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint è \"{}\" ma non esiste, nessuna azione prevista"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Impossibile eseguire dracut sulla destinazione"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configurazione unsquash errata"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurazione di initramfs."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Il filesystem per \"{}\" ({}) non è supportato dal kernel corrente"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurazione del servizio OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Il filesystem sorgente \"{}\" non esiste"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Scrittura di fstab."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Impossibile trovare unsquashfs, assicurarsi di aver installato il pacchetto "
-"squashfs-tools"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "La destinazione del sistema \"{}\" non è una directory"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fittizio."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Python step {} fittizio"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurazione della localizzazione."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvataggio della configurazione di rete."
diff --git a/lang/python/ja/LC_MESSAGES/python.po b/lang/python/ja/LC_MESSAGES/python.po
index 3c0a4d7494..0112c1e6a5 100644
--- a/lang/python/ja/LC_MESSAGES/python.po
+++ b/lang/python/ja/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: UTUMI Hirosi , 2021\n"
 "Language-Team: Japanese (https://www.transifex.com/calamares/teams/20061/ja/)\n"
@@ -23,20 +23,135 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ブートローダーをインストール"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUBを設定にします。"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "ブートローダーのインストールエラー"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "パーティションのマウント。"
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "コンフィグレーションエラー"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     に使用するパーティションが定義されていません。"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemdサービスを設定"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "サービスが変更できません"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"ブートローダーをインストールできませんでした。インストールコマンド 
    {!s}
     がエラーコード {!s} を返しました。"
+"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name!s}というsystemdサービスが可能にすることができません"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が開始できません。"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd でターゲット {name!s}が停止できません。"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "systemd ユニット {name!s} をマスクできません。"
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
+"{suffix!s}。"
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "ファイルシステムをアンマウント。"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "ファイルシステムに書き込んでいます。"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "エラーコード {} によりrsyncを失敗。"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "イメージ {}/{}, ファイル {}/{} を解凍しています"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} の解凍を開始しています"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "イメージ  \"{}\" の展開に失敗"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントがありません"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "ルートパーティションのためのマウントポイントが不正です"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "unsquash の設定が不正です"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) のファイルシステムは、現在のカーネルではサポートされていません"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "ソースファイルシステム  \"{}\" は存在しません"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "unsquashfs が見つかりませんでした。 squashfs-toolsがインストールされているか、確認してください。"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,103 +207,73 @@ msgstr "globalstorage と displaymanager.conf の両方で、displaymanagers リ
 msgid "Display manager configuration was incomplete"
 msgstr "ディスプレイマネージャの設定が不完全です"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracutとinitramfsを作成しています。"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "ターゲット上で dracut の実行に失敗"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "停止コードは {} でした"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstabを書き込んでいます。"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "コンフィグレーションエラー"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     に使用するパーティションが定義されていません。"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "mkinitcpioを設定しています。"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr " 
    {!s}
     を使用するのにルートマウントポイントが与えられていません。"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "
    {!s}
     が使用する 
    {!s}
     設定が指定されていません。"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "暗号化したswapを設定しています。"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUBを設定にします。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "データのインストール。"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "ハードウェアクロックの設定"
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "OpenRCサービスを設定"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "mkinitcpioを設定しています。"
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "ランレベル  {level!s} にサービス {name!s} が追加できません。"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfsを設定しています。"
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "ランレベル  {level!s} からサービス {name!s} が削除できません。"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "ロケールを設定しています。"
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"ランレベル {level!s} 内のサービス {name!s} に対する未知のサービスアクション {arg!s}。"
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "暗号化したswapを設定しています。"
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chrootで rc-update {arg!s} を呼び出すとエラーコード {num!s} が返されました。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfsを使用してinitramfsを作成します。"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "ターゲットとするランレベルは存在しません"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "ターゲットでmkinitfsを実行できませんでした"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "ランレベル {level!s} のパスが {path!s} です。これは存在しません。"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "パーティションのマウント。"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "ターゲットとするサービスは存在しません"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "ネットワーク設定を保存しています。"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "サービス {name!s} のパスが {path!s} です。これは存在しません。"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcryptサービスを設定しています。"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouthテーマを設定"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -239,157 +324,74 @@ msgstr ""
 "パッケージマネージャーはインストールされているシステムに変更を加えられませんでした。コマンド 
    {!s}
     はエラーコード {!s} "
 "を返しました。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouthテーマを設定"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "データのインストール。"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "OpenRCサービスを設定"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "ランレベル  {level!s} にサービス {name!s} が追加できません。"
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "ランレベル  {level!s} からサービス {name!s} が削除できません。"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"ランレベル {level!s} 内のサービス {name!s} に対する未知のサービスアクション {arg!s}。"
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "サービスが変更できません"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chrootで rc-update {arg!s} を呼び出すとエラーコード {num!s} が返されました。"
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "ターゲットとするランレベルは存在しません"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "ランレベル {level!s} のパスが {path!s} です。これは存在しません。"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "ターゲットとするサービスは存在しません"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "サービス {name!s} のパスが {path!s} です。これは存在しません。"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemdサービスを設定"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"chroot で systemctl {arg!s} を呼び出すと、エラーコード {num!s} が返されました。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name!s}というsystemdサービスが可能にすることができません"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が開始できません。"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd でターゲット {name!s}が停止できません。"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ブートローダーをインストール"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "systemd ユニット {name!s} をマスクできません。"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "ブートローダーのインストールエラー"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"ユニット {name!s} に対する未知の systemd コマンド {command!s} と "
-"{suffix!s}。"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "ファイルシステムをアンマウント。"
+"ブートローダーをインストールできませんでした。インストールコマンド 
    {!s}
     がエラーコード {!s} を返しました。"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "ファイルシステムに書き込んでいます。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "ハードウェアクロックの設定"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "エラーコード {} によりrsyncを失敗。"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfsを使用してinitramfsを作成します。"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "イメージ {}/{}, ファイル {}/{} を解凍しています"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "ターゲットでmkinitfsを実行できませんでした"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} の解凍を開始しています"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "停止コードは {} でした"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "イメージ  \"{}\" の展開に失敗"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracutとinitramfsを作成しています。"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "ルートパーティションのためのマウントポイントがありません"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "ターゲット上で dracut の実行に失敗"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage に \"rootMountPoint\" キーが含まれていません。何もしません。"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfsを設定しています。"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "ルートパーティションのためのマウントポイントが不正です"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcryptサービスを設定しています。"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "ルートマウントポイントは \"{}\" ですが、存在しません。何もできません。"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstabを書き込んでいます。"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "unsquash の設定が不正です"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "
    {!s}
     が使用する 
    {!s}
     設定が指定されていません。"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) のファイルシステムは、現在のカーネルではサポートされていません"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "ソースファイルシステム  \"{}\" は存在しません"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "unsquashfs が見つかりませんでした。 squashfs-toolsがインストールされているか、確認してください。"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "ロケールを設定しています。"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "ターゲットシステムの宛先 \"{}\" はディレクトリではありません"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ネットワーク設定を保存しています。"
diff --git a/lang/python/kk/LC_MESSAGES/python.po b/lang/python/kk/LC_MESSAGES/python.po
index 748f6c6fd5..ca14c90d8e 100644
--- a/lang/python/kk/LC_MESSAGES/python.po
+++ b/lang/python/kk/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kazakh (https://www.transifex.com/calamares/teams/20061/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: kk\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/kn/LC_MESSAGES/python.po b/lang/python/kn/LC_MESSAGES/python.po
index 7d0b2da4b8..702f8a7a7f 100644
--- a/lang/python/kn/LC_MESSAGES/python.po
+++ b/lang/python/kn/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Kannada (https://www.transifex.com/calamares/teams/20061/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index 857ef4d80c..acca0391d2 100644
--- a/lang/python/ko/LC_MESSAGES/python.po
+++ b/lang/python/ko/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: JungHee Lee , 2021\n"
 "Language-Team: Korean (https://www.transifex.com/calamares/teams/20061/ko/)\n"
@@ -22,19 +22,134 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "부트로더 설치."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB 구성"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "부트로더 설치 오류"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "파티션 마운트 중."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "구성 오류"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "사용할 
    {!s}
    에 대해 정의된 파티션이 없음."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "systemd 서비스 구성"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "서비스를 수정할 수 없음"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr "부트로더를 설치할 수 없습니다. 
    {!s}
     설치 명령에서  {!s} 오류 코드를 반환했습니다."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
+"s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "파일 시스템 마운트를 해제합니다."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "파일 시스템을 채우는 중."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync가 {} 오류 코드로 실패했습니다."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "이미지 {}/{}, 파일 {}/{} 압축푸는 중"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "{} 압축 풀기 시작 중"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다."
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "루트 파티션에 대한 마운트 위치 없음"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "루트 파티션에 대한 잘못된 마운트 위치"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "잘못된 unsquash 구성"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({})에 대한 파일 시스템은 현재 커널에서 지원되지 않습니다."
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다."
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치되어 있는지 확인하십시오."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,154 +207,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "디스플레이 관리자 구성이 완료되지 않았습니다."
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "dracut을 사용하여 initramfs 만들기."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "대상에서 dracut을 실행하지 못함"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "종료 코드 {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "더미 파이썬 작업."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "더미 파이썬 단계 {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab 쓰기."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "구성 오류"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "사용할 
    {!s}
    에 대해 정의된 파티션이 없음."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "
    {!s}
    에서 사용할 루트 마운트 지점이 제공되지 않음."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "
    {!s}
     구성 없음은 
    {!s}
    을(를) 사용할 수 있도록 제공됩니다."
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB 구성"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "하드웨어 클럭 설정 중."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "mkinitcpio 구성 중."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "initramfs 구성 중."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "로컬 구성 중."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "
    {!s}
    에서 사용할 루트 마운트 지점이 제공되지 않음."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "암호화된 스왑 구성 중."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs로 initramfs 생성 중."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "파티션 마운트 중."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "네트워크 구성 저장 중."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt 서비스 구성 중."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "패키지를 설치합니다."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "패키지 처리중 (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr "패키지 관리자 오류"
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "플리머스 테마 구성"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "데이터 설치중."
@@ -264,11 +247,6 @@ msgstr ""
 "run-level {level!s}의 service {name!s}에 대해 알 수 없는 service-action "
 "{arg!s}입니다."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "서비스를 수정할 수 없음"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -294,99 +272,123 @@ msgid ""
 "exist."
 msgstr "{name!s} 서비스에 대한 경로는 {path!s}이고, 존재하지 않습니다."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "systemd 서비스 구성"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "플리머스 테마 구성"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot에서 systemctl {arg!s} 호출에서오류 코드 {num}를 반환 했습니다."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "패키지를 설치합니다."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "{name! s} 시스템 서비스를 활성화 할 수 없습니다."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "패키지 처리중 (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 활성화 할 수 없습니다."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 설치하는 중입니다."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "systemd 대상 {name! s}를 비활성화 할 수 없습니다."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d개의 패키지들을 제거하는 중입니다."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "시스템 유닛 {name! s}를 마스크할 수 없습니다."
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "패키지 관리자 오류"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:639
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
+msgstr "패키지 관리자가 업데이트를 준비할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr "패키지 관리자가 시스템을 업데이트할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
-"유닛 {name! s}에 대해 알 수 없는 시스템 명령 {command! s} 및 {suffix! "
-"s}."
+"패키지 관리자가 설치된 시스템을 변경할 수 없습니다. 
    {!s}
     명령에서  {!s} 오류 코드를 반환했습니다."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "파일 시스템 마운트를 해제합니다."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "부트로더 설치."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "파일 시스템을 채우는 중."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "부트로더 설치 오류"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync가 {} 오류 코드로 실패했습니다."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr "부트로더를 설치할 수 없습니다. 
    {!s}
     설치 명령에서  {!s} 오류 코드를 반환했습니다."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "이미지 {}/{}, 파일 {}/{} 압축푸는 중"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "하드웨어 클럭 설정 중."
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "{} 압축 풀기 시작 중"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "mkinitfs로 initramfs 생성 중."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" 이미지의 압축을 풀지 못했습니다."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "대상에서 mkinitfs를 실행하지 못했습니다"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "루트 파티션에 대한 마운트 위치 없음"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "종료 코드 {}"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage에는 \"rootMountPoint \" 키가 포함되어 있지 않으며 아무 작업도 수행하지 않습니다."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "dracut을 사용하여 initramfs 만들기."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "루트 파티션에 대한 잘못된 마운트 위치"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "대상에서 dracut을 실행하지 못함"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint는 \"{}\"이고, 존재하지 않으며, 아무 작업도 수행하지 않습니다."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "initramfs 구성 중."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "잘못된 unsquash 구성"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt 서비스 구성 중."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({})에 대한 파일 시스템은 현재 커널에서 지원되지 않습니다."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab 쓰기."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" 소스 파일시스템은 존재하지 않습니다."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "
    {!s}
     구성 없음은 
    {!s}
    을(를) 사용할 수 있도록 제공됩니다."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "unsquashfs를 찾지 못했습니다. squashfs-tools 패키지가 설치되어 있는지 확인하십시오."
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "더미 파이썬 작업."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "대상 시스템의 \"{}\" 목적지가 디렉토리가 아닙니다."
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "더미 파이썬 단계 {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "로컬 구성 중."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "네트워크 구성 저장 중."
diff --git a/lang/python/ko_KR/LC_MESSAGES/python.po b/lang/python/ko_KR/LC_MESSAGES/python.po
index fe6c202a39..12c662f53b 100644
--- a/lang/python/ko_KR/LC_MESSAGES/python.po
+++ b/lang/python/ko_KR/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Korean (Korea) (https://www.transifex.com/calamares/teams/20061/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/lo/LC_MESSAGES/python.po b/lang/python/lo/LC_MESSAGES/python.po
index 0804a62dc6..af73c3ed55 100644
--- a/lang/python/lo/LC_MESSAGES/python.po
+++ b/lang/python/lo/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Lao (https://www.transifex.com/calamares/teams/20061/lo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/lt/LC_MESSAGES/python.po b/lang/python/lt/LC_MESSAGES/python.po
index e47cfd9b13..1c1f54ba89 100644
--- a/lang/python/lt/LC_MESSAGES/python.po
+++ b/lang/python/lt/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Moo, 2021\n"
 "Language-Team: Lithuanian (https://www.transifex.com/calamares/teams/20061/lt/)\n"
@@ -22,21 +22,138 @@ msgstr ""
 "Language: lt\n"
 "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Įdiegti operacinės sistemos paleidyklę."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigūruoti GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Operacinės sistemos paleidyklės diegimo klaida"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Prijungiami skaidiniai."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Konfigūracijos klaida"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
    {!s}
     naudojimui."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigūruoti systemd tarnybas"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nepavyksta modifikuoti tarnybos"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
-"
    {!s}
     grąžino klaidos kodą {!s}."
+"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Nežinomos systemd komandos {command!s} ir "
+"{suffix!s} įtaisui {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Atjungti failų sistemas."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Užpildomos failų sistemos."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync patyrė nesėkmę su klaidos kodu {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Išpakuojamas atvaizdis {}/{}, failas {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Pradedama išpakuoti {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Nepavyko išpakuoti atvaizdį „{}“"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nėra prijungimo taško šaknies skaidiniui"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage viduje nėra „rootMountPoint“ rakto, nieko nedaroma"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Blogas šaknies skaidinio prijungimo taškas"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint yra „{}“, kurio nėra, nieko nedaroma"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Bloga unsquash konfigūracija"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta „{}“ ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Šaltinio failų sistemos „{}“ nėra"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Nepavyko rasti unsquashfs, įsitikinkite, kad esate įdiegę squashfs-tools "
+"paketą"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -94,107 +211,81 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekranų tvarkytuvės konfigūracija yra nepilna"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Sukuriama initramfs naudojant dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nepavyko paskirties vietoje paleisti dracut"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Išėjimo kodas buvo {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktyvi python užduotis."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktyvus python žingsnis {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Rašoma fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Konfigūracijos klaida"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nėra apibrėžta jokių skaidinių, skirtų 
    {!s}
     naudojimui."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigūruojama mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nėra nurodyta jokių šaknies prijungimo taškų, skirtų 
    {!s}
     "
 "naudojimui."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Nenurodyta jokia 
    {!s}
     konfigūracija, kurią 
    {!s}
     galėtų"
-" naudoti."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigūruojamas šifruotas sukeitimų skaidinys."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigūruoti GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Įdiegiami duomenys."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nustatomas aparatinės įrangos laikrodis."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigūruoti OpenRC tarnybas"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigūruojama mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Nepavyksta pridėti tarnybą {name!s} į vykdymo lygmenį {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigūruojama initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Nepavyksta pašalinti tarnybą {name!s} iš vykdymo lygmens {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigūruojamos lokalės."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Nežinomas tarnybos veiksmas {arg!s}, skirtas tarnybai {name!s} "
+"vykdymo lygmenyje {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigūruojamas šifruotas sukeitimų skaidinys."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"rc-update {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
+" {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Kuriama initramfs naudojant mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Paskirties vykdymo lygmens nėra"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Vykdymo lygmens {level!s} kelias yra {path!s}, kurio savo "
+"ruožtu nėra."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Prijungiami skaidiniai."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Paskirties tarnybos nėra"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Įrašoma tinklo konfigūracija."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigūruoti Plymouth temą"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -253,166 +344,77 @@ msgstr ""
 "Paketų tvarkytuvei nepavyko atlikti pakeitimų įdiegtoje sistemoje. Komanda "
 "
    {!s}
     grąžino klaidos kodą {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigūruoti Plymouth temą"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Įdiegiami duomenys."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigūruoti OpenRC tarnybas"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Nepavyksta pridėti tarnybą {name!s} į vykdymo lygmenį {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Nepavyksta pašalinti tarnybą {name!s} iš vykdymo lygmens {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Nežinomas tarnybos veiksmas {arg!s}, skirtas tarnybai {name!s} "
-"vykdymo lygmenyje {level!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Įdiegti operacinės sistemos paleidyklę."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Nepavyksta modifikuoti tarnybos"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Operacinės sistemos paleidyklės diegimo klaida"
 
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:509
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"rc-update {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Paskirties vykdymo lygmens nėra"
+"Nepavyko įdiegti operacinės sistemos paleidyklės. Diegimo komanda "
+"
    {!s}
     grąžino klaidos kodą {!s}."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Vykdymo lygmens {level!s} kelias yra {path!s}, kurio savo "
-"ruožtu nėra."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nustatomas aparatinės įrangos laikrodis."
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Paskirties tarnybos nėra"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Kuriama initramfs naudojant mkinitfs."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Tarnybos {name!s} kelias yra {path!s}, kurio savo ruožtu nėra."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nepavyko paskirties vietoje paleisti mkinitfs"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigūruoti systemd tarnybas"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Išėjimo kodas buvo {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} iškvieta, esanti chroot, grąžino klaidos kodą"
-" {num!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Sukuriama initramfs naudojant dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nepavyksta įjungti systemd tarnybos {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nepavyko paskirties vietoje paleisti dracut"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nepavyksta įjungti systemd paskirties {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigūruojama initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nepavyksta išjungti systemd paskirties {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigūruojama OpenRC dmcrypt tarnyba."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nepavyksta maskuoti systemd įtaiso {name!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Rašoma fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Nežinomos systemd komandos {command!s} ir "
-"{suffix!s} įtaisui {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Atjungti failų sistemas."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Užpildomos failų sistemos."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync patyrė nesėkmę su klaidos kodu {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Išpakuojamas atvaizdis {}/{}, failas {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Pradedama išpakuoti {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Nepavyko išpakuoti atvaizdį „{}“"
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nėra prijungimo taško šaknies skaidiniui"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage viduje nėra „rootMountPoint“ rakto, nieko nedaroma"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Blogas šaknies skaidinio prijungimo taškas"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint yra „{}“, kurio nėra, nieko nedaroma"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Bloga unsquash konfigūracija"
+"Nenurodyta jokia 
    {!s}
     konfigūracija, kurią 
    {!s}
     galėtų"
+" naudoti."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Jūsų branduolys nepalaiko failų sistemos, kuri skirta „{}“ ({})"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktyvi python užduotis."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Šaltinio failų sistemos „{}“ nėra"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktyvus python žingsnis {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Nepavyko rasti unsquashfs, įsitikinkite, kad esate įdiegę squashfs-tools "
-"paketą"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigūruojamos lokalės."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Paskirties vieta „{}“, esanti paskirties sistemoje, nėra katalogas"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Įrašoma tinklo konfigūracija."
diff --git a/lang/python/lv/LC_MESSAGES/python.po b/lang/python/lv/LC_MESSAGES/python.po
index 3318346533..45d84a3a38 100644
--- a/lang/python/lv/LC_MESSAGES/python.po
+++ b/lang/python/lv/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Latvian (https://www.transifex.com/calamares/teams/20061/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,223 +17,201 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -258,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -288,97 +261,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/mk/LC_MESSAGES/python.po b/lang/python/mk/LC_MESSAGES/python.po
index e2af880b5b..12d936266a 100644
--- a/lang/python/mk/LC_MESSAGES/python.po
+++ b/lang/python/mk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Martin Ristovski , 2018\n"
 "Language-Team: Macedonian (https://www.transifex.com/calamares/teams/20061/mk/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,102 +202,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr ""
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -234,153 +316,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ml/LC_MESSAGES/python.po b/lang/python/ml/LC_MESSAGES/python.po
index af0570b5cf..1399955460 100644
--- a/lang/python/ml/LC_MESSAGES/python.po
+++ b/lang/python/ml/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Balasankar C , 2019\n"
 "Language-Team: Malayalam (https://www.transifex.com/calamares/teams/20061/ml/)\n"
@@ -22,221 +22,201 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
-msgstr ""
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "ക്രമീകരണത്തിൽ പിഴവ്"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:639
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -261,11 +241,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -291,97 +266,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "ബൂട്ട്‌ലോടർ ഇൻസ്റ്റാൾ ചെയ്യൂ ."
+
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/mr/LC_MESSAGES/python.po b/lang/python/mr/LC_MESSAGES/python.po
index 7b6802c41b..c0263c764d 100644
--- a/lang/python/mr/LC_MESSAGES/python.po
+++ b/lang/python/mr/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Marathi (https://www.transifex.com/calamares/teams/20061/mr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/nb/LC_MESSAGES/python.po b/lang/python/nb/LC_MESSAGES/python.po
index f2c84468aa..2211af6174 100644
--- a/lang/python/nb/LC_MESSAGES/python.po
+++ b/lang/python/nb/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 865ac004d9acf2568b2e4b389e0007c7_fba755c <3516cc82d94f87187da1e036e5f09e42_616112>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/calamares/teams/20061/nb/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Installer pakker."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Installer pakker."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ne/LC_MESSAGES/python.po b/lang/python/ne/LC_MESSAGES/python.po
index 3781bdfe3f..2338ccf6c6 100644
--- a/lang/python/ne/LC_MESSAGES/python.po
+++ b/lang/python/ne/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Nepali (https://www.transifex.com/calamares/teams/20061/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ne_NP/LC_MESSAGES/python.po b/lang/python/ne_NP/LC_MESSAGES/python.po
index 585f52c769..60b90bdf3b 100644
--- a/lang/python/ne_NP/LC_MESSAGES/python.po
+++ b/lang/python/ne_NP/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Nepali (Nepal) (https://www.transifex.com/calamares/teams/20061/ne_NP/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: ne_NP\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/nl/LC_MESSAGES/python.po b/lang/python/nl/LC_MESSAGES/python.po
index ef25fb2998..4976cb14db 100644
--- a/lang/python/nl/LC_MESSAGES/python.po
+++ b/lang/python/nl/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Adriaan de Groot , 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/calamares/teams/20061/nl/)\n"
@@ -22,19 +22,143 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installeer bootloader"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB instellen."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Partities mounten."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Configuratiefout"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Geen partities gedefinieerd voor 
    {!s}
     om te gebruiken."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configureer systemd services "
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "De service kan niet worden gewijzigd"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
+"{num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+"De systemd service {name!s} kon niet worden ingeschakeld."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Onbekende systemd opdrachten {command!s} en "
+"{suffix!s} voor unit {name!s}. "
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Unmount bestandssystemen."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Bestandssystemen opvullen."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync mislukte met foutcode {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Bestandssysteem uitpakken {}/{}, bestand {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Beginnen met uitpakken van {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Uitpakken van bestandssysteem \"{}\" mislukt"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Geen mount-punt voor de root-partitie"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage bevat geen sleutel \"rootMountPoint\", er wordt niks gedaan"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Onjuist mount-punt voor de root-partitie"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
+"rootMountPoint is ingesteld op \"{}\", welke niet bestaat, er wordt niks "
+"gedaan"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Foutieve unsquash configuratie"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Het bestandssysteem voor \"{}\" ({}) wordt niet ondersteund door je huidige "
+"kernel"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Het bronbestandssysteem \"{}\" bestaat niet"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"unsquashfs niet gevonden, verifieer dat je het squashfs-tools pakket heb "
+"geïnstalleerd"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,156 +216,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Display manager configuratie was incompleet"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "initramfs aanmaken met dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Uitvoeren van dracut op het doel is mislukt"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "De afsluitcode was {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Voorbeeld Python-taak"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Voorbeeld Python-stap {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "fstab schrijven."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Configuratiefout"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Geen partities gedefinieerd voor 
    {!s}
     om te gebruiken."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Instellen van mkinitcpio"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Geen hoofd mount punt is gegeven voor 
    {!s}
     om te gebruiken. "
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB instellen."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Instellen van hardwareklok"
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Instellen van mkinitcpio"
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Instellen van initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Taal en locatie instellen."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Instellen van versleutelde swap."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Een initramfs wordt aangemaakt met mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Partities mounten."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Netwerk-configuratie opslaan."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configureren van OpenRC dmcrypt service."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Pakketten installeren."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Pakket installeren."
-msgstr[1] "%(num)d pakketten installeren."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Pakket verwijderen."
-msgstr[1] "%(num)d pakketten verwijderen."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth thema instellen"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Data aan het installeren."
@@ -266,11 +257,6 @@ msgstr ""
 "Onbekende serviceactie {arg!s} voor service {name!s} in "
 "runlevel {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "De service kan niet worden gewijzigd"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -300,108 +286,124 @@ msgid ""
 msgstr ""
 "Het pad voor service {level!s} is {path!s}, welke niet bestaat"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configureer systemd services "
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth thema instellen"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Pakketten installeren."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Pakketten verwerken (%(count)d/ %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Pakket installeren."
+msgstr[1] "%(num)d pakketten installeren."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Pakket verwijderen."
+msgstr[1] "%(num)d pakketten verwijderen."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} aanroeping in chroot resulteerde in foutcode "
-"{num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
-"De systemd service {name!s} kon niet worden ingeschakeld."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Het systemd doel {name!s} kon niet worden ingeschakeld."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "De systemd service {name!s} kon niet worden uitgeschakeld."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installeer bootloader"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "De systemd unit {name!s} kon niet worden gemaskerd."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Onbekende systemd opdrachten {command!s} en "
-"{suffix!s} voor unit {name!s}. "
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount bestandssystemen."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Instellen van hardwareklok"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Bestandssystemen opvullen."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Een initramfs wordt aangemaakt met mkinitfs."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync mislukte met foutcode {}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Uitvoeren van mkinitfs in het doelsysteem is mislukt"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Bestandssysteem uitpakken {}/{}, bestand {}/{}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "De afsluitcode was {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Beginnen met uitpakken van {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "initramfs aanmaken met dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Uitpakken van bestandssysteem \"{}\" mislukt"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Uitvoeren van dracut op het doel is mislukt"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Geen mount-punt voor de root-partitie"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Instellen van initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage bevat geen sleutel \"rootMountPoint\", er wordt niks gedaan"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configureren van OpenRC dmcrypt service."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Onjuist mount-punt voor de root-partitie"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "fstab schrijven."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"rootMountPoint is ingesteld op \"{}\", welke niet bestaat, er wordt niks "
-"gedaan"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Foutieve unsquash configuratie"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Het bestandssysteem voor \"{}\" ({}) wordt niet ondersteund door je huidige "
-"kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Voorbeeld Python-taak"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Het bronbestandssysteem \"{}\" bestaat niet"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Voorbeeld Python-stap {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"unsquashfs niet gevonden, verifieer dat je het squashfs-tools pakket heb "
-"geïnstalleerd"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Taal en locatie instellen."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "De bestemming \"{}\" in het doelsysteem is niet een map"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Netwerk-configuratie opslaan."
diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po
index 71dae327ab..ccc246e551 100644
--- a/lang/python/pl/LC_MESSAGES/python.po
+++ b/lang/python/pl/LC_MESSAGES/python.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Jacob B. , 2021\n"
 "Language-Team: Polish (https://www.transifex.com/calamares/teams/20061/pl/)\n"
@@ -24,19 +24,143 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalacja programu rozruchowego."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfiguracja GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montowanie partycji."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Błąd konfiguracji"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nie ma zdefiniowanych partycji dla 
    {!s}
     do użytku."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfiguracja usług systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nie można zmodyfikować usług"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nie można włączyć usługi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nie można włączyć celu w systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nie można wyłączyć celu w systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nie można zamaskować jednostki systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Nieznana komenda systemd {command!s} oraz "
+"{suffix!s} dla jednostki {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odmontuj systemy plików."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Zapełnianie systemu plików."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync zakończyło działanie kodem błędu {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Rozpoczynanie odpakowywania {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Błąd rozpakowywania obrazu \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Brak punktu montowania partycji root"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage nie zawiera klucza \"rootMountPoint\", nic nie zostanie "
+"zrobione"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Błędny punkt montowania partycji root"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"Punkt montowania partycji root (rootMountPoint) jest \"{}\", które nie "
+"istnieje; nic nie zostanie zrobione"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Błędna konfiguracja unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego "
+"systemu"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Źródłowy system plików \"{}\" nie istnieje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Nie można odnaleźć unsquashfs, upewnij się, że masz zainstalowany pakiet "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -94,160 +218,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguracja menedżera wyświetlania była niekompletna"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Tworzenie initramfs z dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Nie udało się włączyć dracut."
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Kod wyjściowy to {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Zadanie fikcyjne Python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Krok fikcyjny Python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisywanie fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Błąd konfiguracji"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nie ma zdefiniowanych partycji dla 
    {!s}
     do użytku."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurowanie mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nie znaleziono głównego punktu montowania dla 
    {!s}
     do użycia."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfiguracja GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ustawianie zegara systemowego."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurowanie mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurowanie initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurowanie ustawień lokalnych."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Konfigurowanie zaszyfrowanej przestrzeni wymiany."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Tworzenie initramfs z mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Nie udało się włączyć mkinitfs."
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montowanie partycji."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Zapisywanie konfiguracji sieci."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurowanie usługi OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Zainstaluj pakiety."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalowanie jednego pakietu."
-msgstr[1] "Instalowanie %(num)d pakietów."
-msgstr[2] "Instalowanie %(num)d pakietów."
-msgstr[3] "Instalowanie%(num)d pakietów."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Usuwanie jednego pakietu."
-msgstr[1] "Usuwanie %(num)d pakietów."
-msgstr[2] "Usuwanie %(num)d pakietów."
-msgstr[3] "Usuwanie %(num)d pakietów."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfiguracja motywu Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalowanie danych."
@@ -274,11 +261,6 @@ msgstr ""
 "Nieznana akcja-usługi {arg!s} dla usługi {name!s} w poziomie-"
 "uruchamiania {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Nie można zmodyfikować usług"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -307,108 +289,128 @@ msgid ""
 "exist."
 msgstr "Ścieżka do usługi {name!s} to {path!s},  nie istnieje."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfiguracja usług systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfiguracja motywu Plymouth"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Zainstaluj pakiety."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Przetwarzanie pakietów (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalowanie jednego pakietu."
+msgstr[1] "Instalowanie %(num)d pakietów."
+msgstr[2] "Instalowanie %(num)d pakietów."
+msgstr[3] "Instalowanie%(num)d pakietów."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Usuwanie jednego pakietu."
+msgstr[1] "Usuwanie %(num)d pakietów."
+msgstr[2] "Usuwanie %(num)d pakietów."
+msgstr[3] "Usuwanie %(num)d pakietów."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Wezwanie systemctl {arg!s} w chroot zwróciło kod błędu {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nie można włączyć usługi systemd {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nie można włączyć celu w systemd {name!s}."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nie można wyłączyć celu w systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalacja programu rozruchowego."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nie można zamaskować jednostki systemd {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nieznana komenda systemd {command!s} oraz "
-"{suffix!s} dla jednostki {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odmontuj systemy plików."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ustawianie zegara systemowego."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Zapełnianie systemu plików."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Tworzenie initramfs z mkinitfs."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync zakończyło działanie kodem błędu {}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Nie udało się włączyć mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Odpakowywanie obrazu {}/{}, pliku {}/{}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Kod wyjściowy to {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Rozpoczynanie odpakowywania {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Tworzenie initramfs z dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Błąd rozpakowywania obrazu \"{}\""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Nie udało się włączyć dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Brak punktu montowania partycji root"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurowanie initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage nie zawiera klucza \"rootMountPoint\", nic nie zostanie "
-"zrobione"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurowanie usługi OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Błędny punkt montowania partycji root"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisywanie fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Punkt montowania partycji root (rootMountPoint) jest \"{}\", które nie "
-"istnieje; nic nie zostanie zrobione"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Błędna konfiguracja unsquash"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"System plików dla \"{}\" ({}) nie jest wspierany przez obecne jądro twojego "
-"systemu"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Zadanie fikcyjne Python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Źródłowy system plików \"{}\" nie istnieje"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Krok fikcyjny Python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Nie można odnaleźć unsquashfs, upewnij się, że masz zainstalowany pakiet "
-"squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurowanie ustawień lokalnych."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Miejsce docelowe \"{}\" w docelowym systemie nie jest katalogiem"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Zapisywanie konfiguracji sieci."
diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po
index 2224ed2ab4..7b7ef5941e 100644
--- a/lang/python/pt_BR/LC_MESSAGES/python.po
+++ b/lang/python/pt_BR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Guilherme Marçal Silva, 2021\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/calamares/teams/20061/pt_BR/)\n"
@@ -22,21 +22,138 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar carregador de inicialização."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de inicialização"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Montando partições."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Erro de Configuração."
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Sem partições definidas para uso por 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços do systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Não é possível modificar o serviço"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"O carregador de inicialização não pôde ser instalado. O comando de "
-"instalação 
    {!s}
     retornou o código de erro {!s}."
+"A chamada systemctl {arg!s} no chroot retornou o código de erro"
+" {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível habilitar o serviço {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível habilitar o alvo {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade {name!s} do systemd."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandos desconhecidos do systemd {command!s} e "
+"{suffix!s} para a unidade {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar os sistemas de arquivos."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Preenchendo sistemas de arquivos."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "O rsync falhou com o código de erro {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Descompactando imagem {}/{}, arquivo {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Começando a descompactar {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "O globalstorage não contém uma chave \"rootMountPoint\". Nada foi feito."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem incorreto para a partição root"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "O rootMountPoint é \"{}\", mas ele não existe. Nada foi feito."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Configuração incorreta do unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Não há suporte para o sistema de arquivos \"{}\" ({}) no seu kernel atual"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de arquivos de origem \"{}\" não existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Ocorreu uma falha ao localizar o unsquashfs, certifique-se de que o pacote "
+"squashfs-tools esteja instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "A destinação \"{}\" no sistema de destino não é um diretório"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,164 +212,23 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gerenciador de exibição está incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Criando initramfs com dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Erro ao executar dracut no alvo"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa modelo python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Etapa modelo python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Escrevendo fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Erro de Configuração."
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Sem partições definidas para uso por 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Configurando mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Nenhum ponto de montagem para o root fornecido para uso por 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Nenhuma configuração 
    {!s}
     é dada para que 
    {!s}
     possa "
-"utilizar."
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Configurando relógio de hardware."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Configurando mkinitcpio."
-
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Configurando initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Configurando locais."
-
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando swap encriptada."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Criando initramfs com mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar mkinitfs no alvo"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Montando partições."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Salvando configuração de rede."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configurando serviço dmcrypt do OpenRC."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar pacotes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processando pacotes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Instalando um pacote."
-msgstr[1] "Instalando %(num)d pacotes."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removendo um pacote."
-msgstr[1] "Removendo %(num)d pacotes."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr "Erro do Gerenciador de Pacotes"
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
-"
    {!s}
     retornou o código de erro {!s}."
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
-"
    {!s}
     retornou o código de erro {!s}."
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
-"comando 
    {!s}
     retornou o código de erro {!s}."
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Instalando os dados."
@@ -279,11 +255,6 @@ msgstr ""
 "Serviço de ação {arg!s} desconhecido para o serviço {name!s} no"
 " nível de execução {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Não é possível modificar o serviço"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -315,103 +286,134 @@ msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, o qual não "
 "existe."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços do systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"A chamada systemctl {arg!s} no chroot retornou o código de erro"
-" {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar pacotes."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível habilitar o serviço {name!s} do systemd."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Processando pacotes (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível habilitar o alvo {name!s} do systemd."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Instalando um pacote."
+msgstr[1] "Instalando %(num)d pacotes."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desabilitar o alvo {name!s} do systemd."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Removendo um pacote."
+msgstr[1] "Removendo %(num)d pacotes."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade {name!s} do systemd."
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Erro do Gerenciador de Pacotes"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:639
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Comandos desconhecidos do systemd {command!s} e "
-"{suffix!s} para a unidade {name!s}."
+"O gerenciador de pacotes não pôde preparar as atualizações. O comando "
+"
    {!s}
     retornou o código de erro {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar os sistemas de arquivos."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde atualizar o sistema. O comando "
+"
    {!s}
     retornou o código de erro {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Preenchendo sistemas de arquivos."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
+"O gerenciador de pacotes não pôde fazer mudanças no sistema instalado. O "
+"comando 
    {!s}
     retornou o código de erro {!s}."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "O rsync falhou com o código de erro {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar carregador de inicialização."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Descompactando imagem {}/{}, arquivo {}/{}"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de inicialização"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Começando a descompactar {}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"O carregador de inicialização não pôde ser instalado. O comando de "
+"instalação 
    {!s}
     retornou o código de erro {!s}."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Ocorreu uma falha ao descompactar a imagem \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Configurando relógio de hardware."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nenhum ponto de montagem para a partição root"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Criando initramfs com mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "O globalstorage não contém uma chave \"rootMountPoint\". Nada foi feito."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar mkinitfs no alvo"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ponto de montagem incorreto para a partição root"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "O rootMountPoint é \"{}\", mas ele não existe. Nada foi feito."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando initramfs com dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Configuração incorreta do unsquash"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Erro ao executar dracut no alvo"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Não há suporte para o sistema de arquivos \"{}\" ({}) no seu kernel atual"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Configurando initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "O sistema de arquivos de origem \"{}\" não existe"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Configurando serviço dmcrypt do OpenRC."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Escrevendo fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Ocorreu uma falha ao localizar o unsquashfs, certifique-se de que o pacote "
-"squashfs-tools esteja instalado"
+"Nenhuma configuração 
    {!s}
     é dada para que 
    {!s}
     possa "
+"utilizar."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "A destinação \"{}\" no sistema de destino não é um diretório"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa modelo python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Etapa modelo python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Configurando locais."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Salvando configuração de rede."
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index 06ad17f99e..145dbfd45d 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Hugo Carvalho , 2021\n"
 "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
@@ -23,21 +23,140 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalar o carregador de arranque."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Configurar o GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Erro de instalação do carregador de arranque"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "A montar partições."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Erro de configuração"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nenhuma partição está definida para 
    {!s}
     usar."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Configurar serviços systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Não é possível modificar serviço"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Não foi possível instalar o carregador de arranque. O comando de instalação "
-"
    {!s}
     apresentou o código de erro {!s}."
+"systemctl {arg!s} chamar pelo chroot retornou com código de "
+"erro {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Não é possível ativar o serviço systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Não é possível ativar o destino do systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Não é possível desativar o destino do systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Não é possível mascarar a unidade do systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Comandos do systemd desconhecidos {command!s} e "
+"{suffix!s} por unidade {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Desmontar sistemas de ficheiros."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "A preencher os sistemas de ficheiros."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync falhou com código de erro {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "A descompactar imagem {}/{}, ficheiro {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "A começar a descompactação {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Falha ao descompactar imagem \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Nenhum ponto de montagem para a partição root"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage não contém um \"rootMountPoint\" chave, nada a fazer"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Ponto de montagem mau para partição root"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Má configuração unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"O sistema de ficheiros para \"{}\" ({}) não é suportado pelo seu kernel "
+"atual"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "O sistema de ficheiros fonte \"{}\" não existe"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Falha ao procurar unsquashfs, certifique-se que tem o pacote squashfs-tools "
+"instalado"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "O destino \"{}\" no sistema de destino não é um diretório"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -96,161 +215,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "A configuração do gestor de exibição estava incompleta"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Criando o initramfs com o dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Falha ao executar o dracut no destino"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "O código de saída foi {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Tarefa Dummy python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Passo Dummy python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "A escrever o fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Erro de configuração"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nenhuma partição está definida para 
    {!s}
     usar."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Nenhum ponto de montagem root é fornecido para 
    {!s}
     usar."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Não é dada nenhuma configuração 
    {!s}
     para 
    {!s}
     "
-"utilizar."
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Configurar o GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "A definir o relógio do hardware."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "A configurar o mkintcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "A configurar o initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "A configurar a localização."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Nenhum ponto de montagem root é fornecido para 
    {!s}
     usar."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Configurando a swap criptografada."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "A criar o initramfs com o mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Falha ao executar o mkintfs no destino"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "A montar partições."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "A guardar a configuração de rede."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "A configurar o serviço OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Instalar pacotes."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "A processar pacotes (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "A instalar um pacote."
-msgstr[1] "A instalar %(num)d pacotes."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "A remover um pacote."
-msgstr[1] "A remover %(num)d pacotes."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr "Erro do gestor de pacotes"
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu preparar atualizações. O comando "
-"
    {!s}
     apresentou o código de erro {!s}."
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
-"
    {!s}
     apresentou o código de erro {!s}."
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Configurar tema do Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "A instalar dados."
@@ -277,11 +257,6 @@ msgstr ""
 "Serviço de ação desconhecido {arg!s} para serviço {name!s} em "
 "nível de execução {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Não é possível modificar serviço"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -312,105 +287,132 @@ msgid ""
 msgstr ""
 "O caminho para o serviço {name!s} é {path!s}, que não existe."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Configurar serviços systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Configurar tema do Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chamar pelo chroot retornou com código de "
-"erro {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Instalar pacotes."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Não é possível ativar o serviço systemd {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "A processar pacotes (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Não é possível ativar o destino do systemd {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "A instalar um pacote."
+msgstr[1] "A instalar %(num)d pacotes."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Não é possível desativar o destino do systemd {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "A remover um pacote."
+msgstr[1] "A remover %(num)d pacotes."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Não é possível mascarar a unidade do systemd {name!s}."
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr "Erro do gestor de pacotes"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:639
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Comandos do systemd desconhecidos {command!s} e "
-"{suffix!s} por unidade {name!s}."
+"O gestor de pacotes não conseguiu preparar atualizações. O comando "
+"
    {!s}
     apresentou o código de erro {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Desmontar sistemas de ficheiros."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
+"O gestor de pacotes não conseguiu atualizar o sistema. O comando "
+"
    {!s}
     apresentou o código de erro {!s}."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "A preencher os sistemas de ficheiros."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync falhou com código de erro {}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalar o carregador de arranque."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "A descompactar imagem {}/{}, ficheiro {}/{}"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Erro de instalação do carregador de arranque"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "A começar a descompactação {}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
+"Não foi possível instalar o carregador de arranque. O comando de instalação "
+"
    {!s}
     apresentou o código de erro {!s}."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Falha ao descompactar imagem \"{}\""
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "A definir o relógio do hardware."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Nenhum ponto de montagem para a partição root"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "A criar o initramfs com o mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage não contém um \"rootMountPoint\" chave, nada a fazer"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Falha ao executar o mkintfs no destino"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Ponto de montagem mau para partição root"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "O código de saída foi {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint é \"{}\", que não existe, nada a fazer"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Criando o initramfs com o dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Má configuração unsquash"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Falha ao executar o dracut no destino"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"O sistema de ficheiros para \"{}\" ({}) não é suportado pelo seu kernel "
-"atual"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "A configurar o initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "O sistema de ficheiros fonte \"{}\" não existe"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "A configurar o serviço OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "A escrever o fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Falha ao procurar unsquashfs, certifique-se que tem o pacote squashfs-tools "
-"instalado"
+"Não é dada nenhuma configuração 
    {!s}
     para 
    {!s}
     "
+"utilizar."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "O destino \"{}\" no sistema de destino não é um diretório"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Tarefa Dummy python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Passo Dummy python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "A configurar a localização."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "A guardar a configuração de rede."
diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po
index ba2c8ab1f2..71925e8518 100644
--- a/lang/python/ro/LC_MESSAGES/python.po
+++ b/lang/python/ro/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Sebastian Brici , 2018\n"
 "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
@@ -22,18 +22,131 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Demonteaza sistemul de fisiere"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -90,102 +203,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr ""
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Job python fictiv."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr ""
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr ""
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -237,153 +319,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr ""
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Demonteaza sistemul de fisiere"
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Job python fictiv."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr ""
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/ru/LC_MESSAGES/python.po b/lang/python/ru/LC_MESSAGES/python.po
index 97b825a40d..ff9d25d462 100644
--- a/lang/python/ru/LC_MESSAGES/python.po
+++ b/lang/python/ru/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: ZIzA, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/calamares/teams/20061/ru/)\n"
@@ -22,18 +22,132 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Установить загрузчик."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Настройте GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтирование разделов."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Ошибка конфигурации"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Не определены разделы для использования 
    {!S}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Настройка systemd сервисов"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не могу изменить сервис"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Размонтирование файловой системы."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Наполнение файловой системы."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -90,103 +204,72 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Создание initramfs с помощью dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не удалось запустить dracut на цели"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Код выхода {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr ""
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Запись fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Ошибка конфигурации"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Не определены разделы для использования 
    {!S}
    ."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Настройка зашифрованного swap."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Настройте GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Установка данных."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Установка аппаратных часов."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Настройка служб OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Настройка initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Настройка языка."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Настройка зашифрованного swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтирование разделов."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Целевой сервис не существует."
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Сохранение настроек сети."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Настройка службы OpenRC dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Настроить тему Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -239,154 +322,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Настроить тему Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Установка данных."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Настройка служб OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Не могу изменить сервис"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Целевой сервис не существует."
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Настройка systemd сервисов"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Вызов systemctl {arg!s} в chroot вернул код ошибки {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr ""
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Установить загрузчик."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Размонтирование файловой системы."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Наполнение файловой системы."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Установка аппаратных часов."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr ""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Код выхода {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr ""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Создание initramfs с помощью dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr ""
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не удалось запустить dracut на цели"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Настройка initramfs."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr ""
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Настройка службы OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Запись fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Настройка языка."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Сохранение настроек сети."
diff --git a/lang/python/ru_RU/LC_MESSAGES/python.po b/lang/python/ru_RU/LC_MESSAGES/python.po
index b31c12c65f..f7e725f595 100644
--- a/lang/python/ru_RU/LC_MESSAGES/python.po
+++ b/lang/python/ru_RU/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Russian (Russia) (https://www.transifex.com/calamares/teams/20061/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,225 +17,201 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +261,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/si/LC_MESSAGES/python.po b/lang/python/si/LC_MESSAGES/python.po
index d72d1321a7..4e7ead539d 100644
--- a/lang/python/si/LC_MESSAGES/python.po
+++ b/lang/python/si/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Hela Basa, 2021\n"
 "Language-Team: Sinhala (https://www.transifex.com/calamares/teams/20061/si/)\n"
@@ -21,221 +21,201 @@ msgstr ""
 "Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
-
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "ජාල වින්‍යාසය සුරැකෙමින්."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
-msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
-msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
 
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:639
+#: src/modules/displaymanager/main.py:907
 msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +240,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +265,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "ඇසුරුම් ස්ථාපනය කරන්න."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "ඇසුරුමක් ස්ථාපනය වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ස්ථාපනය වෙමින්."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "ඇසුරුමක් ඉවත් වෙමින්."
+msgstr[1] "ඇසුරුම් %(num)d ක් ඉවත් වෙමින්."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "දෘඩාංග ඔරලෝසුව සැකසෙමින්."
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
 msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "ජාල වින්‍යාසය සුරැකෙමින්."
diff --git a/lang/python/sk/LC_MESSAGES/python.po b/lang/python/sk/LC_MESSAGES/python.po
index d66f63bb8c..8eb67ebc62 100644
--- a/lang/python/sk/LC_MESSAGES/python.po
+++ b/lang/python/sk/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Dušan Kazik , 2020\n"
 "Language-Team: Slovak (https://www.transifex.com/calamares/teams/20061/sk/)\n"
@@ -21,19 +21,136 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Inštalácia zavádzača."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurácia zavádzača GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Pripájanie oddielov."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Chyba konfigurácie"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Nie sú určené žiadne oddiely na použitie pre 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurácia služieb systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Nedá sa upraviť služba"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
+"kód {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Nedá sa povoliť služba systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Neznáme príkazy systému systemd {command!s} a "
+"{suffix!s} pre jednotku {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Odpojenie súborových systémov."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Napĺňanie súborových systémov."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Príkaz rsync zlyhal s chybovým kódom {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Rozbaľuje sa obraz {}/{}, súbor {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Spúšťa sa rozbaľovanie {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Zlyhalo rozbalenie obrazu „{}“"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Žiadny bod pripojenia pre koreňový oddiel"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Zlý bod pripojenia pre koreňový oddiel"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Nesprávna konfigurácia nástroja unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Súborový systém pre \"{}\" ({}) nie je podporovaný vaším aktuálnym jadrom"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Zdrojový súborový systém \"{}\" neexistuje"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -89,103 +206,72 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfigurácia správcu zobrazenia nebola úplná"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Vytváranie initramfs pomocou nástroja dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Zlyhalo spustenie nástroja dracut v cieli"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Kód skončenia bol {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Fiktívna úloha jazyka python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Fiktívny krok {} jazyka python"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Zapisovanie fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Chyba konfigurácie"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Nie sú určené žiadne oddiely na použitie pre 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurácia mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "Nie je zadaný žiadny bod pripojenia na použitie pre 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigurácia zašifrovaného odkladacieho priestoru."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurácia zavádzača GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Inštalácia údajov."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Nastavovanie hardvérových hodín."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigurácia služieb OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurácia mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurácia initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurácia miestnych nastavení."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigurácia zašifrovaného odkladacieho priestoru."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Pripájanie oddielov."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Cieľová služba neexistuje"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ukladanie sieťovej konfigurácie."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr ""
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurácia motívu služby Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -238,157 +324,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurácia motívu služby Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Inštalácia údajov."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigurácia služieb OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Nedá sa upraviť služba"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Inštalácia zavádzača."
 
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-openrc/main.py:102
+#: src/modules/bootloader/main.py:509
 msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Cieľová služba neexistuje"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "Cesta k službe {name!s} je {path!s}, ale neexistuje."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurácia služieb systemd"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Nastavovanie hardvérových hodín."
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
-"Volanie systemctl {arg!s} in prostredí chroot vrátilo chybový "
-"kód {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Nedá sa povoliť služba systému systemd {name!s}."
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Nedá sa povoliť cieľ systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Nedá sa zakázať cieľ systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Nedá sa zamaskovať jednotka systému systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
-"Neznáme príkazy systému systemd {command!s} a "
-"{suffix!s} pre jednotku {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Odpojenie súborových systémov."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Napĺňanie súborových systémov."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Príkaz rsync zlyhal s chybovým kódom {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Rozbaľuje sa obraz {}/{}, súbor {}/{}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Kód skončenia bol {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Spúšťa sa rozbaľovanie {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Vytváranie initramfs pomocou nástroja dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Zlyhalo rozbalenie obrazu „{}“"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Zlyhalo spustenie nástroja dracut v cieli"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Žiadny bod pripojenia pre koreňový oddiel"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurácia initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Zlý bod pripojenia pre koreňový oddiel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Zapisovanie fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Nesprávna konfigurácia nástroja unsquash"
-
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Súborový systém pre \"{}\" ({}) nie je podporovaný vaším aktuálnym jadrom"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Fiktívna úloha jazyka python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Zdrojový súborový systém \"{}\" neexistuje"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Fiktívny krok {} jazyka python"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurácia miestnych nastavení."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Cieľ \"{}\" v cieľovom systéme nie je adresárom"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ukladanie sieťovej konfigurácie."
diff --git a/lang/python/sl/LC_MESSAGES/python.po b/lang/python/sl/LC_MESSAGES/python.po
index 284a18fba2..46cb83357c 100644
--- a/lang/python/sl/LC_MESSAGES/python.po
+++ b/lang/python/sl/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Slovenian (https://www.transifex.com/calamares/teams/20061/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,225 +17,201 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -260,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -290,97 +261,128 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/sq/LC_MESSAGES/python.po b/lang/python/sq/LC_MESSAGES/python.po
index 53f224071c..84a16d9791 100644
--- a/lang/python/sq/LC_MESSAGES/python.po
+++ b/lang/python/sq/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Besnik Bleta , 2021\n"
 "Language-Team: Albanian (https://www.transifex.com/calamares/teams/20061/sq/)\n"
@@ -21,21 +21,139 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Instalo ngarkues nisjesh."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Formësoni GRUB-in."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Gabim instalimi Ngarkuesi Nisësi"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Po montohen pjesë."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Gabim Formësimi"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "S’ka pjesë të përkufizuara për 
    {!s}
     për t’u përdorur."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Formësoni shërbime systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "S’modifikohet dot shërbimi"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
    {!s}
     u "
-"përgjigj me kod gabimi {!s}."
+"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "S’aktivizohet dot objektivi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "S’maskohet dot njësia systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Urdhra të panjohur systemd {command!s} dhe "
+"{suffix!s} për njësi {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Çmontoni sisteme kartelash."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Po mbushen sisteme kartelash."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync dështoi me kod gabimi {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Po shpaketohet paketa {}/{}, kartela {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Po fillohet të shpaketohet {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Dështoi shpaketimi i figurës \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "S’ka pikë montimi për ndarjen rrënjë"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage nuk përmban një vlerë \"rootMountPoint\", s’po bëhet gjë"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Pikë e gabuar montimi për ndarjen rrënjë"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint është \"{}\", që s’ekziston, s’po bëhet gjë"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Formësim i keq i unsquash-it"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"Sistemi i kartelave për \"{}\" ({}) nuk mbulohet nga kerneli juaj i tanishëm"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"S’u arrit të gjendej unsquashfs, sigurohuni se e keni të instaluar paketën "
+"squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,105 +211,81 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Formësimi i përgjegjësit të ekranit s’qe i plotë"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Po krijohet initramfs me dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "S’u arrit të xhirohej dracut mbi objektivin"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Kodi i daljes qe {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Akt python dummy."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Hap python {} dummy"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Po shkruhet fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Gabim Formësimi"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "S’ka pjesë të përkufizuara për 
    {!s}
     për t’u përdorur."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Po formësohet mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "S’është dhënë pikë montimi rrënjë për 
    {!s}
     për t’u përdorur."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"S’është dhënë formësim 
    {!s}
     për t’u përdorur nga 
    {!s}
    ."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Po formësohet pjesë swap e fshehtëzuar."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Formësoni GRUB-in."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Po instalohen të dhëna."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Po caktohet ora hardware."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Formësoni shërbime OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Po formësohet mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "S’shtohet dot shërbimi {name!s} te run-level {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Po formësohet initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "S’hiqet dot shërbimi {name!s} nga run-level {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Po formësohen vendoret."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Service-action {arg!s} i panjohur për shërbimin {name!s} te "
+"run-level {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Po formësohet pjesë swap e fshehtëzuar."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Thirrje rc-update {arg!s} në chroot u përgjigj me kod gabimi "
+"{num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Po krijohet initramfs me mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Runlevel-i i synuar nuk ekziston"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Shtegu për runlevel {level!s} është {path!s}, i cili nuk "
+"ekziston."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Po montohen pjesë."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Shërbimi i synuar nuk ekziston"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Po ruhet formësimi i rrjetit."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Shtegu për shërbimin {name!s} është {path!s}, i cili nuk "
+"ekziston."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Po formësohet shërbim OpenRC dmcrypt."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Formësoni temën Plimuth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -246,168 +340,76 @@ msgstr ""
 "Përgjegjësi i paketave s’bëri dot ndryshime te sistemi i instaluar. Urdhri "
 "
    {!s}
     u përgjigj me kod gabimi {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Formësoni temën Plimuth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Po instalohen të dhëna."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Formësoni shërbime OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "S’shtohet dot shërbimi {name!s} te run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "S’hiqet dot shërbimi {name!s} nga run-level {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Service-action {arg!s} i panjohur për shërbimin {name!s} te "
-"run-level {level!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Instalo ngarkues nisjesh."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "S’modifikohet dot shërbimi"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Gabim instalimi Ngarkuesi Nisësi"
 
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:509
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Thirrje rc-update {arg!s} në chroot u përgjigj me kod gabimi "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Runlevel-i i synuar nuk ekziston"
+"Ngarkuesi i nisësit s’u instalua dot. Urdhri i instalimit 
    {!s}
     u "
+"përgjigj me kod gabimi {!s}."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Shtegu për runlevel {level!s} është {path!s}, i cili nuk "
-"ekziston."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Po caktohet ora hardware."
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Shërbimi i synuar nuk ekziston"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Po krijohet initramfs me mkinitfs."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Shtegu për shërbimin {name!s} është {path!s}, i cili nuk "
-"ekziston."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "S’u arrit të xhirohej mkinitfs te objektivi"
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Formësoni shërbime systemd"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Kodi i daljes qe {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Thirrja systemctl {arg!s} në chroot u përgjigj me kod gabimi "
-"{num!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Po krijohet initramfs me dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "S’aktivizohet dot shërbimi systemd {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "S’u arrit të xhirohej dracut mbi objektivin"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "S’aktivizohet dot objektivi systemd {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Po formësohet initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "S’çaktivizohet dot objektivi systemd {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Po formësohet shërbim OpenRC dmcrypt."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "S’maskohet dot njësia systemd {name!s}."
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Po shkruhet fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Urdhra të panjohur systemd {command!s} dhe "
-"{suffix!s} për njësi {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Çmontoni sisteme kartelash."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Po mbushen sisteme kartelash."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync dështoi me kod gabimi {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Po shpaketohet paketa {}/{}, kartela {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Po fillohet të shpaketohet {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Dështoi shpaketimi i figurës \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "S’ka pikë montimi për ndarjen rrënjë"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage nuk përmban një vlerë \"rootMountPoint\", s’po bëhet gjë"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Pikë e gabuar montimi për ndarjen rrënjë"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint është \"{}\", që s’ekziston, s’po bëhet gjë"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Formësim i keq i unsquash-it"
+"S’është dhënë formësim 
    {!s}
     për t’u përdorur nga 
    {!s}
    ."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"Sistemi i kartelave për \"{}\" ({}) nuk mbulohet nga kerneli juaj i tanishëm"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Akt python dummy."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Sistemi i kartelave \"{}\" ({}) s’ekziston"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Hap python {} dummy"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"S’u arrit të gjendej unsquashfs, sigurohuni se e keni të instaluar paketën "
-"squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Po formësohen vendoret."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinacioni \"{}\" te sistemi i synuar s’është drejtori"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Po ruhet formësimi i rrjetit."
diff --git a/lang/python/sr/LC_MESSAGES/python.po b/lang/python/sr/LC_MESSAGES/python.po
index ac0822784a..0d7b1f3c9d 100644
--- a/lang/python/sr/LC_MESSAGES/python.po
+++ b/lang/python/sr/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Slobodan Simić , 2020\n"
 "Language-Team: Serbian (https://www.transifex.com/calamares/teams/20061/sr/)\n"
@@ -21,18 +21,131 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Подеси ГРУБ"
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтирање партиција."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Грешка поставе"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Подеси „systemd“ сервисе"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не могу да мењам сервис"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтирање фајл-система."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Попуњавање фајл-система."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync неуспешан са кодом грешке {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Неуспело распакивање одраза \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Нема тачке мотирања за root партицију"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Лоша тачка монтирања за корену партицију"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
 #: src/modules/displaymanager/main.py:526
@@ -89,102 +202,71 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr ""
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr ""
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Уписивање fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Грешка поставе"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Инсталирање података."
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Подеси ГРУБ"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Подешавање локалитета."
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтирање партиција."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Упис поставе мреже."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
@@ -236,153 +318,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr ""
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Инсталирање података."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Не могу да мењам сервис"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr ""
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Подеси „systemd“ сервисе"
-
-#: src/modules/services-systemd/main.py:60
+#: src/modules/bootloader/main.py:509
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтирање фајл-система."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Попуњавање фајл-система."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync неуспешан са кодом грешке {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Неуспело распакивање одраза \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Нема тачке мотирања за root партицију"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Лоша тачка монтирања за корену партицију"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr ""
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Уписивање fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Подешавање локалитета."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr ""
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Упис поставе мреже."
diff --git a/lang/python/sr@latin/LC_MESSAGES/python.po b/lang/python/sr@latin/LC_MESSAGES/python.po
index 21e634ab2b..32845fa817 100644
--- a/lang/python/sr@latin/LC_MESSAGES/python.po
+++ b/lang/python/sr@latin/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Serbian (Latin) (https://www.transifex.com/calamares/teams/20061/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,223 +17,201 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -258,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -288,97 +261,126 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po
index 9c4e0b1a3a..10923c5c1b 100644
--- a/lang/python/sv/LC_MESSAGES/python.po
+++ b/lang/python/sv/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Luna Jernberg , 2021\n"
 "Language-Team: Swedish (https://www.transifex.com/calamares/teams/20061/sv/)\n"
@@ -23,21 +23,138 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Installera starthanterare."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Konfigurera GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Starthanterare installationsfel"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Monterar partitioner."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Konfigurationsfel"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Inga partitioner är definerade för 
    {!s}
     att använda."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Konfigurera systemd tjänster"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Kunde inte modifiera tjänst"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Starthanterare kunde inte installeras. Installationskommandot "
-"
    {!s}
    returnerade felkod {!s}."
+"Anrop till systemctl {arg!s}i chroot returnerade felkod "
+"{num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Kunde inte aktivera systemd tjänst {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Kunde inte aktivera systemd målsystem {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Kan inte maskera systemd unit {name!s}"
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Okända systemd kommandon {command!s} och {suffix!s} för "
+"enhet {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Avmontera filsystem."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Packar upp filsystem."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync misslyckades med felkod {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Packar upp avbild {}/{}, fil {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Börjar att packa upp {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Misslyckades att packa upp avbild \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ingen monteringspunkt för root partition"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage innehåller ingen \"rootMountPoint\"-nyckel, så gör inget"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Dålig monteringspunkt för root partition"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint är \"{}\", vilket inte finns, så gör inget"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Dålig unsquash konfiguration"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Filsystemet för \"{}\" ({}) stöds inte av din nuvarande kärna"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Källfilsystemet \"{}\" existerar inte"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Kunde inte hitta unsquashfs, se till att du har paketet squashfs-tools "
+"installerat"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,106 +212,80 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Konfiguration för displayhanteraren var inkomplett"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Skapar initramfs med dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Misslyckades att köra dracut på målet "
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Felkoden var {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Exempel python jobb"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Exempel python steg {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Skriver fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Konfigurationsfel"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Inga partitioner är definerade för 
    {!s}
     att använda."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Konfigurerar mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Ingen root monteringspunkt är angiven för 
    {!s}
     att använda."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Ingen 
    {!s}
     konfiguration är angiven för 
    {!s}
     att "
-"använda. "
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Konfigurerar krypterad swap."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Konfigurera GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Installerar data."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Ställer hårdvaruklockan."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Konfigurera OpenRC tjänster"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Konfigurerar mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Kan inte lägga till tjänsten {name!s} till körnivå {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Konfigurerar initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Kan inte ta bort tjänsten {name!s} från körnivå {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Konfigurerar språkinställningar"
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Okänt tjänst-anrop {arg!s}för tjänsten {name!s} i körnivå "
+"{level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Konfigurerar krypterad swap."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Anrop till rc-update {arg!s} i chroot returnerade felkod "
+"{num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Skapar initramfs med mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Begärd körnivå existerar inte"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Misslyckades att köra mkinitfs på målet "
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Sökvägen till körnivå {level!s} är {path!s}, som inte "
+"existerar."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Monterar partitioner."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Begärd tjänst existerar inte"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Sparar nätverkskonfiguration."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Sökvägen för tjänst {name!s} är {path!s}, som inte existerar."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Konfigurerar OpenRC dmcrypt tjänst."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Konfigurera Plymouth tema"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -249,166 +340,77 @@ msgstr ""
 "Pakethanteraren kunde inte göra ändringar till det installerade systemet. "
 "kommandot 
    {!s}
     returnerade felkod {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Konfigurera Plymouth tema"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Installerar data."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Konfigurera OpenRC tjänster"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Kan inte lägga till tjänsten {name!s} till körnivå {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Kan inte ta bort tjänsten {name!s} från körnivå {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Okänt tjänst-anrop {arg!s}för tjänsten {name!s} i körnivå "
-"{level!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Installera starthanterare."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Kunde inte modifiera tjänst"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Starthanterare installationsfel"
 
-#: src/modules/services-openrc/main.py:94
+#: src/modules/bootloader/main.py:509
 msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Anrop till rc-update {arg!s} i chroot returnerade felkod "
-"{num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Begärd körnivå existerar inte"
+"Starthanterare kunde inte installeras. Installationskommandot "
+"
    {!s}
    returnerade felkod {!s}."
 
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Sökvägen till körnivå {level!s} är {path!s}, som inte "
-"existerar."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Ställer hårdvaruklockan."
 
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Begärd tjänst existerar inte"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Skapar initramfs med mkinitfs."
 
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Sökvägen för tjänst {name!s} är {path!s}, som inte existerar."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Misslyckades att köra mkinitfs på målet "
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Konfigurera systemd tjänster"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Felkoden var {}"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Anrop till systemctl {arg!s}i chroot returnerade felkod "
-"{num!s}."
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Skapar initramfs med dracut."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Kunde inte aktivera systemd tjänst {name!s}."
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Misslyckades att köra dracut på målet "
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Kunde inte aktivera systemd målsystem {name!s}."
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Konfigurerar initramfs."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Kunde inte inaktivera systemd målsystem {name!s}."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Konfigurerar OpenRC dmcrypt tjänst."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Kan inte maskera systemd unit {name!s}"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Skriver fstab."
 
-#: src/modules/services-systemd/main.py:73
-msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Okända systemd kommandon {command!s} och {suffix!s} för "
-"enhet {name!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Avmontera filsystem."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Packar upp filsystem."
-
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync misslyckades med felkod {}."
-
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Packar upp avbild {}/{}, fil {}/{}"
-
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Börjar att packa upp {}"
-
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Misslyckades att packa upp avbild \"{}\""
-
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ingen monteringspunkt för root partition"
-
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage innehåller ingen \"rootMountPoint\"-nyckel, så gör inget"
-
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Dålig monteringspunkt för root partition"
-
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint är \"{}\", vilket inte finns, så gör inget"
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Dålig unsquash konfiguration"
+"Ingen 
    {!s}
     konfiguration är angiven för 
    {!s}
     att "
+"använda. "
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Filsystemet för \"{}\" ({}) stöds inte av din nuvarande kärna"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Exempel python jobb"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Källfilsystemet \"{}\" existerar inte"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Exempel python steg {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Kunde inte hitta unsquashfs, se till att du har paketet squashfs-tools "
-"installerat"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Konfigurerar språkinställningar"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Destinationen \"{}\" på målsystemet är inte en katalog"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Sparar nätverkskonfiguration."
diff --git a/lang/python/te/LC_MESSAGES/python.po b/lang/python/te/LC_MESSAGES/python.po
index 291e4d0c88..869c799619 100644
--- a/lang/python/te/LC_MESSAGES/python.po
+++ b/lang/python/te/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Telugu (https://www.transifex.com/calamares/teams/20061/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po
index fbcef8e1d9..2d422b4483 100644
--- a/lang/python/tg/LC_MESSAGES/python.po
+++ b/lang/python/tg/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Victor Ibragimov , 2020\n"
 "Language-Team: Tajik (https://www.transifex.com/calamares/teams/20061/tg/)\n"
@@ -21,19 +21,140 @@ msgstr ""
 "Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Насбкунии боркунандаи роҳандозӣ."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Танзимоти GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Васлкунии қисмҳои диск."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Хатои танзимкунӣ"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Ягон қисми диск барои истифодаи 
    {!s}
     муайян карда нашуд."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Танзимоти хидматҳои systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Хидмат тағйир дода намешавад"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
+" вуҷуд овард."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Фармонҳои systemd-и номаълум {command!s} ва "
+"{suffix!s} барои воҳиди {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Ҷудо кардани низомҳои файлӣ."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Пурборкунӣ бо низомҳои файлӣ."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync бо рамзи хатои {} қатъ шуд."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Баровардани тимсол: {}/{}, файл: {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Оғози барориши {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Тимсоли \"{}\" бароварда нашуд"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Ягон нуқтаи васл барои қисми диски реша (root) нест"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage калиди \"rootMountPoint\"-ро дар бар намегирад, ҳeҷ кop "
+"намeкyнад"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Нуқтаи васли нодуруст барои қисми диски реша (root)"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint аз \"{}\" иборат аст, ки вуҷуд надорад, ҳeҷ кop намeкyнад"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Танзимоти unsquash нодуруст аст"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Низоми файлӣ барои \"{}\" ({}) бо ҳастаи ҷории шумо дастгирӣ намешавад"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Низоми файлии манбаи \"{}\" вуҷуд надорад"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"unsquashfs ёфт нашуд, мутмаин шавед, ки бастаи squashfs-tools насб карда "
+"шудааст"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -91,155 +212,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Раванди танзимкунии мудири намоиш ба анҷом нарасид"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Эҷодкунии initramfs бо dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "dracut дар низоми интихобшуда иҷро нашуд"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Рамзи барориш: {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Вазифаи амсилаи python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Қадами амсилаи python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Сабткунии fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Хатои танзимкунӣ"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Ягон қисми диск барои истифодаи 
    {!s}
     муайян карда нашуд."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Нуқтаи васли реша (root) барои истифодаи 
    {!s}
     дода нашуд."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Танзимоти GRUB."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Танзимкунии соати сахтафзор."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Танзимкунии mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Танзимкунии initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Танзимкунии маҳаллигардониҳо."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Нуқтаи васли реша (root) барои истифодаи 
    {!s}
     дода нашуд."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Танзимкунии мубодилаи рамзгузоришуда."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Эҷодкунии initramfs бо mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Васлкунии қисмҳои диск."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Нигоҳдории танзимоти шабака."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Танзимкунии хидмати OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Насбкунии қуттиҳо."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Насбкунии як баста."
-msgstr[1] "Насбкунии %(num)d баста."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Тозакунии як баста"
-msgstr[1] "Тозакунии %(num)d баста."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Танзимоти мавзӯи Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Насбкунии иттилоот."
@@ -264,11 +252,6 @@ msgstr ""
 "Хидмати амалии {arg!s} барои хидмати {name!s} дар run-level "
 "{level!s} номаълум аст."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Хидмат тағйир дода намешавад"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -300,105 +283,124 @@ msgstr ""
 "Масир барои хидмати {name!s} аз {path!s} иборат аст, аммо он "
 "вуҷуд надорад."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Танзимоти хидматҳои systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Танзимоти мавзӯи Plymouth"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Дархости systemctl {arg!s} дар chroot рамзи хатои {num!s}-ро ба"
-" вуҷуд овард."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Насбкунии қуттиҳо."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Хидмати systemd-и {name!s} фаъол карда намешавад."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Коргузории қуттиҳо (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} фаъол карда намешавад."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Насбкунии як баста."
+msgstr[1] "Насбкунии %(num)d баста."
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Интихоби systemd-и {name!s} ғайрифаъол карда намешавад."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Тозакунии як баста"
+msgstr[1] "Тозакунии %(num)d баста."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Воҳиди systemd-и {name!s} пинҳон карда намешавад."
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:639
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Фармонҳои systemd-и номаълум {command!s} ва "
-"{suffix!s} барои воҳиди {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Ҷудо кардани низомҳои файлӣ."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Пурборкунӣ бо низомҳои файлӣ."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync бо рамзи хатои {} қатъ шуд."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Насбкунии боркунандаи роҳандозӣ."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Баровардани тимсол: {}/{}, файл: {}/{}"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Оғози барориши {}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Тимсоли \"{}\" бароварда нашуд"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Танзимкунии соати сахтафзор."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Ягон нуқтаи васл барои қисми диски реша (root) нест"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Эҷодкунии initramfs бо mkinitfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage калиди \"rootMountPoint\"-ро дар бар намегирад, ҳeҷ кop "
-"намeкyнад"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Нуқтаи васли нодуруст барои қисми диски реша (root)"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Рамзи барориш: {}"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint аз \"{}\" иборат аст, ки вуҷуд надорад, ҳeҷ кop намeкyнад"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Эҷодкунии initramfs бо dracut."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Танзимоти unsquash нодуруст аст"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "dracut дар низоми интихобшуда иҷро нашуд"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Низоми файлӣ барои \"{}\" ({}) бо ҳастаи ҷории шумо дастгирӣ намешавад"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Танзимкунии initramfs."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Низоми файлии манбаи \"{}\" вуҷуд надорад"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Танзимкунии хидмати OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Сабткунии fstab."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"unsquashfs ёфт нашуд, мутмаин шавед, ки бастаи squashfs-tools насб карда "
-"шудааст"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Ҷойи таъиноти \"{}\" дар низоми интихобшуда феҳрист намебошад"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Вазифаи амсилаи python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Қадами амсилаи python {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Танзимкунии маҳаллигардониҳо."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Нигоҳдории танзимоти шабака."
diff --git a/lang/python/th/LC_MESSAGES/python.po b/lang/python/th/LC_MESSAGES/python.po
index 97c7f90cba..f83e97bcdb 100644
--- a/lang/python/th/LC_MESSAGES/python.po
+++ b/lang/python/th/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Thai (https://www.transifex.com/calamares/teams/20061/th/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/tr_TR/LC_MESSAGES/python.po b/lang/python/tr_TR/LC_MESSAGES/python.po
index 09b8be3e64..419a5c4617 100644
--- a/lang/python/tr_TR/LC_MESSAGES/python.po
+++ b/lang/python/tr_TR/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Demiray Muhterem , 2020\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/calamares/teams/20061/tr_TR/)\n"
@@ -22,19 +22,138 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Önyükleyici kuruluyor"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "GRUB'u yapılandır."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Disk bölümlemeleri bağlanıyor."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Yapılandırma Hatası"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "
    {!s}
     kullanması için hiçbir bölüm tanımlanmadı."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Systemd hizmetlerini yapılandır"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Hizmet değiştirilemiyor"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
+"{num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Systemd birimi maskeleyemiyor {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Bilinmeyen sistem komutları {command!s} ve "
+"{suffix!s}  {name!s} birimi için."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Dosya sistemlerini ayırın."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Dosya sistemlerini dolduruyorum."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync {} hata koduyla başarısız oldu."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Açılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Dışa aktarım başlatılıyor {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "\"{}\" kurulum medyası aktarılamadı"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "kök disk bölümü için bağlama noktası yok"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"globalstorage bir \"rootMountPoint\" anahtarı içermiyor, hiçbirşey yapılmadı"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Kök disk bölümü için hatalı bağlama noktası"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Unsquash yapılandırma sorunlu"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) Dosya sistemi mevcut çekirdeğiniz tarafından desteklenmiyor"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "\"{}\" Kaynak dosya sistemi mevcut değil"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
+"Unsquashfs bulunamadı, squashfs-tools paketinin kurulu olduğundan emin olun."
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,155 +211,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Ekran yöneticisi yapılandırma işi tamamlanamadı"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Dracut ile initramfs oluşturuluyor."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Hedef üzerinde dracut çalıştırılamadı"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Çıkış kodu {} idi"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Dummy python job."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Fstab dosyasına yazılıyor."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Yapılandırma Hatası"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "
    {!s}
     kullanması için hiçbir bölüm tanımlanmadı."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "
    {!s}
     kullanması için kök bağlama noktası verilmedi."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "GRUB'u yapılandır."
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Donanım saati ayarlanıyor."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Mkinitcpio yapılandırılıyor."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Initramfs yapılandırılıyor."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Sistem yerelleri yapılandırılıyor."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "
    {!s}
     kullanması için kök bağlama noktası verilmedi."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Şifreli takas alanı yapılandırılıyor."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Mkinitfs ile initramfs oluşturuluyor."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Hedefte mkinitfs çalıştırılamadı"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Disk bölümlemeleri bağlanıyor."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Ağ yapılandırması kaydediliyor."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Paketleri yükle"
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Paketler işleniyor (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "%(num)d paket yükleniyor"
-msgstr[1] "%(num)d paket yükleniyor"
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "%(num)d paket kaldırılıyor."
-msgstr[1] "%(num)d paket kaldırılıyor."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Plymouth temasını yapılandır"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Veri yükleniyor."
@@ -265,11 +251,6 @@ msgstr ""
 "Çalışma düzeyinde {level!s} hizmetinde {name!s} servisi için bilinmeyen "
 "hizmet eylemi {arg!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Hizmet değiştirilemiyor"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -297,103 +278,124 @@ msgid ""
 "exist."
 msgstr "{name!s} hizmetinin yolu {path!s}, ki mevcut değil."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Systemd hizmetlerini yapılandır"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Plymouth temasını yapılandır"
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"systemctl {arg!s} chroot çağrısında hata kodu döndürüldü "
-"{num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Paketleri yükle"
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Systemd hizmeti etkinleştirilemiyor {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Paketler işleniyor (%(count)d / %(total)d)"
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Systemd hedefi etkinleştirilemiyor {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "%(num)d paket yükleniyor"
+msgstr[1] "%(num)d paket yükleniyor"
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Systemd hedefi devre dışı bırakılamıyor {name!s}."
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "%(num)d paket kaldırılıyor."
+msgstr[1] "%(num)d paket kaldırılıyor."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Systemd birimi maskeleyemiyor {name!s}."
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:639
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"Bilinmeyen sistem komutları {command!s} ve "
-"{suffix!s}  {name!s} birimi için."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Dosya sistemlerini ayırın."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Dosya sistemlerini dolduruyorum."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync {} hata koduyla başarısız oldu."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Önyükleyici kuruluyor"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Açılan kurulum medyası {}/{}, dışa aktarılan dosya sayısı {}/{}"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Dışa aktarım başlatılıyor {}"
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "\"{}\" kurulum medyası aktarılamadı"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Donanım saati ayarlanıyor."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "kök disk bölümü için bağlama noktası yok"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Mkinitfs ile initramfs oluşturuluyor."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"globalstorage bir \"rootMountPoint\" anahtarı içermiyor, hiçbirşey yapılmadı"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Hedefte mkinitfs çalıştırılamadı"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Kök disk bölümü için hatalı bağlama noktası"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Çıkış kodu {} idi"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint \"{}\", mevcut değil, hiçbirşey yapılmadı"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Dracut ile initramfs oluşturuluyor."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Unsquash yapılandırma sorunlu"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Hedef üzerinde dracut çalıştırılamadı"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) Dosya sistemi mevcut çekirdeğiniz tarafından desteklenmiyor"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Initramfs yapılandırılıyor."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "\"{}\" Kaynak dosya sistemi mevcut değil"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "OpenRC dmcrypt hizmeti yapılandırılıyor."
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Fstab dosyasına yazılıyor."
+
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Unsquashfs bulunamadı, squashfs-tools paketinin kurulu olduğundan emin olun."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hedef sistemdeki \"{}\" hedefi bir dizin değil"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Dummy python job."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Dummy python step {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Sistem yerelleri yapılandırılıyor."
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Ağ yapılandırması kaydediliyor."
diff --git a/lang/python/uk/LC_MESSAGES/python.po b/lang/python/uk/LC_MESSAGES/python.po
index 0ebdf95a6e..3f2682f50d 100644
--- a/lang/python/uk/LC_MESSAGES/python.po
+++ b/lang/python/uk/LC_MESSAGES/python.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: Yuri Chornoivan , 2021\n"
 "Language-Team: Ukrainian (https://www.transifex.com/calamares/teams/20061/uk/)\n"
@@ -23,21 +23,143 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Встановити завантажувач."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Налаштовування GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Помилка встановлення завантажувача"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Монтування розділів."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Помилка налаштовування"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Не визначено розділів для використання 
    {!s}
    ."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Налаштуйте служби systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Не вдалося змінити службу"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"Не вдалося встановити завантажувач. Програмою для встановлення "
-"
    {!s}
     повернуто код помилки {!s}."
+"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
+"повідомлення з кодом помилки {num! s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Не вдалося ввімкнути службу systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Не вдалося вимкнути завдання systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Не вдалося замаскувати вузол systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"Невідомі команди systemd {command!s} та {suffix!s}"
+" для пристрою {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Демонтувати файлові системи."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Заповнення файлових систем."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Розпаковуємо образ {} з {}, файл {} з {}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Починаємо розпаковувати {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Не вдалося розпакувати образ «{}»"
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Немає точки монтування для кореневого розділу"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо "
+"ніяких дій."
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Помилкова точна монтування для кореневого розділу"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не "
+"виконуватимемо ніяких дій."
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Помилкові налаштування unsquash"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+"У поточному ядрі системи не передбачено підтримки файлової системи «{}» ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Вихідної файлової системи «{}» не існує"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr ""
+"Не вдалося знайти unsquashfs; переконайтеся, що встановлено пакет squashfs-"
+"tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Призначення «{}» у цільовій системі не є каталогом"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -95,105 +217,81 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Налаштування засобу керування дисплеєм є неповними"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Створюємо initramfs за допомогою dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Не вдалося виконати dracut над призначенням"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Код виходу — {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Фіктивне завдання python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Фіктивний крок python {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Записуємо fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Помилка налаштовування"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Не визначено розділів для використання 
    {!s}
    ."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Налаштовуємо mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 "Не вказано кореневої точки монтування для використання у 
    {!s}
    ."
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-"Не надано налаштувань 
    {!s}
     для використання у 
    {!s}
    ."
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Налаштовуємо зашифрований розділ резервної пам'яті."
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Налаштовування GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Встановлюємо дані."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Встановлюємо значення для апаратного годинника."
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Налаштувати служби OpenRC"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "Налаштовуємо mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Не вдалося додати службу {name!s} до рівня запуску {level!s}."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Налаштовуємо initramfs."
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Не вдалося вилучити службу {name!s} з рівня запуску {level!s}."
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Налаштовуємо локалі."
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Невідома дія зі службою {arg!s} для служби {name!s} на рівні "
+"запуску {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Налаштовуємо зашифрований розділ резервної пам'яті."
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+"Унаслідок виконання виклику rc-update {arg!s} chroot повернуто "
+"повідомлення про помилку із кодом {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Створення initramfs за допомогою mkinitfs."
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Шляху до рівня запуску не існує"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Не вдалося виконати mkinitfs над призначенням"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Шляхом до рівня запуску {level!s} вказано {path!s}. Такого "
+"шляху не існує."
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Монтування розділів."
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Служби призначення не існує"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Зберігаємо налаштування мережі."
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+"Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
+"існує."
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Налаштовуємо службу dmcrypt OpenRC."
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Налаштувати тему Plymouth"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -252,172 +350,76 @@ msgstr ""
 "Засобу керування пакунками не вдалося внести зміну до встановленої системи. "
 "Програмою 
    {!s}
     повернуто код помилки {!s}."
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Налаштувати тему Plymouth"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "Встановлюємо дані."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "Налаштувати служби OpenRC"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Не вдалося додати службу {name!s} до рівня запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Не вдалося вилучити службу {name!s} з рівня запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr ""
-"Невідома дія зі службою {arg!s} для служби {name!s} на рівні "
-"запуску {level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Не вдалося змінити службу"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Унаслідок виконання виклику rc-update {arg!s} chroot повернуто "
-"повідомлення про помилку із кодом {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "Шляху до рівня запуску не існує"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Шляхом до рівня запуску {level!s} вказано {path!s}. Такого "
-"шляху не існує."
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "Служби призначення не існує"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr ""
-"Шляхом до служби {name!s} вказано {path!s}. Такого шляху не "
-"існує."
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Налаштуйте служби systemd"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr ""
-"Внаслідок виклику systemctl {arg!s} у chroot було повернуто "
-"повідомлення з кодом помилки {num! s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Не вдалося ввімкнути службу systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Не вдалося ввімкнути завдання systemd {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Не вдалося вимкнути завдання systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Встановити завантажувач."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Не вдалося замаскувати вузол systemd {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "Помилка встановлення завантажувача"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Невідомі команди systemd {command!s} та {suffix!s}"
-" для пристрою {name!s}."
+"Не вдалося встановити завантажувач. Програмою для встановлення "
+"
    {!s}
     повернуто код помилки {!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Демонтувати файлові системи."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Встановлюємо значення для апаратного годинника."
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Заповнення файлових систем."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Створення initramfs за допомогою mkinitfs."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "Спроба виконати rsync зазнала невдачі з кодом помилки {}."
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Не вдалося виконати mkinitfs над призначенням"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Розпаковуємо образ {} з {}, файл {} з {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Код виходу — {}"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Починаємо розпаковувати {}"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Створюємо initramfs за допомогою dracut."
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Не вдалося розпакувати образ «{}»"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Не вдалося виконати dracut над призначенням"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Немає точки монтування для кореневого розділу"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Налаштовуємо initramfs."
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr ""
-"У globalstorage не міститься ключа «rootMountPoint». Не виконуватимемо "
-"ніяких дій."
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Налаштовуємо службу dmcrypt OpenRC."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Помилкова точна монтування для кореневого розділу"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Записуємо fstab."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
-"Для rootMountPoint вказано значення «{}». Такого шляху не існує. Не "
-"виконуватимемо ніяких дій."
-
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Помилкові налаштування unsquash"
+"Не надано налаштувань 
    {!s}
     для використання у 
    {!s}
    ."
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr ""
-"У поточному ядрі системи не передбачено підтримки файлової системи «{}» ({})"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Фіктивне завдання python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Вихідної файлової системи «{}» не існує"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Фіктивний крок python {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr ""
-"Не вдалося знайти unsquashfs; переконайтеся, що встановлено пакет squashfs-"
-"tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Налаштовуємо локалі."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Призначення «{}» у цільовій системі не є каталогом"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Зберігаємо налаштування мережі."
diff --git a/lang/python/ur/LC_MESSAGES/python.po b/lang/python/ur/LC_MESSAGES/python.po
index f124edb9d7..3a2c39bb97 100644
--- a/lang/python/ur/LC_MESSAGES/python.po
+++ b/lang/python/ur/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Urdu (https://www.transifex.com/calamares/teams/20061/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,221 +17,201 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -256,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -286,97 +261,124 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/uz/LC_MESSAGES/python.po b/lang/python/uz/LC_MESSAGES/python.po
index aa894a6739..f1656b4842 100644
--- a/lang/python/uz/LC_MESSAGES/python.po
+++ b/lang/python/uz/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Uzbek (https://www.transifex.com/calamares/teams/20061/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po
index 328a79b260..c5d101ccb2 100644
--- a/lang/python/vi/LC_MESSAGES/python.po
+++ b/lang/python/vi/LC_MESSAGES/python.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: T. Tran , 2020\n"
 "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n"
@@ -21,19 +21,135 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "Đang cài đặt bộ khởi động."
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Cấu hình GRUB"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "Đang gắn kết các phân vùng."
+
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "Lỗi cấu hình"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "Không có phân vùng nào được định nghĩa cho 
    {!s}
     để dùng."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Cấu hình các dịch vụ systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Không thể sửa đổi dịch vụ"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
+"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "Không thể bật dịch vụ systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
+
+#: src/modules/services-systemd/main.py:73
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
+"Không nhận ra lệnh systemd {command!s} và "
+"{suffix!s} cho đơn vị {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Gỡ kết nối các hệ thống tập tin."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Đang làm đầy các hệ thống tập tin."
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync thất bại với lỗi {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "Bắt đầu bung nội dung {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "Bung hình ảnh thất bại \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "Không có điểm kết nối cho phân vùng gốc"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage không có khoá \"rootMountPoint\", sẽ không làm gì cả"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "Sai điểm kết nối cho phân vùng gốc"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint không tồn tại, có giá trị là \"{}\", sẽ không làm gì cả"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "Sai cấu hình bung nén"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Hệ thống tập tin cho \"{}\" ({}) không được hỗ trợ bởi nhân hiện tại"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Hệ thống tập tin nguồn \"{}\" không tồn tại"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "Không tìm thấy lệnh unsquashfs, vui lòng cài đặt gói squashfs-tools"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -92,153 +208,22 @@ msgstr ""
 msgid "Display manager configuration was incomplete"
 msgstr "Cầu hình quản lý hiện thị không hoàn tất"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "Đang tạo initramfs bằng dracut."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "Chạy dracut thất bại ở hệ thống đích"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "Mã lỗi trả về là {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "Ví dụ công việc python."
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "Ví dụ python bước {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "Đang viết vào fstab."
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "Lỗi cấu hình"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "Không có phân vùng nào được định nghĩa cho 
    {!s}
     để dùng."
-
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "Không có điểm kết nối gốc cho 
    {!s}
     để dùng."
-
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr ""
-
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "Cấu hình GRUB"
-
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "Đang thiết lập đồng hồ máy tính."
-
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
 msgstr "Đang cấu hình mkinitcpio."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "Đang cấu hình initramfs."
-
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "Đang cấu hình ngôn ngữ."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
+msgstr "Không có điểm kết nối gốc cho 
    {!s}
     để dùng."
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
 msgstr "Đang cấu hình hoán đổi mã hoá"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "Đang tạo initramfs bằng mkinitfs."
-
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
-
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "Đang gắn kết các phân vùng."
-
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "Đang lưu cấu hình mạng."
-
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
-
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
-msgstr "Đang cài đặt các gói ứng dụng."
-
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Đang xử lý gói (%(count)d / %(total)d)"
-
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
-msgstr ""
-
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
-msgstr ""
-
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
-msgstr ""
-
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "Cấu hình giao diện Plymouth"
-
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
 msgstr "Đang cài đặt dữ liệu."
@@ -263,11 +248,6 @@ msgstr ""
 "Không nhận ra thao tác {arg!s} cho dịch vụ {name!s} ở run-level"
 " {level!s}."
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "Không thể sửa đổi dịch vụ"
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -299,100 +279,122 @@ msgstr ""
 "Đường dẫn cho dịch vụ {name!s} là {path!s}, nhưng không tồn "
 "tại."
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "Cấu hình các dịch vụ systemd"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Cấu hình giao diện Plymouth"
 
-#: src/modules/services-systemd/main.py:60
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Đang cài đặt các gói ứng dụng."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Đang xử lý gói (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
 msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"systemctl {arg!s} trong môi trường chroot trả về lỗi {num!s}."
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "Không thể bật dịch vụ systemd {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "Không thể bật nhóm dịch vụ systemd {name!s}."
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
+msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "Không thể tắt nhóm dịch vụ systemd {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "Đang cài đặt bộ khởi động."
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "Không thể đánh dấu đơn vị systemd {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
-"Không nhận ra lệnh systemd {command!s} và "
-"{suffix!s} cho đơn vị {name!s}."
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Gỡ kết nối các hệ thống tập tin."
-
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "Đang làm đầy các hệ thống tập tin."
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Đang thiết lập đồng hồ máy tính."
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync thất bại với lỗi {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Đang tạo initramfs bằng mkinitfs."
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "Bắt đầu bung nội dung {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Mã lỗi trả về là {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "Bung hình ảnh thất bại \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Đang tạo initramfs bằng dracut."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "Không có điểm kết nối cho phân vùng gốc"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Chạy dracut thất bại ở hệ thống đích"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage không có khoá \"rootMountPoint\", sẽ không làm gì cả"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Đang cấu hình initramfs."
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "Sai điểm kết nối cho phân vùng gốc"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint không tồn tại, có giá trị là \"{}\", sẽ không làm gì cả"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Đang viết vào fstab."
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Sai cấu hình bung nén"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "Hệ thống tập tin cho \"{}\" ({}) không được hỗ trợ bởi nhân hiện tại"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Ví dụ công việc python."
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "Hệ thống tập tin nguồn \"{}\" không tồn tại"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Ví dụ python bước {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "Không tìm thấy lệnh unsquashfs, vui lòng cài đặt gói squashfs-tools"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Đang cấu hình ngôn ngữ."
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "Đang lưu cấu hình mạng."
diff --git a/lang/python/zh/LC_MESSAGES/python.po b/lang/python/zh/LC_MESSAGES/python.po
index e4e89ce606..da9c9a79b2 100644
--- a/lang/python/zh/LC_MESSAGES/python.po
+++ b/lang/python/zh/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (https://www.transifex.com/calamares/teams/20061/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index 40e684c24c..2f14a3af4b 100644
--- a/lang/python/zh_CN/LC_MESSAGES/python.po
+++ b/lang/python/zh_CN/LC_MESSAGES/python.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 玉堂白鹤 , 2021\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
@@ -25,19 +25,134 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安装启动加载器。"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "配置 GRUB."
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "启动加载器安装出错"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "挂载分区。"
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "配置错误"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "没有分配分区给 
    {!s}
    。"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "配置 systemd 服务"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "无法修改服务"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr "无法安装启动加载器。安装命令
    {!s}
    返回错误代码 {!s}。"
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "无法启用 systemd 服务 {name!s}."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "无法启用 systemd 目标 {name!s}."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "无法禁用 systemd 目标 {name!s}."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "无法屏蔽 systemd 单元 {name!s}."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
+"{suffix!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "卸载文件系统。"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "写入文件系统。"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync 报错，错误码 {}."
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "解压镜像 {}/{}，文件{}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "开始解压 {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "解压镜像失败 \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "无 root 分区挂载点"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "错误的 root 分区挂载点"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "错误的 unsquash 配置"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "你当前的内核不支持文件系统 \"{}\" ({})"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "源文件系统 \"{}\" 不存在"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "未找到 unsquashfs，请确保安装了 squashfs-tools 软件包"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "目标系统中的 \"{}\" 不是一个目录"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -93,103 +208,72 @@ msgstr "globalstorage 和 displaymanager.conf 配置文件中都没有配置显
 msgid "Display manager configuration was incomplete"
 msgstr "显示管理器配置不完全"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "用 dracut 创建 initramfs."
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "无法在目标中运行 dracut "
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "退出码是 {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "占位 Python 任务。"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "占位 Python 步骤 {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在写入 fstab。"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "配置错误"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "没有分配分区给 
    {!s}
    。"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "配置 mkinitcpio."
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr " 未设置 
    {!s}
     要使用的根挂载点。"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "无 
    {!s}
     配置可供 
    {!s}
     使用。"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "配置加密交换分区。"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "配置 GRUB."
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "安装数据."
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "设置硬件时钟。"
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "配置 OpenRC 服务。"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "配置 mkinitcpio."
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "无法将服务 {name!s} 加入 {level!s} 运行级别."
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在配置初始内存文件系统。"
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "无法从 {level!s} 运行级别中删除服务 {name!s}。"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在进行本地化配置。"
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr "未知的服务动作 {arg!s}，服务名: {name!s}，运行级别: {level!s}."
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "配置加密交换分区。"
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "chroot 中运行的 rc-update {arg!s} 返回错误 {num!s}."
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在用 mkinitfs 创建initramfs。"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "目标运行级别不存在。"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "无法在目标中运行 mkinitfs"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "运行级别 {level!s} 所在目录 {path!s} 不存在。"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "挂载分区。"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "目标服务不存在"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "正在保存网络配置。"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "服务 {name!s} 的路径 {path!s} 不存在。"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "配置 OpenRC dmcrypt 服务。"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "配置 Plymouth 主题"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -236,155 +320,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr "软件包管理器无法对已安装的系统进行更改。命令
    {!s}
    返回错误代码{!s}。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "配置 Plymouth 主题"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "安装数据."
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "配置 OpenRC 服务。"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "无法将服务 {name!s} 加入 {level!s} 运行级别."
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "无法从 {level!s} 运行级别中删除服务 {name!s}。"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr "未知的服务动作 {arg!s}，服务名: {name!s}，运行级别: {level!s}."
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "无法修改服务"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot 中运行的 rc-update {arg!s} 返回错误 {num!s}."
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "目标运行级别不存在。"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "运行级别 {level!s} 所在目录 {path!s} 不存在。"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "目标服务不存在"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "服务 {name!s} 的路径 {path!s} 不存在。"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "配置 systemd 服务"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "chroot 中的 systemctl {arg!s} 命令返回错误 {num!s}."
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "无法启用 systemd 服务 {name!s}."
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "无法启用 systemd 目标 {name!s}."
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "无法禁用 systemd 目标 {name!s}."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安装启动加载器。"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "无法屏蔽 systemd 单元 {name!s}."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "启动加载器安装出错"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"未知的 systemd 命令 {command!s} 和 {name!s}  单元前缀 "
-"{suffix!s}."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "卸载文件系统。"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr "无法安装启动加载器。安装命令
    {!s}
    返回错误代码 {!s}。"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "写入文件系统。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "设置硬件时钟。"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync 报错，错误码 {}."
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在用 mkinitfs 创建initramfs。"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "解压镜像 {}/{}，文件{}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "无法在目标中运行 mkinitfs"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "开始解压 {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "退出码是 {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "解压镜像失败 \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "用 dracut 创建 initramfs."
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "无 root 分区挂载点"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "无法在目标中运行 dracut "
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage 未包含 \"rootMountPoint\"，跳过"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在配置初始内存文件系统。"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "错误的 root 分区挂载点"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "配置 OpenRC dmcrypt 服务。"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint 是 \"{}\"，不存在此位置，跳过"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在写入 fstab。"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "错误的 unsquash 配置"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "无 
    {!s}
     配置可供 
    {!s}
     使用。"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "你当前的内核不支持文件系统 \"{}\" ({})"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "占位 Python 任务。"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "源文件系统 \"{}\" 不存在"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "占位 Python 步骤 {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "未找到 unsquashfs，请确保安装了 squashfs-tools 软件包"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在进行本地化配置。"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "目标系统中的 \"{}\" 不是一个目录"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在保存网络配置。"
diff --git a/lang/python/zh_HK/LC_MESSAGES/python.po b/lang/python/zh_HK/LC_MESSAGES/python.po
index 9613bfa8e2..94713bf244 100644
--- a/lang/python/zh_HK/LC_MESSAGES/python.po
+++ b/lang/python/zh_HK/LC_MESSAGES/python.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Language-Team: Chinese (Hong Kong) (https://www.transifex.com/calamares/teams/20061/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,219 +17,201 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr ""
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
 msgstr ""
 
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:526
-msgid "Cannot write KDM configuration file"
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:527
-msgid "KDM config file {!s} does not exist"
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:588
-msgid "Cannot write LXDM configuration file"
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:589
-msgid "LXDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
 msgstr ""
 
-#: src/modules/displaymanager/main.py:672
-msgid "Cannot write LightDM configuration file"
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:673
-msgid "LightDM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:747
-msgid "Cannot configure LightDM"
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:748
-msgid "No LightDM greeter installed."
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:779
-msgid "Cannot write SLIM configuration file"
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:780
-msgid "SLIM config file {!s} does not exist"
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:906
-msgid "No display managers selected for the displaymanager module."
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:907
-msgid ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
 msgstr ""
 
-#: src/modules/displaymanager/main.py:989
-msgid "Display manager configuration was incomplete"
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
 msgstr ""
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
 msgstr ""
 
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
 msgstr ""
 
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
 msgstr ""
 
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
 msgstr ""
 
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
 msgstr ""
 
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
 msgstr ""
 
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
 msgstr ""
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
-#: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
-msgid "No root mount point is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
 msgstr ""
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
 msgstr ""
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
 msgstr ""
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
 msgstr ""
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
 msgstr ""
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
 msgstr ""
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
 msgstr ""
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
 msgstr ""
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
 msgstr ""
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
 msgstr ""
 
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
-msgid "Install packages."
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
 msgstr ""
 
-#: src/modules/packages/main.py:57
-#, python-format
-msgid "Processing packages (%(count)d / %(total)d)"
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
 msgstr ""
 
-#: src/modules/packages/main.py:62
-#, python-format
-msgid "Installing one package."
-msgid_plural "Installing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:65
-#, python-format
-msgid "Removing one package."
-msgid_plural "Removing %(num)d packages."
-msgstr[0] ""
-
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
-msgid "Package Manager error"
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
 msgstr ""
 
-#: src/modules/packages/main.py:639
-msgid ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
 msgstr ""
 
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
 msgstr ""
 
-#: src/modules/packages/main.py:679
-msgid ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
+#: src/modules/initcpiocfg/main.py:202
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
+msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
 msgstr ""
 
 #: src/modules/rawfs/main.py:26
@@ -254,11 +236,6 @@ msgid ""
 "level {level!s}."
 msgstr ""
 
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr ""
-
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
@@ -284,97 +261,122 @@ msgid ""
 "exist."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
 msgstr ""
 
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command 
    {!s}
    "
+" returned error code {!s}."
 msgstr ""
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/packages/main.py:679
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"The package manager could not make changes to the installed system. The "
+"command 
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
 msgstr ""
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
 msgstr ""
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
 msgstr ""
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po
index cd531289d3..447f5f7973 100644
--- a/lang/python/zh_TW/LC_MESSAGES/python.po
+++ b/lang/python/zh_TW/LC_MESSAGES/python.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 11:40+0200\n"
+"POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
 "Last-Translator: 黃柏諺 , 2021\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/calamares/teams/20061/zh_TW/)\n"
@@ -22,19 +22,134 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/modules/bootloader/main.py:43
-msgid "Install bootloader."
-msgstr "安裝開機載入程式。"
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "設定 GRUB。"
 
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "開機載入程式安裝錯誤"
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr "正在掛載分割區。"
 
-#: src/modules/bootloader/main.py:509
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/fstab/main.py:355
+#: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
+#: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
+msgid "Configuration Error"
+msgstr "設定錯誤"
+
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/fstab/main.py:356
+msgid "No partitions are defined for 
    {!s}
     to use."
+msgstr "沒有分割區被定義為 
    {!s}
     以供使用。"
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "設定 systemd 服務"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "無法修改服務"
+
+#: src/modules/services-systemd/main.py:60
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
-msgstr "無法安裝開機載入程式。安裝指令 
    {!s}
     回傳了錯誤碼 {!s}。"
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service {name!s}."
+msgstr "無法啟用 systemd 服務 {name!s}。"
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr "無法啟用 systemd 目標 {name!s}。"
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target {name!s}."
+msgstr "無法停用 systemd 目標 {name!s}。"
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit {name!s}."
+msgstr "無法 mask systemd 單位 {name!s}。"
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
+"{name!s}。"
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "解除掛載檔案系統。"
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "填滿檔案系統。"
+
+#: src/modules/unpackfs/main.py:255
+msgid "rsync failed with error code {}."
+msgstr "rsync 失敗，錯誤碼 {} 。"
+
+#: src/modules/unpackfs/main.py:300
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "正在解壓縮 {}/{}，檔案 {}/{}"
+
+#: src/modules/unpackfs/main.py:315
+msgid "Starting to unpack {}"
+msgstr "開始解壓縮 {}"
+
+#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
+msgid "Failed to unpack image \"{}\""
+msgstr "無法解開映像檔 \"{}\""
+
+#: src/modules/unpackfs/main.py:431
+msgid "No mount point for root partition"
+msgstr "沒有 root 分割區的掛載點"
+
+#: src/modules/unpackfs/main.py:432
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事"
+
+#: src/modules/unpackfs/main.py:437
+msgid "Bad mount point for root partition"
+msgstr "root 分割區掛載點錯誤"
+
+#: src/modules/unpackfs/main.py:438
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事"
+
+#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr "錯誤的 unsquash 設定"
+
+#: src/modules/unpackfs/main.py:455
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
+
+#: src/modules/unpackfs/main.py:459
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "來源檔案系統 \"{}\" 不存在"
+
+#: src/modules/unpackfs/main.py:465
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "找不到 unsquashfs，請確定已安裝 squashfs-tools 軟體包"
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "目標系統中的目的地 \"{}\" 不是目錄"
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
@@ -90,103 +205,72 @@ msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf
 msgid "Display manager configuration was incomplete"
 msgstr "顯示管理器設定不完整"
 
-#: src/modules/dracut/main.py:27
-msgid "Creating initramfs with dracut."
-msgstr "正在使用 dracut 建立 initramfs。"
-
-#: src/modules/dracut/main.py:49
-msgid "Failed to run dracut on the target"
-msgstr "在目標上執行 dracut 失敗"
-
-#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
-msgid "The exit code was {}"
-msgstr "結束碼為 {}"
-
-#: src/modules/dummypython/main.py:35
-msgid "Dummy python job."
-msgstr "假的 python 工作。"
-
-#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
-#: src/modules/dummypython/main.py:94
-msgid "Dummy python step {}"
-msgstr "假的 python step {}"
-
-#: src/modules/fstab/main.py:29
-msgid "Writing fstab."
-msgstr "正在寫入 fstab。"
-
-#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
-#: src/modules/fstab/main.py:388 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201 src/modules/initramfscfg/main.py:85
-#: src/modules/initramfscfg/main.py:89 src/modules/localecfg/main.py:135
-#: src/modules/luksopenswaphookcfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/mount/main.py:144
-#: src/modules/networkcfg/main.py:42 src/modules/openrcdmcryptcfg/main.py:72
-#: src/modules/openrcdmcryptcfg/main.py:76 src/modules/rawfs/main.py:164
-msgid "Configuration Error"
-msgstr "設定錯誤"
-
-#: src/modules/fstab/main.py:356 src/modules/initcpiocfg/main.py:198
-#: src/modules/initramfscfg/main.py:86
-#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/mount/main.py:145
-#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/rawfs/main.py:165
-msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "沒有分割區被定義為 
    {!s}
     以供使用。"
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "正在設定 mkinitcpio。"
 
-#: src/modules/fstab/main.py:362 src/modules/initcpiocfg/main.py:202
-#: src/modules/initramfscfg/main.py:90 src/modules/localecfg/main.py:136
+#: src/modules/initcpiocfg/main.py:202
 #: src/modules/luksopenswaphookcfg/main.py:91
-#: src/modules/networkcfg/main.py:43 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
 msgstr "沒有給定的根掛載點 
    {!s}
     以供使用。"
 
-#: src/modules/fstab/main.py:389
-msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "無 
    {!s}
     設定可供 
    {!s}
     使用。"
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "正在設定已加密的 swap。"
 
-#: src/modules/grubcfg/main.py:28
-msgid "Configure GRUB."
-msgstr "設定 GRUB。"
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "正在安裝資料。"
 
-#: src/modules/hwclock/main.py:26
-msgid "Setting hardware clock."
-msgstr "正在設定硬體時鐘。"
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "設定 OpenRC 服務"
 
-#: src/modules/initcpiocfg/main.py:28
-msgid "Configuring mkinitcpio."
-msgstr "正在設定 mkinitcpio。"
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "無法新增服務 {name!s} 到執行層級 {level!s}。"
 
-#: src/modules/initramfscfg/main.py:32
-msgid "Configuring initramfs."
-msgstr "正在設定 initramfs。"
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "無法移除服務 {name!s} 從執行層級 {level!s}。"
 
-#: src/modules/localecfg/main.py:30
-msgid "Configuring locales."
-msgstr "正在設定語系。"
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr "未知的服務動作 {arg!s} 給服務 {name!s} 在執行層級 {level!s}。"
 
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "正在設定已加密的 swap。"
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr "在 chroot 中呼叫的 rc-update {arg!s} 回傳了錯誤代碼 {num!s}。"
 
-#: src/modules/mkinitfs/main.py:27
-msgid "Creating initramfs with mkinitfs."
-msgstr "正在使用 mkinitfs 建立 initramfs。"
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "目標執行層級不存在"
 
-#: src/modules/mkinitfs/main.py:49
-msgid "Failed to run mkinitfs on the target"
-msgstr "在目標上執行 mkinitfs 失敗"
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr "執行層級 {level!s} 的路徑為 {path!s}，不存在。"
 
-#: src/modules/mount/main.py:30
-msgid "Mounting partitions."
-msgstr "正在掛載分割區。"
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "目標服務不存在"
 
-#: src/modules/networkcfg/main.py:29
-msgid "Saving network configuration."
-msgstr "正在儲存網路設定。"
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。"
 
-#: src/modules/openrcdmcryptcfg/main.py:26
-msgid "Configuring OpenRC dmcrypt service."
-msgstr "正在設定 OpenRC dmcrypt 服務。"
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "設定 Plymouth 主題"
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
@@ -233,155 +317,73 @@ msgid ""
 "command 
    {!s}
     returned error code {!s}."
 msgstr "軟體包管理程式無法對已安裝的系統做出變更。指令 
    {!s}
     回傳了錯誤碼 {!s}。"
 
-#: src/modules/plymouthcfg/main.py:27
-msgid "Configure Plymouth theme"
-msgstr "設定 Plymouth 主題"
-
-#: src/modules/rawfs/main.py:26
-msgid "Installing data."
-msgstr "正在安裝資料。"
-
-#: src/modules/services-openrc/main.py:29
-msgid "Configure OpenRC services"
-msgstr "設定 OpenRC 服務"
-
-#: src/modules/services-openrc/main.py:57
-msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "無法新增服務 {name!s} 到執行層級 {level!s}。"
-
-#: src/modules/services-openrc/main.py:59
-msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "無法移除服務 {name!s} 從執行層級 {level!s}。"
-
-#: src/modules/services-openrc/main.py:61
-msgid ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
-msgstr "未知的服務動作 {arg!s} 給服務 {name!s} 在執行層級 {level!s}。"
-
-#: src/modules/services-openrc/main.py:93
-#: src/modules/services-systemd/main.py:59
-msgid "Cannot modify service"
-msgstr "無法修改服務"
-
-#: src/modules/services-openrc/main.py:94
-msgid ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
-msgstr "在 chroot 中呼叫的 rc-update {arg!s} 回傳了錯誤代碼 {num!s}。"
-
-#: src/modules/services-openrc/main.py:101
-msgid "Target runlevel does not exist"
-msgstr "目標執行層級不存在"
-
-#: src/modules/services-openrc/main.py:102
-msgid ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
-msgstr "執行層級 {level!s} 的路徑為 {path!s}，不存在。"
-
-#: src/modules/services-openrc/main.py:110
-msgid "Target service does not exist"
-msgstr "目標服務不存在"
-
-#: src/modules/services-openrc/main.py:111
-msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
-msgstr "服務 {name!s} 的路徑為 {path!s}，不存在。"
-
-#: src/modules/services-systemd/main.py:26
-msgid "Configure systemd services"
-msgstr "設定 systemd 服務"
-
-#: src/modules/services-systemd/main.py:60
-msgid ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
-msgstr "在 chroot 中呼叫的 systemctl {arg!s} 回傳了錯誤代碼 {num!s}。"
-
-#: src/modules/services-systemd/main.py:63
-#: src/modules/services-systemd/main.py:67
-msgid "Cannot enable systemd service {name!s}."
-msgstr "無法啟用 systemd 服務 {name!s}。"
-
-#: src/modules/services-systemd/main.py:65
-msgid "Cannot enable systemd target {name!s}."
-msgstr "無法啟用 systemd 目標 {name!s}。"
-
-#: src/modules/services-systemd/main.py:69
-msgid "Cannot disable systemd target {name!s}."
-msgstr "無法停用 systemd 目標 {name!s}。"
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr "安裝開機載入程式。"
 
-#: src/modules/services-systemd/main.py:71
-msgid "Cannot mask systemd unit {name!s}."
-msgstr "無法 mask systemd 單位 {name!s}。"
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr "開機載入程式安裝錯誤"
 
-#: src/modules/services-systemd/main.py:73
+#: src/modules/bootloader/main.py:509
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
-msgstr ""
-"未知的 systemd 指令 {command!s} 與 {suffix!s} 給單位 "
-"{name!s}。"
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "解除掛載檔案系統。"
+"The bootloader could not be installed. The installation command "
+"
    {!s}
     returned error code {!s}."
+msgstr "無法安裝開機載入程式。安裝指令 
    {!s}
     回傳了錯誤碼 {!s}。"
 
-#: src/modules/unpackfs/main.py:35
-msgid "Filling up filesystems."
-msgstr "填滿檔案系統。"
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "正在設定硬體時鐘。"
 
-#: src/modules/unpackfs/main.py:255
-msgid "rsync failed with error code {}."
-msgstr "rsync 失敗，錯誤碼 {} 。"
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "正在使用 mkinitfs 建立 initramfs。"
 
-#: src/modules/unpackfs/main.py:300
-msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "正在解壓縮 {}/{}，檔案 {}/{}"
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "在目標上執行 mkinitfs 失敗"
 
-#: src/modules/unpackfs/main.py:315
-msgid "Starting to unpack {}"
-msgstr "開始解壓縮 {}"
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "結束碼為 {}"
 
-#: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
-msgid "Failed to unpack image \"{}\""
-msgstr "無法解開映像檔 \"{}\""
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "正在使用 dracut 建立 initramfs。"
 
-#: src/modules/unpackfs/main.py:431
-msgid "No mount point for root partition"
-msgstr "沒有 root 分割區的掛載點"
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "在目標上執行 dracut 失敗"
 
-#: src/modules/unpackfs/main.py:432
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage 不包含 \"rootMountPoint\" 鍵，不做任何事"
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "正在設定 initramfs。"
 
-#: src/modules/unpackfs/main.py:437
-msgid "Bad mount point for root partition"
-msgstr "root 分割區掛載點錯誤"
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "正在設定 OpenRC dmcrypt 服務。"
 
-#: src/modules/unpackfs/main.py:438
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint 為 \"{}\"，其不存在，不做任何事"
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "正在寫入 fstab。"
 
-#: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
-#: src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "錯誤的 unsquash 設定"
+#: src/modules/fstab/main.py:389
+msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr "無 
    {!s}
     設定可供 
    {!s}
     使用。"
 
-#: src/modules/unpackfs/main.py:455
-msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "\"{}\" ({}) 的檔案系統不獲您目前的內核所支援"
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "假的 python 工作。"
 
-#: src/modules/unpackfs/main.py:459
-msgid "The source filesystem \"{}\" does not exist"
-msgstr "來源檔案系統 \"{}\" 不存在"
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "假的 python step {}"
 
-#: src/modules/unpackfs/main.py:465
-msgid ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
-msgstr "找不到 unsquashfs，請確定已安裝 squashfs-tools 軟體包"
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "正在設定語系。"
 
-#: src/modules/unpackfs/main.py:479
-msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "目標系統中的目的地 \"{}\" 不是目錄"
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr "正在儲存網路設定。"

From e189faabe51e52b6f55d7995f7407238ebd85eb2 Mon Sep 17 00:00:00 2001
From: Johannes Kamprad 
Date: Tue, 14 Sep 2021 16:54:29 +0200
Subject: [PATCH 431/492] Update branding.desc

hint on sizeLimit must be set to have the log option work.
---
 src/branding/default/branding.desc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc
index 938d9eeb2a..b8757411fc 100644
--- a/src/branding/default/branding.desc
+++ b/src/branding/default/branding.desc
@@ -228,6 +228,7 @@ slideshowAPI: 2
 #                Takes string as input. Important bits are the host and port,
 #                the scheme is not used.
 #  - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted.
+#                The option must be set, to have the log option work.
 #                Takes integer as input. If < 0, no limit will be forced,
 #                else only last (approximately) 'n' KiB of log file will be pasted.
 #                Please note that upload size may be slightly over the limit (due

From f49627f41763b8ed4f6bfcf5affa4e618f34aa35 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 15 Sep 2021 13:21:39 +0200
Subject: [PATCH 432/492] [libcalamaresui] Improve sizeLimit handling in log
 upload

The log sizeLimit can be 0 (disable log upload) but that's
not so clear in the code. While here, tidy up and add
some comments to surprising bits.
---
 src/libcalamaresui/utils/Paste.cpp | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp
index 9190fcf5c7..519dc0133c 100644
--- a/src/libcalamaresui/utils/Paste.cpp
+++ b/src/libcalamaresui/utils/Paste.cpp
@@ -33,10 +33,16 @@ using namespace CalamaresUtils::Units;
 STATICTEST QByteArray
 logFileContents( const qint64 sizeLimitBytes )
 {
-    if ( sizeLimitBytes != -1 )
+    if ( sizeLimitBytes > 0 )
     {
         cDebug() << "Log upload size limit was limited to" << sizeLimitBytes << "bytes";
     }
+    if ( sizeLimitBytes == 0 )
+    {
+        cDebug() << "Log upload size is 0, upload disabled.";
+        return QByteArray();
+    }
+
     const QString name = Logger::logFile();
     QFile pasteSourceFile( name );
     if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
@@ -44,7 +50,7 @@ logFileContents( const qint64 sizeLimitBytes )
         cWarning() << "Could not open log file" << name;
         return QByteArray();
     }
-    if ( sizeLimitBytes == -1 )
+    if ( sizeLimitBytes < 0 )
     {
         return pasteSourceFile.readAll();
     }
@@ -52,7 +58,7 @@ logFileContents( const qint64 sizeLimitBytes )
     if ( fi.size() > sizeLimitBytes )
     {
         cDebug() << "Only last" << sizeLimitBytes << "bytes of log file (sized" << fi.size() << "bytes) uploaded";
-        fi.refresh();
+        fi.refresh();  // Because we just wrote to the file with that cDebug() ^^
         pasteSourceFile.seek( fi.size() - sizeLimitBytes );
     }
     return pasteSourceFile.read( sizeLimitBytes );
@@ -115,7 +121,7 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent )
     auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer();
     if ( !serverUrl.isValid() )
     {
-        cWarning() << "Upload configure with invalid URL";
+        cWarning() << "Upload configured with invalid URL";
         return QString();
     }
     if ( type == Calamares::Branding::UploadServerType::None )
@@ -123,6 +129,12 @@ CalamaresUtils::Paste::doLogUpload( QObject* parent )
         // Early return to avoid reading the log file
         return QString();
     }
+    if ( sizeLimitBytes == 0 )
+    {
+        // Suggests that it is un-set in the config file
+        cWarning() << "Upload configured to send 0 bytes";
+        return QString();
+    }
 
     QByteArray pasteData = logFileContents( sizeLimitBytes );
     if ( pasteData.isEmpty() )
@@ -181,5 +193,5 @@ bool
 CalamaresUtils::Paste::isEnabled()
 {
     auto [ type, serverUrl, sizeLimitBytes ] = Calamares::Branding::instance()->uploadServer();
-    return type != Calamares::Branding::UploadServerType::None;
+    return type != Calamares::Branding::UploadServerType::None && sizeLimitBytes != 0;
 }

From d3bd4f49fa5bf5013b1e250459e040909ec90c8b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 15 Sep 2021 13:33:58 +0200
Subject: [PATCH 433/492] Changes: document fixes and contributors

---
 CHANGES | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e0a44f40f0..415424592e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,10 +10,13 @@ website will have to do for older versions.
 # 3.2.43 (unreleased) #
 
 This release contains contributions from (alphabetically by first name):
- - No external contributors yet
+ - Joe Kamprad
 
 ## Core ##
- - No core changes yet
+ - Translations have been made more consistent. In particular, some *OK*,
+   *Yes*, *No* and *Cancel* buttons that were previously untranslated
+   or "stuck" in the language that Calamares started in, are now
+   changed to the current language as selected in the welcome page.
 
 ## Modules ##
  - No module changes yet

From 51f400d8bba2c27b7a582f307c876108099ac9c0 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Thu, 16 Sep 2021 10:57:53 +0200
Subject: [PATCH 434/492] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_pt_PT.ts | 23 ++++++++++++-----------
 lang/calamares_sv.ts    |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index 624f569691..bed076938c 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -2825,17 +2825,17 @@ O instalador será encerrado e todas as alterações serão perdidas.
       
       The filesystem must be at least %1 MiB in size.
-      
+      O sistema de ficheiros deve ter pelo menos %1 MiB de tamanho.
     
     
       
       The filesystem must have flag <strong>%1</strong> set.
-      
+      O sistema de ficheiros deve ter a "flag" %1 definida.
     
     
       
       You can continue without setting up an EFI system partition but your system may fail to start.
-      
+      Pode continuar sem configurar uma partição do sistema EFI, mas o seu sistema pode não arrancar.
     
     
       
@@ -4099,7 +4099,7 @@ Saída de Dados:
     
       
       To activate keyboard preview, select a layout.
-      
+      Para ativar a pré-visualização do teclado, selecione um esquema.
     
     
       
@@ -4146,7 +4146,8 @@ Saída de Dados:
       
       LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
                     Default option.
-      
+      O LibreOffice é um programa de produtividade poderoso e gratuito, utilizado por milhões de pessoas em todo o mundo. Inclui várias aplicações que o tornam o mais versátil programa de produtividade Livre e de Código Aberto do mercado.<br/>
+                    Opção predefinida.
     
     
       
@@ -4156,27 +4157,27 @@ Saída de Dados:
     
       
       If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
-      
+      Se não quiser instalar um programa de produtividade, basta selecionar Sem programa de produtividade. Pode sempre adicionar uma (ou mais) mais tarde no sistema instalado, à medida que houver a necessidade.
     
     
       
       No Office Suite
-      
+      Sem programa de produtividade
     
     
       
       Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
-      
+      Crie uma instalação mínima do Ambiente de trabalho, remova todas as aplicações extra e decida mais tarde o que gostaria de adicionar ao sistema. Exemplos do que não estará em tal instalação, não haverá nenhum programa de produtividade, nenhum reprodutor multimédia, nenhum visualizador de imagens ou suporte de impressão. Será apenas um ambiente de trabalho, navegador de ficheiros, gestor de pacotes, editor de texto e um simples navegador da web.
     
     
       
       Minimal Install
-      
+      Instalação Mínima
     
     
       
       Please select an option for your install, or use the default: LibreOffice included.
-      
+      Selecione uma opção para a sua instalação, ou utilize o predefinido: LibreOffice incluído.
     
   
   
@@ -4332,7 +4333,7 @@ Saída de Dados:
     
       
       Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
-      
+      Apenas são permitidas letras, números, sublinhado e hífen, mínimo de dois caracteres.
     
     
       
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 605ad0538a..43f7cca888 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -4099,7 +4099,7 @@ Systems nationella inställningar påverkar nummer och datumformat. Den nuvarand
     
       
       To activate keyboard preview, select a layout.
-      
+      Välj en layout för att aktivera förhandsgranskning av tangentbord.
     
     
       

From 252ec6bcf27ae3830364869181c7c2118021d30a Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Thu, 16 Sep 2021 10:57:53 +0200
Subject: [PATCH 435/492] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/pt_PT/LC_MESSAGES/python.po | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index 145dbfd45d..d0124ad068 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -341,6 +341,8 @@ msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
+"O gestor de pacotes não pôde fazer alterações ao sistema instalado. O "
+"comando 
    {!s}
    devolveu o código de erro {!s}."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."

From 65b9bb0d6b0eaef9fdcefc4f06f67d7efd1d390b Mon Sep 17 00:00:00 2001
From: demmm 
Date: Thu, 16 Sep 2021 15:01:37 +0200
Subject: [PATCH 436/492] [keyboardq] set proper SPDX headers rename wrongly
 named shift.license

---
 src/modules/keyboardq/data/Key.qml                           | 5 +++--
 src/modules/keyboardq/data/Keyboard.qml                      | 5 +++--
 src/modules/keyboardq/data/afgani.xml                        | 5 +++--
 src/modules/keyboardq/data/ar.xml                            | 5 +++--
 src/modules/keyboardq/data/de.xml                            | 5 +++--
 src/modules/keyboardq/data/empty.xml                         | 5 +++--
 src/modules/keyboardq/data/en.xml                            | 5 +++--
 src/modules/keyboardq/data/es.xml                            | 5 +++--
 src/modules/keyboardq/data/fr.xml                            | 5 +++--
 src/modules/keyboardq/data/generic.xml                       | 5 +++--
 src/modules/keyboardq/data/generic_qz.xml                    | 5 +++--
 src/modules/keyboardq/data/pt.xml                            | 5 +++--
 src/modules/keyboardq/data/ru.xml                            | 5 +++--
 src/modules/keyboardq/data/scan.xml                          | 5 +++--
 .../keyboardq/data/{shift.license => shift.svg.license}      | 0
 15 files changed, 42 insertions(+), 28 deletions(-)
 rename src/modules/keyboardq/data/{shift.license => shift.svg.license} (100%)

diff --git a/src/modules/keyboardq/data/Key.qml b/src/modules/keyboardq/data/Key.qml
index e85b44f08f..e5c766e414 100644
--- a/src/modules/keyboardq/data/Key.qml
+++ b/src/modules/keyboardq/data/Key.qml
@@ -1,6 +1,7 @@
-/* === This file is part of Calamares -  ===
+/* === This file is part of Calamares -  ===
  *
- *   Copyright 2021, Anke Boersma 
+ *   SPDX-FileCopyrightText: 2021 Anke Boersma 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is Free Software: see the License-Identifier above.
  *
diff --git a/src/modules/keyboardq/data/Keyboard.qml b/src/modules/keyboardq/data/Keyboard.qml
index a804ca9f4f..5d1356a826 100644
--- a/src/modules/keyboardq/data/Keyboard.qml
+++ b/src/modules/keyboardq/data/Keyboard.qml
@@ -1,6 +1,7 @@
-/* === This file is part of Calamares -  ===
+/* === This file is part of Calamares -  ===
  *
- *   Copyright 2021, Anke Boersma 
+ *   SPDX-FileCopyrightText: 2021 Anke Boersma 
+ *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is Free Software: see the License-Identifier above.
  *
diff --git a/src/modules/keyboardq/data/afgani.xml b/src/modules/keyboardq/data/afgani.xml
index 356e393f77..f882f1fc7a 100644
--- a/src/modules/keyboardq/data/afgani.xml
+++ b/src/modules/keyboardq/data/afgani.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/ar.xml b/src/modules/keyboardq/data/ar.xml
index 07bd9b0879..ba098e2f17 100644
--- a/src/modules/keyboardq/data/ar.xml
+++ b/src/modules/keyboardq/data/ar.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/de.xml b/src/modules/keyboardq/data/de.xml
index 55513157ed..b1d3f05b1c 100644
--- a/src/modules/keyboardq/data/de.xml
+++ b/src/modules/keyboardq/data/de.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/empty.xml b/src/modules/keyboardq/data/empty.xml
index 74e913a071..8eb7033408 100644
--- a/src/modules/keyboardq/data/empty.xml
+++ b/src/modules/keyboardq/data/empty.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/en.xml b/src/modules/keyboardq/data/en.xml
index 2ab9a344de..4087567988 100644
--- a/src/modules/keyboardq/data/en.xml
+++ b/src/modules/keyboardq/data/en.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/es.xml b/src/modules/keyboardq/data/es.xml
index 6f69c9cbeb..8e758c82ff 100644
--- a/src/modules/keyboardq/data/es.xml
+++ b/src/modules/keyboardq/data/es.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/fr.xml b/src/modules/keyboardq/data/fr.xml
index 0f77c3f06a..529f3ba7b2 100644
--- a/src/modules/keyboardq/data/fr.xml
+++ b/src/modules/keyboardq/data/fr.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/generic.xml b/src/modules/keyboardq/data/generic.xml
index 7304626c4c..bc487f5146 100644
--- a/src/modules/keyboardq/data/generic.xml
+++ b/src/modules/keyboardq/data/generic.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/generic_qz.xml b/src/modules/keyboardq/data/generic_qz.xml
index c896f59fff..2116325282 100644
--- a/src/modules/keyboardq/data/generic_qz.xml
+++ b/src/modules/keyboardq/data/generic_qz.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/pt.xml b/src/modules/keyboardq/data/pt.xml
index 0142260ee9..74a83ab5f1 100644
--- a/src/modules/keyboardq/data/pt.xml
+++ b/src/modules/keyboardq/data/pt.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/ru.xml b/src/modules/keyboardq/data/ru.xml
index 38f2b6836b..3270f91140 100644
--- a/src/modules/keyboardq/data/ru.xml
+++ b/src/modules/keyboardq/data/ru.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/scan.xml b/src/modules/keyboardq/data/scan.xml
index 76981f3c13..7a3192e25e 100644
--- a/src/modules/keyboardq/data/scan.xml
+++ b/src/modules/keyboardq/data/scan.xml
@@ -1,6 +1,7 @@
-
 
diff --git a/src/modules/keyboardq/data/shift.license b/src/modules/keyboardq/data/shift.svg.license
similarity index 100%
rename from src/modules/keyboardq/data/shift.license
rename to src/modules/keyboardq/data/shift.svg.license

From 4e63390e17f8e4a342c89a7bc34e554510432495 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 17 Sep 2021 11:52:16 +0200
Subject: [PATCH 437/492] Changes: pre-release housekeeping

---
 CHANGES        | 7 +++++--
 CMakeLists.txt | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 415424592e..9f375e611b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.43 (unreleased) #
+# 3.2.43 (2021-09-17) #
 
 This release contains contributions from (alphabetically by first name):
  - Joe Kamprad
@@ -17,9 +17,12 @@ This release contains contributions from (alphabetically by first name):
    *Yes*, *No* and *Cancel* buttons that were previously untranslated
    or "stuck" in the language that Calamares started in, are now
    changed to the current language as selected in the welcome page.
+ - Documentation improvements from Joe Kamprad. A *sizeLimit* of zero
+   (which is the default if nothing is set in the branding configuration)
+   disables log uploads.
 
 ## Modules ##
- - No module changes yet
+ - No module changes
 
 
 # 3.2.42 (2021-09-06) #
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4ac779469..421c3f48a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ project( CALAMARES
     LANGUAGES C CXX
 )
 
-set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From 8f1ec4e34ab979875606a8a4877421b4fadcefeb Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 17 Sep 2021 11:53:44 +0200
Subject: [PATCH 438/492] Changes: mention keyboardq improvements

---
 CHANGES | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 9f375e611b..026e32ebae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ website will have to do for older versions.
 # 3.2.43 (2021-09-17) #
 
 This release contains contributions from (alphabetically by first name):
+ - Anke Boersma
  - Joe Kamprad
 
 ## Core ##
@@ -22,7 +23,8 @@ This release contains contributions from (alphabetically by first name):
    disables log uploads.
 
 ## Modules ##
- - No module changes
+ - The *keyboardq* module (QML-based UI for keyboard-layout-selection)
+   now displays a better keyboard preview. (Thanks Anke)
 
 
 # 3.2.42 (2021-09-06) #

From 5a83b036b8dc24a7c00f6a6c69a3bc17d4c6c331 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Fri, 17 Sep 2021 12:40:55 +0200
Subject: [PATCH 439/492] CHANGES: update the keyboardq improvements

---
 CHANGES | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 026e32ebae..535a8e57b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,7 +24,8 @@ This release contains contributions from (alphabetically by first name):
 
 ## Modules ##
  - The *keyboardq* module (QML-based UI for keyboard-layout-selection)
-   now displays a better keyboard preview. (Thanks Anke)
+   now features an interactive keyboard preview and has the
+   layout adjusted. (Thanks Anke)
 
 
 # 3.2.42 (2021-09-06) #

From 8ebd69f4cf89ac5727b18fe1ff8fb9d279f35fd5 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Fri, 17 Sep 2021 12:58:10 +0200
Subject: [PATCH 440/492] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_hi.ts | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index 4e7a9b330b..a7ce01d653 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -949,12 +949,12 @@ The installer will quit and all changes will be lost.
     
       
       Install option: <strong>%1</strong>
-      
+      इंस्टॉल विकल्प : <strong>%1</strong>
     
     
       
       None
-      
+      कोई नहीं
     
     
       
@@ -2805,37 +2805,37 @@ The installer will quit and all changes will be lost.
     
       
       EFI system partition configured incorrectly
-      
+      EFI सिस्टम विभाजन उचित रूप से विन्यस्त नहीं है
     
     
       
       An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem.
-      
+      %1 आरंभ करने हेतु EFI सिस्टम विभाजन आवश्यक है। <br/><br/> EFI सिस्टम विभाजन विन्यस्त करने हेतु, वापस जाएँ व एक उपयुक्त फाइल सिस्टम चुनें या बनाएँ।
     
     
       
       The filesystem must be mounted on <strong>%1</strong>.
-      
+      फाइल सिस्टम का <strong>%1</strong> पर माउंट होना आवश्यक है।
     
     
       
       The filesystem must have type FAT32.
-      
+      फाइल सिस्टम का प्रकार FAT32 होना आवश्यक है।
     
     
       
       The filesystem must be at least %1 MiB in size.
-      
+      फाइल सिस्टम का आकार कम-से-कम %1 एमबी होना आवश्यक है।
     
     
       
       The filesystem must have flag <strong>%1</strong> set.
-      
+      फाइल सिस्टम पर <strong>%1</strong> फ्लैग सेट होना आवश्यक है।
     
     
       
       You can continue without setting up an EFI system partition but your system may fail to start.
-      
+      आप बिना EFI सिस्टम विभाजन सेट करें भी प्रक्रिया जारी रख सकते हैं परन्तु सम्भवतः ऐसा करने से आपका सिस्टम आरंभ नहीं होगा।
     
     
       
@@ -4099,7 +4099,7 @@ Output:
     
       
       To activate keyboard preview, select a layout.
-      
+      कुंजीपटल पूर्वावलोकन सक्रिय करने हेतु एक अभिन्यास चुनें।
     
     
       
@@ -4114,7 +4114,7 @@ Output:
     
       
       Type here to test your keyboard
-      अपना कुंजीपटल जाँचने के लिए यहां टाइप करें
+      अपना कुंजीपटल जाँचने के लिए यहाँ टाइप करें
     
     
       
@@ -4146,37 +4146,38 @@ Output:
       
       LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/>
                     Default option.
-      
+      लिब्रे-ऑफिस एक सशक्त और निःशुल्क ऑफिस सॉफ्टवेयर है जिसका उपयोग दुनिया भर के लाखों लोग करते हैं। इसमें कई अनुप्रयोग सम्मिलित हैं जो इसे उपलब्ध विकल्पों में सबसे बहुमुखी निःशुल्क व मुक्त स्रोत ऑफिस सॉफ्टवेयर बनाते हैं।<br/>
+डिफ़ॉल्ट विकल्प।
     
     
       
       LibreOffice
-      
+      लिब्रे-ऑफिस
     
     
       
       If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
-      
+      यदि आप ऑफिस सॉफ्टवेयर इंस्टॉल नहीं करना चाहते हैं, तो कोई ऑफिस सॉफ्टवेयर नहीं का विकल्प चुनें। आप आवश्यकता अनुसार बाद में अपने इंस्टॉल किए गए सिस्टम पर एक (या अधिक) ऐसे सॉफ्टवेयर जोड़ सकते हैं।
     
     
       
       No Office Suite
-      
+      कोई ऑफिस सॉफ्टवेयर नहीं
     
     
       
       Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support.  It will be just a desktop, file browser, package manager, text editor and simple web-browser.
-      
+      एक संक्षिप्त डेस्कटॉप इंस्टॉल का सृजन करें, सभी अतिरिक्त अनुप्रयोग हटाएँ एवं इंस्टॉल उपरांत तय करें कि आप सिस्टम में कौन से सॉफ्टवेयर जोड़ना चाहते हैं। इस प्रकार के इंस्टॉल में उदाहरण के तौर पर कोई ऑफिस सॉफ्टवेयर, कोई मीडिया प्लेयर, कोई चित्र प्रदर्शक या प्रिंटर समर्थन नहीं होगा। इसमें केवल एक डेस्कटॉप, फाइल प्रबंधक, पैकेज प्रबंधक, लेख संपादक व सरल वेब-ब्राउज़र होगा।
     
     
       
       Minimal Install
-      
+      संक्षिप्त इंस्टॉल
     
     
       
       Please select an option for your install, or use the default: LibreOffice included.
-      
+      कृपया अपने इंस्टॉल हेतु एक विकल्प चुनें या फिर डिफ़ॉल्ट ही उपयोग करें : इसमें लिब्रे-ऑफिस सम्मिलित है।
     
       
   

From 593c1ca0e2f0d7ac51f5f23df55ba7c0d0412287 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 17 Sep 2021 13:12:49 +0200
Subject: [PATCH 441/492] i18n: update languages list

---
 CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 421c3f48a1..1c2e6fdf96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,14 +133,14 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 #       `txstats.py -e`. See also
 #
 # Total 79 languages
-set( _tx_complete az az_AZ ca de fi_FI he hi hr ja ko lt pt_BR sq
-    sv uk zh_TW )
-set( _tx_good as be ca@valencia cs_CZ da fr fur it_IT ml nl pt_PT
-    ru sk tg tr_TR vi zh_CN )
-set( _tx_ok ar ast bg bn el en_GB es es_MX es_PR et eu fa gl hu id
-    is mr nb pl ro si sl sr sr@latin th )
-set( _tx_incomplete eo es_PE fr_CH gu id_ID ie kk kn ko_KR lo lv mk
-    ne ne_NP ru_RU te ur uz )
+set( _tx_complete az az_AZ ca fi_FI he hi ja ko lt pt_PT sq sv uk
+    zh_CN zh_TW )
+set( _tx_good as be ca@valencia cs_CZ da de fr fur hr it_IT ml nl
+    pt_BR ru sk tg tr_TR vi )
+set( _tx_ok ar ast bg bn el en_GB es es_MX et eu fa gl hu id is mr
+    nb pl ro si sl sr sr@latin th )
+set( _tx_incomplete eo es_PE es_PR fr_CH gu id_ID ie kk kn ko_KR lo
+    lv mk ne ne_NP ru_RU te ur uz zh zh_HK )
 
 ### Required versions
 #

From 9c1e6358044a6d24c87c514989bdb4f971e893d1 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Fri, 17 Sep 2021 15:01:27 +0200
Subject: [PATCH 442/492] [keyboardq] fix xml files, xml id has to be first

---
 src/modules/keyboardq/data/afgani.xml     | 3 +--
 src/modules/keyboardq/data/ar.xml         | 3 +--
 src/modules/keyboardq/data/de.xml         | 3 +--
 src/modules/keyboardq/data/empty.xml      | 3 +--
 src/modules/keyboardq/data/en.xml         | 3 +--
 src/modules/keyboardq/data/es.xml         | 3 +--
 src/modules/keyboardq/data/fr.xml         | 3 +--
 src/modules/keyboardq/data/generic.xml    | 3 +--
 src/modules/keyboardq/data/generic_qz.xml | 3 +--
 src/modules/keyboardq/data/pt.xml         | 3 +--
 src/modules/keyboardq/data/ru.xml         | 3 +--
 src/modules/keyboardq/data/scan.xml       | 3 +--
 12 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/modules/keyboardq/data/afgani.xml b/src/modules/keyboardq/data/afgani.xml
index f882f1fc7a..8b445b2eb6 100644
--- a/src/modules/keyboardq/data/afgani.xml
+++ b/src/modules/keyboardq/data/afgani.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/ar.xml b/src/modules/keyboardq/data/ar.xml
index ba098e2f17..a0e5ad0c62 100644
--- a/src/modules/keyboardq/data/ar.xml
+++ b/src/modules/keyboardq/data/ar.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/de.xml b/src/modules/keyboardq/data/de.xml
index b1d3f05b1c..883d4dddfd 100644
--- a/src/modules/keyboardq/data/de.xml
+++ b/src/modules/keyboardq/data/de.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/empty.xml b/src/modules/keyboardq/data/empty.xml
index 8eb7033408..a8afccb115 100644
--- a/src/modules/keyboardq/data/empty.xml
+++ b/src/modules/keyboardq/data/empty.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/en.xml b/src/modules/keyboardq/data/en.xml
index 4087567988..3602f1d94d 100644
--- a/src/modules/keyboardq/data/en.xml
+++ b/src/modules/keyboardq/data/en.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/es.xml b/src/modules/keyboardq/data/es.xml
index 8e758c82ff..3cac9be1ce 100644
--- a/src/modules/keyboardq/data/es.xml
+++ b/src/modules/keyboardq/data/es.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/fr.xml b/src/modules/keyboardq/data/fr.xml
index 529f3ba7b2..5328c49a7f 100644
--- a/src/modules/keyboardq/data/fr.xml
+++ b/src/modules/keyboardq/data/fr.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/generic.xml b/src/modules/keyboardq/data/generic.xml
index bc487f5146..1be4ec4c89 100644
--- a/src/modules/keyboardq/data/generic.xml
+++ b/src/modules/keyboardq/data/generic.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/generic_qz.xml b/src/modules/keyboardq/data/generic_qz.xml
index 2116325282..b8e36cd797 100644
--- a/src/modules/keyboardq/data/generic_qz.xml
+++ b/src/modules/keyboardq/data/generic_qz.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/pt.xml b/src/modules/keyboardq/data/pt.xml
index 74a83ab5f1..fa883f04d3 100644
--- a/src/modules/keyboardq/data/pt.xml
+++ b/src/modules/keyboardq/data/pt.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/ru.xml b/src/modules/keyboardq/data/ru.xml
index 3270f91140..729ff6971a 100644
--- a/src/modules/keyboardq/data/ru.xml
+++ b/src/modules/keyboardq/data/ru.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         
diff --git a/src/modules/keyboardq/data/scan.xml b/src/modules/keyboardq/data/scan.xml
index 7a3192e25e..efdb01de04 100644
--- a/src/modules/keyboardq/data/scan.xml
+++ b/src/modules/keyboardq/data/scan.xml
@@ -1,11 +1,10 @@
+
 
-
-
 
     
         

From a393ffe12683d92c2cfec1110b1eff5c8c9e321f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 11:58:22 +0200
Subject: [PATCH 443/492] [luksbootkeyfile] Don't dd in the target to get
 entropy

---
 .../luksbootkeyfile/LuksBootKeyFileJob.cpp    | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index 075dadafe2..3cd98d3ae9 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -8,7 +8,9 @@
 #include "LuksBootKeyFileJob.h"
 
 #include "utils/CalamaresUtilsSystem.h"
+#include "utils/Entropy.h"
 #include "utils/Logger.h"
+#include "utils/NamedEnum.h"
 #include "utils/UMask.h"
 #include "utils/Variant.h"
 
@@ -102,15 +104,27 @@ static bool
 generateTargetKeyfile()
 {
     CalamaresUtils::UMask m( CalamaresUtils::UMask::Safe );
-    auto r = CalamaresUtils::System::instance()->targetEnvCommand(
-        { "dd", "bs=512", "count=4", "if=/dev/urandom", QString( "of=%1" ).arg( keyfile ) } );
-    if ( r.getExitCode() != 0 )
+
+    // Get the data
+    QByteArray entropy;
+    auto entropySource = CalamaresUtils::getEntropy( 2048, entropy );
+    if ( entropySource != CalamaresUtils::EntropySource::URandom )
+    {
+        cWarning() << "Could not get entropy from /dev/urandom for LUKS.";
+        return false;
+    }
+
+    auto fileResult = CalamaresUtils::System::instance()->createTargetFile(
+        keyfile, entropy, CalamaresUtils::System::WriteMode::Overwrite );
+    entropy.fill( 'A' );
+    if ( !fileResult )
     {
-        cWarning() << "Could not create LUKS keyfile:" << r.getOutput() << "(exit code" << r.getExitCode() << ')';
+        cWarning() << "Could not create LUKS keyfile:" << smash( fileResult.code() );
         return false;
     }
+
     // Give ample time to check that the file was created correctly
-    r = CalamaresUtils::System::instance()->targetEnvCommand( { "ls", "-la", "/" } );
+    auto r = CalamaresUtils::System::instance()->targetEnvCommand( { "ls", "-la", "/" } );
     cDebug() << "In target system after creating LUKS file" << r.getOutput();
     return true;
 }

From ada13c19fd9437978d4d469dd8a0551b0d1f638d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 12:02:26 +0200
Subject: [PATCH 444/492] [libcalamares] Simplify filling the entropy buffer

---
 src/libcalamares/utils/Entropy.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libcalamares/utils/Entropy.cpp b/src/libcalamares/utils/Entropy.cpp
index d28230a85b..67a0718f5e 100644
--- a/src/libcalamares/utils/Entropy.cpp
+++ b/src/libcalamares/utils/Entropy.cpp
@@ -18,15 +18,17 @@
 CalamaresUtils::EntropySource
 CalamaresUtils::getEntropy( int size, QByteArray& b )
 {
+    constexpr const char filler = char( 0xcb );
+
+    b.fill( filler );
     b.clear();
     if ( size < 1 )
     {
         return EntropySource::None;
     }
 
-    b.resize( size );
+    b.fill( filler, size );
     char* buffer = b.data();
-    std::fill( buffer, buffer + size, 0xcb );
 
     qint64 readSize = 0;
     QFile urandom( "/dev/urandom" );

From 1d812f88cea8c645e36e52a6479cf13a8a302e7e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 12:10:21 +0200
Subject: [PATCH 445/492] [luksbootkeyfile] Bump timeout for adding LUKS
 keyfile

---
 src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index 3cd98d3ae9..43da3971a2 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -123,8 +123,10 @@ generateTargetKeyfile()
         return false;
     }
 
-    // Give ample time to check that the file was created correctly
-    auto r = CalamaresUtils::System::instance()->targetEnvCommand( { "ls", "-la", "/" } );
+    // Give ample time to check that the file was created correctly;
+    // we actually expect ls to return pretty-much-instantly.
+    auto r = CalamaresUtils::System::instance()->targetEnvCommand(
+        { "ls", "-la", "/" }, QString(), QString(), std::chrono::seconds( 5 ) );
     cDebug() << "In target system after creating LUKS file" << r.getOutput();
     return true;
 }
@@ -132,8 +134,10 @@ generateTargetKeyfile()
 static bool
 setupLuks( const LuksDevice& d )
 {
+    // Adding the key can take some times, measured around 15 seconds with
+    // a HDD (spinning rust) and a slow-ish computer. Give it a minute.
     auto r = CalamaresUtils::System::instance()->targetEnvCommand(
-        { "cryptsetup", "luksAddKey", d.device, keyfile }, QString(), d.passphrase, std::chrono::seconds( 15 ) );
+        { "cryptsetup", "luksAddKey", d.device, keyfile }, QString(), d.passphrase, std::chrono::seconds( 60 ) );
     if ( r.getExitCode() != 0 )
     {
         cWarning() << "Could not configure LUKS keyfile on" << d.device << ':' << r.getOutput() << "(exit code"

From 9f803905cb85c7f4b0d38664d4a7ca7ff30b0074 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 12:13:25 +0200
Subject: [PATCH 446/492] Changes: post-release housekeeping

---
 CHANGES        | 12 ++++++++++++
 CMakeLists.txt |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 535a8e57b6..1bbf793c29 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.44 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - No external contributors yet
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - No module changes yet
+
+
 # 3.2.43 (2021-09-17) #
 
 This release contains contributions from (alphabetically by first name):
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c2e6fdf96..807cdfabf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,11 +41,11 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.43
+    VERSION 3.2.44
     LANGUAGES C CXX
 )
 
-set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From 45daebd989cb64d299c2be2feaa36927455392d3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 12:42:58 +0200
Subject: [PATCH 447/492] [initcpiocfg] Refactor CPU-characteristics
 determination

The code is still over-wrought, but the API for cpuinfo
now exposes the interesting thing (is it Intel?) in
a useful -- more readable -- way.
---
 src/modules/initcpiocfg/main.py | 77 +++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 28 deletions(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index 4fb0923cd3..d5cb101a14 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -28,35 +28,57 @@ def pretty_name():
     return _("Configuring mkinitcpio.")
 
 
-def cpuinfo():
+class cpuinfo(object):
     """
-    Return the information in /proc/cpuinfo as a dictionary in the following
-    format:
-
-    cpu_info['proc0']={...}
-    cpu_info['proc1']={...}
+    Object describing the current CPU's characteristics. It may be
+    be considered a named tuple, there's no behavior here.
+
+    Fields in the object:
+        - is_intel (if it's definitely an Intel CPU)
+        - is_amd (if it's definitely an AMD CPU)
+        - number_of_cores
+    It is possible for both is_* fields to be False.
     """
-    cpu_info = OrderedDict()
-    procinfo = OrderedDict()
-
-    nprocs = 0
-
-    with open('/proc/cpuinfo') as cpuinfo_file:
-        for line in cpuinfo_file:
-            if not line.strip():
-                # end of one processor
-                cpu_info["proc{!s}".format(nprocs)] = procinfo
-                nprocs += 1
-                # Reset
-                procinfo = OrderedDict()
-            else:
-                if len(line.split(':')) == 2:
-                    splitted_line = line.split(':')[1].strip()
-                    procinfo[line.split(':')[0].strip()] = splitted_line
+    def __init__(self):
+        self.is_intel = False
+        self.is_amd = False
+        self.number_of_cores = 0
+
+        cpu = self._cpuinfo()
+        self.is_intel = cpu['proc0']['vendor_id'].lower() == "genuineintel"
+        self.is_amd = cpu['proc0']['vendor_id'].lower() == "authenticamd"
+        self.number_of_cores = len(cpu)
+
+    @staticmethod
+    def _cpuinfo():
+        """
+        Return the information in /proc/cpuinfo as a dictionary in the following
+        format:
+
+        cpu_info['proc0']={...}
+        cpu_info['proc1']={...}
+        """
+        cpu_info = OrderedDict()
+        procinfo = OrderedDict()
+
+        nprocs = 0
+
+        with open('/proc/cpuinfo') as cpuinfo_file:
+            for line in cpuinfo_file:
+                if not line.strip():
+                    # end of one processor
+                    cpu_info["proc{!s}".format(nprocs)] = procinfo
+                    nprocs += 1
+                    # Reset
+                    procinfo = OrderedDict()
                 else:
-                    procinfo[line.split(':')[0].strip()] = ''
+                    if len(line.split(':')) == 2:
+                        splitted_line = line.split(':')[1].strip()
+                        procinfo[line.split(':')[0].strip()] = splitted_line
+                    else:
+                        procinfo[line.split(':')[0].strip()] = ''
 
-    return cpu_info
+        return cpu_info
 
 
 def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
@@ -172,10 +194,9 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     else:
         hooks.extend(["filesystems"])
 
-    if btrfs == "yes" and cpu['proc0']['vendor_id'].lower() != "genuineintel":
+    if btrfs == "yes" and  not cpu.is_intel:
         modules.append("crc32c")
-    elif (btrfs == "yes"
-          and cpu['proc0']['vendor_id'].lower() == "genuineintel"):
+    elif (btrfs == "yes" and cpu.is_intel):
         modules.append("crc32c-intel")
     else:
         hooks.append("fsck")

From 7f7dc04e8dda8add2454a9b88ad175d56e871aa7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 12:52:16 +0200
Subject: [PATCH 448/492] [initcpiocfg] Use bools for boolean values

Having "" and "yes" as values is a bit shell-script-ish.
Use a regular boolean value instead; simplify code
while we're at it.
---
 src/modules/initcpiocfg/main.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index d5cb101a14..bdc3f9cdea 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -132,9 +132,8 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     :param partitions:
     :param root_mount_point:
     """
-    cpu = cpuinfo()
     swap_uuid = ""
-    btrfs = ""
+    uses_btrfs = False
     lvm2 = ""
     hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard",
              "keymap"]
@@ -159,7 +158,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
                 openswap_hook = True
 
         if partition["fs"] == "btrfs":
-            btrfs = "yes"
+            uses_btrfs = True
 
         if "lvm2" in partition["fs"]:
             lvm2 = "yes"
@@ -194,10 +193,8 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     else:
         hooks.extend(["filesystems"])
 
-    if btrfs == "yes" and  not cpu.is_intel:
-        modules.append("crc32c")
-    elif (btrfs == "yes" and cpu.is_intel):
-        modules.append("crc32c-intel")
+    if uses_btrfs:
+        modules.append("crc32c-intel" if cpuinfo().is_intel else "crc32c")
     else:
         hooks.append("fsck")
 

From 7c3c7c4ff79a66bdb6e3253d0ea4d86a988405b2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 12:54:18 +0200
Subject: [PATCH 449/492] [initcpiocfg] Use booleans for boolean values

(as previous) Use False/True rather than ""/"yes" for
keeping track of does-the-system-use-lvm2.
---
 src/modules/initcpiocfg/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index bdc3f9cdea..fe0712a9a3 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -134,7 +134,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     """
     swap_uuid = ""
     uses_btrfs = False
-    lvm2 = ""
+    uses_lvm2 = False
     hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard",
              "keymap"]
     modules = []
@@ -161,7 +161,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
             uses_btrfs = True
 
         if "lvm2" in partition["fs"]:
-            lvm2 = "yes"
+            uses_lvm2 = True
 
         if partition["mountPoint"] == "/" and "luksMapperName" in partition:
             encrypt_hook = True
@@ -183,7 +183,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
                ):
             files.append("/crypto_keyfile.bin")
 
-    if lvm2:
+    if uses_lvm2:
         hooks.append("lvm2")
 
     if swap_uuid != "":

From 118e18ac6060c5df285f808023b64d5ade4fa9bf Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 13:03:13 +0200
Subject: [PATCH 450/492] [initcpiocfg] Code-shuffle

- put the system-information and -detection functions at top
  and the "do the actual work" things below
- don't mix the boolean do-we-use-this flags with the
  lists of files and modules which are the important
  parts of modify_mkinitcpio_conf
---
 src/modules/initcpiocfg/main.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index fe0712a9a3..b91a460865 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -28,6 +28,16 @@ def pretty_name():
     return _("Configuring mkinitcpio.")
 
 
+def detect_plymouth():
+    """
+    Checks existence (runnability) of plymouth in the target system.
+
+    @return True if plymouth exists in the target, False otherwise
+    """
+    # Used to only check existence of path /usr/bin/plymouth in target
+    return target_env_call(["sh", "-c", "which plymouth"]) == 0
+
+
 class cpuinfo(object):
     """
     Object describing the current CPU's characteristics. It may be
@@ -115,16 +125,6 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
         mkinitcpio_file.write("\n".join(mklins) + "\n")
 
 
-def detect_plymouth():
-    """
-    Checks existence (runnability) of plymouth in the target system.
-
-    @return True if plymouth exists in the target, False otherwise
-    """
-    # Used to only check existence of path /usr/bin/plymouth in target
-    return target_env_call(["sh", "-c", "which plymouth"]) == 0
-
-
 def modify_mkinitcpio_conf(partitions, root_mount_point):
     """
     Modifies mkinitcpio.conf
@@ -132,13 +132,13 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     :param partitions:
     :param root_mount_point:
     """
+    hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap"]
+    modules = []
+    files = []
+
     swap_uuid = ""
     uses_btrfs = False
     uses_lvm2 = False
-    hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard",
-             "keymap"]
-    modules = []
-    files = []
     encrypt_hook = False
     openswap_hook = False
     unencrypted_separate_boot = False

From 60e495bd8c7645f2368ffa9215e0118a750ce635 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 13:13:21 +0200
Subject: [PATCH 451/492] [initcpiocfg] Refactor, improve testability

- don't chain directly from modify_mkinitcpio_conf() to the
  function that writes the file write_mkinitcpio_lines();
  split into "figure out what needs to be written" and calling
  that writing-function, so that we can test / check / log
  if needed between the two.
---
 src/modules/initcpiocfg/main.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index b91a460865..d89c0f94f6 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -125,12 +125,16 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
         mkinitcpio_file.write("\n".join(mklins) + "\n")
 
 
-def modify_mkinitcpio_conf(partitions, root_mount_point):
+def find_initcpio_features(partitions, root_mount_point):
     """
-    Modifies mkinitcpio.conf
+    Returns a tuple (hooks, modules, files) needed to support
+    the given @p partitions (filesystems types, encryption, etc)
+    in the target.
 
-    :param partitions:
-    :param root_mount_point:
+    :param partitions: (from GS)
+    :param root_mount_point: (from GS)
+
+    :return 3-tuple of lists
     """
     hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap"]
     modules = []
@@ -198,7 +202,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     else:
         hooks.append("fsck")
 
-    write_mkinitcpio_lines(hooks, modules, files, root_mount_point)
+    return (hooks, modules, files)
 
 
 def run():
@@ -219,6 +223,7 @@ def run():
         return (_("Configuration Error"),
                 _("No root mount point is given for 
    {!s}
     to use." ).format("initcpiocfg"))
 
-    modify_mkinitcpio_conf(partitions, root_mount_point)
+    hooks, modules, files = find_initcpio_features(partitions, root_mount_point)
+    write_mkinitcpio_lines(hooks, modules, files, root_mount_point)
 
     return None

From 12cd9dd5b22a9274a2486df656b81232b973ae3c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 13:18:01 +0200
Subject: [PATCH 452/492] [initcpiocfg] Refactor

- Read the host /etc/mkinitcpio.cfg in one function rather
  than hiding it inside the writer
---
 src/modules/initcpiocfg/main.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index d89c0f94f6..f209a73762 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -91,14 +91,11 @@ def _cpuinfo():
         return cpu_info
 
 
-def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
+def get_host_initcpio():
     """
-    Set up mkinitcpio.conf.
-
-    :param hooks:
-    :param modules:
-    :param files:
-    :param root_mount_point:
+    Reads the host system mkinitcpio.conf and returns all
+    the lines from that file, or an empty list if it does
+    not exist.
     """
     hostfile = "/etc/mkinitcpio.conf"
     try:
@@ -108,6 +105,20 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
         libcalamares.utils.debug("Could not open host file '%s'" % hostfile)
         mklins = []
 
+    return mklins
+
+
+def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
+    """
+    Set up mkinitcpio.conf.
+
+    :param hooks:
+    :param modules:
+    :param files:
+    :param root_mount_point:
+    """
+    mklins = get_host_initcpio()
+
     for i in range(len(mklins)):
         if mklins[i].startswith("HOOKS"):
             joined_hooks = ' '.join(hooks)

From a4c714238fe1666814309efee861ed1564acb1a3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 13:39:29 +0200
Subject: [PATCH 453/492] [initcpio] Refactor file-writing

- iterate over the lines of the source file, rather
  than over indexes, and make clear that the hooks, modules and files
  lines are replaced, rather than merged.
- this calls write() more often, but it's only a few lines
---
 src/modules/initcpiocfg/main.py | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index f209a73762..903ef635f8 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -119,21 +119,18 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
     """
     mklins = get_host_initcpio()
 
-    for i in range(len(mklins)):
-        if mklins[i].startswith("HOOKS"):
-            joined_hooks = ' '.join(hooks)
-            mklins[i] = "HOOKS=\"{!s}\"".format(joined_hooks)
-        elif mklins[i].startswith("MODULES"):
-            joined_modules = ' '.join(modules)
-            mklins[i] = "MODULES=\"{!s}\"".format(joined_modules)
-        elif mklins[i].startswith("FILES"):
-            joined_files = ' '.join(files)
-            mklins[i] = "FILES=\"{!s}\"".format(joined_files)
-
-    path = os.path.join(root_mount_point, "etc/mkinitcpio.conf")
-
-    with open(path, "w") as mkinitcpio_file:
-        mkinitcpio_file.write("\n".join(mklins) + "\n")
+    target_path = os.path.join(root_mount_point, "etc/mkinitcpio.conf")
+    with open(target_path, "w") as mkinitcpio_file:
+        for line in mklins:
+            # Replace HOOKS, MODULES and FILES lines with what we
+            # have found via find_initcpio_features()
+            if line.startswith("HOOKS"):
+                line = "HOOKS=\"{!s}\"".format(' '.join(hooks))
+            elif line.startswith("MODULES"):
+                line = "MODULES=\"{!s}\"".format(' '.join(modules))
+            elif lines.startswith("FILES"):
+                line = "FILES=\"{!s}\"".format(' '.join(files))
+            mkinitcpio_file.write(line + "\n")
 
 
 def find_initcpio_features(partitions, root_mount_point):

From cb92e49363a3dbb58cb5da7a693d8521ead86ab2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 15:16:08 +0200
Subject: [PATCH 454/492] [initcpiocfg] Document this module

---
 src/modules/initcpiocfg/module.desc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/modules/initcpiocfg/module.desc b/src/modules/initcpiocfg/module.desc
index a4476121be..a64fdf173a 100644
--- a/src/modules/initcpiocfg/module.desc
+++ b/src/modules/initcpiocfg/module.desc
@@ -1,7 +1,13 @@
 # SPDX-FileCopyrightText: no
 # SPDX-License-Identifier: CC0-1.0
+#
+# Writes a mkinitcpio.conf into the target system. It copies
+# the host system's /etc/mkinitcpio.conf, and replaces any
+# HOOKS, MODULES, and FILES lines with calculated values
+# based on what the installation (seems to) need.
 ---
 type:       "job"
 name:       "initcpiocfg"
 interface:  "python"
 script:     "main.py"
+noconfig:   true

From 54385b760630fec1b982f1a57fddc635712feb45 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Tue, 21 Sep 2021 16:53:09 +0200
Subject: [PATCH 455/492] [libcalamares] Cut down config-file-loading log spam

---
 src/libcalamares/modulesystem/Module.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/libcalamares/modulesystem/Module.cpp b/src/libcalamares/modulesystem/Module.cpp
index ff0b20f783..8fbb053004 100644
--- a/src/libcalamares/modulesystem/Module.cpp
+++ b/src/libcalamares/modulesystem/Module.cpp
@@ -101,7 +101,7 @@ Module::loadConfigurationFile( const QString& configFileName )  //throws YAML::E
             YAML::Node doc = YAML::Load( ba.constData() );
             if ( doc.IsNull() )
             {
-                cDebug() << "Found empty module configuration" << path;
+                cWarning() << "Found empty module configuration" << path;
                 // Special case: empty config files are valid,
                 // but aren't a map.
                 return;
@@ -112,14 +112,13 @@ Module::loadConfigurationFile( const QString& configFileName )  //throws YAML::E
                 return;
             }
 
-            cDebug() << "Loaded module configuration" << path;
             m_configurationMap = CalamaresUtils::yamlMapToVariant( doc );
             m_emergency = m_maybe_emergency && m_configurationMap.contains( EMERGENCY )
                 && m_configurationMap[ EMERGENCY ].toBool();
             return;
         }
     }
-    cDebug() << "No config file for" << name() << "found anywhere at" << Logger::DebugList( configCandidates );
+    cWarning() << "No config file for" << name() << "found anywhere at" << Logger::DebugList( configCandidates );
 }
 
 

From 39915db988eb10157c0f551b71020b9431723037 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 22 Sep 2021 00:58:31 +0200
Subject: [PATCH 456/492] [libcalamares] Reduce log spam when running commands

---
 src/libcalamares/utils/CalamaresUtilsSystem.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
index df578a8622..d2c0a6cf11 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
@@ -169,7 +169,7 @@ System::runCommand( System::RunLocation location,
         }
     }
 
-    cDebug() << "Running" << program << RedactedList( arguments );
+    cDebug() << Logger::SubEntry << "Running" << program << RedactedList( arguments );
     process.start();
     if ( !process.waitForStarted() )
     {
@@ -208,10 +208,6 @@ System::runCommand( System::RunLocation location,
         {
             cDebug() << Logger::SubEntry << "Finished. Exit code:" << r << "output:\n" << Logger::NoQuote << output;
         }
-        else
-        {
-            cDebug() << Logger::SubEntry << "Finished. Exit code:" << r;
-        }
     }
     else  // if ( r != 0 )
     {

From 857aaa6ca4319023e286a6b426cd66ca87abe434 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 22 Sep 2021 01:05:13 +0200
Subject: [PATCH 457/492] [partition] Cut down log spam about /etc/fstab

---
 src/modules/partition/core/PartUtils.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 54f971f4e6..58e2fdf0d0 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -250,8 +250,6 @@ lookForFstabEntries( const QString& partitionPath )
     {
         QFile fstabFile( mount.path() + "/etc/fstab" );
 
-        cDebug() << Logger::SubEntry << "reading" << fstabFile.fileName();
-
         if ( fstabFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
         {
             const QStringList fstabLines = QString::fromLocal8Bit( fstabFile.readAll() ).split( '\n' );
@@ -261,10 +259,10 @@ lookForFstabEntries( const QString& partitionPath )
                 fstabEntries.append( FstabEntry::fromEtcFstab( rawLine ) );
             }
             fstabFile.close();
-            cDebug() << Logger::SubEntry << "got" << fstabEntries.count() << "lines.";
+            const int lineCount = fstabEntries.count();
             std::remove_if(
                 fstabEntries.begin(), fstabEntries.end(), []( const FstabEntry& x ) { return !x.isValid(); } );
-            cDebug() << Logger::SubEntry << "got" << fstabEntries.count() << "fstab entries.";
+            cDebug() << Logger::SubEntry << "got" << fstabEntries.count() << "fstab entries from" << lineCount << "lines in" << fstabFile.fileName();
         }
         else
         {

From cf1128b719dcb66c5b91bedac6f46fca1f15f46b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 22 Sep 2021 01:27:33 +0200
Subject: [PATCH 458/492] [partition] Cut down log-spam while checking for
 resize

---
 src/modules/partition/core/PartUtils.cpp | 38 +++++++++++++-----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 58e2fdf0d0..c99884ce63 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -126,23 +126,22 @@ canBeResized( Partition* candidate, const Logger::Once& o )
         return false;
     }
 
-    cDebug() << o << "Checking if" << convenienceName( candidate ) << "can be resized.";
     if ( !candidate->fileSystem().supportGrow() || !candidate->fileSystem().supportShrink() )
     {
-        cDebug() << Logger::SubEntry << "NO, filesystem" << candidate->fileSystem().name()
-                 << "does not support resize.";
+        cDebug() << o << "Can not resize" << convenienceName( candidate ) << ", filesystem"
+                 << candidate->fileSystem().name() << "does not support resize.";
         return false;
     }
 
     if ( isPartitionFreeSpace( candidate ) )
     {
-        cDebug() << Logger::SubEntry << "NO, partition is free space";
+        cDebug() << o << "Can not resize" << convenienceName( candidate ) << ", partition is free space";
         return false;
     }
 
     if ( candidate->isMounted() )
     {
-        cDebug() << Logger::SubEntry << "NO, partition is mounted";
+        cDebug() << o << "Can not resize" << convenienceName( candidate ) << ", partition is mounted";
         return false;
     }
 
@@ -151,14 +150,14 @@ canBeResized( Partition* candidate, const Logger::Once& o )
         PartitionTable* table = dynamic_cast< PartitionTable* >( candidate->parent() );
         if ( !table )
         {
-            cDebug() << Logger::SubEntry << "NO, no partition table found";
+            cDebug() << o << "Can not resize" << convenienceName( candidate ) << ", no partition table found";
             return false;
         }
 
         if ( table->numPrimaries() >= table->maxPrimaries() )
         {
-            cDebug() << Logger::SubEntry << "NO, partition table already has" << table->maxPrimaries()
-                     << "primary partitions.";
+            cDebug() << o << "Can not resize" << convenienceName( candidate ) << ", partition table already has"
+                     << table->maxPrimaries() << "primary partitions.";
             return false;
         }
     }
@@ -167,7 +166,8 @@ canBeResized( Partition* candidate, const Logger::Once& o )
     double requiredStorageGiB = getRequiredStorageGiB( ok );
     if ( !ok )
     {
-        cDebug() << Logger::SubEntry << "NO, requiredStorageGiB is not set correctly.";
+        cDebug() << o << "Can not resize" << convenienceName( candidate )
+                 << ", requiredStorageGiB is not set correctly.";
         return false;
     }
 
@@ -200,24 +200,25 @@ canBeResized( Partition* candidate, const Logger::Once& o )
 bool
 canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once& o )
 {
-    cDebug() << o << "Checking if" << partitionPath << "can be resized.";
-    QString partitionWithOs = partitionPath;
-    if ( partitionWithOs.startsWith( "/dev/" ) )
+    if ( partitionPath.startsWith( "/dev/" ) )
     {
         for ( int i = 0; i < dm->rowCount(); ++i )
         {
             Device* dev = dm->deviceForIndex( dm->index( i ) );
-            Partition* candidate = CalamaresUtils::Partition::findPartitionByPath( { dev }, partitionWithOs );
+            Partition* candidate = CalamaresUtils::Partition::findPartitionByPath( { dev }, partitionPath );
             if ( candidate )
             {
                 return canBeResized( candidate, o );
             }
         }
-        cDebug() << Logger::SubEntry << "no Partition* found for" << partitionWithOs;
+        cWarning() << "Can not resize" << partitionPath << ", no Partition* found.";
+        return false;
+    }
+    else
+    {
+        cWarning() << "Can not resize" << partitionPath << ", does not start with /dev";
+        return false;
     }
-
-    cDebug() << Logger::SubEntry << "Partition" << partitionWithOs << "CANNOT BE RESIZED FOR AUTOINSTALL.";
-    return false;
 }
 
 
@@ -262,7 +263,8 @@ lookForFstabEntries( const QString& partitionPath )
             const int lineCount = fstabEntries.count();
             std::remove_if(
                 fstabEntries.begin(), fstabEntries.end(), []( const FstabEntry& x ) { return !x.isValid(); } );
-            cDebug() << Logger::SubEntry << "got" << fstabEntries.count() << "fstab entries from" << lineCount << "lines in" << fstabFile.fileName();
+            cDebug() << Logger::SubEntry << "got" << fstabEntries.count() << "fstab entries from" << lineCount
+                     << "lines in" << fstabFile.fileName();
         }
         else
         {

From 049bccbdd82ce6559a04fe67f94edbfd0f273a23 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 22 Sep 2021 01:28:40 +0200
Subject: [PATCH 459/492] [libcalamares] Cut down log-spam from KPMManager

---
 src/libcalamares/partition/KPMManager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libcalamares/partition/KPMManager.cpp b/src/libcalamares/partition/KPMManager.cpp
index 5f6b875893..ff7701703c 100644
--- a/src/libcalamares/partition/KPMManager.cpp
+++ b/src/libcalamares/partition/KPMManager.cpp
@@ -100,12 +100,10 @@ getInternal()
 KPMManager::KPMManager()
     : m_d( getInternal() )
 {
-    cDebug() << "KPMManager" << s_backend.use_count() << "created.";
 }
 
 KPMManager::~KPMManager()
 {
-    cDebug() << "KPMManager" << s_backend.use_count() << "being destroyed.";
 }
 
 KPMManager::operator bool() const

From 9be9431970d83822d06f0a4e4edbe621bea102a3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 22 Sep 2021 01:41:28 +0200
Subject: [PATCH 460/492] [libcalamares] Give Logger::Once more flexibility

---
 src/libcalamares/utils/Logger.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h
index 871cc6fb3a..1fd534d04d 100644
--- a/src/libcalamares/utils/Logger.h
+++ b/src/libcalamares/utils/Logger.h
@@ -310,6 +310,14 @@ class Once
     }
     friend CDebug& operator<<( CDebug&&, const Once& );
 
+    /** @brief Restore the object to "fresh" state
+     *
+     * It may be necessary to allow the Once object to stream the
+     * function header again -- for instance, after logging an error,
+     * any following debug log might want to re-introduce the header.
+     */
+    void refresh() { m = true; }
+
 private:
     mutable bool m = false;
 };

From db26df311d93b47a7cc98fc08feaf504ccfe9ff0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 22 Sep 2021 01:44:00 +0200
Subject: [PATCH 461/492] [libcalamares] Reduce log-spam in emergencies

- when an emergency strikes, log the modules that are skipped
  with a Once, but if an emergency module runs, refresh that
  Once so that the function header is printed again -- to
  distinguish JobQueue debugging from the logging from the
  emergency module.
---
 src/libcalamares/JobQueue.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp
index 00b30f3187..039a28e264 100644
--- a/src/libcalamares/JobQueue.cpp
+++ b/src/libcalamares/JobQueue.cpp
@@ -112,17 +112,19 @@ class JobThread : public QThread
         QString message;  ///< Filled in with errors
         QString details;
 
+        Logger::Once o;
         m_jobIndex = 0;
         for ( const auto& jobitem : *m_runningJobs )
         {
             if ( failureEncountered && !jobitem.job->isEmergency() )
             {
-                cDebug() << "Skipping non-emergency job" << jobitem.job->prettyName();
+                cDebug() << o << "Skipping non-emergency job" << jobitem.job->prettyName();
             }
             else
             {
-                cDebug() << "Starting" << ( failureEncountered ? "EMERGENCY JOB" : "job" ) << jobitem.job->prettyName()
+                cDebug() << o << "Starting" << ( failureEncountered ? "EMERGENCY JOB" : "job" ) << jobitem.job->prettyName()
                          << '(' << ( m_jobIndex + 1 ) << '/' << m_runningJobs->count() << ')';
+                o.refresh();  // So next time it shows the function header again
                 emitProgress( 0.0 );  // 0% for *this job*
                 connect( jobitem.job.data(), &Job::progress, this, &JobThread::emitProgress );
                 auto result = jobitem.job->exec();

From cce8b73554584d73942a5313e41463a4b4696983 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Tue, 21 Sep 2021 15:25:51 +0200
Subject: [PATCH 462/492] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_cs_CZ.ts | 74 ++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index 1c2ed17556..5714c4e31b 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -134,7 +134,7 @@
     
       
       Widget Tree
-      Strom widgetu
+      Strom ovládacích prvků
     
     
       
@@ -217,7 +217,7 @@
     
       
       Working directory %1 for python job %2 is not readable.
-      Pracovní složku %1 pro Python skript %2 se nedaří otevřít pro čtení.
+      Pracovní složka %1 pro Python skript %2 není přístupná pro čtení.
     
     
       
@@ -227,7 +227,7 @@
     
       
       Main script file %1 for python job %2 is not readable.
-      Hlavní soubor s python skriptem %1 pro úlohu %2 se nedaří otevřít pro čtení..
+      Hlavní soubor Python skriptu %1 pro úlohu %2 není přístupný pro čtení.
     
     
       
@@ -504,7 +504,7 @@ Instalační program bude ukončen a všechny změny ztraceny.    
     
       
       %1 Installer
-      %1 instalátor
+      Instalátor %1
     
   
   
@@ -660,7 +660,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       This storage device is a part of an <strong>inactive RAID</strong> device.
-      Toto úložné zařízení je součástí <strong>Neaktivního RAID</strong> zařízení.
+      Toto úložné zařízení je součástí <strong>neaktivního RAID</strong> zařízení.
     
     
       
@@ -758,7 +758,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Set keyboard layout to %1/%2.
-      Nastavit rozložení klávesnice na %1/%2.
+      Nastavit rozvržení klávesnice na %1/%2.
     
     
       
@@ -808,7 +808,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a>
-      Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Instalace nemůže pokračovat <a href="#details">Podrobnosti…</a>
+      Počítač nesplňuje minimální požadavky pro instalaci %1.<br/>Nastavování nemůže pokračovat <a href="#details">Podrobnosti…</a>
     
     
       
@@ -953,7 +953,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Install option: <strong>%1</strong>
-      Možnost instalace: <strong>%1</strong>
+      Volba instalace: <strong>%1</strong>
     
     
       
@@ -1182,7 +1182,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Preserving home directory
-      Zachování domovské složky
+      Zachovává se domovská složka
     
     
       
@@ -1198,7 +1198,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Setting file permissions
-      Nastavení oprávnění souboru
+      Nastavují se přístupová práva k souboru
     
   
   
@@ -1755,7 +1755,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       System locale setting
-      Místní a jazykové nastavení systému
+      Místní a jazyková nastavení systému
     
     
       
@@ -1986,7 +1986,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Timezone: %1
-      Časová zóna: %1
+      Časové pásmo: %1
     
     
       
@@ -2152,12 +2152,12 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Select your preferred Zone within your Region.
-      Vyberte preferovanou zónu ve vašem regionu.
+      Vyberte upřednostňované pásmo ve svém regionu.
     
     
       
       Zones
-      Zóny
+      Pásma
     
     
       
@@ -2283,7 +2283,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
       
         Heslo obsahuje méně než %1 číslici
         Heslo obsahuje méně než %1 číslice
-        Heslo obsahuje méně než %1 číslice
+        Heslo obsahuje méně než %1 číslic
         Heslo obsahuje méně než %1 číslice
       
     
@@ -2463,7 +2463,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Form
-      Form
+      Formulář
     
     
       
@@ -2724,7 +2724,7 @@ Instalační program bude ukončen a všechny změny ztraceny.
     
       
       Form
-      Form
+      Formulář
     
     
       
@@ -3609,7 +3609,7 @@ Výstup:
     
       
       These groups are missing in the target system: %1
-      Tyto skupiny chybí v cílovém systému chybí: %1
+      Tyto skupiny v cílovém systému chybí: %1
     
   
   
@@ -3703,7 +3703,7 @@ Výstup:
     
       
       KDE user feedback
-      Zpětná vazba uživatele KDE
+      Zpětná vazba od uživatele pro KDE
     
     
       
@@ -3719,12 +3719,12 @@ Výstup:
     
       
       Could not configure KDE user feedback correctly, script error %1.
-      Nepodařilo se správně nastavit zpětnou vazbu KDE uživatele, chyba ve skriptu %1.
+      Nepodařilo se správně nastavit zpětnou vazbu od uživatele pro KDE, chyba ve skriptu %1.
     
     
       
       Could not configure KDE user feedback correctly, Calamares error %1.
-      Nepodařilo se správně nastavit zpětnou vazbu KDE uživatele, chyba Calamares %1.
+      Nepodařilo se správně nastavit zpětnou vazbu od uživatel pro KDE, chyba Calamares %1.
     
   
   
@@ -3732,28 +3732,28 @@ Výstup:
     
       
       Machine feedback
-      Zpětná vazba stroje
+      Zpětná vazba ze stroje
     
     
       
       Configuring machine feedback.
-      Nastavování zpětné vazby stroje
+      Nastavování zpětné vazby ze stroje
     
     
       
       
       Error in machine feedback configuration.
-      Chyba v nastavení zpětné vazby stroje.
+      Chyba v nastavení zpětné vazby ze stroje.
     
     
       
       Could not configure machine feedback correctly, script error %1.
-      Nepodařilo se správně nastavit zpětnou vazbu stroje, chyba skriptu %1.
+      Nepodařilo se správně nastavit zpětnou vazbu ze stroje, chyba skriptu %1.
     
     
       
       Could not configure machine feedback correctly, Calamares error %1.
-      Nepodařilo se správně nastavit zpětnou vazbu stroje, chyba Calamares %1.
+      Nepodařilo se správně nastavit zpětnou vazbu ze stroje, chyba Calamares %1.
     
   
   
@@ -3786,7 +3786,7 @@ Výstup:
     
       
       By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes.
-      Výběrem tohoto pošlete informace o své instalaci a hardware. Tyto údaje budou poslány <b>pouze jednorázově</b> po dokončení instalace.
+      Výběrem tohoto pošlete informace o své instalaci a hardware. Tyto údaje budou odeslány <b>pouze jednorázově</b> po dokončení instalace.
     
     
       
@@ -3975,7 +3975,7 @@ Výstup:
     
       
       <h1>Welcome to the Calamares installer for %1.</h1>
-      <h1>Vítejte v Calamares,  instalačním programu (nejen) pro %1.</h1>
+      <h1>Vítejte v Calamares, instalačním programu (nejen) pro %1.</h1>
     
     
       
@@ -4121,7 +4121,7 @@ Výstup:
     
       
       To activate keyboard preview, select a layout.
-      
+      Pokud chcete aktivovat náhled klávesnice, vyberte rozvržení.
     
     
       
@@ -4131,7 +4131,7 @@ Výstup:
     
       
       Layouts
-      Rovzržení
+      Rozvržení
     
     
       
@@ -4179,7 +4179,7 @@ Výstup:
     
       
       If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives.
-      Pokud nechcete nainstalovat žádnou sadu kancelářských aplikací, stačí jen zvolit Žádná sada kancelářských aplikací. V případě potřeby je možné kdykoli nějakou přidat na už nainstalovaný systém.
+      Pokud nechcete nainstalovat žádnou sadu kancelářských aplikací, stačí jen zvolit Žádná sada kancelářských aplikací. V případě potřeby je možné kdykoli nějakou přidat do už nainstalovaného systému.
     
     
       
@@ -4310,7 +4310,7 @@ Výstup:
     
       
       This name will be used if you make the computer visible to others on a network.
-      Tento název se použije, pokud počítač zviditelníte ostatním v síti.
+      Pod tímto názvem se bude počítač případně zobrazovat ostatním počítačům v síti.
     
     
       
@@ -4335,7 +4335,7 @@ Výstup:
     
       
       Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
-      Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní. Dobré heslo by mělo obsahovat směs písmen, čísel a interpunkce a mělo by mít alespoň osm znaků. Zvažte také jeho pravidelnou změnu.
+      Zadání hesla zopakujte i do kontrolní kolonky, abyste měli jistotu, že jste napsali, co zamýšleli (že nedošlo k překlepu). Dobré heslo se bude skládat z písmen, číslic a interpunkce a mělo by být alespoň osm znaků dlouhé. Heslo byste také měli pravidelně měnit (prevence škod z jeho případného prozrazení).
     
     
       
@@ -4350,7 +4350,7 @@ Výstup:
     
       
       Log in automatically without asking for the password
-      Přihlaste se automaticky bez zadávání hesla
+      Přihlašovat se automaticky bez zadávání hesla
     
     
       
@@ -4360,7 +4360,7 @@ Výstup:
     
       
       Reuse user password as root password
-      Použijte uživatelské heslo zároveň jako heslo root
+      Použijte heslo uživatele i pro účet správce (root)
     
     
       
@@ -4380,12 +4380,12 @@ Výstup:
     
       
       Repeat Root Password
-      Opakujte root heslo
+      Zopakujte zadání hesla pro správce systému (root)
     
     
       
       Enter the same password twice, so that it can be checked for typing errors.
-      Zadejte dvakrát stejné heslo, aby bylo možné zkontrolovat chyby při psaní.
+      Zadání hesla zopakujte i do kontrolní kolonky, abyste měli jistotu, že jste napsali, co zamýšleli (že nedošlo k překlepu).
     
   
   

From 7bdccd0ea7320a9badad1b43f88f3caff77de516 Mon Sep 17 00:00:00 2001
From: Calamares CI 
Date: Tue, 21 Sep 2021 15:25:51 +0200
Subject: [PATCH 463/492] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/az/LC_MESSAGES/python.po    | 4 ++--
 lang/python/az_AZ/LC_MESSAGES/python.po | 4 ++--
 lang/python/cs_CZ/LC_MESSAGES/python.po | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index f4c40e5ab2..8ac8172d8f 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# xxmn77 , 2021
+# Xəyyam Qocayev , 2021
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: xxmn77 , 2021\n"
+"Last-Translator: Xəyyam Qocayev , 2021\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index 2d57f0d4ba..0df66e7111 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR , YEAR.
 # 
 # Translators:
-# xxmn77 , 2021
+# Xəyyam Qocayev , 2021
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-08 13:31+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: xxmn77 , 2021\n"
+"Last-Translator: Xəyyam Qocayev , 2021\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index 6305ba7fb3..993ed0b3f3 100644
--- a/lang/python/cs_CZ/LC_MESSAGES/python.po
+++ b/lang/python/cs_CZ/LC_MESSAGES/python.po
@@ -206,8 +206,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
-"Seznam správců displejů je prázdný nebo není definován v jak "
-"bothglobalstorage, tak v displaymanager.conf."
+"Seznam správců displejů je prázdný nebo není definován v jak globalstorage, "
+"tak v displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
@@ -343,7 +343,7 @@ msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
-"Nástroji pro správu balíčků se nepodařilo udělat změny v nainstalovaném "
+"Nástroji pro správu balíčků se nepodařilo udělat změny v instalovaném "
 "systému. Příkaz 
    {!s}
     vrátil chybový kód {!s}."
 
 #: src/modules/bootloader/main.py:43

From b0149c271257e216a4d5a5d501f07962b6f4c6d2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 22 Sep 2021 11:03:56 +0200
Subject: [PATCH 464/492] [libcalamares] Log the Python language-search process
 just once

- log the list of search paths once
- log the found-language as if from Python
- warn always if none are found
---
 src/libcalamares/PythonJobApi.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index d61cfc223b..3f908b98da 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -16,6 +16,7 @@
 #include "partition/Mount.h"
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
+#include "utils/RAII.h"
 #include "utils/String.h"
 
 #include 
@@ -147,7 +148,7 @@ debug( const std::string& s )
 void
 warning( const std::string& s )
 {
-    Logger::CDebug( Logger::LOGWARNING )  << output_prefix << QString::fromStdString( s );
+    Logger::CDebug( Logger::LOGWARNING ) << output_prefix << QString::fromStdString( s );
 }
 
 PythonJobInterface::PythonJobInterface( Calamares::PythonJob* parent )
@@ -241,6 +242,10 @@ _add_localedirs( QStringList& pathList, const QString& candidate )
 bp::object
 gettext_path()
 {
+    // Going to log informatively just once
+    static bool first_time = true;
+    cPointerSetter( &first_time, false );
+
     // TODO: distinguish between -d runs and normal runs
     // TODO: can we detect DESTDIR-installs?
     QStringList candidatePaths
@@ -257,21 +262,26 @@ gettext_path()
     }
     _add_localedirs( candidatePaths, QDir().canonicalPath() );  // .
 
-    cDebug() << "Determining gettext path from" << candidatePaths;
+    if ( first_time )
+    {
+        cDebug() << "Determining gettext path from" << candidatePaths;
+    }
 
     QStringList candidateLanguages = _gettext_languages();
-
     for ( const auto& lang : candidateLanguages )
+    {
         for ( auto localedir : candidatePaths )
         {
             QDir ldir( localedir );
             if ( ldir.cd( lang ) )
             {
-                cDebug() << Logger::SubEntry << "Found" << lang << "in" << ldir.canonicalPath();
+                Logger::CDebug( Logger::LOGDEBUG )
+                    << output_prefix << "Found gettext" << lang << "in" << ldir.canonicalPath();
                 return bp::object( localedir.toStdString() );
             }
         }
-    cDebug() << Logger::SubEntry << "No translation found for languages" << candidateLanguages;
+    }
+    cWarning() << "No translation found for languages" << candidateLanguages;
     return bp::object();  // None
 }
 

From bba5b21873969587edabc6b8c18c16a834754d4b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 22 Sep 2021 11:17:41 +0200
Subject: [PATCH 465/492] [libcalamares] Remove cBoolSetter

This class was used only once, and is confusing because
the assignment happens always, but to the opposite value
as what was visible. It can be replaced with other
scoped assignment, instead.

Removes the tests for it, too.
---
 src/libcalamares/utils/RAII.h     | 14 --------------
 src/libcalamares/utils/Tests.cpp  | 28 ++--------------------------
 src/modules/locale/LocalePage.cpp |  3 ++-
 3 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/src/libcalamares/utils/RAII.h b/src/libcalamares/utils/RAII.h
index 00e276ec6f..186775676f 100644
--- a/src/libcalamares/utils/RAII.h
+++ b/src/libcalamares/utils/RAII.h
@@ -42,20 +42,6 @@ struct cqDeleter
     }
 };
 
-/// @brief Sets a bool to @p value and resets to !value on destruction
-template < bool value >
-struct cBoolSetter
-{
-    bool& m_b;
-
-    cBoolSetter( bool& b )
-        : m_b( b )
-    {
-        m_b = value;
-    }
-    ~cBoolSetter() { m_b = !value; }
-};
-
 /// @brief Blocks signals on a QObject until destruction
 using cSignalBlocker = QSignalBlocker;
 
diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp
index a689505e9b..bb1bf95202 100644
--- a/src/libcalamares/utils/Tests.cpp
+++ b/src/libcalamares/utils/Tests.cpp
@@ -55,7 +55,6 @@ private Q_SLOTS:
     void testOddSizedPrintable();
 
     /** @section Tests the RAII bits. */
-    void testBoolSetter();
     void testPointerSetter();
 
     /** @section Tests the Traits bits. */
@@ -340,28 +339,6 @@ LibCalamaresTests::testOddSizedPrintable()
     }
 }
 
-void
-LibCalamaresTests::testBoolSetter()
-{
-    bool b = false;
-
-    QVERIFY( !b );
-    {
-        QVERIFY( !b );
-        cBoolSetter< true > x( b );
-        QVERIFY( b );
-    }
-    QVERIFY( !b );
-
-    QVERIFY( !b );
-    {
-        QVERIFY( !b );
-        cBoolSetter< false > x( b );
-        QVERIFY( !b );  // Still!
-    }
-    QVERIFY( b );
-}
-
 void
 LibCalamaresTests::testPointerSetter()
 {
@@ -384,7 +361,7 @@ LibCalamaresTests::testPointerSetter()
     }
     QCOMPARE( special, 3 );
     {
-        cPointerSetter p( nullptr );
+        cPointerSetter< int > p( nullptr );
     }
     QCOMPARE( special, 3 );
     {
@@ -490,8 +467,7 @@ LibCalamaresTests::testVariantStringListCode()
                   QStringList { "astring" } );  // A single string **can** be considered a stringlist!
         m.insert( key, QString( "more strings" ) );
         QCOMPARE( getStringList( m, key ).count(), 1 );
-        QCOMPARE( getStringList( m, key ),
-                  QStringList { "more strings" } );
+        QCOMPARE( getStringList( m, key ), QStringList { "more strings" } );
         m.insert( key, QString() );
         QCOMPARE( getStringList( m, key ).count(), 1 );
         QCOMPARE( getStringList( m, key ), QStringList { QString() } );
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index f63aed10d5..027d50a38e 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -174,7 +174,8 @@ LocalePage::locationChanged( const CalamaresUtils::Locale::TimeZoneData* locatio
     {
         return;
     }
-    cBoolSetter< true > b( m_blockTzWidgetSet );
+    m_blockTzWidgetSet = true;  // Blocked until we go out of scope
+    cPointerSetter b( &m_blockTzWidgetSet, false );
 
     // Set region index
     int index = m_regionCombo->findData( location->region() );

From 8f65a644a9fe67a8d387f73e18a7627e8895fafe Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Wed, 22 Sep 2021 11:26:28 +0200
Subject: [PATCH 466/492] [libcalamares] Rename cPointerSetter

This class doesn't really set a pointer -- it is a scoped assignment
through a pointer, which **can** set a value on destruction (when
it leaves scope). Rename it.

While here, extend the API so that it can do an assignment to the
underlying object **now**, while also doing a scoped assignment
later when it leaves scope. This makes some code a bit easier
to read ("in this scope, X is now  and then it becomes ")
---
 src/libcalamares/PythonJobApi.cpp        |  2 +-
 src/libcalamares/utils/RAII.h            | 37 +++++++++++++++++-------
 src/libcalamares/utils/Tests.cpp         | 16 +++++-----
 src/modules/keyboard/Config.cpp          |  4 +--
 src/modules/locale/LocalePage.cpp        |  3 +-
 src/modules/partition/core/PartUtils.cpp |  2 +-
 6 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 3f908b98da..480a115ae7 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -244,7 +244,7 @@ gettext_path()
 {
     // Going to log informatively just once
     static bool first_time = true;
-    cPointerSetter( &first_time, false );
+    cScopedAssignment( &first_time, false );
 
     // TODO: distinguish between -d runs and normal runs
     // TODO: can we detect DESTDIR-installs?
diff --git a/src/libcalamares/utils/RAII.h b/src/libcalamares/utils/RAII.h
index 186775676f..957e4fe42e 100644
--- a/src/libcalamares/utils/RAII.h
+++ b/src/libcalamares/utils/RAII.h
@@ -48,10 +48,11 @@ using cSignalBlocker = QSignalBlocker;
 /** @brief Writes a value on destruction to a pointed-to location.
  *
  * If the pointer is non-null, write the last-given-value if there
- * is one to the pointed-to object.
+ * is one to the pointed-to object. This is called the "then-value".
+ *
  */
 template < typename T >
-struct cPointerSetter
+struct cScopedAssignment
 {
     std::optional< T > m_value;
     T* m_pointer;
@@ -62,22 +63,36 @@ struct cPointerSetter
      * will do nothing on destruction, leaving the pointed-to
      * value unchanged.
      */
-    cPointerSetter( T* p )
+    cScopedAssignment( T* p )
         : m_pointer( p )
     {
     }
-    /** @brief Create a setter with a value already set
+    /** @brief Create a setter with a then-value already set
      *
      * This ensures that on destruction, the value @p v will be written;
      * it is equivalent to assigning @p v immediately. The pointed-to
      * value is **not** changed (until destruction).
      */
-    cPointerSetter( T* p, T v )
-        : m_value( v )
+    cScopedAssignment( T* p, T then )
+        : m_value( then )
         , m_pointer( p )
     {
     }
-    ~cPointerSetter()
+    /** @brief Create a setter with a then-value and assign a new value now
+     *
+     * As above, but also assign @p now to the thing pointed-to.
+     */
+    cScopedAssignment( T* p, T now, T then )
+        : m_value( then )
+        , m_pointer( p )
+    {
+        if ( p )
+        {
+            *p = now;
+        }
+    }
+
+    ~cScopedAssignment()
     {
         if ( m_pointer && m_value.has_value() )
         {
@@ -85,13 +100,13 @@ struct cPointerSetter
         }
     }
 
-    const T& operator=( const T& v )
+    const T& operator=( const T& then )
     {
-        m_value = v;
-        return v;
+        m_value = then;
+        return then;
     }
 };
 
 template < typename T >
-cPointerSetter( T p )->cPointerSetter< decltype( *p ) >;
+cScopedAssignment( T p )->cScopedAssignment< decltype( *p ) >;
 #endif
diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp
index bb1bf95202..c652571b4b 100644
--- a/src/libcalamares/utils/Tests.cpp
+++ b/src/libcalamares/utils/Tests.cpp
@@ -346,35 +346,35 @@ LibCalamaresTests::testPointerSetter()
 
     QCOMPARE( special, 17 );
     {
-        cPointerSetter p( &special );
+        cScopedAssignment p( &special );
     }
     QCOMPARE( special, 17 );
     {
-        cPointerSetter p( &special );
+        cScopedAssignment p( &special );
         p = 18;
     }
     QCOMPARE( special, 18 );
     {
-        cPointerSetter p( &special );
+        cScopedAssignment p( &special );
         p = 20;
         p = 3;
     }
     QCOMPARE( special, 3 );
     {
-        cPointerSetter< int > p( nullptr );
+        cScopedAssignment< int > p( nullptr );
     }
     QCOMPARE( special, 3 );
     {
         // "don't do this" .. order of destructors is important
-        cPointerSetter p( &special );
-        cPointerSetter q( &special );
+        cScopedAssignment p( &special );
+        cScopedAssignment q( &special );
         p = 17;
     }
     QCOMPARE( special, 17 );
     {
         // "don't do this" .. order of destructors is important
-        cPointerSetter p( &special );
-        cPointerSetter q( &special );
+        cScopedAssignment p( &special );
+        cScopedAssignment q( &special );
         p = 34;
         q = 2;
         // q destroyed first, then p
diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 7140bd7905..f1b6efebad 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -275,7 +275,7 @@ Config::detectCurrentKeyboardLayout()
     {
         return;
     }
-    cPointerSetter returnToIntial( &m_state, State::Initial );
+    cScopedAssignment returnToIntial( &m_state, State::Initial );
     m_state = State::Guessing;
 
     //### Detect current keyboard layout and variant
@@ -427,7 +427,7 @@ Config::guessLocaleKeyboardLayout()
     {
         return;
     }
-    cPointerSetter returnToIntial( &m_state, State::Initial );
+    cScopedAssignment returnToIntial( &m_state, State::Initial );
     m_state = State::Guessing;
 
     /* Guessing a keyboard layout based on the locale means
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 027d50a38e..236f63ec33 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -174,8 +174,7 @@ LocalePage::locationChanged( const CalamaresUtils::Locale::TimeZoneData* locatio
     {
         return;
     }
-    m_blockTzWidgetSet = true;  // Blocked until we go out of scope
-    cPointerSetter b( &m_blockTzWidgetSet, false );
+    cScopedAssignment b( &m_blockTzWidgetSet, true, false );
 
     // Set region index
     int index = m_regionCombo->findData( location->region() );
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index c99884ce63..806c0ceb37 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -529,7 +529,7 @@ efiFilesystemMinimumSize()
 QString
 canonicalFilesystemName( const QString& fsName, FileSystem::Type* fsType )
 {
-    cPointerSetter type( fsType );
+    cScopedAssignment type( fsType );
     if ( fsName.isEmpty() )
     {
         type = FileSystem::Ext4;

From 9b57f402da97aada820054a168c144e17fd6d767 Mon Sep 17 00:00:00 2001
From: Shrinivas Vishnu Kumbhar 
Date: Thu, 23 Sep 2021 11:07:43 +0200
Subject: [PATCH 467/492] [keyboard] Use US-English for India

---
 src/modules/keyboard/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index f1b6efebad..720588810a 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -472,7 +472,7 @@ Config::guessLocaleKeyboardLayout()
         { "el_GR", "gr" }, /* Greek in Greece */
         { "ig_NG", "igbo_NG" }, /* Igbo in Nigeria */
         { "ha_NG", "hausa_NG" }, /* Hausa */
-        { "en_IN", "eng_in" }, /* India, English with Rupee */
+        { "en_IN", "us" }, /* India, US English keyboards are common in India */
     } );
 
     // Try to preselect a layout, depending on language and locale

From 528a8153072dfb7892089abdb8206779ec5cfc34 Mon Sep 17 00:00:00 2001
From: Shrinivas Vishnu Kumbhar 
Date: Thu, 23 Sep 2021 11:08:11 +0200
Subject: [PATCH 468/492] [locale] Default to English in India

---
 CHANGES                                    | 3 +++
 src/modules/locale/LocaleConfiguration.cpp | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGES b/CHANGES
index 1bdb681f09..a5a1b1fe16 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,12 +10,15 @@ website will have to do for older versions.
 # 3.2.44 (unreleased) #
 
 This release contains contributions from (alphabetically by first name):
+ - Shrinivas Vishnu Kumbhar (new contributor, welcome!)
  - whorfin (new contributor, welcome!)
 
 ## Core ##
  - No core changes yet
 
 ## Modules ##
+ - Both *locale* and *keyboard* have received some tweaks for configurations
+   in India; unless the user selects otherwise, English is preferred.
  - The *luksbootkeyfile* module was reported to be too quick to declare
    a timeout when applying the keyfile. The timeout has been increased
    to one minute. (Thanks whorfin)
diff --git a/src/modules/locale/LocaleConfiguration.cpp b/src/modules/locale/LocaleConfiguration.cpp
index c208dc02d6..b7b895290e 100644
--- a/src/modules/locale/LocaleConfiguration.cpp
+++ b/src/modules/locale/LocaleConfiguration.cpp
@@ -201,6 +201,10 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
                 // but nearly all its native speakers also speak English,
                 // and migrants are likely to use English.
                 { "IE", "en" },
+                // India has many languages even though Hindi is known as
+                // national language but English is used in all computer
+                // and mobile devices.
+                { "IN", "en" },
                 { "IT", "it" },
                 { "MA", "ar" },
                 { "MK", "mk" },

From 3f890dfb8e51f9f4e9dea55b426c8b574156452f Mon Sep 17 00:00:00 2001
From: librewish 
Date: Fri, 24 Sep 2021 12:24:58 +0530
Subject: [PATCH 469/492] [fstab] Improve btrfs mount options

---
 src/modules/fstab/fstab.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf
index 21f6ffce30..fdf0d41ece 100644
--- a/src/modules/fstab/fstab.conf
+++ b/src/modules/fstab/fstab.conf
@@ -13,7 +13,7 @@
 # options from this mapping.
 mountOptions:
     default: defaults,noatime
-    btrfs: defaults,noatime,space_cache,autodefrag
+    btrfs: defaults,noatime,space_cache,autodefrag,compress=zstd
 
 # Mount options to use for the EFI System Partition. If not defined, the
 # *mountOptions* for *vfat* are used, or if that is not set either,
@@ -38,10 +38,10 @@ efiMountOptions: umask=0077
 #     swap: discard
 #     btrfs: discard,compress=lzo
 #
-# The standard configuration applies only lzo compression to btrfs
+# The standard configuration applies asynchronous discard support and ssd optimizations to btrfs
 # and does nothing for other filesystems.
 ssdExtraMountOptions:
-    btrfs: compress=lzo
+    btrfs: discard=async,ssd
 
 # Additional options added to each line in /etc/crypttab
 crypttabOptions: luks

From e5e9e14a9f053de20eed42c3baf74c823526bfd5 Mon Sep 17 00:00:00 2001
From: librewish 
Date: Fri, 24 Sep 2021 12:30:42 +0530
Subject: [PATCH 470/492] [initcpiocfg] add consolefont to hooks

---
 src/modules/initcpiocfg/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index 903ef635f8..ba43984d28 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -144,7 +144,7 @@ def find_initcpio_features(partitions, root_mount_point):
 
     :return 3-tuple of lists
     """
-    hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap"]
+    hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard", "keymap", "consolefont"]
     modules = []
     files = []
 

From 678e6f6d7444d116e3224fdaa4c63ee2f7ab81f4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 24 Sep 2021 12:15:16 +0200
Subject: [PATCH 471/492] [networkcfg] Be more forgiving when getting the live
 username

- This function is intended to do whatever it takes to
  get the live username.
---
 src/modules/networkcfg/main.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index 35bf67d63e..75b5a3abee 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -29,6 +29,34 @@ def pretty_name():
     return _("Saving network configuration.")
 
 
+def live_user():
+    """
+    Gets the "live user" login. This might be "live", or "nitrux",
+    or something similar: it is the login name used *right now*,
+    and network configurations saved for that user, should be applied
+    also for the installed user (which probably has a different name).
+    """
+    # getlogin() is a thin-wrapper, and depends on getlogin(3),
+    # which reads utmp -- and utmp isn't always set up right.
+    try:
+        return os.getlogin()
+    except OSError:
+        pass
+    # getpass will return the **current** user, which is generally root.
+    # That isn't very useful, because the network settings have been
+    # made outside of Calamares-running-as-root, as a different user.
+    #
+    # If Calamares is running as non-root, though, this is fine.
+    import getpass
+    name = getpass.getuser()
+    if name != "root":
+        return name
+
+    # TODO: other mechanisms, e.g. guessing that "live" is the name
+    # TODO: support a what-is-the-live-user setting
+    return None
+
+
 def run():
     """
     Setup network configuration

From bf60d0576b5796f4646ea817253ecf5b38bf5819 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 24 Sep 2021 12:25:33 +0200
Subject: [PATCH 472/492] [networkcfg] Refactor username-replacement

Read, then write, the NM file. Add a note about how we might
handle this better. Rename live_user() function to give it
a verb (and avoid UnboundLocal when using a variable of the same name).
---
 src/modules/networkcfg/main.py | 43 ++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index 75b5a3abee..f2970af246 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -29,7 +29,7 @@ def pretty_name():
     return _("Saving network configuration.")
 
 
-def live_user():
+def get_live_user():
     """
     Gets the "live user" login. This might be "live", or "nitrux",
     or something similar: it is the login name used *right now*,
@@ -57,13 +57,41 @@ def live_user():
     return None
 
 
+def replace_username(nm_config_filename, live_user, target_user):
+    """
+    If @p live_user isn't None, then go through the given
+    file and replace @p live_user by the @p target_user.
+
+    Reads the file, then (re-)writes it with new permissions lives.
+    """
+    # FIXME: Perhaps if live_user is None, we should just replace **all**
+    #        permissions lines? After all, this is supposed to be a live
+    #        system so **whatever** NM networks are configured, should be
+    #        available to the new user.
+    if live_user is None:
+        return
+    if not os.path.exists(nm_config_filename):
+        return
+
+    with open(target_network, "r") as network_conf:
+        text = network_conf.readlines()
+
+    live_permissions = 'permissions=user:{}:;'.format(live_user)
+    target_permissions = 'permissions=user:{}:;\n'.format(user)
+    with open(target_network, "w") as network_conf:
+        for line in text:
+            if live_permissions in line:
+                line = target_permissions
+            network_conf.write(line)
+
+
 def run():
     """
     Setup network configuration
     """
     root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
     user = libcalamares.globalstorage.value("username")
-    live_user = os.getlogin()
+    live_user = get_live_user()
 
     if root_mount_point is None:
         libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point))
@@ -91,16 +119,7 @@ def run():
 
             try:
                 shutil.copy(source_network, target_network, follow_symlinks=False)
-                if live_user in open(target_network).read():
-                    text = []
-                    with open(target_network, "r") as network_conf:
-                        text = network_conf.readlines()
-                        with open(target_network, "w") as network_conf:
-                            for line in text:
-                                if 'permissions=user:{}:;'.format(live_user) in line:
-                                    line = 'permissions=user:{}:;\n'.format(user)
-                                network_conf.write(line)
-                    network_conf.close()
+                replace_username(target_network, live_user, user)
             except FileNotFoundError:
                 libcalamares.utils.debug(
                     "Can't copy network configuration files in "

From 13d69cb81352e60dc5b4ad34ec99c93f68b5870f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 24 Sep 2021 12:30:11 +0200
Subject: [PATCH 473/492] [networkcfg] Don't mindlessly PEP8

---
 src/modules/networkcfg/main.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index f2970af246..6dab71fd94 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -98,10 +98,9 @@ def run():
         return (_("Configuration Error"),
                 _("No root mount point is given for 
    {!s}
     to use." ).format("networkcfg"))
 
-    source_nm = "/etc/NetworkManager/system-connections/"
-    target_nm = os.path.join(
-        root_mount_point, "etc/NetworkManager/system-connections/"
-        )
+    nm_connections = "etc/NetworkManager/system-connections/"
+    source_nm = "/" + nm_connections
+    target_nm = os.path.join(root_mount_point, nm_connections)
 
     # Sanity checks.  We don't want to do anything if a network
     # configuration already exists on the target
@@ -122,8 +121,7 @@ def run():
                 replace_username(target_network, live_user, user)
             except FileNotFoundError:
                 libcalamares.utils.debug(
-                    "Can't copy network configuration files in "
-                    + "{}".format(source_network)
+                    "Can't copy network configuration files in {}".format(source_network)
                     )
             except FileExistsError:
                 pass

From ce5d42ce0f1b352f5f7a1215ad82cbf1370f73aa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 24 Sep 2021 12:33:00 +0200
Subject: [PATCH 474/492] [networkcfg] Refactor getting source-and-target paths
 of a file

---
 src/modules/networkcfg/main.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index 6dab71fd94..4dc6cbbf7f 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -85,6 +85,13 @@ def replace_username(nm_config_filename, live_user, target_user):
             network_conf.write(line)
 
 
+def path_pair(root_mount_point, relative_path):
+    """
+    Returns /relative_path and the relative path in the target system.
+    """
+    return ("/" + relative_path, os.path.join(root_mount_point, relative_path))
+
+
 def run():
     """
     Setup network configuration
@@ -98,9 +105,7 @@ def run():
         return (_("Configuration Error"),
                 _("No root mount point is given for 
    {!s}
     to use." ).format("networkcfg"))
 
-    nm_connections = "etc/NetworkManager/system-connections/"
-    source_nm = "/" + nm_connections
-    target_nm = os.path.join(root_mount_point, nm_connections)
+    source_nm, target_nm = path_pair(root_mount_point, "etc/NetworkManager/system-connections/")
 
     # Sanity checks.  We don't want to do anything if a network
     # configuration already exists on the target
@@ -127,8 +132,7 @@ def run():
                 pass
 
     # We need to overwrite the default resolv.conf in the chroot.
-    source_resolv = "/etc/resolv.conf"
-    target_resolv = os.path.join(root_mount_point, "etc/resolv.conf")
+    source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf")
     if source_resolv != target_resolv and os.path.exists(source_resolv):
         try:
             os.remove(target_resolv)

From 0403749bf105020f273aff1fe4d4faa091b407c5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 24 Sep 2021 12:40:38 +0200
Subject: [PATCH 475/492] Changes: pre-release housekeeping

---
 CHANGES        | 10 ++++++++--
 CMakeLists.txt |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index a5a1b1fe16..c91e992991 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,21 +7,27 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.44 (unreleased) #
+# 3.2.44 (2021-09-24) #
 
 This release contains contributions from (alphabetically by first name):
+ - Anke Boersma
  - Shrinivas Vishnu Kumbhar (new contributor, welcome!)
  - whorfin (new contributor, welcome!)
 
 ## Core ##
- - No core changes yet
+ - "Log spam" has been reduced a little in the partitioning module.
 
 ## Modules ##
+ - *initcpiocfg* has had a number of internal code-fixes, and now adds
+   the `consolefont` hook by default as well. (Thanks Shrinivas)
  - Both *locale* and *keyboard* have received some tweaks for configurations
    in India; unless the user selects otherwise, English is preferred.
  - The *luksbootkeyfile* module was reported to be too quick to declare
    a timeout when applying the keyfile. The timeout has been increased
    to one minute. (Thanks whorfin)
+ - *networkcfg* tries harder to find the live-user login for re-working
+   networking settings. This fixes a regression on FerenOS, where the
+   installer was crashing because it could not find the live-user login.
 
 
 # 3.2.43 (2021-09-17) #
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 807cdfabf8..b391cfeb2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ project( CALAMARES
     LANGUAGES C CXX
 )
 
-set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From 0a0f3dd2b6291989c7b7fe74dfab3a0b913c0a43 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 24 Sep 2021 13:48:27 +0200
Subject: [PATCH 476/492] Changes: hot-fix release

---
 CHANGES        | 9 +++++++++
 CMakeLists.txt | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index c91e992991..97f8bd4c74 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,15 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.44.1 (2021-09-24) #
+
+This release contains contributions from (alphabetically by first name):
+ - Anke Boersma
+
+This is a hotfix for a typo -- not a syntax error -- that affects the
+*initcpiocfg* module. Reported and fixed by Anke.
+
+
 # 3.2.44 (2021-09-24) #
 
 This release contains contributions from (alphabetically by first name):
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b391cfeb2b..01ae160d9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.44
+    VERSION 3.2.44.1
     LANGUAGES C CXX
 )
 

From 723da94e755509687fc168639d4c0afdf621b14a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Fri, 24 Sep 2021 13:48:35 +0200
Subject: [PATCH 477/492] i18n: source texts

---
 lang/calamares_en.ts |  50 ++++++------
 lang/python.pot      | 189 +++++++++++++++++++------------------------
 2 files changed, 108 insertions(+), 131 deletions(-)

diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 884498c2ce..5575b69645 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -171,7 +171,7 @@
   
     Calamares::JobThread
     
-      
+      
       Done
       Done
     
@@ -320,17 +320,17 @@
       &Close
     
     
-      
+      
       Install Log Paste URL
       Install Log Paste URL
     
     
-      
+      
       The upload was unsuccessful. No web-paste was done.
       The upload was unsuccessful. No web-paste was done.
     
     
-      
+      
       Install log posted to
 
 %1
@@ -1926,35 +1926,35 @@ The installer will quit and all changes will be lost.
   
     LuksBootKeyFileJob
     
-      
+      
       Configuring LUKS key file.
       Configuring LUKS key file.
     
     
-      
-      
+      
+      
       No partitions are defined.
       No partitions are defined.
     
     
-      
-      
-      
+      
+      
+      
       Encrypted rootfs setup error
       Encrypted rootfs setup error
     
     
-      
+      
       Root partition %1 is LUKS but no passphrase has been set.
       Root partition %1 is LUKS but no passphrase has been set.
     
     
-      
+      
       Could not create LUKS key file for root partition %1.
       Could not create LUKS key file for root partition %1.
     
     
-      
+      
       Could not configure LUKS key file on partition %1.
       Could not configure LUKS key file on partition %1.
     
@@ -2929,14 +2929,14 @@ The installer will quit and all changes will be lost.
   
     ProcessResult
     
-      
+      
       
 There was no output from the command.
       
 There was no output from the command.
     
     
-      
+      
       
 Output:
 
@@ -2945,52 +2945,52 @@ Output:
 
     
     
-      
+      
       External command crashed.
       External command crashed.
     
     
-      
+      
       Command <i>%1</i> crashed.
       Command <i>%1</i> crashed.
     
     
-      
+      
       External command failed to start.
       External command failed to start.
     
     
-      
+      
       Command <i>%1</i> failed to start.
       Command <i>%1</i> failed to start.
     
     
-      
+      
       Internal error when starting command.
       Internal error when starting command.
     
     
-      
+      
       Bad parameters for process job call.
       Bad parameters for process job call.
     
     
-      
+      
       External command failed to finish.
       External command failed to finish.
     
     
-      
+      
       Command <i>%1</i> failed to finish in %2 seconds.
       Command <i>%1</i> failed to finish in %2 seconds.
     
     
-      
+      
       External command finished with errors.
       External command finished with errors.
     
     
-      
+      
       Command <i>%1</i> finished with exit code %2.
       Command <i>%1</i> finished with exit code %2.
     
diff --git a/lang/python.pot b/lang/python.pot
index 335a89206b..9520a6d6b9 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -2,32 +2,32 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-08 13:31+0200\n"
+"POT-Creation-Date: 2021-09-22 11:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
-msgstr "Configure GRUB."
+msgstr ""
 
 #: src/modules/mount/main.py:30
 msgid "Mounting partitions."
-msgstr "Mounting partitions."
+msgstr ""
 
-#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:197
-#: src/modules/initcpiocfg/main.py:201
+#: src/modules/mount/main.py:144 src/modules/initcpiocfg/main.py:227
+#: src/modules/initcpiocfg/main.py:231
 #: src/modules/luksopenswaphookcfg/main.py:86
 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
@@ -36,372 +36,349 @@ msgstr "Mounting partitions."
 #: src/modules/fstab/main.py:361 src/modules/fstab/main.py:388
 #: src/modules/localecfg/main.py:135 src/modules/networkcfg/main.py:42
 msgid "Configuration Error"
-msgstr "Configuration Error"
+msgstr ""
 
-#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:198
+#: src/modules/mount/main.py:145 src/modules/initcpiocfg/main.py:228
 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:73
 #: src/modules/fstab/main.py:356
 msgid "No partitions are defined for 
    {!s}
     to use."
-msgstr "No partitions are defined for 
    {!s}
     to use."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:26
 msgid "Configure systemd services"
-msgstr "Configure systemd services"
+msgstr ""
 
 #: src/modules/services-systemd/main.py:59
 #: src/modules/services-openrc/main.py:93
 msgid "Cannot modify service"
-msgstr "Cannot modify service"
+msgstr ""
 
 #: src/modules/services-systemd/main.py:60
 msgid ""
 "systemctl {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
 
 #: src/modules/services-systemd/main.py:63
 #: src/modules/services-systemd/main.py:67
 msgid "Cannot enable systemd service {name!s}."
-msgstr "Cannot enable systemd service {name!s}."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:65
 msgid "Cannot enable systemd target {name!s}."
-msgstr "Cannot enable systemd target {name!s}."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:69
 msgid "Cannot disable systemd target {name!s}."
-msgstr "Cannot disable systemd target {name!s}."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:71
 msgid "Cannot mask systemd unit {name!s}."
-msgstr "Cannot mask systemd unit {name!s}."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:73
 msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}."
 msgstr ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
 
 #: src/modules/umount/main.py:31
 msgid "Unmount file systems."
-msgstr "Unmount file systems."
+msgstr ""
 
 #: src/modules/unpackfs/main.py:35
 msgid "Filling up filesystems."
-msgstr "Filling up filesystems."
+msgstr ""
 
 #: src/modules/unpackfs/main.py:255
 msgid "rsync failed with error code {}."
-msgstr "rsync failed with error code {}."
+msgstr ""
 
 #: src/modules/unpackfs/main.py:300
 msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Unpacking image {}/{}, file {}/{}"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:315
 msgid "Starting to unpack {}"
-msgstr "Starting to unpack {}"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:324 src/modules/unpackfs/main.py:464
 msgid "Failed to unpack image \"{}\""
-msgstr "Failed to unpack image \"{}\""
+msgstr ""
 
 #: src/modules/unpackfs/main.py:431
 msgid "No mount point for root partition"
-msgstr "No mount point for root partition"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:432
 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:437
 msgid "Bad mount point for root partition"
-msgstr "Bad mount point for root partition"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:438
 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:454 src/modules/unpackfs/main.py:458
 #: src/modules/unpackfs/main.py:478
 msgid "Bad unsquash configuration"
-msgstr "Bad unsquash configuration"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:455
 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:459
 msgid "The source filesystem \"{}\" does not exist"
-msgstr "The source filesystem \"{}\" does not exist"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:465
 msgid ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed"
 msgstr ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
 
 #: src/modules/unpackfs/main.py:479
 msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "The destination \"{}\" in the target system is not a directory"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:526
 msgid "Cannot write KDM configuration file"
-msgstr "Cannot write KDM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:527
 msgid "KDM config file {!s} does not exist"
-msgstr "KDM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:588
 msgid "Cannot write LXDM configuration file"
-msgstr "Cannot write LXDM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:589
 msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:672
 msgid "Cannot write LightDM configuration file"
-msgstr "Cannot write LightDM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:673
 msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:747
 msgid "Cannot configure LightDM"
-msgstr "Cannot configure LightDM"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:748
 msgid "No LightDM greeter installed."
-msgstr "No LightDM greeter installed."
+msgstr ""
 
 #: src/modules/displaymanager/main.py:779
 msgid "Cannot write SLIM configuration file"
-msgstr "Cannot write SLIM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:780
 msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:906
 msgid "No display managers selected for the displaymanager module."
-msgstr "No display managers selected for the displaymanager module."
+msgstr ""
 
 #: src/modules/displaymanager/main.py:907
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:989
 msgid "Display manager configuration was incomplete"
-msgstr "Display manager configuration was incomplete"
+msgstr ""
 
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
-msgstr "Configuring mkinitcpio."
+msgstr ""
 
-#: src/modules/initcpiocfg/main.py:202
+#: src/modules/initcpiocfg/main.py:232
 #: src/modules/luksopenswaphookcfg/main.py:91
 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:77
 #: src/modules/fstab/main.py:362 src/modules/localecfg/main.py:136
 #: src/modules/networkcfg/main.py:43
 msgid "No root mount point is given for 
    {!s}
     to use."
-msgstr "No root mount point is given for 
    {!s}
     to use."
+msgstr ""
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
-msgstr "Configuring encrypted swap."
+msgstr ""
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
-msgstr "Installing data."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
-msgstr "Configure OpenRC services"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:57
 msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:59
 msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:61
 msgid ""
 "Unknown service-action {arg!s} for service {name!s} in run-"
 "level {level!s}."
 msgstr ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
 
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "rc-update {arg!s} call in chroot returned error code {num!s}."
 msgstr ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
 
 #: src/modules/services-openrc/main.py:101
 msgid "Target runlevel does not exist"
-msgstr "Target runlevel does not exist"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:102
 msgid ""
 "The path for runlevel {level!s} is {path!s}, which does not "
 "exist."
 msgstr ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
 
 #: src/modules/services-openrc/main.py:110
 msgid "Target service does not exist"
-msgstr "Target service does not exist"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:111
 msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+"The path for service {name!s} is {path!s}, which does not exist."
 msgstr ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
 
 #: src/modules/plymouthcfg/main.py:27
 msgid "Configure Plymouth theme"
-msgstr "Configure Plymouth theme"
+msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
 msgid "Install packages."
-msgstr "Install packages."
+msgstr ""
 
 #: src/modules/packages/main.py:57
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
+msgstr ""
 
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/modules/packages/main.py:65
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/modules/packages/main.py:638 src/modules/packages/main.py:650
 #: src/modules/packages/main.py:678
 msgid "Package Manager error"
-msgstr "Package Manager error"
+msgstr ""
 
 #: src/modules/packages/main.py:639
 msgid ""
 "The package manager could not prepare updates. The command 
    {!s}
     "
 "returned error code {!s}."
 msgstr ""
-"The package manager could not prepare updates. The command 
    {!s}
     "
-"returned error code {!s}."
 
 #: src/modules/packages/main.py:651
 msgid ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
+"The package manager could not update the system. The command 
    {!s}
     "
+"returned error code {!s}."
 msgstr ""
-"The package manager could not update the system. The command 
    {!s}
    "
-" returned error code {!s}."
 
 #: src/modules/packages/main.py:679
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command 
    {!s}
     returned error code {!s}."
 msgstr ""
-"The package manager could not make changes to the installed system. The "
-"command 
    {!s}
     returned error code {!s}."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
-msgstr "Install bootloader."
+msgstr ""
 
 #: src/modules/bootloader/main.py:508
 msgid "Bootloader installation error"
-msgstr "Bootloader installation error"
+msgstr ""
 
 #: src/modules/bootloader/main.py:509
 msgid ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
+"The bootloader could not be installed. The installation command 
    {!s} returned error code {!s}."
 msgstr ""
-"The bootloader could not be installed. The installation command "
-"
    {!s}
     returned error code {!s}."
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
-msgstr "Setting hardware clock."
+msgstr ""
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr "Creating initramfs with mkinitfs."
+msgstr ""
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr "Failed to run mkinitfs on the target"
+msgstr ""
 
 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
 msgid "The exit code was {}"
-msgstr "The exit code was {}"
+msgstr ""
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
-msgstr "Creating initramfs with dracut."
+msgstr ""
 
 #: src/modules/dracut/main.py:49
 msgid "Failed to run dracut on the target"
-msgstr "Failed to run dracut on the target"
+msgstr ""
 
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
-msgstr "Configuring initramfs."
+msgstr ""
 
 #: src/modules/openrcdmcryptcfg/main.py:26
 msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuring OpenRC dmcrypt service."
+msgstr ""
 
 #: src/modules/fstab/main.py:29
 msgid "Writing fstab."
-msgstr "Writing fstab."
+msgstr ""
 
 #: src/modules/fstab/main.py:389
 msgid "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
-msgstr "No 
    {!s}
     configuration is given for 
    {!s}
     to use."
+msgstr ""
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
-msgstr "Dummy python job."
+msgstr ""
 
 #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
 #: src/modules/dummypython/main.py:94
 msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+msgstr ""
 
 #: src/modules/localecfg/main.py:30
 msgid "Configuring locales."
-msgstr "Configuring locales."
+msgstr ""
 
 #: src/modules/networkcfg/main.py:29
 msgid "Saving network configuration."
-msgstr "Saving network configuration."
+msgstr ""

From 65c1ef7cb5fcab2bc80268aebc15de072ffab0f2 Mon Sep 17 00:00:00 2001
From: demmm 
Date: Fri, 24 Sep 2021 16:27:35 +0200
Subject: [PATCH 478/492] [initcpiocfg] fix install failure due to extra s

---
 src/modules/initcpiocfg/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index ba43984d28..99168dcde0 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -128,7 +128,7 @@ def write_mkinitcpio_lines(hooks, modules, files, root_mount_point):
                 line = "HOOKS=\"{!s}\"".format(' '.join(hooks))
             elif line.startswith("MODULES"):
                 line = "MODULES=\"{!s}\"".format(' '.join(modules))
-            elif lines.startswith("FILES"):
+            elif line.startswith("FILES"):
                 line = "FILES=\"{!s}\"".format(' '.join(files))
             mkinitcpio_file.write(line + "\n")
 

From 590f16370ca764385a2e89e369681c419dc30326 Mon Sep 17 00:00:00 2001
From: corey lang 
Date: Mon, 27 Sep 2021 01:04:52 -0500
Subject: [PATCH 479/492] [networkcfg] fix replace_username() undefined
 variables

---
 src/modules/networkcfg/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index 4dc6cbbf7f..0ee47c1aa7 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -73,12 +73,12 @@ def replace_username(nm_config_filename, live_user, target_user):
     if not os.path.exists(nm_config_filename):
         return
 
-    with open(target_network, "r") as network_conf:
+    with open(nm_config_filename, "r") as network_conf:
         text = network_conf.readlines()
 
     live_permissions = 'permissions=user:{}:;'.format(live_user)
-    target_permissions = 'permissions=user:{}:;\n'.format(user)
-    with open(target_network, "w") as network_conf:
+    target_permissions = 'permissions=user:{}:;\n'.format(target_user)
+    with open(nm_config_filename, "w") as network_conf:
         for line in text:
             if live_permissions in line:
                 line = target_permissions

From c4034d944bb6484a85fcb2ddc613f75c1d51eaf9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 13:08:22 +0200
Subject: [PATCH 480/492] Changes: pre-release housekeeping

---
 CHANGES        | 9 +++++++++
 CMakeLists.txt | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 97f8bd4c74..a9afa18f1f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,15 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.44.2 (2021-09-27) #
+
+This release contains contributions from (alphabetically by first name):
+ -
+
+This is a hotfix for a typo -- not a syntax error -- that affects the
+*networkcfg* module. Reported and fixed by .
+
+
 # 3.2.44.1 (2021-09-24) #
 
 This release contains contributions from (alphabetically by first name):
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01ae160d9d..58a06db81f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.44.1
+    VERSION 3.2.44.2
     LANGUAGES C CXX
 )
 

From 657a36310bb8e7199ad5ac897160469c5df16f13 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 13:18:12 +0200
Subject: [PATCH 481/492] [libcalamares] Log the Python pre-script a little
 better

- Make clear that the @ is a string-location, and how long the
  pre-script is (although in practice, it will be either null
  and 0, or the values set in the loadmodule executable).
---
 src/libcalamares/PythonJob.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp
index 1a4683c29c..201f56a159 100644
--- a/src/libcalamares/PythonJob.cpp
+++ b/src/libcalamares/PythonJob.cpp
@@ -330,7 +330,8 @@ void
 PythonJob::setInjectedPreScript( const char* preScript )
 {
     s_preScript = preScript;
-    cDebug() << "Python pre-script set to" << Logger::Pointer( preScript );
+    cDebug() << "Python pre-script set to string" << Logger::Pointer( preScript ) << "length"
+             << ( preScript ? strlen( preScript ) : 0 );
 }
 
 }  // namespace Calamares

From de9e6a7d7086b2d4859ac6fa869afd19ab337969 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 13:27:36 +0200
Subject: [PATCH 482/492] [calamares] Log module-searching in the
 test-application

---
 src/calamares/testmain.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 6d75a4fbb1..35cddfce8a 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -143,8 +143,7 @@ handle_args( QCoreApplication& a )
                               parser.value( langOption ),
                               parser.value( brandOption ),
                               parser.isSet( slideshowOption ) || parser.isSet( uiOption ),
-                              pythonInjection
-        };
+                              pythonInjection };
     }
 }
 
@@ -299,7 +298,8 @@ load_module( const ModuleConfig& moduleConfig )
     bool ok = false;
     QVariantMap descriptor;
 
-    for ( const QString& prefix : QStringList { "./", "src/modules/", "modules/" } )
+    QStringList moduleDirectories { "./", "src/modules/", "modules/" };
+    for ( const QString& prefix : qAsConst( moduleDirectories ) )
     {
         // Could be a complete path, eg. src/modules/dummycpp/module.desc
         fi = QFileInfo( prefix + moduleName );
@@ -330,7 +330,7 @@ load_module( const ModuleConfig& moduleConfig )
 
     if ( !ok )
     {
-        cWarning() << "No suitable module descriptor found.";
+        cWarning() << "No suitable module descriptor found in" << Logger::DebugList( moduleDirectories );
         return nullptr;
     }
 
@@ -461,7 +461,7 @@ main( int argc, char* argv[] )
 #ifdef WITH_PYTHON
     if ( module.m_pythonInjection )
     {
-        Calamares::PythonJob::setInjectedPreScript(pythonPreScript);
+        Calamares::PythonJob::setInjectedPreScript( pythonPreScript );
     }
 #endif
 #ifdef WITH_QML

From 058e6cbcda1104455c7e0f777e0170f9eedd483a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 13:34:08 +0200
Subject: [PATCH 483/492] [calamares] Log failed module-load in
 test-application

---
 src/calamares/testmain.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 35cddfce8a..c0258eb54f 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -325,6 +325,17 @@ load_module( const ModuleConfig& moduleConfig )
             {
                 break;
             }
+            else
+            {
+                if ( !fi.exists() )
+                {
+                    cDebug() << "Expected a descriptor file" << fi.path();
+                }
+                else
+                {
+                    cDebug() << "Read descriptor" << fi.path() << "and it was empty.";
+                }
+            }
         }
     }
 

From 7cda1d2edde0e3e0e4c682adf8028588b2aee23c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 13:39:27 +0200
Subject: [PATCH 484/492] [calamares] Test-loader tries loading from
 install-dir, too

---
 src/calamares/testmain.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index c0258eb54f..1d6971e80a 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -298,7 +298,7 @@ load_module( const ModuleConfig& moduleConfig )
     bool ok = false;
     QVariantMap descriptor;
 
-    QStringList moduleDirectories { "./", "src/modules/", "modules/" };
+    QStringList moduleDirectories { "./", "src/modules/", "modules/", CMAKE_INSTALL_FULL_LIBDIR "/calamares/modules/" };
     for ( const QString& prefix : qAsConst( moduleDirectories ) )
     {
         // Could be a complete path, eg. src/modules/dummycpp/module.desc

From 815bb62ae520d24923b6cc1aed8c1340117f508f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 14:26:43 +0200
Subject: [PATCH 485/492] [calamares] Fix test-application command-line-args

- use C++11 uniform-initialization
- while here, remove space from name of --global option
---
 src/calamares/testmain.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 1d6971e80a..9d01890315 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -71,22 +71,20 @@ handle_args( QCoreApplication& a )
 {
     QCommandLineOption debugLevelOption(
         QStringLiteral( "D" ), "Verbose output for debugging purposes (0-8), ignored.", "level" );
-    QCommandLineOption globalOption( QStringList() << QStringLiteral( "g" ) << QStringLiteral( "global " ),
+    QCommandLineOption globalOption( { QStringLiteral( "g" ), QStringLiteral( "global" ) },
                                      QStringLiteral( "Global settings document" ),
                                      "global.yaml" );
-    QCommandLineOption jobOption( QStringList() << QStringLiteral( "j" ) << QStringLiteral( "job" ),
-                                  QStringLiteral( "Job settings document" ),
-                                  "job.yaml" );
-    QCommandLineOption langOption( QStringList() << QStringLiteral( "l" ) << QStringLiteral( "language" ),
+    QCommandLineOption jobOption(
+        { QStringLiteral( "j" ), QStringLiteral( "job" ) }, QStringLiteral( "Job settings document" ), "job.yaml" );
+    QCommandLineOption langOption( { QStringLiteral( "l" ), QStringLiteral( "language" ) },
                                    QStringLiteral( "Language (global)" ),
                                    "languagecode" );
-    QCommandLineOption brandOption( QStringList() << QStringLiteral( "b" ) << QStringLiteral( "branding" ),
+    QCommandLineOption brandOption( { QStringLiteral( "b" ), QStringLiteral( "branding" ) },
                                     QStringLiteral( "Branding directory" ),
                                     "path/to/branding.desc",
                                     "src/branding/default/branding.desc" );
-    QCommandLineOption uiOption( QStringList() << QStringLiteral( "U" ) << QStringLiteral( "ui" ),
-                                 QStringLiteral( "Enable UI" ) );
-    QCommandLineOption slideshowOption( QStringList() << QStringLiteral( "s" ) << QStringLiteral( "slideshow" ),
+    QCommandLineOption uiOption( { QStringLiteral( "U" ), QStringLiteral( "ui" ) }, QStringLiteral( "Enable UI" ) );
+    QCommandLineOption slideshowOption( { QStringLiteral( "s" ), QStringLiteral( "slideshow" ) },
                                         QStringLiteral( "Run slideshow module" ) );
     QCommandLineParser parser;
     parser.setApplicationDescription( "Calamares module tester" );
@@ -101,7 +99,7 @@ handle_args( QCoreApplication& a )
     parser.addOption( uiOption );
     parser.addOption( slideshowOption );
 #ifdef WITH_PYTHON
-    QCommandLineOption pythonOption( QStringList() << QStringLiteral( "P" ) << QStringLiteral( "no-injected-python" ),
+    QCommandLineOption pythonOption( { QStringLiteral( "P" ), QStringLiteral( "no-injected-python" ) },
                                      QStringLiteral( "Do not disable potentially-harmful Python commands" ) );
     parser.addOption( pythonOption );
 #endif

From f197acf8e00d20db25f267604685898dc0547daa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 17:27:42 +0200
Subject: [PATCH 486/492] CI: add stubs for libcalamares bits, to help pylint

---
 ci/libcalamares/__init__.py      |  9 +++++++++
 ci/libcalamares/globalstorage.py |  9 +++++++++
 ci/libcalamares/utils.py         | 15 +++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 ci/libcalamares/__init__.py
 create mode 100644 ci/libcalamares/globalstorage.py
 create mode 100644 ci/libcalamares/utils.py

diff --git a/ci/libcalamares/__init__.py b/ci/libcalamares/__init__.py
new file mode 100644
index 0000000000..11bf0ffe2b
--- /dev/null
+++ b/ci/libcalamares/__init__.py
@@ -0,0 +1,9 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
+# Stubs for part of the Python API from libcalamares
+# (although the **actual** API is presented through
+# Boost::Python, not as a bare C-extension) so that
+# pylint doesn't complain about libcalamares internals.
+
+pass
diff --git a/ci/libcalamares/globalstorage.py b/ci/libcalamares/globalstorage.py
new file mode 100644
index 0000000000..3c2acb8701
--- /dev/null
+++ b/ci/libcalamares/globalstorage.py
@@ -0,0 +1,9 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
+# Stubs for part of the Python API from libcalamares
+# (although the **actual** API is presented through
+# Boost::Python, not as a bare C-extension) so that
+# pylint doesn't complain about libcalamares internals.
+
+def value(_): return 1
diff --git a/ci/libcalamares/utils.py b/ci/libcalamares/utils.py
new file mode 100644
index 0000000000..1d423893b7
--- /dev/null
+++ b/ci/libcalamares/utils.py
@@ -0,0 +1,15 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
+# Stubs for part of the Python API from libcalamares
+# (although the **actual** API is presented through
+# Boost::Python, not as a bare C-extension) so that
+# pylint doesn't complain about libcalamares internals.
+
+def debug(_): pass
+
+def warning(_): pass
+
+def gettext_path(): pass
+
+def gettext_languages(): pass

From 836ea55dbd1da35ea0c4f4205662de4693827fe2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 17:50:47 +0200
Subject: [PATCH 487/492] Changes: credit to Corey for fixes

---
 CHANGES | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index a9afa18f1f..773f05e57a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,10 +10,10 @@ website will have to do for older versions.
 # 3.2.44.2 (2021-09-27) #
 
 This release contains contributions from (alphabetically by first name):
- -
+ - Corey Lang (new contributor, welcome!)
 
 This is a hotfix for a typo -- not a syntax error -- that affects the
-*networkcfg* module. Reported and fixed by .
+*networkcfg* module. Reported and fixed by Corey.
 
 
 # 3.2.44.1 (2021-09-24) #

From 719548213f00a504f383ca67f8cc5f051586f3f3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 17:52:02 +0200
Subject: [PATCH 488/492] CMake: if pylint is available, run it as part of the
 test-suite

This introduces a stub-implementation (fake) that mimics the
API offered by libcalamares (the library is actually exposed
to Python via Boost::Python, so it doesn't act like a C-extension).
Using that stub-implementation, we can check Python modules for
validity as part of the test-suite.

The stub-implementation is needed, because otherwise every
Python module already fails at `import libcalamares`.

- stub-implement the API that is actually used by the Python modules
- in globalstorage, be slightly smart about what keys are being
  requested (so that e.g. all the modules that handle partitions
  information get an empty list and can manipulate that, instead of
  erroring out when they get a string)
---
 .../CalamaresAddModuleSubdirectory.cmake      | 25 +++++++++++++++++++
 ci/libcalamares/__init__.py                   |  2 +-
 ci/libcalamares/globalstorage.py              | 17 ++++++++++++-
 ci/libcalamares/utils.py                      |  8 ++++++
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/CMakeModules/CalamaresAddModuleSubdirectory.cmake b/CMakeModules/CalamaresAddModuleSubdirectory.cmake
index 1f1c023005..91524a09e4 100644
--- a/CMakeModules/CalamaresAddModuleSubdirectory.cmake
+++ b/CMakeModules/CalamaresAddModuleSubdirectory.cmake
@@ -42,6 +42,18 @@ include( CalamaresCheckModuleSelection )
 
 set( MODULE_DATA_DESTINATION share/calamares/modules )
 
+# We look for Pylint (just once) so that unittests can be added that
+# check the syntax / variables of Python modules. This should help
+# avoid more typo's-in-releases.
+if(BUILD_TESTING AND NOT PYLINT_COMMAND_SEARCHED)
+    set(PYLINT_COMMAND_SEARCHED TRUE)
+    find_program(
+        PYLINT_COMMAND
+        NAMES pylint3 pylint
+        PATHS $ENV{HOME}/.local/bin
+        )
+endif()
+
 function( _calamares_add_module_subdirectory_impl )
     set( SUBDIRECTORY ${ARGV0} )
 
@@ -241,6 +253,19 @@ function( _calamares_add_module_subdirectory_impl )
         if ( EXISTS ${_testdir}/CMakeTests.txt AND NOT EXISTS ${_mod_dir}/CMakeLists.txt )
             include( ${_testdir}/CMakeTests.txt )
         endif()
+        if ( PYLINT_COMMAND AND MODULE_INTERFACE MATCHES "python" )
+            # Python modules get an additional test via pylint; this
+            # needs to run at top-level because the ci/libcalamares directory
+            # contains API stubs.
+            #
+            # TODO: the entry point is assumed to be `main.py`, but that is
+            #       configurable through module.desc
+            add_test(
+                NAME lint-${SUBDIRECTORY}
+                COMMAND env PYTHONPATH=ci: ${PYLINT_COMMAND} -E ${_mod_dir}/main.py
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                )
+        endif()
     endif()
 endfunction()
 
diff --git a/ci/libcalamares/__init__.py b/ci/libcalamares/__init__.py
index 11bf0ffe2b..1f7a094307 100644
--- a/ci/libcalamares/__init__.py
+++ b/ci/libcalamares/__init__.py
@@ -6,4 +6,4 @@
 # Boost::Python, not as a bare C-extension) so that
 # pylint doesn't complain about libcalamares internals.
 
-pass
+VERSION_SHORT="1.0"
diff --git a/ci/libcalamares/globalstorage.py b/ci/libcalamares/globalstorage.py
index 3c2acb8701..d40a282048 100644
--- a/ci/libcalamares/globalstorage.py
+++ b/ci/libcalamares/globalstorage.py
@@ -6,4 +6,19 @@
 # Boost::Python, not as a bare C-extension) so that
 # pylint doesn't complain about libcalamares internals.
 
-def value(_): return 1
+def count(): return 1
+
+def keys(): return []
+
+def contains(_): return True
+
+def value(key):
+    if key in ("branding",):
+        return dict()
+    if key in ("partitions",):
+        return list()
+    return ""
+
+def insert(key, value): pass
+
+def remove(_): pass
diff --git a/ci/libcalamares/utils.py b/ci/libcalamares/utils.py
index 1d423893b7..706e4a95a2 100644
--- a/ci/libcalamares/utils.py
+++ b/ci/libcalamares/utils.py
@@ -10,6 +10,14 @@ def debug(_): pass
 
 def warning(_): pass
 
+def error(_): pass
+
 def gettext_path(): pass
 
 def gettext_languages(): pass
+
+def target_env_call(_): return 0
+
+def check_target_env_call(_): pass
+
+def mount(device, mountpoint, fstype, options): return 0

From 96c89fc08011a8f4532e60989efb784624626529 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 20:29:03 +0200
Subject: [PATCH 489/492] [displaymanager] Fix Python errors

Apparently nobody ever hit the else-branch here (because
each DM has exactly one implementation -- that's what the
check is there for!) because the logging of the error
itself would raise IndexError or ValueError.
---
 src/modules/displaymanager/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py
index 8b63b9e8d8..5fb2286822 100644
--- a/src/modules/displaymanager/main.py
+++ b/src/modules/displaymanager/main.py
@@ -198,7 +198,7 @@ def update_from_desktop_file(self, root_mount_point):
     DesktopEnvironment('/usr/bin/fvwm3', 'fvwm3'),
     DesktopEnvironment('/usr/bin/sway', 'sway'),
     DesktopEnvironment('/usr/bin/ukui-session', 'ukui'),
-    DesktopEnvironment('/usr/bin/cutefish-session', 'cutefish-xsession'),    
+    DesktopEnvironment('/usr/bin/cutefish-session', 'cutefish-xsession'),
 ]
 
 
@@ -923,7 +923,7 @@ def run():
             else:
                 dm_instance = None
         else:
-            libcalamares.utils.debug("{!s} has {!d} implementation classes.".format(dm).format(len(impl)))
+            libcalamares.utils.debug("{!s} has {!s} implementation classes.".format(dm, len(impl)))
 
         if dm_instance is None:
             libcalamares.utils.debug("{!s} selected but not installed".format(dm))

From 16f8243fb34277f71a2c7fdab1fbdb233c6e0f3c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 20:41:52 +0200
Subject: [PATCH 490/492] [unpackfs] Move to conventional python-libcalamares
 use

All **other** modules fully specify libcalamares; only unpackfs
was importing shortcuts. Change to conventional usage (partly
because that's easier on the pylint implementation, partly because
it's then consistent with the rest).
---
 src/modules/unpackfs/main.py | 51 ++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py
index 8a5194843c..e48e9b6bd9 100644
--- a/src/modules/unpackfs/main.py
+++ b/src/modules/unpackfs/main.py
@@ -22,13 +22,12 @@
 import sys
 import tempfile
 
-from libcalamares import *
-from libcalamares.utils import mount
+import libcalamares
 
 import gettext
 _ = gettext.translation("calamares-python",
-                        localedir=utils.gettext_path(),
-                        languages=utils.gettext_languages(),
+                        localedir=libcalamares.utils.gettext_path(),
+                        languages=libcalamares.utils.gettext_languages(),
                         fallback=True).gettext
 
 def pretty_name():
@@ -123,14 +122,14 @@ def do_mount(self, base):
             return
 
         if os.path.isdir(self.source):
-            r = mount(self.source, imgmountdir, "", "--bind")
+            r = libcalamares.utils.mount(self.source, imgmountdir, "", "--bind")
         elif os.path.isfile(self.source):
-            r = mount(self.source, imgmountdir, self.sourcefs, "loop")
+            r = libcalamares.utils.mount(self.source, imgmountdir, self.sourcefs, "loop")
         else: # self.source is a device
-            r = mount(self.source, imgmountdir, self.sourcefs, "")
+            r = libcalamares.utils.mount(self.source, imgmountdir, self.sourcefs, "")
 
         if r != 0:
-            utils.debug("Failed to mount '{}' (fs={}) (target={})".format(self.source, self.sourcefs, imgmountdir))
+            libcalamares.utils.debug("Failed to mount '{}' (fs={}) (target={})".format(self.source, self.sourcefs, imgmountdir))
             raise subprocess.CalledProcessError(r, "mount")
 
 
@@ -142,7 +141,7 @@ def global_excludes():
     List excludes for rsync.
     """
     lst = []
-    extra_mounts = globalstorage.value("extraMounts")
+    extra_mounts = libcalamares.globalstorage.value("extraMounts")
     if extra_mounts is None:
         extra_mounts = []
 
@@ -251,7 +250,7 @@ def file_copy(source, entry, progress_cb):
     # https://bugzilla.redhat.com/show_bug.cgi?id=868755#c50
     # for the same issue in Anaconda, which uses a similar workaround.
     if process.returncode != 0 and process.returncode != 23:
-        utils.warning("rsync failed with error code {}.".format(process.returncode))
+        libcalamares.utils.warning("rsync failed with error code {}.".format(process.returncode))
         return _("rsync failed with error code {}.").format(process.returncode)
 
     return None
@@ -298,7 +297,7 @@ def report_progress(self):
 
         global status
         status = _("Unpacking image {}/{}, file {}/{}").format((complete_count+1), len(self.entries), current_done, current_total)
-        job.setprogress(progress)
+        libcalamares.job.setprogress(progress)
 
     def run(self):
         """
@@ -313,7 +312,7 @@ def run(self):
             complete = 0
             for entry in self.entries:
                 status = _("Starting to unpack {}").format(entry.source)
-                job.setprogress( ( 1.0 * complete ) / len(self.entries) )
+                libcalamares.job.setprogress( ( 1.0 * complete ) / len(self.entries) )
                 entry.do_mount(source_mount_path)
                 entry.do_count()  # Fill in the entry.total
 
@@ -398,7 +397,7 @@ def repair_root_permissions(root_mount_point):
         try:
             os.chmod(root_mount_point, 0o755)  # Want / to be rwxr-xr-x
         except OSError as e:
-            utils.warning("Could not set / to safe permissions: {}".format(e))
+            libcalamares.utils.warning("Could not set / to safe permissions: {}".format(e))
             # But ignore it
 
 
@@ -414,9 +413,9 @@ def extract_weight(entry):
             wi = int(w)
             return wi if wi > 0 else 1
         except ValueError:
-            utils.warning("*weight* setting {!r} is not valid.".format(w))
+            libcalamares.utils.warning("*weight* setting {!r} is not valid.".format(w))
         except TypeError:
-            utils.warning("*weight* setting {!r} must be number.".format(w))
+            libcalamares.utils.warning("*weight* setting {!r} must be number.".format(w))
     return 1
 
 
@@ -424,16 +423,16 @@ def run():
     """
     Unsquash filesystem.
     """
-    root_mount_point = globalstorage.value("rootMountPoint")
+    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
 
     if not root_mount_point:
-        utils.warning("No mount point for root partition")
+        libcalamares.utils.warning("No mount point for root partition")
         return (_("No mount point for root partition"),
                 _("globalstorage does not contain a \"rootMountPoint\" key, "
                 "doing nothing"))
 
     if not os.path.exists(root_mount_point):
-        utils.warning("Bad root mount point \"{}\"".format(root_mount_point))
+        libcalamares.utils.warning("Bad root mount point \"{}\"".format(root_mount_point))
         return (_("Bad mount point for root partition"),
                 _("rootMountPoint is \"{}\", which does not "
                 "exist, doing nothing").format(root_mount_point))
@@ -444,22 +443,22 @@ def run():
     #   - unsupported filesystems
     #   - non-existent sources
     #   - missing tools for specific FS
-    for entry in job.configuration["unpack"]:
+    for entry in libcalamares.job.configuration["unpack"]:
         source = os.path.abspath(entry["source"])
         sourcefs = entry["sourcefs"]
 
         if sourcefs not in supported_filesystems:
-            utils.warning("The filesystem for \"{}\" ({}) is not supported by your current kernel".format(source, sourcefs))
-            utils.warning(" ... modprobe {} may solve the problem".format(sourcefs))
+            libcalamares.utils.warning("The filesystem for \"{}\" ({}) is not supported by your current kernel".format(source, sourcefs))
+            libcalamares.utils.warning(" ... modprobe {} may solve the problem".format(sourcefs))
             return (_("Bad unsquash configuration"),
                     _("The filesystem for \"{}\" ({}) is not supported by your current kernel").format(source, sourcefs))
         if not os.path.exists(source):
-            utils.warning("The source filesystem \"{}\" does not exist".format(source))
+            libcalamares.utils.warning("The source filesystem \"{}\" does not exist".format(source))
             return (_("Bad unsquash configuration"),
                     _("The source filesystem \"{}\" does not exist").format(source))
         if sourcefs == "squashfs":
             if shutil.which("unsquashfs") is None:
-                utils.warning("Failed to find unsquashfs")
+                libcalamares.utils.warning("Failed to find unsquashfs")
 
                 return (_("Failed to unpack image \"{}\"").format(self.source),
                         _("Failed to find unsquashfs, make sure you have the squashfs-tools package installed"))
@@ -467,18 +466,18 @@ def run():
     unpack = list()
 
     is_first = True
-    for entry in job.configuration["unpack"]:
+    for entry in libcalamares.job.configuration["unpack"]:
         source = os.path.abspath(entry["source"])
         sourcefs = entry["sourcefs"]
         destination = os.path.abspath(root_mount_point + entry["destination"])
 
         if not os.path.isdir(destination) and sourcefs != "file":
-            utils.warning(("The destination \"{}\" in the target system is not a directory").format(destination))
+            libcalamares.utils.warning(("The destination \"{}\" in the target system is not a directory").format(destination))
             if is_first:
                 return (_("Bad unsquash configuration"),
                         _("The destination \"{}\" in the target system is not a directory").format(destination))
             else:
-                utils.debug(".. assuming that the previous targets will create that directory.")
+                libcalamares.utils.debug(".. assuming that the previous targets will create that directory.")
 
         unpack.append(UnpackEntry(source, sourcefs, destination))
         # Optional settings

From 51898ea32b23f0450999318792033795c264a4b2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 20:48:28 +0200
Subject: [PATCH 491/492] [unpackfs] Fix typo

Apparently everyone shipping a squashfs image also has the tools
installed, because the error message reporting that the tools-are-
missing contained a reference to an undefined variable.
Fix that, and while here improve the error message so you
don't get a whole path as a title in the error message.

The slightly weird error-message construction is so that no
messages change and no translation work is needed.
---
 src/modules/unpackfs/main.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py
index e48e9b6bd9..020db370c9 100644
--- a/src/modules/unpackfs/main.py
+++ b/src/modules/unpackfs/main.py
@@ -460,8 +460,9 @@ def run():
             if shutil.which("unsquashfs") is None:
                 libcalamares.utils.warning("Failed to find unsquashfs")
 
-                return (_("Failed to unpack image \"{}\"").format(self.source),
-                        _("Failed to find unsquashfs, make sure you have the squashfs-tools package installed"))
+                return (_("Bad unsquash configuration"),
+                        _("Failed to find unsquashfs, make sure you have the squashfs-tools package installed.") +
+                        " " + _("Failed to unpack image \"{}\"").format(source))
 
     unpack = list()
 

From de63669ceee38b21faba08c245f41d4ffb6ef3f6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot 
Date: Mon, 27 Sep 2021 21:32:43 +0200
Subject: [PATCH 492/492] CI: add missing API stub-implementation for pylint

---
 ci/libcalamares/job.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ci/libcalamares/job.py

diff --git a/ci/libcalamares/job.py b/ci/libcalamares/job.py
new file mode 100644
index 0000000000..9ea38b8786
--- /dev/null
+++ b/ci/libcalamares/job.py
@@ -0,0 +1,15 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+#
+# Stubs for part of the Python API from libcalamares
+# (although the **actual** API is presented through
+# Boost::Python, not as a bare C-extension) so that
+# pylint doesn't complain about libcalamares internals.
+
+configuration = dict()
+
+def setprogress(_): pass
+
+def pretty_name(): return ""
+
+def working_path(): return ""